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>

1 files changed, 59 insertions, 36 deletions

diff --git a/src/main/java/gtPlusPlus/GTplusplus.java b/src/main/java/gtPlusPlus/GTplusplus.java
index 4c52a6f59d..f552ee2850 100644
--- a/src/main/java/gtPlusPlus/GTplusplus.java
+++ b/src/main/java/gtPlusPlus/GTplusplus.java
@@ -1,5 +1,8 @@
 package gtPlusPlus;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+import static gregtech.api.enums.Mods.Names;
+import static gregtech.api.enums.Mods.Thaumcraft;
 import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustomCapes;
 
 import java.awt.event.ActionEvent;
@@ -50,11 +53,9 @@ import gtPlusPlus.core.handler.events.MissingMappingsEvent;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.item.general.ItemGiantEgg;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.data.LocaleUtils;
-import gtPlusPlus.core.util.minecraft.HazmatUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.nei.NEI_IMC_Sender;
 import gtPlusPlus.plugin.manager.Core_Manager;
@@ -68,10 +69,29 @@ import gtPlusPlus.xmod.thaumcraft.commands.CommandDumpAspects;
 
 @MCVersion(value = "1.7.10")
 @Mod(
-        modid = CORE.MODID,
+        modid = Names.G_T_PLUS_PLUS,
         name = CORE.name,
         version = CORE.VERSION,
-        dependencies = "required-after:Forge; after:TConstruct; after:PlayerAPI; after:dreamcraft; after:IC2; after:ihl; after:psychedelicraft; required-after:gregtech; after:Forestry; after:MagicBees; after:CoFHCore; after:Growthcraft; after:Railcraft; after:CompactWindmills; after:ForbiddenMagic; after:MorePlanet; after:PneumaticCraft; after:ExtraUtilities; after:Thaumcraft; after:rftools; after:simplyjetpacks; after:BigReactors; after:EnderIO; after:tectech; after:GTRedtech; after:beyondrealitycore; after:OpenBlocks; after:IC2NuclearControl; after:TGregworks; after:StevesCarts; after:xreliquary; required-after:gtnhlib@[0.0.10,)")
+        dependencies = "required-after:Forge;" + " after:TConstruct;"
+                + " after:PlayerAPI;"
+                + " after:dreamcraft;"
+                + " after:IC2;"
+                + " required-after:gregtech;"
+                + " after:Forestry;"
+                + " after:MagicBees;"
+                + " after:CoFHCore;"
+                + " after:Railcraft;"
+                + " after:CompactWindmills;"
+                + " after:ForbiddenMagic;"
+                + " after:ExtraUtilities;"
+                + " after:Thaumcraft;"
+                + " after:EnderIO;"
+                + " after:tectech;"
+                + " after:OpenBlocks;"
+                + " after:IC2NuclearControl;"
+                + " after:TGregworks;"
+                + " after:StevesCarts;"
+                + " required-after:gtnhlib@[0.0.10,);")
 public class GTplusplus implements ActionListener {
 
     public static enum INIT_PHASE {
@@ -108,7 +128,7 @@ public class GTplusplus implements ActionListener {
     public static INIT_PHASE CURRENT_LOAD_PHASE = INIT_PHASE.SUPER;
 
     // Mod Instance
-    @Mod.Instance(CORE.MODID)
+    @Mod.Instance(Names.G_T_PLUS_PLUS)
     public static GTplusplus instance;
 
     // GT++ Proxy Instances
@@ -196,7 +216,6 @@ public class GTplusplus implements ActionListener {
     public void postInit(final FMLPostInitializationEvent event) {
         INIT_PHASE.POST_INIT.setPhaseActive(true);
         proxy.postInit(event);
-        HazmatUtils.init();
         BookHandler.runLater();
         Meta_GT_Proxy.postInit();
         Core_Manager.postInit();
@@ -237,7 +256,7 @@ public class GTplusplus implements ActionListener {
         event.registerServerCommand(new CommandMath());
         event.registerServerCommand(new CommandEnableDebugWhileRunning());
         event.registerServerCommand(new CommandDebugChunks());
-        if (LoadedMods.Thaumcraft) {
+        if (Thaumcraft.isModLoaded()) {
             event.registerServerCommand(new CommandDumpAspects());
         }
         Core_Manager.serverStart();
@@ -381,56 +400,60 @@ public class GTplusplus implements ActionListener {
     private static final HashMap<String, Block> sMissingBlockMappings = new HashMap<String, Block>();
 
     private static void processMissingMappings() {
-        sMissingItemMappings.put("miscutils:Ammonium", GameRegistry.findItem(CORE.MODID, "itemCellAmmonium"));
-        sMissingItemMappings.put("miscutils:Hydroxide", GameRegistry.findItem(CORE.MODID, "itemCellHydroxide"));
+        sMissingItemMappings.put("miscutils:Ammonium", GameRegistry.findItem(GTPlusPlus.ID, "itemCellAmmonium"));
+        sMissingItemMappings.put("miscutils:Hydroxide", GameRegistry.findItem(GTPlusPlus.ID, "itemCellHydroxide"));
         sMissingItemMappings.put(
                 "miscutils:BerylliumHydroxide",
-                GameRegistry.findItem(CORE.MODID, "itemCellmiscutils:BerylliumHydroxide"));
-        sMissingItemMappings.put("miscutils:Bromine", GameRegistry.findItem(CORE.MODID, "itemCellBromine"));
-        sMissingItemMappings.put("miscutils:Krypton", GameRegistry.findItem(CORE.MODID, "itemCellKrypton"));
+                GameRegistry.findItem(GTPlusPlus.ID, "itemCellmiscutils:BerylliumHydroxide"));
+        sMissingItemMappings.put("miscutils:Bromine", GameRegistry.findItem(GTPlusPlus.ID, "itemCellBromine"));
+        sMissingItemMappings.put("miscutils:Krypton", GameRegistry.findItem(GTPlusPlus.ID, "itemCellKrypton"));
         sMissingItemMappings.put(
                 "miscutils:itemCellZirconiumTetrafluoride",
-                GameRegistry.findItem(CORE.MODID, "ZirconiumTetrafluoride"));
+                GameRegistry.findItem(GTPlusPlus.ID, "ZirconiumTetrafluoride"));
         sMissingItemMappings
-                .put("miscutils:Li2BeF4", GameRegistry.findItem(CORE.MODID, "itemCellLithiumTetrafluoroberyllate"));
+                .put("miscutils:Li2BeF4", GameRegistry.findItem(GTPlusPlus.ID, "itemCellLithiumTetrafluoroberyllate"));
 
         // Cryolite
-        sMissingBlockMappings.put("miscutils:oreCryolite", GameRegistry.findBlock(CORE.MODID, "oreCryoliteF"));
+        sMissingBlockMappings.put("miscutils:oreCryolite", GameRegistry.findBlock(GTPlusPlus.ID, "oreCryoliteF"));
         sMissingItemMappings
-                .put("miscutils:itemDustTinyCryolite", GameRegistry.findItem(CORE.MODID, "itemDustTinyCryoliteF"));
+                .put("miscutils:itemDustTinyCryolite", GameRegistry.findItem(GTPlusPlus.ID, "itemDustTinyCryoliteF"));
         sMissingItemMappings
-                .put("miscutils:itemDustSmallCryolite", GameRegistry.findItem(CORE.MODID, "itemDustSmallCryoliteF"));
-        sMissingItemMappings.put("miscutils:itemDustCryolite", GameRegistry.findItem(CORE.MODID, "itemDustCryoliteF"));
-        sMissingItemMappings.put("miscutils:dustPureCryolite", GameRegistry.findItem(CORE.MODID, "dustPureCryoliteF"));
+                .put("miscutils:itemDustSmallCryolite", GameRegistry.findItem(GTPlusPlus.ID, "itemDustSmallCryoliteF"));
         sMissingItemMappings
-                .put("miscutils:dustImpureCryolite", GameRegistry.findItem(CORE.MODID, "dustImpureCryoliteF"));
-        sMissingItemMappings.put("miscutils:crushedCryolite", GameRegistry.findItem(CORE.MODID, "crushedCryoliteF"));
+                .put("miscutils:itemDustCryolite", GameRegistry.findItem(GTPlusPlus.ID, "itemDustCryoliteF"));
+        sMissingItemMappings
+                .put("miscutils:dustPureCryolite", GameRegistry.findItem(GTPlusPlus.ID, "dustPureCryoliteF"));
+        sMissingItemMappings
+                .put("miscutils:dustImpureCryolite", GameRegistry.findItem(GTPlusPlus.ID, "dustImpureCryoliteF"));
+        sMissingItemMappings.put("miscutils:crushedCryolite", GameRegistry.findItem(GTPlusPlus.ID, "crushedCryoliteF"));
         sMissingItemMappings.put(
                 "miscutils:crushedPurifiedCryolite",
-                GameRegistry.findItem(CORE.MODID, "crushedPurifiedCryoliteF"));
+                GameRegistry.findItem(GTPlusPlus.ID, "crushedPurifiedCryoliteF"));
         sMissingItemMappings.put(
                 "miscutils:crushedCentrifugedCryolite",
-                GameRegistry.findItem(CORE.MODID, "crushedCentrifugedCryoliteF"));
-        sMissingItemMappings.put("miscutils:oreCryolite", GameRegistry.findItem(CORE.MODID, "oreCryoliteF"));
+                GameRegistry.findItem(GTPlusPlus.ID, "crushedCentrifugedCryoliteF"));
+        sMissingItemMappings.put("miscutils:oreCryolite", GameRegistry.findItem(GTPlusPlus.ID, "oreCryoliteF"));
 
         // Fluorite
-        sMissingBlockMappings.put("miscutils:oreFluorite", GameRegistry.findBlock(CORE.MODID, "oreFluoriteF"));
+        sMissingBlockMappings.put("miscutils:oreFluorite", GameRegistry.findBlock(GTPlusPlus.ID, "oreFluoriteF"));
+        sMissingItemMappings
+                .put("miscutils:itemDustTinyFluorite", GameRegistry.findItem(GTPlusPlus.ID, "itemDustTinyFluoriteF"));
+        sMissingItemMappings
+                .put("miscutils:itemDustSmallFluorite", GameRegistry.findItem(GTPlusPlus.ID, "itemDustSmallFluoriteF"));
         sMissingItemMappings
-                .put("miscutils:itemDustTinyFluorite", GameRegistry.findItem(CORE.MODID, "itemDustTinyFluoriteF"));
+                .put("miscutils:itemDustFluorite", GameRegistry.findItem(GTPlusPlus.ID, "itemDustFluoriteF"));
         sMissingItemMappings
-                .put("miscutils:itemDustSmallFluorite", GameRegistry.findItem(CORE.MODID, "itemDustSmallFluoriteF"));
-        sMissingItemMappings.put("miscutils:itemDustFluorite", GameRegistry.findItem(CORE.MODID, "itemDustFluoriteF"));
-        sMissingItemMappings.put("miscutils:dustPureFluorite", GameRegistry.findItem(CORE.MODID, "dustPureFluoriteF"));
+                .put("miscutils:dustPureFluorite", GameRegistry.findItem(GTPlusPlus.ID, "dustPureFluoriteF"));
         sMissingItemMappings
-                .put("miscutils:dustImpureFluorite", GameRegistry.findItem(CORE.MODID, "dustImpureFluoriteF"));
-        sMissingItemMappings.put("miscutils:crushedFluorite", GameRegistry.findItem(CORE.MODID, "crushedFluoriteF"));
+                .put("miscutils:dustImpureFluorite", GameRegistry.findItem(GTPlusPlus.ID, "dustImpureFluoriteF"));
+        sMissingItemMappings.put("miscutils:crushedFluorite", GameRegistry.findItem(GTPlusPlus.ID, "crushedFluoriteF"));
         sMissingItemMappings.put(
                 "miscutils:crushedPurifiedFluorite",
-                GameRegistry.findItem(CORE.MODID, "crushedPurifiedFluoriteF"));
+                GameRegistry.findItem(GTPlusPlus.ID, "crushedPurifiedFluoriteF"));
         sMissingItemMappings.put(
                 "miscutils:crushedCentrifugedFluorite",
-                GameRegistry.findItem(CORE.MODID, "crushedCentrifugedFluoriteF"));
-        sMissingItemMappings.put("miscutils:oreFluorite", GameRegistry.findItem(CORE.MODID, "oreFluoriteF"));
+                GameRegistry.findItem(GTPlusPlus.ID, "crushedCentrifugedFluoriteF"));
+        sMissingItemMappings.put("miscutils:oreFluorite", GameRegistry.findItem(GTPlusPlus.ID, "oreFluoriteF"));
     }
 
     @Mod.EventHandler
@@ -461,11 +484,11 @@ public class GTplusplus implements ActionListener {
 
     private static void remap(Item item, FMLMissingMappingsEvent.MissingMapping mapping) {
         mapping.remap(item);
-        Logger.INFO("Remapping item " + mapping.name + " to " + CORE.MODID + ":" + item.getUnlocalizedName());
+        Logger.INFO("Remapping item " + mapping.name + " to " + GTPlusPlus.ID + ":" + item.getUnlocalizedName());
     }
 
     private static void remap(Block block, FMLMissingMappingsEvent.MissingMapping mapping) {
         mapping.remap(block);
-        Logger.INFO("Remapping block " + mapping.name + " to " + CORE.MODID + ":" + block.getUnlocalizedName());
+        Logger.INFO("Remapping block " + mapping.name + " to " + GTPlusPlus.ID + ":" + block.getUnlocalizedName());
     }
 }