Mod load check refactors (#2621)

* deprecate LoaderReference

* replace all uses of LoaderReference

* delete loaderreference

* mod loaded checks in gagreg

* remove modloaded checks for merged mods

9 files changed, 578 insertions, 641 deletions

diff --git a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
index da749e5b31..5226976d0d 100644
--- a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
@@ -2015,14 +2015,12 @@ public class GT_CraftingRecipeLoader implements Runnable {
             Materials.Fireclay.getDust(2),
             new Object[] { Materials.Brick.getDust(1), Materials.Clay.getDust(1) });
 
-        if (BartWorks.isModLoaded()) {
-            GT_ModHandler.addCraftingRecipe(
-                ItemList.Casing_Advanced_Rhodium_Palladium.get(1L),
-                bits,
-                new Object[] { "PhP", "PFP", aTextPlateWrench, 'P',
-                    GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedplate", 1L, 88), 'F',
-                    OrePrefixes.frameGt.get(Materials.Chrome) });
-        }
+        GT_ModHandler.addCraftingRecipe(
+            ItemList.Casing_Advanced_Rhodium_Palladium.get(1L),
+            bits,
+            new Object[] { "PhP", "PFP", aTextPlateWrench, 'P',
+                GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedplate", 1L, 88), 'F',
+                OrePrefixes.frameGt.get(Materials.Chrome) });
 
         if (Forestry.isModLoaded()) {
             ItemStack[] coverIDs = { ItemList.Plank_Larch.get(2L), ItemList.Plank_Teak.get(2L),
diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java
index 392e6fa154..7c3beec6aa 100644
--- a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java
@@ -58,44 +58,42 @@ public class GT_PCBFactoryRecipes {
             .duration(5 * MINUTES)
             .addTo(AssemblyLine);
 
-        if (GTPlusPlus.isModLoaded()) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1),
-                    Materials.get("Artherium-Sn")
-                        .getPlates(6))
-                .itemOutputs(ItemList.BasicPhotolithographicFrameworkCasing.get(1))
-                .duration(30 * SECONDS)
-                .eut(TierEU.RECIPE_ZPM)
-                .addTo(assemblerRecipes);
-            GT_Values.RA.stdBuilder()
-                .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1),
-                    Materials.EnrichedHolmium.getPlates(6))
-                .itemOutputs(ItemList.ReinforcedPhotolithographicFrameworkCasing.get(1))
-                .duration(30 * SECONDS)
-                .eut(TierEU.RECIPE_UHV)
-                .addTo(assemblerRecipes);
-            GT_Values.RA.stdBuilder()
-                .itemInputs(
-                    GT_ModHandler.getModItem(GTPlusPlus.ID, "blockFrameGtCelestialTungsten", 1),
-                    Materials.get("Quantum")
-                        .getPlates(6))
-                .itemOutputs(ItemList.RadiationProofPhotolithographicFrameworkCasing.get(1))
-                .duration(30 * SECONDS)
-                .eut(TierEU.RECIPE_UIV)
-                .addTo(assemblerRecipes);
-            GT_Values.RA.stdBuilder()
-                .itemInputs(
-                    GT_ModHandler.getModItem(GTPlusPlus.ID, "blockFrameGtHypogen", 1),
-                    GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Infinity, 2),
-                    Materials.Thulium.getPlates(6))
-                .itemOutputs(ItemList.InfinityCooledCasing.get(1))
-                .fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(8 * 144))
-                .duration(10 * SECONDS)
-                .eut(TierEU.RECIPE_UMV)
-                .addTo(assemblerRecipes);
-        }
+        GT_Values.RA.stdBuilder()
+            .itemInputs(
+                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1),
+                Materials.get("Artherium-Sn")
+                    .getPlates(6))
+            .itemOutputs(ItemList.BasicPhotolithographicFrameworkCasing.get(1))
+            .duration(30 * SECONDS)
+            .eut(TierEU.RECIPE_ZPM)
+            .addTo(assemblerRecipes);
+        GT_Values.RA.stdBuilder()
+            .itemInputs(
+                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1),
+                Materials.EnrichedHolmium.getPlates(6))
+            .itemOutputs(ItemList.ReinforcedPhotolithographicFrameworkCasing.get(1))
+            .duration(30 * SECONDS)
+            .eut(TierEU.RECIPE_UHV)
+            .addTo(assemblerRecipes);
+        GT_Values.RA.stdBuilder()
+            .itemInputs(
+                GT_ModHandler.getModItem(GTPlusPlus.ID, "blockFrameGtCelestialTungsten", 1),
+                Materials.get("Quantum")
+                    .getPlates(6))
+            .itemOutputs(ItemList.RadiationProofPhotolithographicFrameworkCasing.get(1))
+            .duration(30 * SECONDS)
+            .eut(TierEU.RECIPE_UIV)
+            .addTo(assemblerRecipes);
+        GT_Values.RA.stdBuilder()
+            .itemInputs(
+                GT_ModHandler.getModItem(GTPlusPlus.ID, "blockFrameGtHypogen", 1),
+                GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Infinity, 2),
+                Materials.Thulium.getPlates(6))
+            .itemOutputs(ItemList.InfinityCooledCasing.get(1))
+            .fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(8 * 144))
+            .duration(10 * SECONDS)
+            .eut(TierEU.RECIPE_UMV)
+            .addTo(assemblerRecipes);
 
         // Load CircuitBoard Recipes
 
