replace Loader.isModLoaded() calls with Mods enum cached call (#3031)

* replace Loader.isModLoaded() calls with Mods enum cached call

* prevent Loader.isModLoaded calls

* Revert "prevent Loader.isModLoaded calls"

This reverts commit 9df23fd8db9dfe70a16be10e1d8688ee629da054.

* no Loader.isModLoaded calls in gagreg

---------

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

2 files changed, 50 insertions, 54 deletions

diff --git a/src/main/java/tectech/TecTech.java b/src/main/java/tectech/TecTech.java
index 503f6ff35c..4f3dc3428d 100644
--- a/src/main/java/tectech/TecTech.java
+++ b/src/main/java/tectech/TecTech.java
@@ -1,7 +1,5 @@
 package tectech;
 
-import static gregtech.api.enums.Mods.COFHCore;
-
 import net.minecraftforge.common.MinecraftForge;
 
 import cpw.mods.fml.common.FMLCommonHandler;
@@ -13,6 +11,7 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import eu.usrv.yamcore.auxiliary.IngameErrorLog;
 import eu.usrv.yamcore.auxiliary.LogHelper;
+import gregtech.api.enums.Mods;
 import gregtech.api.objects.XSTR;
 import tectech.loader.MainLoader;
 import tectech.loader.TecTechConfig;
@@ -95,7 +94,7 @@ public class TecTech {
     @Mod.EventHandler
     @SuppressWarnings("unused")
     public void Load(FMLInitializationEvent event) {
-        hasCOFH = COFHCore.isModLoaded();
+        hasCOFH = Mods.COFHCore.isModLoaded();
 
         MainLoader.load();
         MainLoader.addAfterGregTechPostLoadRunner();
diff --git a/src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java b/src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java
index 7a8cad71b9..c60b0d3026 100644
--- a/src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java
+++ b/src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java
@@ -11,7 +11,6 @@ import static gregtech.api.enums.Mods.DraconicEvolution;
 import static gregtech.api.enums.Mods.EternalSingularity;
 import static gregtech.api.enums.Mods.ExtraUtilities;
 import static gregtech.api.enums.Mods.GTNHIntergalactic;
-import static gregtech.api.enums.Mods.GTPlusPlusEverglades;
 import static gregtech.api.enums.Mods.GalacticraftAmunRa;
 import static gregtech.api.enums.Mods.GalaxySpace;
 import static gregtech.api.enums.Mods.GraviSuite;
@@ -923,57 +922,55 @@ public class ResearchStationAssemblyLine implements Runnable {
                 250 * 20,
                 6_400_000);
 
-            if (GTPlusPlusEverglades.isModLoaded()) {
-                // Insanely Ultimate Battery
-                TTRecipeAdder.addResearchableAssemblylineRecipe(
-                    ItemList.ZPM4.get(1),
-                    24_000_000,
-                    1_280,
-                    (int) TierEU.RECIPE_UIV,
-                    32,
-                    new Object[] { HYPOGEN.getPlateDouble(32), HYPOGEN.getPlateDouble(32),
-                        new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 },
-                        new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 },
-                        new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 },
-                        new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 }, ItemList.ZPM4.get(8L),
-                        ItemList.Field_Generator_UIV.get(4), ItemList.Circuit_Wafer_QPIC.get(64),
-                        ItemList.Circuit_Wafer_QPIC.get(64),
-                        GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RawPicoWafer", 64),
-                        ItemList.Circuit_Parts_DiodeXSMD.get(64), ItemList.Circuit_Parts_InductorXSMD.get(32),
-                        GTOreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorUIV, 64) },
-                    new FluidStack[] { new FluidStack(solderUEV, 18_432),
-                        MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN.getFluidStack(18_432),
-                        Materials.Quantium.getMolten(18_432), Materials.SuperCoolant.getFluid(128_000) },
-                    ItemList.ZPM5.get(1),
-                    300 * 20,
-                    (int) TierEU.RECIPE_UIV);
+            // Insanely Ultimate Battery
+            TTRecipeAdder.addResearchableAssemblylineRecipe(
+                ItemList.ZPM4.get(1),
+                24_000_000,
+                1_280,
+                (int) TierEU.RECIPE_UIV,
+                32,
+                new Object[] { HYPOGEN.getPlateDouble(32), HYPOGEN.getPlateDouble(32),
+                    new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 }, ItemList.ZPM4.get(8L),
+                    ItemList.Field_Generator_UIV.get(4), ItemList.Circuit_Wafer_QPIC.get(64),
+                    ItemList.Circuit_Wafer_QPIC.get(64),
+                    GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RawPicoWafer", 64),
+                    ItemList.Circuit_Parts_DiodeXSMD.get(64), ItemList.Circuit_Parts_InductorXSMD.get(32),
+                    GTOreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorUIV, 64) },
+                new FluidStack[] { new FluidStack(solderUEV, 18_432),
+                    MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN.getFluidStack(18_432),
+                    Materials.Quantium.getMolten(18_432), Materials.SuperCoolant.getFluid(128_000) },
+                ItemList.ZPM5.get(1),
+                300 * 20,
+                (int) TierEU.RECIPE_UIV);
 
