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

2 files changed, 63 insertions, 68 deletions

diff --git a/src/main/java/common/recipeLoaders/AlloySmelter.java b/src/main/java/common/recipeLoaders/AlloySmelter.java
index 2737d98f4a..537c054630 100644
--- a/src/main/java/common/recipeLoaders/AlloySmelter.java
+++ b/src/main/java/common/recipeLoaders/AlloySmelter.java
@@ -1,6 +1,5 @@
 package common.recipeLoaders;
 
-import static gregtech.api.enums.Mods.BartWorks;
 import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes;
 import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
 
@@ -15,18 +14,16 @@ public class AlloySmelter implements Runnable {
 
     @Override
     public void run() {
-        if (BartWorks.isModLoaded()) {
-            final MetaItem_CraftingComponent craftingItem = MetaItem_CraftingComponent.getInstance();
+        final MetaItem_CraftingComponent craftingItem = MetaItem_CraftingComponent.getInstance();
 
-            // YSZ Cermic Plate
-            GT_Values.RA.stdBuilder()
-                .itemInputs(
-                    craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicDust.getMetaID(), 3),
-                    ItemList.Shape_Mold_Plate.get(0))
-                .itemOutputs(craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicPlate.getMetaID(), 1))
-                .duration(20 * SECONDS)
-                .eut(TierEU.RECIPE_HV)
-                .addTo(alloySmelterRecipes);
-        }
+        // YSZ Cermic Plate
+        GT_Values.RA.stdBuilder()
+            .itemInputs(
+                craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicDust.getMetaID(), 3),
+                ItemList.Shape_Mold_Plate.get(0))
+            .itemOutputs(craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicPlate.getMetaID(), 1))
+            .duration(20 * SECONDS)
+            .eut(TierEU.RECIPE_HV)
+            .addTo(alloySmelterRecipes);
     }
 }
diff --git a/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java b/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java
index fe1aaaf70e..6a410a1ac3 100644
--- a/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java
+++ b/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java
@@ -52,62 +52,60 @@ public class ResearchableAssemblyLine implements Runnable {
             250 * 20,
             (int) TierEU.RECIPE_UEV);
 
-        if (GTPlusPlus.isModLoaded()) {
-            // Insanely Ultimate Capacitor (UIV)
-            TT_recipeAdder.addResearchableAssemblylineRecipe(
-                new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 8),
-                24_000_000,
-                1_280,
-                32_000_000,
-                32,
-                new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.TranscendentMetal, 4),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.TranscendentMetal, 24),
-                    GT_ModHandler.getModItem(GTPlusPlus.ID, "itemPlateDoubleHypogen", 32),
-                    GT_ModHandler.getModItem(GTPlusPlus.ID, "itemPlateDoubleHypogen", 32),
-                    new Object[] { OrePrefixes.circuit.get(Materials.Piko), 1 },
-                    new Object[] { OrePrefixes.circuit.get(Materials.Piko), 1 },
-                    new Object[] { OrePrefixes.circuit.get(Materials.Piko), 1 },
-                    new Object[] { OrePrefixes.circuit.get(Materials.Piko), 1 }, ItemList.ZPM4.get(8L),
-                    ItemList.Field_Generator_UIV.get(4), ItemList.Circuit_Wafer_QPIC.get(64),
-                    ItemList.Circuit_Wafer_QPIC.get(64),
-                    GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RawPicoWafer", 64),
-                    ItemList.Circuit_Parts_DiodeXSMD.get(64), ItemList.Circuit_Parts_InductorXSMD.get(32),
-                    GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorUIV, 64) },
-                new FluidStack[] { new FluidStack(solderUEV, 18_432),
-                    new FluidStack(FluidRegistry.getFluid("molten.celestialtungsten"), 18432),
-                    Materials.Quantium.getMolten(18_432), Materials.SuperCoolant.getFluid(128_000) },
-                new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 9),
-                300 * 20,
-                (int) TierEU.RECIPE_UIV);
+        // Insanely Ultimate Capacitor (UIV)
+        TT_recipeAdder.addResearchableAssemblylineRecipe(
+            new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 8),
+            24_000_000,
+            1_280,
+            32_000_000,
+            32,
+            new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.TranscendentMetal, 4),
+                GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.TranscendentMetal, 24),
+                GT_ModHandler.getModItem(GTPlusPlus.ID, "itemPlateDoubleHypogen", 32),
+                GT_ModHandler.getModItem(GTPlusPlus.ID, "itemPlateDoubleHypogen", 32),
+                new Object[] { OrePrefixes.circuit.get(Materials.Piko), 1 },
+                new Object[] { OrePrefixes.circuit.get(Materials.Piko), 1 },
+                new Object[] { OrePrefixes.circuit.get(Materials.Piko), 1 },
+                new Object[] { OrePrefixes.circuit.get(Materials.Piko), 1 }, ItemList.ZPM4.get(8L),
+                ItemList.Field_Generator_UIV.get(4), ItemList.Circuit_Wafer_QPIC.get(64),
+                ItemList.Circuit_Wafer_QPIC.get(64),
+                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RawPicoWafer", 64),
+                ItemList.Circuit_Parts_DiodeXSMD.get(64), ItemList.Circuit_Parts_InductorXSMD.get(32),
+                GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorUIV, 64) },
+            new FluidStack[] { new FluidStack(solderUEV, 18_432),
+                new FluidStack(FluidRegistry.getFluid("molten.celestialtungsten"), 18432),
+                Materials.Quantium.getMolten(18_432), Materials.SuperCoolant.getFluid(128_000) },
+            new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 9),
+            300 * 20,
+            (int) TierEU.RECIPE_UIV);
 
