clean up GT++ code (#589)

* yeet big reactor support

* yeet IC2 classic support

* yeet pneumaticraft support

* yeet More Planets support

* yeet Immersive Engineering support

* yeet Psychedilicraft support

* yeet Beyond Reality Core support

* sort mods to see what must be purged

* yeet simply jetpacks

* yeet RFTools

* yeet xReliquary

* yeet RedTech

* yeet Mekanism

* yeet GrowthCraft

* yeet ihl

* leftover cleaning

* yeet thermal fondation support

* yeet compact windmills support

* spotless

* remove constants from LoadedMods (part 1 / 2)

* spotless

* remove constants from LoadedMods (part 2 / 2)

* use mod id enum instead of strings + optimize imports

* Loaded.isModLoaded -> enum

* restore RA init

* missing !

* start organizing recipes stuff

* fix crash on world load in dev

* remove unused class

* remove HazmatUtils.java

* move all the removals

* remove enableHarderRecipesForHighTierCasings and usages(disabled in the pack)

* move some pyrolyse oven recipes to its own file

* sa

* bump GT version

* bump GT5U version

* spotless apply

* use Everglades entry from the mod enum

---------

Co-authored-by: miozune <miozune@gmail.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>

13 files changed, 40 insertions, 395 deletions

diff --git a/src/main/java/gtPlusPlus/core/common/CommonProxy.java b/src/main/java/gtPlusPlus/core/common/CommonProxy.java
index 8961ceb80f..d97cb80ba6 100644
--- a/src/main/java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/main/java/gtPlusPlus/core/common/CommonProxy.java
@@ -10,7 +10,11 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraftforge.client.IItemRenderer;
 
-import cpw.mods.fml.common.event.*;
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.event.FMLServerStartingEvent;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gtPlusPlus.GTplusplus;
@@ -24,12 +28,21 @@ import gtPlusPlus.core.entity.monster.EntityGiantChickenBase;
 import gtPlusPlus.core.entity.monster.EntitySickBlaze;
 import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct;
 import gtPlusPlus.core.fluids.FluidFactory;
-import gtPlusPlus.core.handler.*;
-import gtPlusPlus.core.handler.events.*;
+import gtPlusPlus.core.handler.BookHandler;
+import gtPlusPlus.core.handler.BurnableFuelHandler;
+import gtPlusPlus.core.handler.COMPAT_HANDLER;
+import gtPlusPlus.core.handler.COMPAT_IntermodStaging;
+import gtPlusPlus.core.handler.GuiHandler;
+import gtPlusPlus.core.handler.events.BlockEventHandler;
+import gtPlusPlus.core.handler.events.EnderDragonDeathHandler;
+import gtPlusPlus.core.handler.events.EntityDeathHandler;
+import gtPlusPlus.core.handler.events.GeneralTooltipEventHandler;
+import gtPlusPlus.core.handler.events.PickaxeBlockBreakEventHandler;
+import gtPlusPlus.core.handler.events.PlayerSleepEventHandler;
+import gtPlusPlus.core.handler.events.ZombieBackupSpawnEventHandler;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.CORE.ConfigSwitches;
-import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.ALLOY;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.tileentities.ModTileEntities;
@@ -44,6 +57,7 @@ import gtPlusPlus.preloader.CORE_Preloader;
 import gtPlusPlus.xmod.eio.handler.HandlerTooltip_EIO;
 import gtPlusPlus.xmod.galacticraft.handler.HandlerTooltip_GC;
 import gtPlusPlus.xmod.gregtech.api.util.SpecialBehaviourTooltipHandler;
+import gtPlusPlus.xmod.gregtech.recipes.GregtechRecipeAdder;
 import gtPlusPlus.xmod.ic2.CustomInternalName;
 
 public class CommonProxy {
@@ -55,9 +69,8 @@ public class CommonProxy {
 
     public void preInit(final FMLPreInitializationEvent e) {
         Logger.INFO("Doing some house cleaning.");
-        LoadedMods.checkLoaded();
-        Logger.INFO("Making sure we're ready to party!");
-
+        CORE.RA = new GregtechRecipeAdder();
+        Logger.INFO("Created Gregtech recipe handler.");
         if (!CORE_Preloader.DEBUG_MODE) {
             Logger.WARNING("Development mode not enabled.");
         } else if (CORE_Preloader.DEBUG_MODE) {
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java
index d06ad2324e..34642abde6 100644
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java
+++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java
@@ -1,6 +1,16 @@
 package gtPlusPlus.core.common.compat;
 
-import static gregtech.client.GT_TooltipHandler.Tier.*;
+import static gregtech.api.enums.Mods.Baubles;
+import static gregtech.api.enums.Mods.PlayerAPI;
+import static gregtech.client.GT_TooltipHandler.Tier.EV;
+import static gregtech.client.GT_TooltipHandler.Tier.HV;
+import static gregtech.client.GT_TooltipHandler.Tier.IV;
+import static gregtech.client.GT_TooltipHandler.Tier.LV;
+import static gregtech.client.GT_TooltipHandler.Tier.LuV;
+import static gregtech.client.GT_TooltipHandler.Tier.MV;
+import static gregtech.client.GT_TooltipHandler.Tier.UHV;
+import static gregtech.client.GT_TooltipHandler.Tier.UV;
+import static gregtech.client.GT_TooltipHandler.Tier.ZPM;
 import static gregtech.client.GT_TooltipHandler.registerTieredTooltip;
 
 import net.minecraft.entity.monster.EntityBlaze;
@@ -23,15 +33,12 @@ import gtPlusPlus.core.item.bauble.MonsterKillerBaseBauble;
 import gtPlusPlus.core.item.general.ItemCloakingDevice;
 import gtPlusPlus.core.item.general.ItemHealingDevice;
 import gtPlusPlus.core.item.general.ItemSlowBuildingRing;
-import gtPlusPlus.core.lib.LoadedMods;
 
 public class COMPAT_Baubles {
 
     public static void run() {
-        if (LoadedMods.Baubles) {
+        if (Baubles.isModLoaded()) {
             baublesLoaded();
-        } else {
-            baublesNotLoaded();
         }
     }
 
@@ -85,12 +92,8 @@ public class COMPAT_Baubles {
                 "Hellish",
                 6);
 
-        if (LoadedMods.PlayerAPI) {
+        if (PlayerAPI.isModLoaded()) {
             ModItems.itemSlowBuildingRing = new ItemSlowBuildingRing();
         }
     }
-
-    public static void baublesNotLoaded() {
-        Logger.INFO("Baubles Not Found - Skipping Resources.");
-    }
 }
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java
deleted file mode 100644
index c2bbacd5d8..0000000000
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package gtPlusPlus.core.common.compat;
-
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.util.GT_OreDictUnificator;
-import gtPlusPlus.core.item.ModItems;
-
-public class COMPAT_BigReactors {
-
-    public static void OreDict() {
-        run();
-    }
-
-    private static final void run() {
-        GT_OreDictUnificator.registerOre("plateBlutonium", new ItemStack(ModItems.itemPlateBlutonium));
-        GT_OreDictUnificator.registerOre("plateCyanite", new ItemStack(ModItems.itemPlateCyanite));
-        GT_OreDictUnificator.registerOre("plateLudicrite", new ItemStack(ModItems.itemPlateLudicrite));
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java
deleted file mode 100644
index 159cfe2b78..0000000000
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java
+++ /dev/null
@@ -1,221 +0,0 @@
-package gtPlusPlus.core.common.compat;
-
-import static gtPlusPlus.core.handler.COMPAT_HANDLER.*;
-
-import net.minecraft.item.ItemStack;
-
-import gtPlusPlus.core.recipe.ShapedRecipeObject;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-
-public class COMPAT_CompactWindmills {
-
-    // Change IC2 Upgrades
-    public static ItemStack kineticWind = ItemUtils.simpleMetaStack("IC2:blockKineticGenerator", 0, 1);
-    public static ItemStack shaftIron = ItemUtils.simpleMetaStack("IC2:itemRecipePart", 11, 1);
-    public static ItemStack cableCopper = ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 1367, 1);
-    public static String plateRubber = "ore:plateRubber";
-
-    // Machine Casings
-    public static ItemStack elvCasing = ItemUtils.simpleMetaStack("gregtech:gt.blockcasings", 0, 1);
-    public static ItemStack lvCasing = ItemUtils.simpleMetaStack("gregtech:gt.blockcasings", 1, 1);
-    public static ItemStack mvCasing = ItemUtils.simpleMetaStack("gregtech:gt.blockcasings", 2, 1);
-    public static ItemStack hvCasing = ItemUtils.simpleMetaStack("gregtech:gt.blockcasings", 3, 1);
-    public static ItemStack evCasing = ItemUtils.simpleMetaStack("gregtech:gt.blockcasings", 4, 1);
-    public static ItemStack ivCasing = ItemUtils.simpleMetaStack("gregtech:gt.blockcasings", 5, 1);
-
-    // GT Transformers
-    public static ItemStack elvTransformer = ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 20, 1);
-    public static ItemStack lvTransformer = ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 21, 1);
-    public static ItemStack mvTransformer = ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 22, 1);
-    public static ItemStack hvTransformer = ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 23, 1);
-    public static ItemStack evTransformer = ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 24, 1);
-
-    // Compact Windmills
-    public static ItemStack elvWindmill = ItemUtils.simpleMetaStack("CompactWindmills:blockCompactWindmill", 0, 1);
-    public static ItemStack lvWindmill = ItemUtils.simpleMetaStack("CompactWindmills:blockCompactWindmill", 1, 1);
-    public static ItemStack mvWindmill = ItemUtils.simpleMetaStack("CompactWindmills:blockCompactWindmill", 2, 1);
-    public static ItemStack hvWindmill = ItemUtils.simpleMetaStack("CompactWindmills:blockCompactWindmill", 3, 1);
-    public static ItemStack evWindmill = ItemUtils.simpleMetaStack("CompactWindmills:blockCompactWindmill", 4, 1);
-
-    // Compact Rotors
-    public static ItemStack rotor2 = ItemUtils.getItemStackFromFQRN("CompactWindmills:WOOL", 1);
-    public static ItemStack rotor1 = ItemUtils.getItemStackFromFQRN("CompactWindmills:WOOD", 1);
-    public static ItemStack rotor3 = ItemUtils.getItemStackFromFQRN("CompactWindmills:ALLOY", 1);
-    public static ItemStack rotor4 = ItemUtils.getItemStackFromFQRN("CompactWindmills:CARBON", 1);
-    public static ItemStack rotor5 = ItemUtils.getItemStackFromFQRN("CompactWindmills:IRIDIUM", 1);
-
-    // IC2 Rotors
-    public static ItemStack rotorIC1 = ItemUtils.getItemStackFromFQRN("IC2:itemwoodrotor", 1);
-    public static ItemStack rotorIC2 = ItemUtils.getItemStackFromFQRN("IC2:itemironrotor", 1);
-    public static ItemStack rotorIC3 = ItemUtils.getItemStackFromFQRN("IC2:itemsteelrotor", 1);
-    public static ItemStack rotorIC4 = ItemUtils.getItemStackFromFQRN("IC2:itemwcarbonrotor", 1);
-    public static ItemStack rotorBlade1 = ItemUtils.simpleMetaStack("IC2:itemRecipePart", 7, 1);
-    public static ItemStack rotorBlade2 = ItemUtils.simpleMetaStack("IC2:itemRecipePart", 8, 1);
-    public static ItemStack rotorBlade3 = ItemUtils.simpleMetaStack("IC2:itemRecipePart", 10, 1);
-    public static ItemStack rotorBlade4 = ItemUtils.simpleMetaStack("IC2:itemRecipePart", 9, 1);
-
-    // Plates
-    public static String plateTier1 = "ore:plateMagnalium";
-    public static String plateTier2 = "ore:plateStainlessSteel";
-    public static String plateTier3 = "ore:plateTitanium";
-    public static String plateTier4 = "ore:plateTungstenSteel";
-    public static String plateTier5 = "ore:plateNichrome";
-    public static String plateCarbon = "ore:plateAlloyCarbon";
-    public static String plateAlloy = "ore:plateAlloyAdvanced";
-
-    // Circuits
-    public static String circuitTier1 = "ore:circuitGood";
-    public static String circuitTier2 = "ore:circuitAdvanced";
-    public static String circuitTier3 = "ore:circuitData";
-    public static String circuitTier4 = "ore:circuitElite";
-    public static String circuitTier5 = "ore:circuitMaster";
-
-    // Wooden Rotor
-    public static ShapedRecipeObject Wooden_Rotor = new ShapedRecipeObject(
-            rotorBlade1,
-            "ore:plateAnyIron",
-            "ore:plateAnyIron",
-            "ore:screwAluminium",
-            rotorIC1,
-            "ore:screwAluminium",
-            rotorBlade1,
-            "plateAnyIron",
-            rotorBlade1,
-            rotor1);
-    // Alloy Rotor
-    public static ShapedRecipeObject Alloy_Rotor = new ShapedRecipeObject(
-            plateAlloy,
-            plateAlloy,
-            plateAlloy,
-            plateAlloy,
-            rotorIC3,
-            plateAlloy,
-            plateAlloy,
-            plateAlloy,
-            plateAlloy,
-            rotor3);
-    // Carbon Rotor
-    public static ShapedRecipeObject Carbon_Rotor = new ShapedRecipeObject(
-            plateCarbon,
-            rotorBlade4,
-            plateCarbon,
-            rotorBlade4,
-            rotor3,
-            rotorBlade4,
-            plateCarbon,
-            rotorBlade4,
-            plateCarbon,
-            rotor4);
-
-    // Kinetic Wind Turbine
-    public static ShapedRecipeObject KWT = new ShapedRecipeObject(
-            plateCarbon,
-            shaftIron,
-            plateCarbon,
-            cableCopper,
-            mvCasing,
-            cableCopper,
-            plateRubber,
-            plateCarbon,
-            plateRubber,
-            kineticWind);
-
-    // ELV Windmill
-    public static ShapedRecipeObject WM_ELV = new ShapedRecipeObject(
-            circuitTier1,
-            elvTransformer,
-            circuitTier1,
-            plateTier1,
-            lvCasing,
-            plateTier1,
-            plateTier1,
-            rotor1,
-            plateTier1,
-            elvWindmill);
-
-    // LV Windmill
-    public static ShapedRecipeObject WM_LV = new ShapedRecipeObject(
-            circuitTier2,
-            lvTransformer,
-            circuitTier2,
-            plateTier2,
-            mvCasing,
-            plateTier2,
-            plateTier2,
-            rotor2,
-            plateTier2,
-            lvWindmill);
-
-    // MV Windmill
-    public static ShapedRecipeObject WM_MV = new ShapedRecipeObject(
-            circuitTier3,
-            mvTransformer,
-            circuitTier3,
-            plateTier3,
-            hvCasing,
-            plateTier3,
-            plateTier3,
-            rotor3,
-            plateTier3,
-            mvWindmill);
-
-    // HV Windmill
-    public static ShapedRecipeObject WM_HV = new ShapedRecipeObject(
-            circuitTier4,
-            hvTransformer,
-            circuitTier4,
-            plateTier4,
-            evCasing,
-            plateTier4,
-            plateTier4,
-            rotor4,
-            plateTier4,
-            hvWindmill);
-
-    // EV Windmill
-    public static ShapedRecipeObject WM_EV = new ShapedRecipeObject(
-            circuitTier5,
-            evTransformer,
-            circuitTier5,
-            plateTier5,
-            ivCasing,
-            plateTier5,
-            plateTier5,
-            rotor5,
-            plateTier5,
-            evWindmill);
-
-    public static void OreDict() {
-        run();
-    }
-
-    private static final void run() {
-        // RemoveRecipeQueue.add("CompactWindmills:WOOL");
-        // RemoveRecipeQueue.add("CompactWindmills:WOOD");
-        // RemoveRecipeQueue.add("CompactWindmills:ALLOY");
-        // RemoveRecipeQueue.add("CompactWindmills:CARBON");
-        // RemoveRecipeQueue.add("CompactWindmills:IRIDIUM");
-
-        // Remove Recipes
-        RemoveRecipeQueue.add(kineticWind);
-        RemoveRecipeQueue.add(elvWindmill);
-        RemoveRecipeQueue.add(lvWindmill);
-        RemoveRecipeQueue.add(mvWindmill);
-        RemoveRecipeQueue.add(hvWindmill);
-        RemoveRecipeQueue.add(evWindmill);
-        RemoveRecipeQueue.add(rotor1);
-        RemoveRecipeQueue.add(rotor3);
-        RemoveRecipeQueue.add(rotor4);
-
-        // Add Recipes
-        AddRecipeQueue.add(Wooden_Rotor);
-        AddRecipeQueue.add(Alloy_Rotor);
-        AddRecipeQueue.add(Carbon_Rotor);
-        AddRecipeQueue.add(KWT);
-        AddRecipeQueue.add(WM_ELV);
-        AddRecipeQueue.add(WM_LV);
-        AddRecipeQueue.add(WM_MV);
-        AddRecipeQueue.add(WM_HV);
-        AddRecipeQueue.add(WM_EV);
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java
deleted file mode 100644
index fa2beb54ad..0000000000
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package gtPlusPlus.core.common.compat;
-
-import gtPlusPlus.xmod.growthcraft.fishtrap.FishTrapHandler;
-
-public class COMPAT_HarvestCraft {
-
-    public static void OreDict() {
-        run();
-    }
-
-    private static final void run() {
-        FishTrapHandler.pamsHarvestCraftCompat();
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
index 2a08956e2e..92da90184f 100644
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
+++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
@@ -37,11 +37,6 @@ public class COMPAT_IC2 {
             itemSolarHelmet);
 
     public static void OreDict() {
-        // Get ItemStacks for results
-        /*
-         * itemCropnalyzer = UtilsItems.getItemStack("IC2:itemCropnalyzer", 1); itemSolarHelmet =
-         * UtilsItems.getItemStack("IC2:itemSolarHelmet", 1);
-         */
         run();
     }
 
@@ -58,11 +53,6 @@ public class COMPAT_IC2 {
             RemoveRecipeQueue.add("IC2:itemCable:6");
             RemoveRecipeQueue.add("IC2:itemCable:10");
             RemoveRecipeQueue.add("IC2:itemCable:13");
-            // RemoveRecipeQueue.add(itemCropnalyzer);
-            // RemoveRecipeQueue.add(itemSolarHelmet);
-
-            // AddRecipeQueue.add(Cropnalyzer);
-            // AddRecipeQueue.add(SolarHelmet);
         }
     }
 }
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java
deleted file mode 100644
index 8e665b366e..0000000000
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package gtPlusPlus.core.common.compat;
-
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-
-public class COMPAT_MorePlanets {
-
-    public static void OreDict() {
-        run();
-    }
-
-    private static final void run() {
-        // Metals
-        ItemUtils.getItemForOreDict("MorePlanet:kapteyn-b_item", "ingotFrozenIron", "Frozen Iron Ingot", 0);
-        ItemUtils.getItemForOreDict("MorePlanet:kapteyn-b_item", "ingotAnyIron", "Frozen Iron Ingot", 0);
-        ItemUtils.getItemForOreDict("MorePlanet:polongnius_item", "ingotPalladium", "Palladium Ingot", 5);
-        ItemUtils.getItemForOreDict("MorePlanet:fronos_item", "ingotIridium", "Iridium Ingot", 3);
-        ItemUtils.getItemForOreDict("MorePlanet:nibiru_item", "ingotNorium", "Norium Ingot", 1);
-        ItemUtils.getItemForOreDict("MorePlanet:venus_item", "ingotLead", "Lead Ingot", 0);
-        ItemUtils.getItemForOreDict("MorePlanet:diona_item", "ingotQuontonium", "Quontonium Ingot", 0);
-        ItemUtils.getItemForOreDict("MorePlanet:diona_item", "ingotFronisium", "Fronisium Ingot", 1);
-        ItemUtils.getItemForOreDict("MorePlanet:sirius-b_item", "ingotSulfur", "Sulfur Ingot", 3);
-        ItemUtils.getItemForOreDict(
-                "MorePlanet:koentus_item",
-                "ingotKoentusMeteoricIron",
-                "Koentus Meteoric Iron Ingot",
-                4);
-        ItemUtils.getItemForOreDict("MorePlanet:mercury_item", "ingotMetallic", "Metallic Ingot", 2);
-        ItemUtils.getItemForOreDict(
-                "MorePlanet:polongnius_item",
-                "ingotPolongiusMeteoricIron",
-                "Polongius Meteoric Iron Ingot",
-                4);
-        ItemUtils.getItemForOreDict("MorePlanet:mercury_item", "ingotMeteoricSteel", "Meteoric Steel Ingot", 3);
-        ItemUtils.getItemForOreDict("MorePlanet:sirius-b_item", "dustSulfur", "Sulfur Dust", 2);
-
-        // Gems
-        ItemUtils.getItemForOreDict("MorePlanet:fronos_item", "gemBlackDiamond", "Black Diamond Gem", 2);
-        ItemUtils.getItemForOreDict("MorePlanet:koentus_item", "gemWhiteCrystal", "White Crystal", 0);
-        ItemUtils.getItemForOreDict("MorePlanet:nibiru_item", "gemRedCrystal", "Red Crystal", 0);
-        ItemUtils.getItemForOreDict("MorePlanet:pluto_item", "gemXeonius", "Xeonius Gem", 0);
-        ItemUtils.getItemForOreDict("MorePlanet:kapteyn-b_item", "gemUranium", "Uranium Gem", 1);
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java
deleted file mode 100644
index 51ea1a3587..0000000000
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package gtPlusPlus.core.common.compat;
-
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.util.GT_OreDictUnificator;
-import gtPlusPlus.core.item.ModItems;
-
-public class COMPAT_PneumaticCraft {
-
-    public static void OreDict() {
-        run();
-    }
-
-    private static final void run() {
-        GT_OreDictUnificator.registerOre("plateCompressedIron", new ItemStack(ModItems.itemPlateCompressedIron));
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java
deleted file mode 100644
index b05e42ba45..0000000000
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package gtPlusPlus.core.common.compat;
-
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.util.GT_OreDictUnificator;
-import gtPlusPlus.core.item.ModItems;
-
-public class COMPAT_RFTools {
-
-    public static void OreDict() {
-        run();
-    }
-
-    private static final void run() {
-        GT_OreDictUnificator.registerOre("plateDimensionShard", new ItemStack(ModItems.itemPlateDimensionShard));
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Railcraft.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Railcraft.java
deleted file mode 100644
index 69fa7674c6..0000000000
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Railcraft.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package gtPlusPlus.core.common.compat;
-
-public class COMPAT_Railcraft {
-
-    public static void OreDict() {
-        run();
-    }
-
-    private static final void run() {}
-}
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java
deleted file mode 100644
index 0e745ba0b0..0000000000
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package gtPlusPlus.core.common.compat;
-
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.util.GT_OreDictUnificator;
-import gtPlusPlus.core.item.ModItems;
-
-public class COMPAT_SimplyJetpacks {
-
-    public static void OreDict() {
-        run();
-    }
-
-    private static final void run() {
-        GT_OreDictUnificator.registerOre("plateEnrichedSoularium", new ItemStack(ModItems.itemPlateEnrichedSoularium));
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java
index 73dad8602f..fd760af771 100644
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java
+++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java
@@ -1,8 +1,9 @@
 package gtPlusPlus.core.common.compat;
 
+import static gregtech.api.enums.Mods.ForbiddenMagic;
+
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.core.lib.CORE.ConfigSwitches;
-import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class COMPAT_Thaumcraft {
@@ -17,19 +18,16 @@ public class COMPAT_Thaumcraft {
     private static final void run() {
 
         for (int i = 0; i <= 6; i++) {
-            // Utils.LOG_INFO(""+i);
             ItemUtils.getItemForOreDict("Thaumcraft:ItemShard", "shardAny", "TC Shard " + i, i);
             GT_OreDictUnificator
                     .registerOre("shardAny", ItemUtils.getItemStackFromFQRN("Thaumcraft:ItemShard:" + i, 1));
             ItemUtils.getItemForOreDict("Thaumcraft:ItemShard", "gemInfusedAnything", "TC Shard " + i, i);
             GT_OreDictUnificator
                     .registerOre("gemInfusedAnything", ItemUtils.getItemStackFromFQRN("Thaumcraft:ItemShard:" + i, 1));
-            // System.out.println("TC Shard registration count is: "+i);
         }
 
-        if (LoadedMods.ForbiddenMagic) {
+        if (ForbiddenMagic.isModLoaded()) {
             for (int i = 0; i <= 6; i++) {
-                // Utils.LOG_INFO(""+i);
                 ItemUtils.getItemForOreDict("ForbiddenMagic:NetherShard", "shardAny", "FM Shard " + i, i);
                 GT_OreDictUnificator
                         .registerOre("shardAny", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:NetherShard:" + i, 1));
@@ -37,7 +35,6 @@ public class COMPAT_Thaumcraft {
                 GT_OreDictUnificator.registerOre(
                         "gemInfusedAnything",
                         ItemUtils.getItemStackFromFQRN("ForbiddenMagic:NetherShard:" + i, 1));
-                // System.out.println("TC Shard registration count is: "+i);
             }
             ItemUtils.getItemForOreDict("ForbiddenMagic:GluttonyShard", "shardAny", "FM Gluttony Shard", 0);
             GT_OreDictUnificator
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java
index e0470fe02a..f746042c2d 100644
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java
+++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java
@@ -1,6 +1,6 @@
 package gtPlusPlus.core.common.compat;
 
-import static gtPlusPlus.core.lib.LoadedMods.Witchery;
+import static gregtech.api.enums.Mods.Witchery;
 
 import net.minecraft.item.ItemStack;
 
@@ -16,11 +16,11 @@ public class COMPAT_Witchery {
     private static final void run() {
         // Koboldite
         ItemStack aKobolditeDust = ItemUtils
-                .getItemStackWithMeta(Witchery, "witchery:ingredient", "Koboldite Dust", 148, 1);
+                .getItemStackWithMeta(Witchery.isModLoaded(), "witchery:ingredient", "Koboldite Dust", 148, 1);
         ItemStack aKobolditeNugget = ItemUtils
-                .getItemStackWithMeta(Witchery, "witchery:ingredient", "Koboldite Nugget", 149, 1);
+                .getItemStackWithMeta(Witchery.isModLoaded(), "witchery:ingredient", "Koboldite Nugget", 149, 1);
         ItemStack aKobolditeIngot = ItemUtils
-                .getItemStackWithMeta(Witchery, "witchery:ingredient", "Koboldite Ingot", 150, 1);
+                .getItemStackWithMeta(Witchery.isModLoaded(), "witchery:ingredient", "Koboldite Ingot", 150, 1);
         if (aKobolditeDust != null) GT_OreDictUnificator.registerOre("dust" + "Koboldite", aKobolditeDust);
         if (aKobolditeNugget != null) GT_OreDictUnificator.registerOre("nugget" + "Koboldite", aKobolditeNugget);
         if (aKobolditeIngot != null) GT_OreDictUnificator.registerOre("ingot" + "Koboldite", aKobolditeIngot);