Code cleanup (#2309)

* guard clause technique on GT_ItemIterator

* removing oredict for ars magica 2 items

* removing oredict for mystcraft items

* convert big if ladder into a swtich statement

* enhanced switch

* clean non GTNH compat and identify other compats

* spotlessApply (#2310)

Co-authored-by: GitHub GTNH Actions <>

* more guard clauses

* reordering condition

* removing dead code

* removing optional block

* deprecating mIC2Classic

* spotless apply

* deprecate modloaded variables

* spotlessApply

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>

7 files changed, 19 insertions, 13 deletions

diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java
index ded3a6c9d7..de295e2aa6 100644
--- a/src/main/java/gregtech/api/GregTech_API.java
+++ b/src/main/java/gregtech/api/GregTech_API.java
@@ -278,7 +278,10 @@ public class GregTech_API {
         sMachineExplosions = true, sMachineFlammable = true, sMachineNonWrenchExplosions = true,
         sMachineRainExplosions = true, sMachineThunderExplosions = true, sMachineFireExplosions = true,
         sMachineWireFire = true, mOutputRF = false, mInputRF = false, meIOLoaded = false, mRFExplosions = false,
-        mServerStarted = false, mIC2Classic = false, mMagneticraft = false, mImmersiveEngineering = false,
+        mServerStarted = false;
+
+    @Deprecated
+    public static boolean mIC2Classic = false, mMagneticraft = false, mImmersiveEngineering = false,
         mGTPlusPlus = false, mTranslocator = false, mTConstruct = false, mGalacticraft = false, mHodgepodge = false,
         mAvaritia = false;
     /**
diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java
index 5a756519e3..f0ee636f8b 100644
--- a/src/main/java/gregtech/api/enums/OrePrefixes.java
+++ b/src/main/java/gregtech/api/enums/OrePrefixes.java
@@ -3,6 +3,7 @@ package gregtech.api.enums;
 import static gregtech.api.enums.GT_Values.B;
 import static gregtech.api.enums.GT_Values.D2;
 import static gregtech.api.enums.GT_Values.M;
+import static gregtech.api.enums.Mods.GTPlusPlus;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -1280,7 +1281,7 @@ public enum OrePrefixes {
                     plateQuadruple.mDisabledItems.add(aMaterial);
                 if (!enableUnusedQuinPlates && !(aMaterial == Materials.Paper))
                     plateQuintuple.mDisabledItems.add(aMaterial);
-                if (!(enableUnusedDensePlates || GregTech_API.mGTPlusPlus)
+                if (!(enableUnusedDensePlates || GTPlusPlus.isModLoaded())
                     && !(aMaterial == Materials.Iron || aMaterial == Materials.Copper
                         || aMaterial == Materials.Lead
                         || aMaterial == Materials.Paper
diff --git a/src/main/java/gregtech/api/items/GT_BreederCell_Item.java b/src/main/java/gregtech/api/items/GT_BreederCell_Item.java
index 587d469017..3d51415783 100644
--- a/src/main/java/gregtech/api/items/GT_BreederCell_Item.java
+++ b/src/main/java/gregtech/api/items/GT_BreederCell_Item.java
@@ -68,7 +68,7 @@ public class GT_BreederCell_Item extends GT_Generic_Item implements IReactorComp
     @Override
     public void onUpdate(ItemStack stack, World world, Entity entity, int slotIndex, boolean isCurrentItem) {
         if ((entity instanceof EntityLivingBase entityLiving)) {
-            if (!GregTech_API.mIC2Classic && !GT_Utility.isWearingFullRadioHazmat(entityLiving)) {
+            if (!GT_Utility.isWearingFullRadioHazmat(entityLiving)) {
                 IC2Potion.radiation.applyTo(entityLiving, 20, 1);
             }
         }
diff --git a/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java b/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java
index c38510f750..8698bac886 100644
--- a/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java
+++ b/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java
@@ -7,7 +7,6 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
-import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.util.GT_Utility;
 import ic2.api.reactor.IReactor;
@@ -176,7 +175,7 @@ public class GT_RadioactiveCellIC_Item extends GT_RadioactiveCell_Item implement
     @Override
     public void onUpdate(ItemStack stack, World world, Entity entity, int slotIndex, boolean isCurrentItem) {
         if (this.sRadiation > 0 && (entity instanceof EntityLivingBase entityLiving)) {
-            if (!GregTech_API.mIC2Classic && !GT_Utility.isWearingFullRadioHazmat(entityLiving)) {
+            if (!GT_Utility.isWearingFullRadioHazmat(entityLiving)) {
                 IC2Potion.radiation.applyTo(entityLiving, sRadiation * 20, sRadiation * 10);
             }
         }
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java
index 862650d3d5..7162815a17 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java
@@ -2,6 +2,8 @@ package gregtech.api.metatileentity.implementations;
 
 import static gregtech.api.enums.GT_Values.ALL_VALID_SIDES;
 import static gregtech.api.enums.GT_Values.D1;
+import static gregtech.api.enums.Mods.TinkerConstruct;
+import static gregtech.api.enums.Mods.Translocator;
 import static gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid.Border.BOTTOM;
 import static gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid.Border.LEFT;
 import static gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid.Border.RIGHT;
@@ -38,7 +40,6 @@ import org.apache.commons.lang3.tuple.MutableTriple;
 
 import cpw.mods.fml.common.Optional;
 import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.Mods;
@@ -549,15 +550,15 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
             ? (IGregTechTileEntity) tileEntity
             : null;
 
-        if (coverBehavior instanceof GT_Cover_Drain || (GregTech_API.mTConstruct && isTConstructFaucet(tileEntity)))
-            return true;
+        if (coverBehavior instanceof GT_Cover_Drain
+            || (TinkerConstruct.isModLoaded() && isTConstructFaucet(tileEntity))) return true;
 
         final IFluidHandler fTileEntity = (tileEntity instanceof IFluidHandler) ? (IFluidHandler) tileEntity : null;
 
         if (fTileEntity != null) {
             final FluidTankInfo[] tInfo = fTileEntity.getTankInfo(tSide);
             if (tInfo != null) {
-                return tInfo.length > 0 || (GregTech_API.mTranslocator && isTranslocator(tileEntity))
+                return tInfo.length > 0 || (Translocator.isModLoaded() && isTranslocator(tileEntity))
                     || gTileEntity != null
                         && gTileEntity.getCoverBehaviorAtSideNew(tSide) instanceof GT_Cover_FluidRegulator;
             }
diff --git a/src/main/java/gregtech/api/util/GT_GC_Compat.java b/src/main/java/gregtech/api/util/GT_GC_Compat.java
index a441fa4be1..24710ab0ac 100644
--- a/src/main/java/gregtech/api/util/GT_GC_Compat.java
+++ b/src/main/java/gregtech/api/util/GT_GC_Compat.java
@@ -1,9 +1,10 @@
 package gregtech.api.util;
 
+import static gregtech.api.enums.Mods.GalacticraftCore;
+
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import gregtech.api.GregTech_API;
 import micdoodle8.mods.galacticraft.api.power.EnergySource;
 import micdoodle8.mods.galacticraft.api.power.EnergySource.EnergySourceAdjacent;
 import micdoodle8.mods.galacticraft.api.power.IEnergyHandlerGC;
@@ -15,7 +16,7 @@ public class GT_GC_Compat {
 
     public static long insertEnergyInto(TileEntity tTileEntity, long aVoltage, ForgeDirection tDirection) {
         // GC Compat
-        if (GregTech_API.mGalacticraft && tTileEntity instanceof IEnergyHandlerGC) {
+        if (GalacticraftCore.isModLoaded() && tTileEntity instanceof IEnergyHandlerGC) {
             if (!(tTileEntity instanceof IConnector)
                 || ((IConnector) tTileEntity).canConnect(tDirection, NetworkType.POWER)) {
                 EnergySource eSource = new EnergySourceAdjacent(tDirection);
@@ -44,7 +45,7 @@ public class GT_GC_Compat {
 
     public static boolean canConnect(TileEntity tTileEntity, ForgeDirection tDirection) {
         // GC Compat
-        return GregTech_API.mGalacticraft && tTileEntity instanceof IEnergyHandlerGC
+        return GalacticraftCore.isModLoaded() && tTileEntity instanceof IEnergyHandlerGC
             && (!(tTileEntity instanceof IConnector)
                 || ((IConnector) tTileEntity).canConnect(tDirection, NetworkType.POWER));
     }
diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index 0bac435d9a..b61ec8336f 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -10,6 +10,7 @@ import static gregtech.api.enums.GT_Values.NW;
 import static gregtech.api.enums.GT_Values.V;
 import static gregtech.api.enums.GT_Values.W;
 import static gregtech.api.enums.Materials.FLUID_MAP;
+import static gregtech.api.enums.Mods.Translocator;
 import static gregtech.common.GT_UndergroundOil.undergroundOilReadInformation;
 import static net.minecraftforge.common.util.ForgeDirection.DOWN;
 import static net.minecraftforge.common.util.ForgeDirection.EAST;
@@ -573,7 +574,7 @@ public class GT_Utility {
         if (TE_CHECK && tileEntity instanceof IItemDuct) return true;
         if (BC_CHECK && tileEntity instanceof buildcraft.api.transport.IPipeTile pipeTile)
             return pipeTile.isPipeConnected(side);
-        return GregTech_API.mTranslocator && tileEntity instanceof codechicken.translocator.TileItemTranslocator;
+        return Translocator.isModLoaded() && tileEntity instanceof codechicken.translocator.TileItemTranslocator;
     }
 
     /**