remove Loader.isModLoaded calls

13 files changed, 55 insertions, 35 deletions

diff --git a/src/main/java/com/github/technus/tectech/Reference.java b/src/main/java/com/github/technus/tectech/Reference.java
index bf472f3afd..e343b9fc77 100644
--- a/src/main/java/com/github/technus/tectech/Reference.java
+++ b/src/main/java/com/github/technus/tectech/Reference.java
@@ -1,18 +1,15 @@
 package com.github.technus.tectech;
 
+import gregtech.api.enums.Mods;
+
 public final class Reference {
 
-    public static final String MODID = "tectech";
+    public static final String MODID = Mods.Names.TECTECH;
     public static final String NAME = "TecTech - Tec Technology!";
     public static final String VERSION = "GRADLETOKEN_VERSION";
     public static final String COLLECTIONNAME = "TecTech";
     public static final String CLIENTSIDE = "com.github.technus.tectech.proxy.ClientProxy";
     public static final String SERVERSIDE = "com.github.technus.tectech.proxy.CommonProxy";
 
-    public static final String COFHCORE = "CoFHCore";
-    public static final String THAUMCRAFT = "Thaumcraft";
-    public static final String DREAMCRAFT = "dreamcraft";
-    public static final String GTPLUSPLUS = "miscutils";
-
     private Reference() {}
 }
diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java
index 17b5c88828..9bc7289819 100644
--- a/src/main/java/com/github/technus/tectech/TecTech.java
+++ b/src/main/java/com/github/technus/tectech/TecTech.java
@@ -1,6 +1,7 @@
 package com.github.technus.tectech;
 
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
+import static gregtech.api.enums.Mods.COFHCore;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
@@ -132,7 +133,7 @@ public class TecTech {
 
     @Mod.EventHandler
     public void Load(FMLInitializationEvent event) {
-        hasCOFH = Loader.isModLoaded(Reference.COFHCORE);
+        hasCOFH = COFHCore.isModLoaded();
 
         if (configTecTech.DISABLE_MATERIAL_LOADING_FFS) {
             try {
diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
index 54c72a2da5..6d63a81cdf 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
@@ -2,6 +2,15 @@ package com.github.technus.tectech.compatibility.dreamcraft;
 
 import static com.github.technus.tectech.loader.recipe.BaseRecipeLoader.getOrDefault;
 import static com.google.common.math.LongMath.pow;
+import static gregtech.api.enums.Mods.BartWorks;
+import static gregtech.api.enums.Mods.BloodMagic;
+import static gregtech.api.enums.Mods.DraconicEvolution;
+import static gregtech.api.enums.Mods.ElectroMagicTools;
+import static gregtech.api.enums.Mods.EternalSingularity;
+import static gregtech.api.enums.Mods.GTPlusPlus;
+import static gregtech.api.enums.Mods.GTPlusPlusEverglades;
+import static gregtech.api.enums.Mods.SGCraft;
+import static gregtech.api.enums.Mods.TinkersGregworks;
 import static gregtech.api.util.GT_ModHandler.getModItem;
 
 import java.lang.reflect.Method;
@@ -294,7 +303,7 @@ public class DreamCraftRecipeLoader {
                 60 * 20,
                 8_000_000);
 
-        if (Loader.isModLoaded(Reference.GTPLUSPLUS)) {
+        if (GTPlusPlus.isModLoaded()) {
             // Hypogen Coil
             TT_recipeAdder.addResearchableAssemblylineRecipe(
                     ItemList.Casing_Coil_Infinity.get(1),
@@ -923,7 +932,7 @@ public class DreamCraftRecipeLoader {
                 32000000);
 
         // Buck Converter IV-UIV
-        if (Loader.isModLoaded("bartworks")) {
+        if (BartWorks.isModLoaded()) {
             GT_Values.RA.addAssemblerRecipe(
                     new ItemStack[] { ItemList.Transformer_LuV_IV.get(1), getItemContainer("Display").get(1),
                             GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 2),
@@ -2503,7 +2512,7 @@ public class DreamCraftRecipeLoader {
 
         addWirelessEnergyRecipes();
 
-        if (Loader.isModLoaded("TGregworks")) {
+        if (TinkersGregworks.isModLoaded()) {
             addEOHRecipes();
         }
 
@@ -2955,7 +2964,7 @@ public class DreamCraftRecipeLoader {
                 32_000_000);
 
         // Stargate Recipes
-        if (Loader.isModLoaded("eternalsingularity") && Loader.isModLoaded("SGCraft")) {
+        if (EternalSingularity.isModLoaded() && SGCraft.isModLoaded()) {
 
             final int baseStargateTime = 125_000 * 20;
 
@@ -3063,7 +3072,7 @@ public class DreamCraftRecipeLoader {
 
         // Dimensionally Transcendent Plasma Forge (DTPF)
 
-        if (Loader.isModLoaded("eternalsingularity")) {
+        if (EternalSingularity.isModLoaded()) {
 
             // DTPF Controller.
             TT_recipeAdder.addResearchableAssemblylineRecipe(
@@ -3329,7 +3338,7 @@ public class DreamCraftRecipeLoader {
                 250 * 20,
                 6_400_000);
 
-        if (Loader.isModLoaded(Reference.GTPLUSPLUS)) {
+        if (GTPlusPlusEverglades.isModLoaded()) {
             // Insanely Ultimate Battery
             TT_recipeAdder.addResearchableAssemblylineRecipe(
                     ItemList.ZPM4.get(1),
@@ -3444,7 +3453,7 @@ public class DreamCraftRecipeLoader {
         }
 
         // Draconic Evolution Fusion Crafter Controller
-        if (Loader.isModLoaded("AWWayofTime") && Loader.isModLoaded("EMT")) {
+        if (BloodMagic.isModLoaded() && ElectroMagicTools.isModLoaded()) {
             TT_recipeAdder.addResearchableAssemblylineRecipe(
                     getModItem("EMT", "EMT_GTBLOCK_CASEING", 1, 8),
                     16_777_216,
@@ -3466,7 +3475,7 @@ public class DreamCraftRecipeLoader {
                     getModItem("gregtech", "gt.blockmachines", 1, 5001),
                     1500,
                     8_000_000);
-            if (Loader.isModLoaded("DraconicEvolution")) {
+            if (DraconicEvolution.isModLoaded()) {
                 // DE Schematics Cores Tier 1
                 TT_recipeAdder.addResearchableAssemblylineRecipe(
                         getModItem("EMT", "EMT_GTBLOCK_CASEING", 1, 9),
@@ -5393,7 +5402,7 @@ public class DreamCraftRecipeLoader {
                 ? FluidRegistry.getFluid("molten.mutatedlivingsolder")
                 : FluidRegistry.getFluid("molten.solderingalloy");
 
-        ItemStack largeShirabonPlate = Loader.isModLoaded("TGregworks")
+        ItemStack largeShirabonPlate = TinkersGregworks.isModLoaded()
                 ? TGregUtils.newItemStack(Materials.get("Shirabon"), PartTypes.LargePlate, 1)
                 : GT_OreDictUnificator.get("plateDenseShirabon", 1);
 
diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java
index badc773669..6bc93c55df 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java
@@ -1,5 +1,6 @@
 package com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turretbase;
 
+import gregtech.api.enums.Mods;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
@@ -21,7 +22,7 @@ public class TileTurretBaseEM extends TurretBaseTierFiveTileEntity {
     }
 
     @Override
-    @Optional.Method(modid = "OpenComputers")
+    @Optional.Method(modid = Mods.Names.OPEN_COMPUTERS)
     public String getComponentName() {
         return "turretBaseEM";
     }
diff --git a/src/main/java/com/github/technus/tectech/loader/EntityLoader.java b/src/main/java/com/github/technus/tectech/loader/EntityLoader.java
index 0ba5565ab7..fae299ea75 100644
--- a/src/main/java/com/github/technus/tectech/loader/EntityLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/EntityLoader.java
@@ -6,6 +6,8 @@ import com.github.technus.tectech.compatibility.openmodularturrets.entity.projec
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.registry.EntityRegistry;
 
+import static gregtech.api.enums.Mods.OpenModularTurrets;
+
 /**
  * Created by Tec on 30.07.2017.
  */
@@ -13,7 +15,7 @@ public class EntityLoader implements Runnable {
 
     @Override
     public void run() {
-        if (Loader.isModLoaded("openmodularturrets")) {
+        if (OpenModularTurrets.isModLoaded()) {
             EntityRegistry.registerModEntity(projectileEM.class, "projectileEM", 0, TecTech.instance, 16, 5, true);
         }
     }
diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
index 43a711bf60..531864438f 100644
--- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
@@ -10,6 +10,9 @@ import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatte
 import static com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompat.essentiaContainerCompat;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 import static gregtech.api.enums.GT_Values.W;
+import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
+import static gregtech.api.enums.Mods.Thaumcraft;
+import static gregtech.api.enums.Mods.TwilightForest;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -80,7 +83,7 @@ public final class MainLoader {
         LOGGER.info("Elemental Init Done");
 
         progressBarLoad.step("Thaumcraft Compatibility");
-        if (Loader.isModLoaded(Reference.THAUMCRAFT)) {
+        if (Thaumcraft.isModLoaded()) {
             essentiaContainerCompat = new EssentiaCompatEnabled();
         } else {
             essentiaContainerCompat = new EssentiaCompat();
@@ -126,7 +129,7 @@ public final class MainLoader {
         ProgressManager.ProgressBar progressBarPostLoad = ProgressManager.push("TecTech Post Loader", 4);
 
         progressBarPostLoad.step("Dreamcraft Compatibility");
-        if (Loader.isModLoaded(Reference.DREAMCRAFT)) {
+        if (NewHorizonsCoreMod.isModLoaded()) {
             try {
                 Class<?> clazz = Class.forName("com.dreammaster.gthandler.casings.GT_Container_CasingsNH");
                 TT_Container_Casings.sBlockCasingsNH = (Block) clazz.getField("sBlockCasingsNH").get(null);
@@ -140,7 +143,7 @@ public final class MainLoader {
         }
 
         progressBarPostLoad.step("Thaumcraft Compatibility");
-        if (Loader.isModLoaded(Reference.THAUMCRAFT)) {
+        if (Thaumcraft.isModLoaded()) {
             aspectDefinitionCompat = new AspectDefinitionCompatEnabled();
             aspectDefinitionCompat.run(definitionsRegistry);
         } else {
@@ -318,7 +321,7 @@ public final class MainLoader {
     }
 
     private static void adjustTwilightBlockResistance() {
-        if (Loader.isModLoaded("TwilightForest")) {
+        if (TwilightForest.isModLoaded()) {
             safeSetResistance(GameRegistry.findBlock("TwilightForest", "tile.TFShield"), 30);
             safeSetResistance(GameRegistry.findBlock("TwilightForest", "tile.TFThorns"), 10);
             safeSetResistance(GameRegistry.findBlock("TwilightForest", "tile.TFTowerTranslucent"), 30);
diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/BaseRecipeLoader.java b/src/main/java/com/github/technus/tectech/loader/recipe/BaseRecipeLoader.java
index d12f16efcf..40972d1fc2 100644
--- a/src/main/java/com/github/technus/tectech/loader/recipe/BaseRecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/recipe/BaseRecipeLoader.java
@@ -1,6 +1,8 @@
 package com.github.technus.tectech.loader.recipe;
 
 import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.enums.Mods.GTPlusPlus;
+import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidRegistry;
@@ -38,7 +40,7 @@ public class BaseRecipeLoader {
     public void run(EMTransformationRegistry transformationInfo) {
         EMAtomDefinition.setTransformations(transformationInfo);
         EMHadronDefinition.setTransformations(transformationInfo);
-        if (Loader.isModLoaded(Reference.GTPLUSPLUS)) {
+        if (GTPlusPlus.isModLoaded()) {
             new GtppAtomLoader().setTransformations(transformationInfo);
         }
 
@@ -115,7 +117,7 @@ public class BaseRecipeLoader {
                 2048,
                 12000);
 
-        if (Loader.isModLoaded(Reference.DREAMCRAFT)) {
+        if (NewHorizonsCoreMod.isModLoaded()) {
             new DreamCraftRecipeLoader().run(transformationInfo); // init recipes for GTNH version
         }
     }
diff --git a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java
index 117f7309aa..f2e1ead9d7 100644
--- a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java
@@ -2,6 +2,7 @@ package com.github.technus.tectech.loader.thing;
 
 import static com.github.technus.tectech.Reference.MODID;
 import static com.github.technus.tectech.TecTech.tectechTexturePage1;
+import static gregtech.api.enums.Mods.OpenModularTurrets;
 
 import com.github.technus.tectech.Reference;
 import com.github.technus.tectech.TecTech;
@@ -37,10 +38,7 @@ public class ThingsLoader implements Runnable {
         }
 
         TecTech.LOGGER.info("Added texture page if was null");
-        if (!Loader.isModLoaded(Reference.DREAMCRAFT)) {
-            TT_Container_Casings.sBlockCasingsNH = new GT_Block_CasingsNH();
-            TecTech.LOGGER.info("Adding basic casings");
-        }
+
         TT_Container_Casings.sBlockCasingsTT = new GT_Block_CasingsTT();
         TecTech.LOGGER.info("Elemental Casing registered");
         TT_Container_Casings.sBlockCasingsBA0 = new GT_Block_CasingsBA0();
@@ -57,7 +55,7 @@ public class ThingsLoader implements Runnable {
         QuantumGlassBlock.run();
         TecTech.LOGGER.info("Quantum Glass registered");
 
-        if (Loader.isModLoaded("openmodularturrets")) {
+        if (OpenModularTurrets.isModLoaded()) {
             TurretHeadEM.run();
             TecTech.LOGGER.info("TurretHeadEM registered");
             TurretBaseEM.run();
diff --git a/src/main/java/com/github/technus/tectech/mechanics/spark/RendererMessage.java b/src/main/java/com/github/technus/tectech/mechanics/spark/RendererMessage.java
index 55504f9352..810ac49570 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/spark/RendererMessage.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/spark/RendererMessage.java
@@ -18,6 +18,8 @@ import cpw.mods.fml.relauncher.SideOnly;
 import eu.usrv.yamcore.network.client.AbstractClientMessageHandler;
 import io.netty.buffer.ByteBuf;
 
+import static gregtech.api.enums.Mods.Thaumcraft;
+
 // TODO Re-work how sparks are distributed
 public class RendererMessage implements IMessage {
 
@@ -86,7 +88,7 @@ public class RendererMessage implements IMessage {
     @SideOnly(Side.CLIENT)
     private static void thaumLightning(int tX, int tY, int tZ, int tXN, int tYN, int tZN, int wID) {
         // This is enough to check for thaum, since it only ever matters for client side effects (Tested not to crash)
-        if (Loader.isModLoaded("Thaumcraft")) {
+        if (Thaumcraft.isModLoaded()) {
             World world = Minecraft.getMinecraft().theWorld;
             if (world.provider.dimensionId == wID) {
                 FXLightningBolt bolt = new FXLightningBolt(
diff --git a/src/main/java/com/github/technus/tectech/nei/IMCForNEI.java b/src/main/java/com/github/technus/tectech/nei/IMCForNEI.java
index 3c9bf8c53d..86c9867baf 100644
--- a/src/main/java/com/github/technus/tectech/nei/IMCForNEI.java
+++ b/src/main/java/com/github/technus/tectech/nei/IMCForNEI.java
@@ -1,6 +1,7 @@
 package com.github.technus.tectech.nei;
 
 import static com.github.technus.tectech.Reference.MODID;
+import static gregtech.api.enums.Mods.NotEnoughItems;
 
 import net.minecraft.nbt.NBTTagCompound;
 
@@ -10,7 +11,7 @@ import cpw.mods.fml.common.event.FMLInterModComms;
 public class IMCForNEI {
 
     public static void IMCSender() {
-        if (!Loader.isModLoaded("NotEnoughItems")) {
+        if (!NotEnoughItems.isModLoaded()) {
             return;
         }
         sendHandler("gt.recipe.eyeofharmony", "gregtech:gt.blockmachines:15410", 1);
diff --git a/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java b/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java
index 7d33091d1e..c1a521f0a3 100644
--- a/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java
+++ b/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java
@@ -2,6 +2,7 @@ package com.github.technus.tectech.proxy;
 
 import static com.github.technus.tectech.TecTech.RANDOM;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.eyeOfHarmonyRenderBlock;
+import static gregtech.api.enums.Mods.OpenModularTurrets;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityClientPlayerMP;
@@ -44,7 +45,7 @@ public class ClientProxy extends CommonProxy {
         MinecraftForgeClient
                 .registerItemRenderer(Item.getItemFromBlock(eyeOfHarmonyRenderBlock), new RenderEyeOfHarmonyItem());
 
-        if (Loader.isModLoaded("openmodularturrets")) {
+        if (OpenModularTurrets.isModLoaded()) {
             new TT_turret_loader().run();
         }
 
diff --git a/src/main/java/com/github/technus/tectech/thing/item/AvrProgrammer.java b/src/main/java/com/github/technus/tectech/thing/item/AvrProgrammer.java
index 6b359dcf8f..91204927ca 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/AvrProgrammer.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/AvrProgrammer.java
@@ -9,6 +9,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.List;
 
+import gregtech.api.enums.Mods;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -34,7 +35,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 
 @Optional.InterfaceList({ @Optional.Interface(iface = "dan200.computercraft.api.media.IMedia", modid = "ComputerCraft"),
-        @Optional.Interface(iface = "li.cil.oc.api.fs.FileSystem", modid = "OpenComputers") })
+        @Optional.Interface(iface = "li.cil.oc.api.fs.FileSystem", modid = Mods.Names.OPEN_COMPUTERS) })
 public class AvrProgrammer extends Item implements IMedia {
 
     public static AvrProgrammer INSTANCE = new AvrProgrammer();
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java
index 4ee6691b40..ec31e5ffca 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java
@@ -3,6 +3,8 @@ package com.github.technus.tectech.thing.metaTileEntity.hatch;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 import static com.github.technus.tectech.util.CommonValues.MULTI_CHECK_AT;
 import static com.github.technus.tectech.util.TT_Utility.getUniqueIdentifier;
+import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
+import static gregtech.api.enums.Mods.OpenComputers;
 import static net.minecraft.util.StatCollector.translateToLocal;
 import static net.minecraft.util.StatCollector.translateToLocalFormatted;
 
@@ -390,7 +392,7 @@ public class GT_MetaTileEntity_Hatch_Rack extends GT_MetaTileEntity_Hatch implem
         new RackComponent("IC2:ic2.reactorVentGold", 0, -1, 40f, 5000, false);
         new RackComponent("IC2:ic2.reactorVentDiamond", 0, -1, 80f, 10000, false); // 2x oc
 
-        if (Loader.isModLoaded(Reference.DREAMCRAFT)) {
+        if (NewHorizonsCoreMod.isModLoaded()) {
             // GTNH-GT5u circuits
             // these components causes crashes when used with the original GT5u
             new RackComponent(ItemList.NandChip.get(1), 2, 6, 0, 750, true); // Primitive Circuit
@@ -406,7 +408,7 @@ public class GT_MetaTileEntity_Hatch_Rack extends GT_MetaTileEntity_Hatch implem
             new RackComponent("dreamcraft:item.QuantumCircuit", 128, 48, -.6f, 9000, true);
         }
 
-        if (Loader.isModLoaded("OpenComputers")) {
+        if (OpenComputers.isModLoaded()) {
             new RackComponent("OpenComputers:item.oc.Transistor", 0, 1, 0f, 100, true); // Transistor
             new RackComponent("OpenComputers:item.oc.Microchip0", 7, 12, -.05f, 1500, true); // chip t1
             new RackComponent("OpenComputers:item.oc.Microchip1", 18, 20, -.1f, 3000, true); // chip t2