@@ -597,106 +595,95 @@ public class GT_PCBFactoryRecipes {
                 .addTo(RecipeMaps.pcbFactoryRecipes);
         }
 
-        if (GTPlusPlus.isModLoaded()) {
-            // Optical Circuit Board
-            for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
-                int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 7))));
-                List<ItemStack> aBoards = new ArrayList<>();
-                for (int i = amountOfBoards; i > 64; i -= 64) {
-                    aBoards.add(ItemList.Circuit_Board_Optical.get(i));
-                    amountOfBoards -= 64;
-                }
-                aBoards.add(ItemList.Circuit_Board_Optical.get(amountOfBoards));
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(
-                        GT_Utility.getIntegratedCircuit(1),
-                        GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
-                            .getPlates(1),
-                        GT_ModHandler.getModItem(
-                            BartWorks.ID,
-                            "gt.bwMetaGeneratedfoil",
-                            (long) (16 * (Math.sqrt(tier - 6))),
-                            10106),
-                        GT_OreDictUnificator
-                            .get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))),
-                        GT_ModHandler
-                            .getModItem("miscutils", "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6)))))
-                    .fluidInputs(
-                        Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))),
-                        Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))),
-                        Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6)))))
-                    .itemOutputs(aBoards.toArray(new ItemStack[0]))
-                    .duration((int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 5.5))))
-                    .eut((int) GT_Values.VP[tier] * 3 / 4)
-                    .metadata(TIER, 1)
-                    .addTo(RecipeMaps.pcbFactoryRecipes);
+        // Optical Circuit Board
+        for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
+            int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 7))));
+            List<ItemStack> aBoards = new ArrayList<>();
+            for (int i = amountOfBoards; i > 64; i -= 64) {
+                aBoards.add(ItemList.Circuit_Board_Optical.get(i));
+                amountOfBoards -= 64;
             }
-            for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
-                int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 6.5))));
-                List<ItemStack> aBoards = new ArrayList<>();
-                for (int i = amountOfBoards; i > 64; i -= 64) {
-                    aBoards.add(ItemList.Circuit_Board_Optical.get(i));
-                    amountOfBoards -= 64;
-                }
-                aBoards.add(ItemList.Circuit_Board_Optical.get(amountOfBoards));
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(
-                        GT_Utility.getIntegratedCircuit(2),
-                        GT_Utility.getNaniteAsCatalyst(Materials.Silver),
-                        GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
-                            .getPlates(1),
-                        GT_ModHandler.getModItem(
-                            BartWorks.ID,
-                            "gt.bwMetaGeneratedfoil",
-                            (long) (16 * (Math.sqrt(tier - 6))),
-                            10106),
-                        GT_OreDictUnificator
-                            .get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))),
-                        GT_ModHandler
-                            .getModItem("miscutils", "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6)))))
-                    .fluidInputs(
-                        Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))),
-                        Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))),
-                        Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6)))))
-                    .itemOutputs(aBoards.toArray(new ItemStack[0]))
-                    .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 6.5))))
-                    .eut((int) GT_Values.VP[tier + 1] * 3 / 4)
-                    .metadata(TIER, 2)
-                    .addTo(RecipeMaps.pcbFactoryRecipes);
+            aBoards.add(ItemList.Circuit_Board_Optical.get(amountOfBoards));
+            GT_Values.RA.stdBuilder()
+                .itemInputs(
+                    GT_Utility.getIntegratedCircuit(1),
+                    GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
+                        .getPlates(1),
+                    GT_ModHandler
+                        .getModItem(BartWorks.ID, "gt.bwMetaGeneratedfoil", (long) (16 * (Math.sqrt(tier - 6))), 10106),
+                    GT_OreDictUnificator
+                        .get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))),
+                    GT_ModHandler
+                        .getModItem(GTPlusPlus.ID, "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6)))))
+                .fluidInputs(
+                    Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))),
+                    Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))),
+                    Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6)))))
+                .itemOutputs(aBoards.toArray(new ItemStack[0]))
+                .duration((int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 5.5))))
+                .eut((int) GT_Values.VP[tier] * 3 / 4)
+                .metadata(TIER, 1)
+                .addTo(RecipeMaps.pcbFactoryRecipes);
+        }
+        for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
+            int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 6.5))));
+            List<ItemStack> aBoards = new ArrayList<>();
+            for (int i = amountOfBoards; i > 64; i -= 64) {
+                aBoards.add(ItemList.Circuit_Board_Optical.get(i));
+                amountOfBoards -= 64;
             }
