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

4 files changed, 78 insertions, 77 deletions

diff --git a/src/main/java/kubatech/loaders/DEFCRecipes.java b/src/main/java/kubatech/loaders/DEFCRecipes.java
index f7805ec84f..d23637d7d2 100644
--- a/src/main/java/kubatech/loaders/DEFCRecipes.java
+++ b/src/main/java/kubatech/loaders/DEFCRecipes.java
@@ -1,5 +1,6 @@
 package kubatech.loaders;
 
+import static gregtech.api.enums.Mods.ElectroMagicTools;
 import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
 import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
 
@@ -30,7 +31,6 @@ import gregtech.api.util.GT_Utility;
 import gregtech.nei.formatter.SimpleSpecialValueFormatter;
 import gtPlusPlus.xmod.forestry.bees.handler.GTPP_CombType;
 import kubatech.Tags;
-import kubatech.api.LoaderReference;
 
 public class DEFCRecipes {
 
@@ -47,19 +47,17 @@ public class DEFCRecipes {
     public static void addRecipes() {
 
         // Dragonblood recipe for magics haters
-        if (LoaderReference.GTPlusPlus) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(
-                    new ItemStack(Blocks.dragon_egg, 1),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64L),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64L))
-                .fluidInputs(Materials.Radon.getPlasma(144))
-                .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 8L))
-                .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 288))
-                .eut(1_966_080)
-                .duration(14_000)
-                .addTo(mixerRecipes);
-        }
+        GT_Values.RA.stdBuilder()
+            .itemInputs(
+                new ItemStack(Blocks.dragon_egg, 1),
+                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64L),
+                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64L))
+            .fluidInputs(Materials.Radon.getPlasma(144))
+            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 8L))
+            .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 288))
+            .eut(1_966_080)
+            .duration(14_000)
+            .addTo(mixerRecipes);
 
         // Casings
 
@@ -129,7 +127,7 @@ public class DEFCRecipes {
     private static final Item EMTItems = GameRegistry.findItem("EMT", "EMTItems");
 
     private static void addOldHiddenRecipe(GT_Recipe recipe) {
-        if (!LoaderReference.ElectroMagicTools) return;
+        if (!ElectroMagicTools.isModLoaded()) return;
         recipe = recipe.copy();
         recipe.mInputs = Arrays.stream(recipe.mInputs)
             .map(i -> {
@@ -147,7 +145,7 @@ public class DEFCRecipes {
     }
 
     private static void conversionRecipes() {
-        if (!LoaderReference.ElectroMagicTools) return;
+        if (!ElectroMagicTools.isModLoaded()) return;
         GameRegistry.addShapelessRecipe(
             kubatech.api.enums.ItemList.DEFCDraconicSchematic.get(1),
             new ItemStack(EMTItems, 1, 16));
@@ -271,59 +269,56 @@ public class DEFCRecipes {
             .forEach(DEFCRecipes::addOldHiddenRecipe);
 
         // Dragon Blood
-        if (LoaderReference.GTPlusPlus) {
-
-            GT_Values.RA.stdBuilder()
-                .itemInputs(
-                    new ItemStack(Blocks.dragon_egg, 0),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64),
-                    GT_Utility.getIntegratedCircuit(1))
-                .fluidInputs(Materials.Radon.getPlasma(144))
-                .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 288))
-                .eut(1_966_080)
-                .duration(4200)
-                .specialValue(3)
-                .noOptimize()
-                .addTo(fusionCraftingRecipes);
+        GT_Values.RA.stdBuilder()
+            .itemInputs(
+                new ItemStack(Blocks.dragon_egg, 0),
+                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64),
+                GT_Utility.getIntegratedCircuit(1))
+            .fluidInputs(Materials.Radon.getPlasma(144))
+            .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 288))
+            .eut(1_966_080)
+            .duration(4200)
+            .specialValue(3)
+            .noOptimize()
+            .addTo(fusionCraftingRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(
-                    GT_ModHandler.getModItem("witchery", "infinityegg", 0),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64),
-                    GT_Utility.getIntegratedCircuit(1))
-                .fluidInputs(Materials.Radon.getPlasma(72))
-                .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 432))
-                .eut(1_966_080)
-                .duration(3600)
-                .specialValue(3)
-                .noOptimize()
-                .addTo(fusionCraftingRecipes);
+        GT_Values.RA.stdBuilder()
+            .itemInputs(
+                GT_ModHandler.getModItem("witchery", "infinityegg", 0),
+                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64),
+                GT_Utility.getIntegratedCircuit(1))
+            .fluidInputs(Materials.Radon.getPlasma(72))
+            .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 432))
+            .eut(1_966_080)
+            .duration(3600)
+            .specialValue(3)
+            .noOptimize()
+            .addTo(fusionCraftingRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(
-                    new ItemStack(Blocks.dragon_egg, 0),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64),
-                    GTPP_CombType.DRAGONBLOOD.getStackForType(1))
-                .fluidInputs(Materials.Radon.getPlasma(216))
-                .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 432))
-                .eut(1_966_080)
-                .duration(2800)
-                .specialValue(3)
-                .noOptimize()
-                .addTo(fusionCraftingRecipes);
+        GT_Values.RA.stdBuilder()
+            .itemInputs(
+                new ItemStack(Blocks.dragon_egg, 0),
+                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64),
+                GTPP_CombType.DRAGONBLOOD.getStackForType(1))
+            .fluidInputs(Materials.Radon.getPlasma(216))
+            .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 432))
+            .eut(1_966_080)
+            .duration(2800)
+            .specialValue(3)
+            .noOptimize()
+            .addTo(fusionCraftingRecipes);
 
