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>

11 files changed, 113 insertions, 101 deletions

diff --git a/src/main/java/gtPlusPlus/core/handler/AchievementHandler.java b/src/main/java/gtPlusPlus/core/handler/AchievementHandler.java
index ee1dfe984e..489d26fa96 100644
--- a/src/main/java/gtPlusPlus/core/handler/AchievementHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/AchievementHandler.java
@@ -1,5 +1,8 @@
 package gtPlusPlus.core.handler;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+import static gregtech.api.enums.Mods.GregTech;
+
 import java.util.concurrent.ConcurrentHashMap;
 
 import net.minecraft.entity.player.EntityPlayer;
@@ -338,8 +341,8 @@ public class AchievementHandler {
                 return;
             }
 
-            if (aModID != null && (ItemUtils.getModId(aStack).equals(CORE.MODID)
-                    || ItemUtils.getModId(aStack).equalsIgnoreCase("gregtech"))) {
+            if (aModID != null && (ItemUtils.getModId(aStack).equals(GTPlusPlus.ID)
+                    || ItemUtils.getModId(aStack).equalsIgnoreCase(GregTech.ID))) {
                 isValid = true;
             }
             if (!isValid) {
@@ -347,7 +350,7 @@ public class AchievementHandler {
             }
 
             // Should unlock base achievement from *ANY* GT++ item. (Too lazy to special case GT machineBlocks though)
-            if (ItemUtils.getModId(aStack).equals(CORE.MODID)) {
+            if (ItemUtils.getModId(aStack).equals(GTPlusPlus.ID)) {
                 this.issueAchievement(aPlayer, aBaseAchievementName);
             }
 
diff --git a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index 5e78c2ed2d..694cd86c69 100644
--- a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -1,5 +1,11 @@
 package gtPlusPlus.core.handler;
 
+import static gregtech.api.enums.Mods.EnderIO;
+import static gregtech.api.enums.Mods.ExtraUtilities;
+import static gregtech.api.enums.Mods.OpenBlocks;
+import static gregtech.api.enums.Mods.Thaumcraft;
+import static gregtech.api.enums.Mods.Witchery;
+
 import java.util.LinkedList;
 import java.util.Queue;
 import java.util.Set;
@@ -13,24 +19,15 @@ import gtPlusPlus.api.interfaces.RunnableWithInfo;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.minecraft.ItemPackage;
-import gtPlusPlus.core.common.compat.COMPAT_BigReactors;
-import gtPlusPlus.core.common.compat.COMPAT_CompactWindmills;
 import gtPlusPlus.core.common.compat.COMPAT_EnderIO;
 import gtPlusPlus.core.common.compat.COMPAT_ExtraUtils;
-import gtPlusPlus.core.common.compat.COMPAT_HarvestCraft;
 import gtPlusPlus.core.common.compat.COMPAT_IC2;
-import gtPlusPlus.core.common.compat.COMPAT_MorePlanets;
 import gtPlusPlus.core.common.compat.COMPAT_OpenBlocks;
-import gtPlusPlus.core.common.compat.COMPAT_PneumaticCraft;
-import gtPlusPlus.core.common.compat.COMPAT_RFTools;
-import gtPlusPlus.core.common.compat.COMPAT_Railcraft;
-import gtPlusPlus.core.common.compat.COMPAT_SimplyJetpacks;
 import gtPlusPlus.core.common.compat.COMPAT_Thaumcraft;
 import gtPlusPlus.core.common.compat.COMPAT_Witchery;
 import gtPlusPlus.core.handler.Recipes.LateRegistrationHandler;
 import gtPlusPlus.core.handler.Recipes.RegistrationHandler;
 import gtPlusPlus.core.item.ModItems;
-import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.recipe.RECIPES_GREGTECH;
@@ -46,7 +43,73 @@ import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_ChemicalSkips;
 import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_GTNH;
 import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_GlueLine;
 import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_Nuclear;
-import gtPlusPlus.xmod.gregtech.registration.gregtech.*;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.Gregtech4Content;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechAdvancedBoilers;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechAlgaeContent;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechAmazonWarehouse;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechBufferDynamos;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechComponentAssembler;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechCustomHatches;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechCyclotron;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechDehydrator;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechEnergyBuffer;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechFactoryGradeReplacementMultis;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechFluidReactor;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechGeneratorsULV;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechGeothermalThermalGenerator;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechHiAmpTransformer;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialAlloySmelter;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialArcFurnace;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialBlastSmelter;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialCentrifuge;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialChisel;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialCokeOven;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialCuttingFactory;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialElectrolyzer;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialElementDuplicator;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialExtruder;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialFishPond;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialFluidHeater;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialForgeHammer;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialFuelRefinery;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialGeneratorArray;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialMacerator;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialMassFabricator;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialMixer;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialMultiMachine;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialPlatePress;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialRockBreaker;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialSifter;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialThermalCentrifuge;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialTreeFarm;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialWashPlant;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialWiremill;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIronBlastFurnace;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIsaMill;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechLFTR;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechLargeTurbinesAndHeatExchanger;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechMolecularTransformer;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechPollutionDevices;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechPowerBreakers;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechPowerSubStation;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechQuantumForceTransformer;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechRTG;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechRocketFuelGenerator;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSafeBlock;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSemiFluidgenerators;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSimpleWasher;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSolarGenerators;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSolarTower;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSteamCondenser;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSteamMultis;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSuperChests;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechTeslaTower;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechThaumcraftDevices;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechThreadedBuffers;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechTieredChunkloaders;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechTieredFluidTanks;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechTreeFarmerTE;
+import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechWirelessChargers;
 
 public class COMPAT_HANDLER {
 
@@ -105,7 +168,6 @@ public class COMPAT_HANDLER {
         GregtechAdvancedBoilers.run();
         GregtechPollutionDevices.run();
         GregtechTieredFluidTanks.run();
-        // GregtechIndustrialMultiTank.run();
         GregtechGeothermalThermalGenerator.run();
         Gregtech4Content.run();
         GregtechIndustrialFuelRefinery.run();
@@ -122,7 +184,6 @@ public class COMPAT_HANDLER {
         GregtechWirelessChargers.run();
         GregtechIndustrialGeneratorArray.run();
         GregtechIndustrialCuttingFactory.run();
-        // GregtechMiniRaFusion.run();
         GregtechComponentAssembler.run();
         GregtechTeslaTower.run();
         GregtechSuperChests.run();
@@ -130,7 +191,6 @@ public class COMPAT_HANDLER {
         GregtechTieredChunkloaders.run();
         GregtechIndustrialExtruder.run();
         GregtechIndustrialMultiMachine.run();
-        // GregtechBedrockPlatforms.run();
         GregtechBufferDynamos.run();
         GregtechAmazonWarehouse.run();
         GregtechFactoryGradeReplacementMultis.run();
@@ -138,7 +198,6 @@ public class COMPAT_HANDLER {
         GregtechThreadedBuffers.run();
         GregtechIndustrialMixer.run();
         GregtechCustomHatches.run();
-        // GregtechNaqReactor.run();
         GregtechIndustrialArcFurnace.run();
         GregtechSolarTower.run();
         GregtechLargeTurbinesAndHeatExchanger.run();
@@ -159,44 +218,21 @@ public class COMPAT_HANDLER {
     // InterMod
     public static void intermodOreDictionarySupport() {
 
-        if (LoadedMods.Big_Reactors) {
-            COMPAT_BigReactors.OreDict();
-        }
-        if (LoadedMods.EnderIO) {
+        if (EnderIO.isModLoaded()) {
             COMPAT_EnderIO.OreDict();
         }
-        if (LoadedMods.MorePlanets) {
-            COMPAT_MorePlanets.OreDict();
-        }
-        if (LoadedMods.OpenBlocks) {
+        if (OpenBlocks.isModLoaded()) {
             COMPAT_OpenBlocks.OreDict();
         }
-        if (LoadedMods.Railcraft) {
-            COMPAT_Railcraft.OreDict();
-        }
-        if (LoadedMods.Simply_Jetpacks) {
-            COMPAT_SimplyJetpacks.OreDict();
-        }
-        if (LoadedMods.RFTools) {
-            COMPAT_RFTools.OreDict();
-        }
-        if (LoadedMods.Thaumcraft) {
+        if (Thaumcraft.isModLoaded()) {
             COMPAT_Thaumcraft.OreDict();
         }
-        if (LoadedMods.Extra_Utils) {
+        if (ExtraUtilities.isModLoaded()) {
             COMPAT_ExtraUtils.OreDict();
         }
-        if (LoadedMods.PneumaticCraft) {
-            COMPAT_PneumaticCraft.OreDict();
-        }
-        if (LoadedMods.CompactWindmills) {
-            COMPAT_CompactWindmills.OreDict();
-        }
         COMPAT_IC2.OreDict();
-        if (LoadedMods.PamsHarvestcraft) {
-            COMPAT_HarvestCraft.OreDict();
-        }
-        if (LoadedMods.Witchery) {
+
+        if (Witchery.isModLoaded()) {
             COMPAT_Witchery.OreDict();
         }
     }
diff --git a/src/main/java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java b/src/main/java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
index 58762cca9d..d51acebcac 100644
--- a/src/main/java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
+++ b/src/main/java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
@@ -4,18 +4,14 @@ 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 gtPlusPlus.xmod.advsolar.HANDLER_AdvSolar;
+import gtPlusPlus.recipes.RecipeRemovals;
 import gtPlusPlus.xmod.bartcrops.HANDLER_CropsPlusPlus;
 import gtPlusPlus.xmod.bop.HANDLER_BiomesOPlenty;
-import gtPlusPlus.xmod.computronics.HANDLER_Computronics;
 import gtPlusPlus.xmod.forestry.HANDLER_FR;
-import gtPlusPlus.xmod.galacticraft.HANDLER_GalactiCraft;
 import gtPlusPlus.xmod.gregtech.HANDLER_GT;
-import gtPlusPlus.xmod.growthcraft.HANDLER_GC;
 import gtPlusPlus.xmod.ic2.HANDLER_IC2;
 import gtPlusPlus.xmod.ob.HANDLER_OpenBlocks;
 import gtPlusPlus.xmod.railcraft.HANDLER_Railcraft;
-import gtPlusPlus.xmod.reliquary.HANDLER_Reliquary;
 import gtPlusPlus.xmod.sc2.HANDLER_SC2;
 import gtPlusPlus.xmod.sol.HANDLER_SpiceOfLife;
 import gtPlusPlus.xmod.thaumcraft.HANDLER_Thaumcraft;
@@ -26,66 +22,38 @@ public class COMPAT_IntermodStaging {
 
     public static void preInit(FMLPreInitializationEvent preinit) {
         HANDLER_GT.preInit();
-        HANDLER_GC.preInit();
         HANDLER_TF.preInit();
         HANDLER_FR.preInit();
         HANDLER_IC2.preInit();
-        HANDLER_Computronics.preInit();
         HANDLER_BiomesOPlenty.preInit();
-        // HANDLER_Mekanism.preInit();
-        HANDLER_Thaumcraft.preInit();
-        HANDLER_Tinkers.preInit();
         HANDLER_SC2.preInit();
-        HANDLER_GalactiCraft.preInit();
         HANDLER_CropsPlusPlus.preInit(preinit);
         HANDLER_Railcraft.preInit();
-        HANDLER_Reliquary.preInit();
-        HANDLER_OpenBlocks.preInit();
         HANDLER_SpiceOfLife.preInit();
     }
 
     public static void init(FMLInitializationEvent init) {
         HANDLER_GT.init();
-        HANDLER_GC.init();
         HANDLER_TF.init();
-        HANDLER_FR.Init();
-        HANDLER_IC2.init();
-        HANDLER_Computronics.init();
-        HANDLER_BiomesOPlenty.init();
-        // HANDLER_Mekanism.init();
         HANDLER_Thaumcraft.init();
-        HANDLER_Tinkers.init();
-        HANDLER_SC2.init();
-        HANDLER_GalactiCraft.init();
-        HANDLER_CropsPlusPlus.init(init);
-        HANDLER_Railcraft.init();
-        HANDLER_Reliquary.init();
         HANDLER_OpenBlocks.init();
-        HANDLER_SpiceOfLife.init();
     }
 
     public static void postInit(FMLPostInitializationEvent postinit) {
         HANDLER_GT.postInit();
-        HANDLER_GC.postInit();
         HANDLER_TF.postInit();
         HANDLER_FR.postInit();
         HANDLER_IC2.postInit();
-        HANDLER_Computronics.postInit();
         HANDLER_BiomesOPlenty.postInit();
-        // HANDLER_Mekanism.postInit();
-        HANDLER_Thaumcraft.postInit();
         HANDLER_Tinkers.postInit();
-        HANDLER_SC2.postInit();
-        HANDLER_GalactiCraft.postInit();
         HANDLER_CropsPlusPlus.postInit(postinit);
         HANDLER_Railcraft.postInit();
-        HANDLER_Reliquary.postInit();
         HANDLER_OpenBlocks.postInit();
-        HANDLER_SpiceOfLife.postInit();
-        HANDLER_AdvSolar.postInit();
+        RecipeRemovals.postInit();
     }
 
     public static void onLoadComplete(FMLLoadCompleteEvent event) {
         HANDLER_GT.onLoadComplete(event);
+        RecipeRemovals.onLoadComplete();
     }
 }
diff --git a/src/main/java/gtPlusPlus/core/handler/MobMentality.java b/src/main/java/gtPlusPlus/core/handler/MobMentality.java
index 9f7ba19175..15be7cc4f4 100644
--- a/src/main/java/gtPlusPlus/core/handler/MobMentality.java
+++ b/src/main/java/gtPlusPlus/core/handler/MobMentality.java
@@ -1,6 +1,8 @@
 package gtPlusPlus.core.handler;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
diff --git a/src/main/java/gtPlusPlus/core/handler/PacketHandler.java b/src/main/java/gtPlusPlus/core/handler/PacketHandler.java
index 3ff6a0a990..8e04b5b68f 100644
--- a/src/main/java/gtPlusPlus/core/handler/PacketHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/PacketHandler.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.handler;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 
@@ -8,7 +10,6 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
 import cpw.mods.fml.relauncher.Side;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.network.handler.AbstractClientMessageHandler;
 import gtPlusPlus.core.network.packet.AbstractPacket;
 import gtPlusPlus.core.network.packet.Packet_VolumetricFlaskGui;
@@ -19,7 +20,7 @@ public class PacketHandler {
 
     private static byte packetId = 0;
 
-    private static final SimpleNetworkWrapper INSTANCE = NetworkRegistry.INSTANCE.newSimpleChannel(CORE.MODID);
+    private static final SimpleNetworkWrapper INSTANCE = NetworkRegistry.INSTANCE.newSimpleChannel(GTPlusPlus.ID);
 
     public static final void init() {
         registerMessage(Packet_VolumetricFlaskGui.class, Packet_VolumetricFlaskGui.class);
diff --git a/src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java b/src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java
index cd4ff542dc..12acc8b4d3 100644
--- a/src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java
@@ -2,7 +2,11 @@ package gtPlusPlus.core.handler.Recipes;
 
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.handler.COMPAT_HANDLER;
-import gtPlusPlus.core.recipe.*;
+import gtPlusPlus.core.recipe.RECIPES_General;
+import gtPlusPlus.core.recipe.RECIPES_MachineComponents;
+import gtPlusPlus.core.recipe.RECIPES_Machines;
+import gtPlusPlus.core.recipe.RECIPES_Tools;
+import gtPlusPlus.core.recipe.RECIPE_Batteries;
 
 public class RegistrationHandler {
 
diff --git a/src/main/java/gtPlusPlus/core/handler/events/BlockEventHandler.java b/src/main/java/gtPlusPlus/core/handler/events/BlockEventHandler.java
index 73789038b5..e2ea5746a1 100644
--- a/src/main/java/gtPlusPlus/core/handler/events/BlockEventHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/events/BlockEventHandler.java
@@ -1,5 +1,6 @@
 package gtPlusPlus.core.handler.events;
 
+import static gregtech.api.enums.Mods.Thaumcraft;
 import static gtPlusPlus.core.lib.CORE.ConfigSwitches.chanceToDropDrainedShard;
 import static gtPlusPlus.core.lib.CORE.ConfigSwitches.chanceToDropFluoriteOre;
 
@@ -17,7 +18,6 @@ import net.minecraftforge.oredict.OreDictionary;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.item.ModItems;
-import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.nuclear.FLUORIDES;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -155,7 +155,7 @@ public class BlockEventHandler {
                     if (((event.block == Blocks.stone) || (event.block == Blocks.sandstone)
                             || (event.block == Blocks.log)
                             || (event.block == Blocks.log2)
-                            || (event.block == Blocks.grass)) && !LoadedMods.Thaumcraft
+                            || (event.block == Blocks.grass)) && !Thaumcraft.isModLoaded()
                             && (chanceToDropDrainedShard != 0)) {
                         // small chance for one to spawn per stone mined. 1 per 3 stacks~
                         if (MathUtils.randInt(1, chanceToDropDrainedShard) == 1) {
diff --git a/src/main/java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java b/src/main/java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java
index 363ad472f2..6aa9fde2a8 100644
--- a/src/main/java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java
@@ -9,11 +9,11 @@ import net.minecraftforge.event.entity.player.ItemTooltipEvent;
 import advsolar.common.AdvancedSolarPanel;
 import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import gregtech.api.enums.Mods;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.GTplusplus.INIT_PHASE;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
@@ -90,12 +90,12 @@ public class GeneralTooltipEventHandler {
             event.toolTip.add("Max Capacity: " + MathUtils.formatNumbers(32000) + "L");
         }
 
-        if (LoadedMods.AdvancedSolarPanel) {
+        if (Mods.AdvancedSolarPanel.isModLoaded()) {
             molecularTransformer(event);
         }
     }
 
-    @Optional.Method(modid = "AdvancedSolarPanel")
+    @Optional.Method(modid = Mods.Names.ADVANCED_SOLAR_PANEL)
     public static void molecularTransformer(ItemTooltipEvent event) {
         if (event.itemStack.getItem() == Item.getItemFromBlock(AdvancedSolarPanel.blockMolecularTransformer)) {
             event.toolTip.add("" + EnumChatFormatting.RED + "Disabled, Use the multiblock");
diff --git a/src/main/java/gtPlusPlus/core/handler/events/MissingMappingsEvent.java b/src/main/java/gtPlusPlus/core/handler/events/MissingMappingsEvent.java
index 762a2400f7..7ba06f4bbd 100644
--- a/src/main/java/gtPlusPlus/core/handler/events/MissingMappingsEvent.java
+++ b/src/main/java/gtPlusPlus/core/handler/events/MissingMappingsEvent.java
@@ -1,5 +1,6 @@
 package gtPlusPlus.core.handler.events;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
 import static gtPlusPlus.core.item.base.dusts.BaseItemDustEx.mCachedPileLinkages;
 
 import net.minecraft.item.ItemStack;
@@ -10,14 +11,13 @@ import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
 import cpw.mods.fml.common.event.FMLMissingMappingsEvent.MissingMapping;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
 
 public class MissingMappingsEvent {
 
     @EventHandler
     public void onMissingMapping(FMLMissingMappingsEvent event) {
         for (MissingMapping mapping : event.get()) {
-            boolean bool1 = mapping.name.contains(CORE.MODID);
+            boolean bool1 = mapping.name.contains(GTPlusPlus.ID);
             // Missing Blocks
             if (mapping.type == cpw.mods.fml.common.registry.GameRegistry.Type.BLOCK && bool1) {
 
@@ -30,12 +30,6 @@ public class MissingMappingsEvent {
 
             // Missing Items
             if (mapping.type == cpw.mods.fml.common.registry.GameRegistry.Type.ITEM && bool1) {
-
-                // Example
-                // if(mapping.name.equals("PneumaticCraft:etchingAcidBucket")) {
-                // mapping.remap(Fluids.getBucket(Fluids.etchingAcid));
-                // }
-
                 if (mapping.name.contains("miscutils:itemDustTiny")) {
                     ItemStack stack = null;
                     String missingItemString = StringUtils.remove(mapping.name, "miscutils:itemDustTiny");
diff --git a/src/main/java/gtPlusPlus/core/handler/render/CapeHandler.java b/src/main/java/gtPlusPlus/core/handler/render/CapeHandler.java
index 3fd0e6b984..26d944c96d 100644
--- a/src/main/java/gtPlusPlus/core/handler/render/CapeHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/render/CapeHandler.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.handler.render;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import java.util.Collection;
 
 import net.minecraft.client.entity.AbstractClientPlayer;
@@ -20,8 +22,8 @@ import gtPlusPlus.core.lib.CORE;
 
 public class CapeHandler extends RenderPlayer {
 
-    private final ResourceLocation[] mCapes = { new ResourceLocation(CORE.MODID + ":textures/TesterCape.png"),
-            new ResourceLocation(CORE.MODID + ":textures/Draknyte1.png"),
+    private final ResourceLocation[] mCapes = { new ResourceLocation(GTPlusPlus.ID + ":textures/TesterCape.png"),
+            new ResourceLocation(GTPlusPlus.ID + ":textures/Draknyte1.png"),
             new ResourceLocation("gregtech:textures/GregoriusCape.png") };
     private final Collection<String> mCapeList;
 
diff --git a/src/main/java/gtPlusPlus/core/handler/render/FirepitRender.java b/src/main/java/gtPlusPlus/core/handler/render/FirepitRender.java
index c1099585ce..0237047121 100644
--- a/src/main/java/gtPlusPlus/core/handler/render/FirepitRender.java
+++ b/src/main/java/gtPlusPlus/core/handler/render/FirepitRender.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.handler.render;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.Tessellator;
@@ -13,7 +15,7 @@ import org.lwjgl.opengl.GL11;
 
 public class FirepitRender extends TileEntitySpecialRenderer {
 
-    ResourceLocation texture = new ResourceLocation("miscutils" + ":" + "textures/blocks/FirePit/mossyFirepit.png");
+    ResourceLocation texture = new ResourceLocation(GTPlusPlus.ID + ":" + "textures/blocks/FirePit/mossyFirepit.png");
 
     private final FirepitModel model;