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>

3 files changed, 13 insertions, 13 deletions

diff --git a/src/main/java/detrav/items/DetravMetaGeneratedTool01.java b/src/main/java/detrav/items/DetravMetaGeneratedTool01.java
index e704631467..c171f56561 100644
--- a/src/main/java/detrav/items/DetravMetaGeneratedTool01.java
+++ b/src/main/java/detrav/items/DetravMetaGeneratedTool01.java
@@ -16,6 +16,7 @@ import detrav.items.tools.DetravProspector;
 import detrav.items.tools.DetravToolElectricProspector;
 import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
+import gregtech.api.enums.Mods;
 import gregtech.api.enums.TCAspects;
 import gregtech.api.interfaces.IToolStats;
 import gregtech.api.items.MetaGeneratedTool;
@@ -280,7 +281,7 @@ public class DetravMetaGeneratedTool01 extends MetaGeneratedTool {
     public void getDetravSubItems(Item item, CreativeTabs detravCreativeTab, List list) {
 
         ItemStack dStack;
-        if (DetravScannerMod.isDreamcraftLoaded) {
+        if (Mods.NewHorizonsCoreMod.isModLoaded()) {
             // Materials at tiers
             list.add(getToolWithStats(0, 1, Materials.Polycaprolactam, Materials.Polycaprolactam, null));
             list.add(getToolWithStats(2, 1, Materials.Steel, Materials.Steel, null));
@@ -327,7 +328,7 @@ public class DetravMetaGeneratedTool01 extends MetaGeneratedTool {
         setCharge(dStack, 409600000L);
         list.add(dStack);
 
-        if (DetravScannerMod.isDreamcraftLoaded) {
+        if (Mods.NewHorizonsCoreMod.isModLoaded()) {
             dStack = getToolWithStats(
                 104,
                 1,
diff --git a/src/main/java/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java b/src/main/java/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java
index 25da8b6277..56f97ea862 100644
--- a/src/main/java/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java
+++ b/src/main/java/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java
@@ -17,13 +17,12 @@ import net.minecraftforge.fluids.FluidStack;
 
 import com.sinthoras.visualprospecting.VisualProspecting_API;
 
-import cpw.mods.fml.common.Loader;
-import detrav.DetravScannerMod;
 import detrav.items.DetravMetaGeneratedTool01;
 import detrav.net.DetravNetwork;
 import detrav.net.ProspectingPacket;
 import detrav.utils.BartWorksHelper;
 import detrav.utils.GTppHelper;
+import gregtech.api.enums.Mods;
 import gregtech.api.items.MetaBaseItem;
 import gregtech.api.objects.ItemData;
 import gregtech.api.util.GTLanguageManager;
@@ -119,13 +118,13 @@ public class BehaviourDetravToolElectricProspector extends BehaviourDetravToolPr
                                             packet.addBlock(c.xPosition * 16 + x, y, c.zPosition * 16 + z, tMetaID);
                                         }
                                     }
-                                } else if (DetravScannerMod.isGTppLoaded && GTppHelper.isGTppBlock(tBlock)) {
+                                } else if (GTppHelper.isGTppBlock(tBlock)) {
                                     packet.addBlock(
                                         c.xPosition * 16 + x,
                                         y,
                                         c.zPosition * 16 + z,
                                         GTppHelper.getGTppMeta(tBlock));
-                                } else if (DetravScannerMod.isBartWorksLoaded && BartWorksHelper.isOre(tBlock)) {
+                                } else if (BartWorksHelper.isOre(tBlock)) {
                                     if (data != 1 && BartWorksHelper.isSmallOre(tBlock)) continue;
                                     packet.addBlock(
                                         c.xPosition * 16 + x,
@@ -182,7 +181,7 @@ public class BehaviourDetravToolElectricProspector extends BehaviourDetravToolPr
             DetravNetwork.INSTANCE.sendToPlayer(packet, (EntityPlayerMP) aPlayer);
             if (!aPlayer.capabilities.isCreativeMode) tool.doDamage(aStack, this.mCosts * chunks.size());
 
-            if (Loader.isModLoaded("visualprospecting")) {
+            if (Mods.VisualProspecting.isModLoaded()) {
                 if (data == 0 || data == 1) {
                     VisualProspecting_API.LogicalServer.sendProspectionResultsToClient(
                         (EntityPlayerMP) aPlayer,
diff --git a/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java b/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java
index c914640573..45b4c7fb29 100644
--- a/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java
+++ b/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java
@@ -23,7 +23,6 @@ import net.minecraftforge.fluids.FluidStack;
 import com.sinthoras.visualprospecting.VisualProspecting_API;
 
 import bartworks.system.material.Werkstoff;
-import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.registry.LanguageRegistry;
 import detrav.DetravScannerMod;
 import detrav.items.DetravMetaGeneratedTool01;
@@ -31,6 +30,7 @@ import detrav.utils.BartWorksHelper;
 import detrav.utils.GTppHelper;
 import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Materials;
+import gregtech.api.enums.Mods;
 import gregtech.api.items.MetaBaseItem;
 import gregtech.api.objects.ItemData;
 import gregtech.api.util.GTLanguageManager;
@@ -82,7 +82,7 @@ public class BehaviourDetravToolProspector extends BehaviourNone {
                 if (!aPlayer.capabilities.isCreativeMode)
                     ((DetravMetaGeneratedTool01) aItem).doDamage(aStack, this.mCosts);
 
-                if (Loader.isModLoaded("visualprospecting")) {
+                if (Mods.VisualProspecting.isModLoaded()) {
                     VisualProspecting_API.LogicalServer.sendProspectionResultsToClient(
                         (EntityPlayerMP) aPlayer,
                         new ArrayList<>(),
@@ -213,7 +213,7 @@ public class BehaviourDetravToolProspector extends BehaviourNone {
             aPlayer.addChatMessage(msg);
         }
 
-        if (Loader.isModLoaded("visualprospecting")) {
+        if (Mods.VisualProspecting.isModLoaded()) {
             VisualProspecting_API.LogicalServer.sendProspectionResultsToClient(
                 (EntityPlayerMP) aPlayer,
                 VisualProspecting_API.LogicalServer.prospectOreVeinsWithinRadius(
@@ -249,7 +249,7 @@ public class BehaviourDetravToolProspector extends BehaviourNone {
             addChatMassageByValue(aPlayer, value, key);
         }
 
-        if (Loader.isModLoaded("visualprospecting")) {
+        if (Mods.VisualProspecting.isModLoaded()) {
             VisualProspecting_API.LogicalServer.sendProspectionResultsToClient(
                 (EntityPlayerMP) aPlayer,
                 VisualProspecting_API.LogicalServer.prospectOreVeinsWithinRadius(
@@ -311,10 +311,10 @@ public class BehaviourDetravToolProspector extends BehaviourNone {
                                 addOreToHashMap(name, aPlayer);
                             }
                         }
-                    } else if (DetravScannerMod.isGTppLoaded && GTppHelper.isGTppBlock(tBlock)) {
+                    } else if (GTppHelper.isGTppBlock(tBlock)) {
                         String name = GTppHelper.getGTppVeinName(tBlock);
                         if (!name.isEmpty()) addOreToHashMap(name, aPlayer);
-                    } else if (DetravScannerMod.isBartWorksLoaded && BartWorksHelper.isOre(tBlock)) {
+                    } else if (BartWorksHelper.isOre(tBlock)) {
                         if (data != 1 && BartWorksHelper.isSmallOre(tBlock)) continue;
                         final Werkstoff werkstoff = Werkstoff.werkstoffHashMap.getOrDefault(
                             (short) ((BartWorksHelper.getMetaFromBlock(aChunk, x, y, z, tBlock)) * -1),