-            GT_Values.RA.stdBuilder()
-                .itemInputs(
-                    GT_ModHandler.getModItem("witchery", "infinityegg", 0),
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64),
-                    GTPP_CombType.DRAGONBLOOD.getStackForType(1))
-                .fluidInputs(Materials.Radon.getPlasma(108))
-                .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 648))
-                .eut(1_966_080)
-                .duration(2400)
-                .specialValue(3)
-                .noOptimize()
-                .addTo(fusionCraftingRecipes);
-        }
+        GT_Values.RA.stdBuilder()
+            .itemInputs(
+                GT_ModHandler.getModItem("witchery", "infinityegg", 0),
+                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64),
+                GTPP_CombType.DRAGONBLOOD.getStackForType(1))
+            .fluidInputs(Materials.Radon.getPlasma(108))
+            .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 648))
+            .eut(1_966_080)
+            .duration(2400)
+            .specialValue(3)
+            .noOptimize()
+            .addTo(fusionCraftingRecipes);
     }
 }
diff --git a/src/main/java/kubatech/loaders/MobHandlerLoader.java b/src/main/java/kubatech/loaders/MobHandlerLoader.java
index e7e4ff1736..261cad087c 100644
--- a/src/main/java/kubatech/loaders/MobHandlerLoader.java
+++ b/src/main/java/kubatech/loaders/MobHandlerLoader.java
@@ -20,6 +20,8 @@
 
 package kubatech.loaders;
 
+import static gregtech.api.enums.Mods.InfernalMobs;
+import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
 import static kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeEntityCrusher.DIAMOND_SPIKES_DAMAGE;
 import static kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeEntityCrusher.MOB_SPAWN_INTERVAL;
 
@@ -59,7 +61,6 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.util.GT_Utility;
 import kubatech.Tags;
-import kubatech.api.LoaderReference;
 import kubatech.api.helpers.ReflectionHelper;
 import kubatech.config.Config;
 import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeEntityCrusher;
@@ -161,7 +162,7 @@ public class MobHandlerLoader {
                 }
             }
 