-                // Mega Ultimate Battery
-                TTRecipeAdder.addResearchableAssemblylineRecipe(
-                    ItemList.ZPM5.get(1L),
-                    480_000_000,
-                    12_288,
-                    (int) TierEU.RECIPE_UMV,
-                    64,
-                    new Object[] { MaterialsElements.STANDALONE.DRAGON_METAL.getPlateDouble(32),
-                        MaterialsElements.STANDALONE.DRAGON_METAL.getPlateDouble(32),
-                        new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1 },
-                        new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1 },
-                        new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1 },
-                        new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1 }, ItemList.ZPM5.get(8L),
-                        ItemList.Field_Generator_UMV.get(4), ItemList.Circuit_Wafer_QPIC.get(64),
-                        ItemList.Circuit_Wafer_QPIC.get(64),
-                        GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 64),
-                        ItemList.Circuit_Parts_DiodeXSMD.get(64), ItemList.Circuit_Parts_InductorXSMD.get(64),
-                        GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUMV, 64) },
-                    new FluidStack[] { new FluidStack(solderUEV, 36_864),
-                        MaterialsElements.STANDALONE.ASTRAL_TITANIUM.getFluidStack(36_864),
-                        MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN.getFluidStack(36_864),
-                        Materials.SuperCoolant.getFluid(256_000) },
-                    ItemList.ZPM6.get(1),
-                    350 * 20,
-                    (int) TierEU.RECIPE_UMV);
-            }
+            // Mega Ultimate Battery
+            TTRecipeAdder.addResearchableAssemblylineRecipe(
+                ItemList.ZPM5.get(1L),
+                480_000_000,
+                12_288,
+                (int) TierEU.RECIPE_UMV,
+                64,
+                new Object[] { MaterialsElements.STANDALONE.DRAGON_METAL.getPlateDouble(32),
+                    MaterialsElements.STANDALONE.DRAGON_METAL.getPlateDouble(32),
+                    new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1 },
+                    new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1 }, ItemList.ZPM5.get(8L),
+                    ItemList.Field_Generator_UMV.get(4), ItemList.Circuit_Wafer_QPIC.get(64),
+                    ItemList.Circuit_Wafer_QPIC.get(64),
+                    GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 64),
+                    ItemList.Circuit_Parts_DiodeXSMD.get(64), ItemList.Circuit_Parts_InductorXSMD.get(64),
+                    GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUMV, 64) },
+                new FluidStack[] { new FluidStack(solderUEV, 36_864),
+                    MaterialsElements.STANDALONE.ASTRAL_TITANIUM.getFluidStack(36_864),
+                    MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN.getFluidStack(36_864),
+                    Materials.SuperCoolant.getFluid(256_000) },
+                ItemList.ZPM6.get(1),
+                350 * 20,
+                (int) TierEU.RECIPE_UMV);
         }
 
         // MK4 Computer