-            for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
-                int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 6))));
-                List<ItemStack> aBoards = new ArrayList<>();
-                for (int i = amountOfBoards; i > 64; i -= 64) {
-                    aBoards.add(ItemList.Circuit_Board_Optical.get(i));
-                    amountOfBoards -= 64;
-                }
-                aBoards.add(ItemList.Circuit_Board_Optical.get(amountOfBoards));
-                GT_Values.RA.stdBuilder()
-                    .itemInputs(
-                        GT_Utility.getIntegratedCircuit(3),
-                        GT_Utility.getNaniteAsCatalyst(Materials.Gold),
-                        GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
-                            .getPlates(1),
-                        GT_ModHandler.getModItem(
-                            BartWorks.ID,
-                            "gt.bwMetaGeneratedfoil",
-                            (long) (16 * (Math.sqrt(tier - 6))),
-                            10106),
-                        GT_OreDictUnificator
-                            .get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))),
-                        GT_ModHandler
-                            .getModItem("miscutils", "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6)))))
-                    .fluidInputs(
-                        Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))),
-                        Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))),
-                        Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6)))))
-                    .itemOutputs(aBoards.toArray(new ItemStack[0]))
-                    .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 6.5))))
-                    .eut((int) GT_Values.VP[tier + 1] * 3 / 4)
-                    .metadata(TIER, 3)
-                    .addTo(RecipeMaps.pcbFactoryRecipes);
+            aBoards.add(ItemList.Circuit_Board_Optical.get(amountOfBoards));
+            GT_Values.RA.stdBuilder()
+                .itemInputs(
+                    GT_Utility.getIntegratedCircuit(2),
+                    GT_Utility.getNaniteAsCatalyst(Materials.Silver),
+                    GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
+                        .getPlates(1),
+                    GT_ModHandler
+                        .getModItem(BartWorks.ID, "gt.bwMetaGeneratedfoil", (long) (16 * (Math.sqrt(tier - 6))), 10106),
+                    GT_OreDictUnificator
+                        .get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))),
+                    GT_ModHandler
+                        .getModItem(GTPlusPlus.ID, "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6)))))
+                .fluidInputs(
+                    Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))),
+                    Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))),
+                    Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6)))))
+                .itemOutputs(aBoards.toArray(new ItemStack[0]))
+                .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 6.5))))
+                .eut((int) GT_Values.VP[tier + 1] * 3 / 4)
+                .metadata(TIER, 2)
+                .addTo(RecipeMaps.pcbFactoryRecipes);
+        }
+        for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
+            int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 6))));
+            List<ItemStack> aBoards = new ArrayList<>();
+            for (int i = amountOfBoards; i > 64; i -= 64) {
+                aBoards.add(ItemList.Circuit_Board_Optical.get(i));
+                amountOfBoards -= 64;
             }
