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>

1 files changed, 5 insertions, 4 deletions

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;
             }