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, 36 insertions, 78 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
index be77280550..2d790b5491 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
@@ -6,7 +6,6 @@ import net.minecraftforge.fluids.FluidRegistry;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -21,72 +20,40 @@ public class GregtechFluidHandler {
     }
 
     private static void start() {
-
-        /*
-         * Meta_GT_Proxy.addFluid("lubricant", "Lubricant", Materials.Lubricant, 1, 295,
-         * GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Lubricant, 1L), ItemUtils.getEmptyCell(), 1000);
-         * Meta_GT_Proxy.addFluid("creosote", "Creosote Oil", Materials.Creosote, 1, 295,
-         * GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Creosote, 1L), ItemUtils.getEmptyCell(), 1000);
-         * Meta_GT_Proxy.addFluid("seedoil", "Seed Oil", Materials.SeedOil, 1, 295,
-         * GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SeedOil, 1L), ItemUtils.getEmptyCell(), 1000);
-         * Meta_GT_Proxy.addFluid("fishoil", "Fish Oil", Materials.FishOil, 1, 295,
-         * GT_OreDictUnificator.get(OrePrefixes.cell, Materials.FishOil, 1L), ItemUtils.getEmptyCell(), 1000);
-         * Meta_GT_Proxy.addFluid("oil", "Oil", Materials.Oil, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell,
-         * Materials.Oil, 1L), ItemUtils.getEmptyCell(), 1000); Meta_GT_Proxy.addFluid("fuel", "Diesel", Materials.Fuel,
-         * 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fuel, 1L), ItemUtils.getEmptyCell(), 1000);
-         * Meta_GT_Proxy.addFluid("for.honey", "Honey", Materials.Honey, 1, 295,
-         * GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Honey, 1L), ItemUtils.getEmptyCell(), 1000);
-         * Meta_GT_Proxy.addFluid("biomass", "Biomass", Materials.Biomass, 1, 295,
-         * GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Biomass, 1L), ItemUtils.getEmptyCell(), 1000);
-         * Meta_GT_Proxy.addFluid("bioethanol", "Bio Ethanol", Materials.Ethanol, 1, 295,
-         * GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Ethanol, 1L), ItemUtils.getEmptyCell(), 1000);
-         * Meta_GT_Proxy.addFluid("sulfuricacid", "Sulfuric Acid", Materials.SulfuricAcid, 1, 295,
-         * GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricAcid, 1L), ItemUtils.getEmptyCell(), 1000);
-         * Meta_GT_Proxy.addFluid("milk", "Milk", Materials.Milk, 1, 290, GT_OreDictUnificator.get(OrePrefixes.cell,
-         * Materials.Milk, 1L), ItemUtils.getEmptyCell(), 1000); Meta_GT_Proxy.addFluid("mcguffium", "Mc Guffium 239",
-         * Materials.McGuffium239, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.McGuffium239, 1L),
-         * ItemUtils.getEmptyCell(), 1000); Meta_GT_Proxy.addFluid("glue", "Glue", Materials.Glue, 1, 295,
-         * GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Glue, 1L), ItemUtils.getEmptyCell(), 1000);
-         */
-
-        if (!LoadedMods.ThermalFoundation) {
-
-            Logger.INFO("Adding in our own GT versions of Thermal Foundation Fluids if they do not already exist.");
-            if (!FluidRegistry.isFluidRegistered("cryotheum")) {
-                FluidUtils.addGtFluid(
-                        "cryotheum",
-                        "Gelid Cryotheum",
-                        GT_Materials.Cryotheum,
-                        4,
-                        -1200,
-                        GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Cryotheum, 1L),
-                        ItemUtils.getEmptyCell(),
-                        1000);
-            }
-            if (!FluidRegistry.isFluidRegistered("pyrotheum")) {
-                FluidUtils.addGtFluid(
-                        "pyrotheum",
-                        "Blazing Pyrotheum",
-                        GT_Materials.Pyrotheum,
-                        4,
-                        4000,
-                        GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Pyrotheum, 1L),
-                        ItemUtils.getEmptyCell(),
-                        1000);
-            }
-            if (!FluidRegistry.isFluidRegistered("ender")) {
-                FluidUtils.addGtFluid(
-                        "ender",
-                        "Resonant Ender",
-                        GT_Materials.Ender,
-                        4,
-                        4000,
-                        GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Ender, 1L),
-                        ItemUtils.getEmptyCell(),
-                        1000);
-            }
+        Logger.INFO("Adding in our own GT versions of Thermal Foundation Fluids if they do not already exist.");
+        if (!FluidRegistry.isFluidRegistered("cryotheum")) {
+            FluidUtils.addGtFluid(
+                    "cryotheum",
+                    "Gelid Cryotheum",
+                    GT_Materials.Cryotheum,
+                    4,
+                    -1200,
+                    GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Cryotheum, 1L),
+                    ItemUtils.getEmptyCell(),
+                    1000);
+        }
+        if (!FluidRegistry.isFluidRegistered("pyrotheum")) {
+            FluidUtils.addGtFluid(
+                    "pyrotheum",
+                    "Blazing Pyrotheum",
+                    GT_Materials.Pyrotheum,
+                    4,
+                    4000,
+                    GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Pyrotheum, 1L),
+                    ItemUtils.getEmptyCell(),
+                    1000);
+        }
+        if (!FluidRegistry.isFluidRegistered("ender")) {
+            FluidUtils.addGtFluid(
+                    "ender",
+                    "Resonant Ender",
+                    GT_Materials.Ender,
+                    4,
+                    4000,
+                    GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Ender, 1L),
+                    ItemUtils.getEmptyCell(),
+                    1000);
         }
-
         Logger.INFO("Adding in GT Fluids for various nuclear related content.");
 
         FluidUtils.addGtFluid(
@@ -131,15 +98,9 @@ public class GregtechFluidHandler {
                 false);
         generateIC2FluidCell("SulfuricApatite");
 
-        // Check for IHL Hydrogen Chloride
-        if (!LoadedMods.IHL || (ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 1) == null)) {
+        // Check for Hydrogen Chloride
+        if (ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 1) == null) {
             if (FluidUtils.getFluidStack("hydrogenchloride", 1) == null) {
-                if (LoadedMods.IHL) {
-                    Logger.INFO(
-                            "IHL Loaded but hydrogen chloride could not be found for some reason. How about we add our own.");
-                } else {
-                    Logger.INFO("No Suitable versions of Hydrogen Chloride available, adding our own.");
-                }
                 FluidUtils.addGtFluid(
                         "hydrogenChloride",
                         "Industrial Strength Hydrogen Chloride",
@@ -181,10 +142,7 @@ public class GregtechFluidHandler {
 
     private static ItemStack generateIC2FluidCell(final String fluidNameWithCaps) {
         Logger.INFO("Adding a Cell for " + fluidNameWithCaps);
-        if (!LoadedMods.IndustrialCraft2Classic) {
-            return Utils.createInternalNameAndFluidCell(fluidNameWithCaps);
-        }
-        return null;
+        return Utils.createInternalNameAndFluidCell(fluidNameWithCaps);
     }
 
 }