+            aBoards.add(ItemList.Circuit_Board_Optical.get(amountOfBoards));
+            GT_Values.RA.stdBuilder()
+                .itemInputs(
+                    GT_Utility.getIntegratedCircuit(3),
+                    GT_Utility.getNaniteAsCatalyst(Materials.Gold),
+                    GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
+                        .getPlates(1),
+                    GT_ModHandler
+                        .getModItem(BartWorks.ID, "gt.bwMetaGeneratedfoil", (long) (16 * (Math.sqrt(tier - 6))), 10106),
+                    GT_OreDictUnificator
+                        .get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))),
+                    GT_ModHandler
+                        .getModItem(GTPlusPlus.ID, "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6)))))
+                .fluidInputs(
+                    Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))),
+                    Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))),
+                    Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6)))))
+                .itemOutputs(aBoards.toArray(new ItemStack[0]))
+                .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 6.5))))
+                .eut((int) GT_Values.VP[tier + 1] * 3 / 4)
+                .metadata(TIER, 3)
+                .addTo(RecipeMaps.pcbFactoryRecipes);
         }
     }
 }
diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java
index 76fcbfe346..b41340e52e 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java
@@ -2,11 +2,9 @@ package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.enums.Mods.AppliedEnergistics2;
 import static gregtech.api.enums.Mods.AvaritiaAddons;
-import static gregtech.api.enums.Mods.BartWorks;
 import static gregtech.api.enums.Mods.BuildCraftFactory;
 import static gregtech.api.enums.Mods.ExtraUtilities;
 import static gregtech.api.enums.Mods.Forestry;
-import static gregtech.api.enums.Mods.GTNHLanthanides;
 import static gregtech.api.enums.Mods.GTPlusPlus;
 import static gregtech.api.enums.Mods.GalacticraftCore;
 import static gregtech.api.enums.Mods.GalacticraftMars;
