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>

3 files changed, 13 insertions, 34 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java
index 082486dd62..0bca8535fe 100644
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java
@@ -1,12 +1,13 @@
 package gtPlusPlus.xmod.thaumcraft;
 
+import static gregtech.api.enums.Mods.Thaumcraft;
+
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.data.Pair;
-import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.xmod.thaumcraft.aspect.GTPP_AspectCompat;
 import gtPlusPlus.xmod.thaumcraft.aspect.GTPP_AspectStack;
@@ -17,12 +18,8 @@ public class HANDLER_Thaumcraft {
     public static Item mResearchNotes;
     public static final AutoMap<Pair<ItemStack, GTPP_AspectStack[]>> sItemsToGetAspects = new AutoMap<Pair<ItemStack, GTPP_AspectStack[]>>();
 
-    public static void preInit() {
-        if (LoadedMods.Thaumcraft) {}
-    }
-
     public static void init() {
-        if (LoadedMods.Thaumcraft) {
+        if (Thaumcraft.isModLoaded()) {
             try {
                 mResearchNotes = (Item) ReflectionUtils
                         .getField(ReflectionUtils.getClass("thaumcraft.common.config.ConfigItems"), "itemResearchNotes")
@@ -32,24 +29,4 @@ public class HANDLER_Thaumcraft {
             }
         }
     }
-
-    public static void postInit() {
-        if (LoadedMods.Thaumcraft) {
-            // Add Custom Aspects
-
-            // sThaumcraftCompat = (IThaumcraftCompat)
-            // GT_Utility.callConstructor("gtPlusPlus.xmod.thaumcraft.aspect.GTPP_AspectCompat", 0, null, GT_Values.D1,
-            // new Object[0]);
-            // sThaumcraftCompat = new GTPP_AspectCompat();
-
-            /*
-             * if (!sItemsToGetAspects.isEmpty() && false) { for (Pair<ItemStack, GTPP_AspectStack[]> j :
-             * sItemsToGetAspects) { if (j .getKey() != null && (j.getValue() != null && j.getValue().length > 0)) {
-             * List<GTPP_AspectStack> list = Arrays.asList(j.getValue()); if
-             * (ThaumcraftUtils.registerThaumcraftAspectsToItem(j.getKey(), list, true)) {
-             * Logger.WARNING("[Aspect] Successfully added Aspects to "+j.getKey().getDisplayName()+"."); } else {
-             * Logger.WARNING("[Aspect] Failed adding Aspects to "+j.getKey().getDisplayName()+"."); } } } }
-             */
-        }
-    }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java
index 4f0c9873a1..feda254313 100644
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.xmod.thaumcraft.aspect;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.HashMap;
@@ -11,7 +13,6 @@ import net.minecraft.util.ResourceLocation;
 import gregtech.api.enums.TC_Aspects;
 import gregtech.common.GT_ThaumcraftCompat;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_AspectList_Wrapper;
 import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_Aspect_Wrapper;
@@ -72,7 +73,7 @@ public class GTPP_AspectCompat {
                 "Sagrausten",
                 Utils.rgbtoHexValue(125, 125, 125),
                 new TC_Aspect_Wrapper[] { ASPECT_STARBOUND, get(TC_Aspects.RADIO) },
-                new ResourceLocation(CORE.MODID + ":textures/aspects/" + "Sagrausten.png"),
+                new ResourceLocation(GTPlusPlus.ID + ":textures/aspects/" + "Sagrausten.png"),
                 false,
                 1,
                 "Ancient Knowledge");
@@ -81,7 +82,7 @@ public class GTPP_AspectCompat {
                 "Slusium",
                 Utils.rgbtoHexValue(175, 125, 25),
                 new TC_Aspect_Wrapper[] { ASPECT_BALANCE, get(TC_Aspects.NEBRISUM) },
-                new ResourceLocation(CORE.MODID + ":textures/aspects/" + "Slusium.png"),
+                new ResourceLocation(GTPlusPlus.ID + ":textures/aspects/" + "Slusium.png"),
                 false,
                 1,
                 "Warped Thoughts");
@@ -90,7 +91,7 @@ public class GTPP_AspectCompat {
                 "Xenil",
                 Utils.rgbtoHexValue(25, 25, 25),
                 new TC_Aspect_Wrapper[] { get(TC_Aspects.MAGNETO), get(TC_Aspects.RADIO) },
-                new ResourceLocation(CORE.MODID + ":textures/aspects/" + "Xenil.png"),
+                new ResourceLocation(GTPlusPlus.ID + ":textures/aspects/" + "Xenil.png"),
                 false,
                 1,
                 "A beginning to something new");
@@ -99,7 +100,7 @@ public class GTPP_AspectCompat {
                 "Xablum",
                 Utils.rgbtoHexValue(25, 185, 25),
                 new TC_Aspect_Wrapper[] { ASPECT_STARBOUND, ASPECT_LUST },
-                new ResourceLocation(CORE.MODID + ":textures/aspects/" + "Xablum.png"),
+                new ResourceLocation(GTPlusPlus.ID + ":textures/aspects/" + "Xablum.png"),
                 false,
                 1,
                 "Insanity");
@@ -108,7 +109,7 @@ public class GTPP_AspectCompat {
                 "Zetralt",
                 Utils.rgbtoHexValue(225, 225, 225),
                 new TC_Aspect_Wrapper[] { get(TC_Aspects.AURAM), ASPECT_TOXIC },
-                new ResourceLocation(CORE.MODID + ":textures/aspects/" + "Zetralt.png"),
+                new ResourceLocation(GTPlusPlus.ID + ":textures/aspects/" + "Zetralt.png"),
                 false,
                 1,
                 "Control, Respect, Glory");
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java
index c847953cd8..76d1998527 100644
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect;
 
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
 import java.lang.reflect.Array;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
@@ -12,7 +14,6 @@ import net.minecraft.util.ResourceLocation;
 import gregtech.api.enums.TC_Aspects;
 import gregtech.api.util.GT_LanguageManager;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.xmod.thaumcraft.util.ThaumcraftUtils;
 
@@ -124,7 +125,7 @@ public class TC_Aspect_Wrapper {
                 color,
                 components,
                 vanilla ? new ResourceLocation("thaumcraft", "textures/aspects/" + tag.toLowerCase() + ".png")
-                        : new ResourceLocation(CORE.MODID, "textures/aspects/" + tag.toLowerCase() + ".png"),
+                        : new ResourceLocation(GTPlusPlus.ID, "textures/aspects/" + tag.toLowerCase() + ".png"),
                 vanilla,
                 blend,
                 aTooltip);