From e0d5a220e764f9a921d5cd98a3e1e2e64ad6c591 Mon Sep 17 00:00:00 2001 From: boubou19 Date: Wed, 4 Oct 2023 23:22:52 +0200 Subject: 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 --- src/main/java/gregtech/api/util/GT_GC_Compat.java | 7 ++++--- src/main/java/gregtech/api/util/GT_Utility.java | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src/main/java/gregtech/api/util') 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; } /** -- cgit