@@ -6447,9 +6445,6 @@ public class AssemblerRecipes implements Runnable {
     }
 
     public void withBartWorks() {
-        if (!BartWorks.isModLoaded()) {
-            return;
-        }
 
         GT_Values.RA.stdBuilder()
             .itemInputs(
@@ -6632,9 +6627,6 @@ public class AssemblerRecipes implements Runnable {
     }
 
     public void withGTNHLanthAndGTPP() {
-        if (!(GTNHLanthanides.isModLoaded() && GTPlusPlus.isModLoaded())) {
-            return;
-        }
 
         GT_Values.RA.stdBuilder()
             .itemInputs(
diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java
index 8748c96654..8c6bfc8100 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java
@@ -1,9 +1,7 @@
 package gregtech.loaders.postload.recipes;
 
-import static gregtech.api.enums.Mods.GTPlusPlus;
 import static gregtech.api.enums.Mods.GregTech;
 import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
-import static gregtech.api.enums.Mods.TecTech;
 import static gregtech.api.util.GT_RecipeBuilder.HOURS;
 import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
 import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
@@ -31,8 +29,7 @@ public class AssemblyLineRecipes implements Runnable {
     private final Materials LuVMat;
 
     public AssemblyLineRecipes() {
-        solderIndalloy = GTPlusPlus.isModLoaded() ? FluidRegistry.getFluid("molten.indalloy140")
-            : FluidRegistry.getFluid("molten.solderingalloy");
+        solderIndalloy = FluidRegistry.getFluid("molten.indalloy140");
 
         LuVMat = ExternalMaterials.getRuridit();
     }
@@ -861,9 +858,7 @@ public class AssemblyLineRecipes implements Runnable {
                 ItemList.Energy_Module.get(1),
                 ItemList.Cover_WirelessNeedsMaintainance.get(1))
             .itemOutputs(ItemList.TierdDrone1.get(4))
-            .fluidInputs(
-                new FluidStack(solderIndalloy, 576),
-                FluidRegistry.getFluidStack(GTPlusPlus.isModLoaded() ? "fluid.rocketfuelmixc" : "nitrofuel", 4000))
+            .fluidInputs(new FluidStack(solderIndalloy, 576), FluidRegistry.getFluidStack("fluid.rocketfuelmixc", 4000))
             .duration(60 * SECONDS)
             .eut(TierEU.RECIPE_UV)
             .addTo(AssemblyLine);
@@ -878,15 +873,13 @@ public class AssemblyLineRecipes implements Runnable {
                 ItemList.Field_Generator_UV.get(16),
                 ItemList.Gravistar.get(8),
                 ItemList.Emitter_UV.get(4),
-                TecTech.isModLoaded() ? GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 16, 15497)
-                    : ItemList.Hatch_AutoMaintenance.get(64),
+                GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 16, 15497),
                 ItemList.Energy_Cluster.get(8),
                 ItemList.Cover_WirelessNeedsMaintainance.get(1))
             .itemOutputs(ItemList.TierdDrone2.get(1))
             .fluidInputs(
                 new FluidStack(solderIndalloy, 144000),
-                GTPlusPlus.isModLoaded() ? FluidRegistry.getFluidStack("molten.ethylcyanoacrylatesuperglue", 2000)
-                    : Materials.AdvancedGlue.getFluid(256000))
+                FluidRegistry.getFluidStack("molten.ethylcyanoacrylatesuperglue", 2000))
             .duration(60 * SECONDS)
             .eut(TierEU.RECIPE_UHV)
             .addTo(AssemblyLine);
diff --git a/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java
index b05f585950..36bfb67de5 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java
@@ -1,8 +1,6 @@
 package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.enums.Mods.BartWorks;
-import static gregtech.api.enums.Mods.GTNHLanthanides;
-import static gregtech.api.enums.Mods.GTPlusPlus;
 import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes;
 import static gregtech.api.recipe.RecipeMaps.primitiveBlastRecipes;
 import static gregtech.api.util.GT_ModHandler.getModItem;
@@ -631,31 +629,26 @@ public class BlastFurnaceRecipes implements Runnable {
             .metadata(COIL_HEAT, 1200)
             .addTo(blastFurnaceRecipes);
 
-        if (GTNHLanthanides.isModLoaded() && GTPlusPlus.isModLoaded()) {
-
-            GT_Values.RA.stdBuilder()
-                .itemInputs(MaterialsUEVplus.TranscendentMetal.getDust(1), GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, MaterialsUEVplus.TranscendentMetal, 1))
-                .fluidInputs(Materials.Tungsten.getMolten(144))
-                .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.celestialtungsten"), 72))
-                .duration(3 * MINUTES)
-                .eut(32000000)
-                .metadata(COIL_HEAT, 11701)
-                .addTo(blastFurnaceRecipes);
+        GT_Values.RA.stdBuilder()
+            .itemInputs(MaterialsUEVplus.TranscendentMetal.getDust(1), GT_Utility.getIntegratedCircuit(1))
+            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, MaterialsUEVplus.TranscendentMetal, 1))
+            .fluidInputs(Materials.Tungsten.getMolten(144))
+            .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.celestialtungsten"), 72))
+            .duration(3 * MINUTES)
+            .eut(32000000)
+            .metadata(COIL_HEAT, 11701)
+            .addTo(blastFurnaceRecipes);
 
-            // Rh + 3Cl = RhCl3
+        // Rh + 3Cl = RhCl3
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(
-                    getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 1L, 78),
-                    GT_Utility.getIntegratedCircuit(2))
-                .itemOutputs(MaterialsKevlar.RhodiumChloride.getDust(4))
-                .fluidInputs(Materials.Chlorine.getGas(3000))
-                .duration(30 * SECONDS)
-                .eut((int) TierEU.RECIPE_HV)
-                .metadata(COIL_HEAT, 573)
-                .addTo(blastFurnaceRecipes);
-        }
+        GT_Values.RA.stdBuilder()
+            .itemInputs(getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 1L, 78), GT_Utility.getIntegratedCircuit(2))
+            .itemOutputs(MaterialsKevlar.RhodiumChloride.getDust(4))
+            .fluidInputs(Materials.Chlorine.getGas(3000))
+            .duration(30 * SECONDS)
+            .eut((int) TierEU.RECIPE_HV)
+            .metadata(COIL_HEAT, 573)
+            .addTo(blastFurnaceRecipes);
     }
 
     public void registerPrimitiveBlastFurnaceRecipes() {
diff --git a/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java
index d099157c1c..5add456f34 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java
@@ -1,7 +1,6 @@
 package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.enums.Mods.BartWorks;
-import static gregtech.api.enums.Mods.GTNHLanthanides;
 import static gregtech.api.enums.Mods.GTPlusPlus;
 import static gregtech.api.enums.Mods.GalaxySpace;
 import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
@@ -3699,108 +3698,103 @@ public class ChemicalRecipes implements Runnable {
             .eut(30)
             .addTo(UniversalChemical);
 
-        if (BartWorks.isModLoaded()) {
-            // CaSi2 + 2HCl = 2Si + CaCl2 + 2H
+        // CaSi2 + 2HCl = 2Si + CaCl2 + 2H
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CalciumDisilicide, 3),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 2),
-                    getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 3L, 63))
-                .fluidInputs(Materials.HydrochloricAcid.getFluid(2000))
-                .fluidOutputs(Materials.Hydrogen.getGas(2000))
-                .duration(45 * SECONDS)
-                .eut(30)
-                .addTo(UniversalChemical);
-
-            // SiCl4 + 2Zn = 2ZnCl2 + Si
+        GT_Values.RA.stdBuilder()
+            .itemInputs(
+                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CalciumDisilicide, 3),
+                GT_Utility.getIntegratedCircuit(1))
+            .itemOutputs(
+                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 2),
+                getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 3L, 63))
+            .fluidInputs(Materials.HydrochloricAcid.getFluid(2000))
+            .fluidOutputs(Materials.Hydrogen.getGas(2000))
+            .duration(45 * SECONDS)
+            .eut(30)
+            .addTo(UniversalChemical);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 2),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1),
-                    getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 6L, 10052))
-                .fluidInputs(Materials.SiliconTetrachloride.getFluid(1000))
-                .duration(20 * SECONDS)
-                .eut(30)
-                .addTo(UniversalChemical);
-        }
+        // SiCl4 + 2Zn = 2ZnCl2 + Si
 