-            if (LoaderReference.InfernalMobs) {
+            if (InfernalMobs.isModLoaded()) {
                 InfernalMobsCore infernalMobsCore = InfernalMobsCore.instance();
                 if (recipe.infernalityAllowed && mEUt * 8 <= MTE.getMaxInputEu()
                     && !infernalMobsCore.getDimensionBlackList()
@@ -229,7 +230,7 @@ public class MobHandlerLoader {
 
     @SubscribeEvent
     public void onPostOverridesConfigLoad(PostMobsOverridesLoadEvent event) {
-        if (LoaderReference.GTNHCoreMod) {
+        if (NewHorizonsCoreMod.isModLoaded()) {
             LOG.info("Detected GTNH Core Mod, parsing custom drops from there.");
             CustomDrops coredrops = ReflectionHelper.getField(MainRegistry.Module_CustomDrops, "_mCustomDrops", null);
             if (coredrops != null) {
diff --git a/src/main/java/kubatech/loaders/RecipeLoader.java b/src/main/java/kubatech/loaders/RecipeLoader.java
index c2103b7f69..7d609021b6 100644
--- a/src/main/java/kubatech/loaders/RecipeLoader.java
+++ b/src/main/java/kubatech/loaders/RecipeLoader.java
@@ -21,8 +21,12 @@
 package kubatech.loaders;
 
 import static gregtech.api.enums.Mods.Avaritia;
+import static gregtech.api.enums.Mods.DraconicEvolution;
+import static gregtech.api.enums.Mods.EnderIO;
+import static gregtech.api.enums.Mods.Forestry;
 import static gregtech.api.enums.Mods.GregTech;
 import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
+import static gregtech.api.enums.Mods.PamsHarvestCraft;
 import static gregtech.api.recipe.RecipeMaps.benderRecipes;
 import static gregtech.api.recipe.RecipeMaps.cutterRecipes;
 import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
@@ -79,7 +83,6 @@ import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.lib.CORE;
-import kubatech.api.LoaderReference;
 import kubatech.api.enums.ItemList;
 import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_DEFusionCrafter;
 import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeEntityCrusher;
@@ -101,7 +104,7 @@ public class RecipeLoader {
             GT_MetaTileEntity_ExtremeEntityCrusher.class,
             "multimachine.entitycrusher",
             "Extreme Entity Crusher",
-            LoaderReference.EnderIO)) {
+            EnderIO.isModLoaded())) {
             GT_ModHandler.addCraftingRecipe(
                 ItemList.ExtremeEntityCrusher.get(1),
                 bitsd,
@@ -114,7 +117,7 @@ public class RecipeLoader {
             GT_MetaTileEntity_MegaIndustrialApiary.class,
             "multimachine.extremeapiary",
             "Industrial Apicultural Acclimatiser and Drone Domestication Station",
-            LoaderReference.Forestry)) {
+            Forestry.isModLoaded())) {
             GT_Values.RA.stdBuilder()
                 .metadata(RESEARCH_ITEM, gregtech.api.enums.ItemList.Machine_IndustrialApiary.get(1))
                 .metadata(RESEARCH_TIME, 8 * MINUTES + 20 * SECONDS)
@@ -158,7 +161,7 @@ public class RecipeLoader {
             GT_MetaTileEntity_DEFusionCrafter.class,
             "multimachine.defusioncrafter",
             "Draconic Evolution Fusion Crafter",
-            LoaderReference.DraconicEvolution)) {
+            DraconicEvolution.isModLoaded())) {
             // Controller recipe added in TecTech
             DEFCRecipes.addRecipes();
         }
@@ -212,7 +215,7 @@ public class RecipeLoader {
 
     private static void RegisterTeaLine() {
         // TEA LINE //
-        if (LoaderReference.GTPlusPlus && LoaderReference.HarvestCraft) {
+        if (PamsHarvestCraft.isModLoaded()) {
             CORE.RA.addDehydratorRecipe(
                 new ItemStack[] { GameRegistry.findItemStack("harvestcraft", "tealeafItem", 1) },
                 null,
diff --git a/src/main/java/kubatech/loaders/TCLoader.java b/src/main/java/kubatech/loaders/TCLoader.java
index 7d6abe5132..f6ff1cac9f 100644
--- a/src/main/java/kubatech/loaders/TCLoader.java
+++ b/src/main/java/kubatech/loaders/TCLoader.java
@@ -20,6 +20,9 @@
 
 package kubatech.loaders;
 
+import static gregtech.api.enums.Mods.DraconicEvolution;
+import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -32,7 +35,6 @@ import net.minecraft.world.World;
 import com.kuba6000.mobsinfo.api.utils.ItemID;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import kubatech.api.LoaderReference;
 import kubatech.api.enums.ItemList;
 import kubatech.loaders.item.items.TeaUltimate;
 import thaumcraft.api.ThaumcraftApi;
@@ -55,7 +57,7 @@ public class TCLoader {
          * new ResourceLocation(Tags.MODID, "textures/gui/green_tea.png"),
          * new ResourceLocation("thaumcraft", "textures/gui/gui_researchback.png"));
          */
-        if (!LoaderReference.GTNHCoreMod || !LoaderReference.DraconicEvolution) return;
+        if (!NewHorizonsCoreMod.isModLoaded() || !DraconicEvolution.isModLoaded()) return;
         registerRecipe();
         registerResearch();
     }