-            // Mega Ultimate Capacitor (UMV)
-            TT_recipeAdder.addResearchableAssemblylineRecipe(
-                new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 9),
-                480_000_000,
-                12_288,
-                128_000_000,
-                64,
-                new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 4),
-                    GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.SpaceTime, 24),
-                    GT_ModHandler.getModItem(GTPlusPlus.ID, "itemPlateDoubleDragonblood", 32),
-                    GT_ModHandler.getModItem(GTPlusPlus.ID, "itemPlateDoubleDragonblood", 32),
-                    new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 },
-                    new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 },
-                    new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 },
-                    new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 }, ItemList.ZPM5.get(8L),
-                    ItemList.Field_Generator_UMV.get(4), ItemList.Circuit_Wafer_QPIC.get(64),
-                    ItemList.Circuit_Wafer_QPIC.get(64),
-                    GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 64),
-                    ItemList.Circuit_Parts_DiodeXSMD.get(64), ItemList.Circuit_Parts_InductorXSMD.get(64),
-                    GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUMV, 64) },
-                new FluidStack[] { new FluidStack(solderUEV, 36_864),
-                    new FluidStack(FluidRegistry.getFluid("molten.astraltitanium"), 36_864),
-                    new FluidStack(FluidRegistry.getFluid("molten.celestialtungsten"), 36_864),
-                    Materials.SuperCoolant.getFluid(256_000) },
-                new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 10),
-                350 * 20,
-                (int) TierEU.RECIPE_UMV);
-        }
+        // Mega Ultimate Capacitor (UMV)
+        TT_recipeAdder.addResearchableAssemblylineRecipe(
+            new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 9),
+            480_000_000,
+            12_288,
+            128_000_000,
+            64,
+            new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 4),
+                GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.SpaceTime, 24),
+                GT_ModHandler.getModItem(GTPlusPlus.ID, "itemPlateDoubleDragonblood", 32),
+                GT_ModHandler.getModItem(GTPlusPlus.ID, "itemPlateDoubleDragonblood", 32),
+                new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 },
+                new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 },
+                new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 },
+                new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 }, ItemList.ZPM5.get(8L),
+                ItemList.Field_Generator_UMV.get(4), ItemList.Circuit_Wafer_QPIC.get(64),
+                ItemList.Circuit_Wafer_QPIC.get(64),
+                GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 64),
+                ItemList.Circuit_Parts_DiodeXSMD.get(64), ItemList.Circuit_Parts_InductorXSMD.get(64),
+                GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUMV, 64) },
+            new FluidStack[] { new FluidStack(solderUEV, 36_864),
+                new FluidStack(FluidRegistry.getFluid("molten.astraltitanium"), 36_864),
+                new FluidStack(FluidRegistry.getFluid("molten.celestialtungsten"), 36_864),
+                Materials.SuperCoolant.getFluid(256_000) },
+            new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 10),
+            350 * 20,
+            (int) TierEU.RECIPE_UMV);
 
         // Ultimate Capacitor (UHV)
         TT_recipeAdder.addResearchableAssemblylineRecipe(