-        if (GTNHLanthanides.isModLoaded() && GTPlusPlus.isModLoaded()) {
+        GT_Values.RA.stdBuilder()
+            .itemInputs(
+                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 2),
+                GT_Utility.getIntegratedCircuit(1))
+            .itemOutputs(
+                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1),
+                getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 6L, 10052))
+            .fluidInputs(Materials.SiliconTetrachloride.getFluid(1000))
+            .duration(20 * SECONDS)
+            .eut(30)
+            .addTo(UniversalChemical);
 
-            // C4H8O + 2H =Pd= C4H10O
+        // C4H8O + 2H =Pd= C4H10O
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.Butyraldehyde, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Palladium, 1))
-                .itemOutputs(ItemList.Cell_Empty.get(1))
-                .fluidInputs(Materials.Hydrogen.getGas(2000))
-                .fluidOutputs(new FluidStack(FluidRegistry.getFluid("butanol"), 1000))
-                .duration(10 * SECONDS)
-                .eut(30)
-                .addTo(UniversalChemical);
+        GT_Values.RA.stdBuilder()
+            .itemInputs(
+                GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.Butyraldehyde, 1),
+                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Palladium, 1))
+            .itemOutputs(ItemList.Cell_Empty.get(1))
+            .fluidInputs(Materials.Hydrogen.getGas(2000))
+            .fluidOutputs(new FluidStack(FluidRegistry.getFluid("butanol"), 1000))
+            .duration(10 * SECONDS)
+            .eut(30)
+            .addTo(UniversalChemical);
 
-            // 4CH2O + C2H4O =NaOH= C5H12O4 + CO
+        // 4CH2O + C2H4O =NaOH= C5H12O4 + CO
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(
-                    getModItem(GTPlusPlus.ID, "Formaldehyde", 4),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 1))
-                .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.Pentaerythritol, 21),
-                    Materials.Empty.getCells(4))
-                .fluidInputs(MaterialsKevlar.Acetaldehyde.getGas(1000))
-                .fluidOutputs(Materials.CarbonMonoxide.getGas(1000))
-                .duration(30 * SECONDS)
-                .eut(TierEU.RECIPE_HV)
-                .addTo(UniversalChemical);
+        GT_Values.RA.stdBuilder()
+            .itemInputs(
+                getModItem(GTPlusPlus.ID, "Formaldehyde", 4),
+                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 1))
+            .itemOutputs(
+                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.Pentaerythritol, 21),
+                Materials.Empty.getCells(4))
+            .fluidInputs(MaterialsKevlar.Acetaldehyde.getGas(1000))
+            .fluidOutputs(Materials.CarbonMonoxide.getGas(1000))
+            .duration(30 * SECONDS)
+            .eut(TierEU.RECIPE_HV)
+            .addTo(UniversalChemical);
 
