From cbd4cbe002f613f1aca4a08bbac178094c36cca6 Mon Sep 17 00:00:00 2001 From: miozune Date: Sun, 10 Sep 2023 23:00:58 +0900 Subject: Deprecate GregTech_API#mAE2 (#2288) --- src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java | 4 ++-- .../api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'src/main/java/gregtech/api/metatileentity') diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java index af1fbace15..c67648df9c 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java @@ -972,7 +972,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity tileEntityInvalid = false; leaveEnet(); if (canAccessData()) { - if (GregTech_API.mAE2) invalidateAE(); + invalidateAE(); mMetaTileEntity.onRemoval(); mMetaTileEntity.setBaseMetaTileEntity(null); } @@ -982,7 +982,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity @Override public void onChunkUnload() { super.onChunkUnload(); - if (GregTech_API.mAE2) onChunkUnloadAE(); + onChunkUnloadAE(); } @Override diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java index 9d51f6f37e..9c9bdd0078 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java @@ -359,10 +359,8 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile if (GalacticraftCore.isModLoaded() && GT_GC_Compat.canConnect(tileEntity, oppositeSide)) return true; // AE2-p2p Compat - if (GT_Mod.gregtechproxy.mAE2Integration) { - if (tileEntity instanceof appeng.tile.powersink.IC2 ic2sink - && ic2sink.acceptsEnergyFrom((TileEntity) baseMetaTile, oppositeSide)) return true; - } + if (tileEntity instanceof appeng.tile.powersink.IC2 ic2sink + && ic2sink.acceptsEnergyFrom((TileEntity) baseMetaTile, oppositeSide)) return true; // IC2 Compat { -- cgit