-            // 4CH2O + C2H4O =NaOH= C5H12O4 + CO
+        // 4CH2O + C2H4O =NaOH= C5H12O4 + CO
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.Acetaldehyde, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 1))
-                .itemOutputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.Pentaerythritol, 21),
-                    Materials.Empty.getCells(1))
-                .fluidInputs(new FluidStack(FluidRegistry.getFluid("fluid.formaldehyde"), 4000))
-                .fluidOutputs(Materials.CarbonMonoxide.getGas(1000))
-                .duration(30 * SECONDS)
-                .eut(TierEU.RECIPE_HV)
-                .addTo(UniversalChemical);
+        GT_Values.RA.stdBuilder()
+            .itemInputs(
+                GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.Acetaldehyde, 1),
+                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 1))
+            .itemOutputs(
+                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.Pentaerythritol, 21),
+                Materials.Empty.getCells(1))
+            .fluidInputs(new FluidStack(FluidRegistry.getFluid("fluid.formaldehyde"), 4000))
+            .fluidOutputs(Materials.CarbonMonoxide.getGas(1000))
+            .duration(30 * SECONDS)
+            .eut(TierEU.RECIPE_HV)
+            .addTo(UniversalChemical);
 
-            // CaC2 + 2H2O = Ca(OH)2 + C2H2
+        // CaC2 + 2H2O = Ca(OH)2 + C2H2
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CalciumCarbide, 3),
-                    GT_Utility.getIntegratedCircuit(1))
-                .itemOutputs(getModItem(GTPlusPlus.ID, "itemDustCalciumHydroxide", 5))
-                .fluidInputs(Materials.Water.getFluid(2000))
-                .fluidOutputs(MaterialsKevlar.Acetylene.getGas(1000))
-                .duration(15 * SECONDS)
-                .eut(TierEU.RECIPE_HV)
-                .addTo(UniversalChemical);
+        GT_Values.RA.stdBuilder()
+            .itemInputs(
+                GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CalciumCarbide, 3),
+                GT_Utility.getIntegratedCircuit(1))
+            .itemOutputs(getModItem(GTPlusPlus.ID, "itemDustCalciumHydroxide", 5))
+            .fluidInputs(Materials.Water.getFluid(2000))
+            .fluidOutputs(MaterialsKevlar.Acetylene.getGas(1000))
+            .duration(15 * SECONDS)
+            .eut(TierEU.RECIPE_HV)
+            .addTo(UniversalChemical);
 
-            // Co(NO3)2 + 2NaOH = Co(OH)2 + 2NaNO3
+        // Co(NO3)2 + 2NaOH = Co(OH)2 + 2NaNO3
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(
-                    MaterialsKevlar.CobaltIINitrate.getDust(9),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 6))
-                .itemOutputs(
-                    MaterialsKevlar.CobaltIIHydroxide.getDust(5),
-                    getModItem(GTPlusPlus.ID, "itemDustSodiumNitrate", 10))
-                .duration(5 * SECONDS)
-                .eut(TierEU.RECIPE_MV)
-                .addTo(UniversalChemical);
-        }
+        GT_Values.RA.stdBuilder()
+            .itemInputs(
+                MaterialsKevlar.CobaltIINitrate.getDust(9),
+                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 6))
+            .itemOutputs(
+                MaterialsKevlar.CobaltIIHydroxide.getDust(5),
+                getModItem(GTPlusPlus.ID, "itemDustSodiumNitrate", 10))
+            .duration(5 * SECONDS)
+            .eut(TierEU.RECIPE_MV)
+            .addTo(UniversalChemical);
     }
 
     public void addDefaultPolymerizationRecipes(Fluid aBasicMaterial, ItemStack aBasicMaterialCell, Fluid aPolymer) {
@@ -5625,349 +5619,337 @@ public class ChemicalRecipes implements Runnable {
             .eut(500000)
             .addTo(multiblockChemicalReactorRecipes);
 
-        if (GTNHLanthanides.isModLoaded() && GTPlusPlus.isModLoaded()) {
-            // CH2O + 2C6H7N + HCl = C13H14N2(HCl) + H2O
+        // CH2O + 2C6H7N + HCl = C13H14N2(HCl) + H2O
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.getIntegratedCircuit(1))
-                .fluidInputs(
-                    new FluidStack(FluidRegistry.getFluid("fluid.formaldehyde"), 1000),
-                    new FluidStack(FluidRegistry.getFluid("aniline"), 2000),
-                    Materials.HydrochloricAcid.getFluid(1000))
-                .fluidOutputs(MaterialsKevlar.DiaminodiphenylmethanMixture.getFluid(1000))
-                .duration(60 * SECONDS)
-                .eut(TierEU.RECIPE_EV)