diff options
| author | miozune <miozune@gmail.com> | 2023-09-10 23:00:58 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-10 16:00:58 +0200 |
| commit | cbd4cbe002f613f1aca4a08bbac178094c36cca6 (patch) | |
| tree | e0f6dfcd95f0c5fd370c9b4833a127aa97dc72cc /src/main/java/gregtech/api | |
| parent | f10f4f27a891aea5d89113a05c9b5d5e7f59360c (diff) | |
| download | GT5-Unofficial-cbd4cbe002f613f1aca4a08bbac178094c36cca6.tar.gz GT5-Unofficial-cbd4cbe002f613f1aca4a08bbac178094c36cca6.tar.bz2 GT5-Unofficial-cbd4cbe002f613f1aca4a08bbac178094c36cca6.zip | |
Deprecate GregTech_API#mAE2 (#2288)
Diffstat (limited to 'src/main/java/gregtech/api')
3 files changed, 11 insertions, 8 deletions
diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java index d25fde3047..ded3a6c9d7 100644 --- a/src/main/java/gregtech/api/GregTech_API.java +++ b/src/main/java/gregtech/api/GregTech_API.java @@ -279,8 +279,13 @@ public class GregTech_API { sMachineRainExplosions = true, sMachineThunderExplosions = true, sMachineFireExplosions = true, sMachineWireFire = true, mOutputRF = false, mInputRF = false, meIOLoaded = false, mRFExplosions = false, mServerStarted = false, mIC2Classic = false, mMagneticraft = false, mImmersiveEngineering = false, - mGTPlusPlus = false, mTranslocator = false, mTConstruct = false, mGalacticraft = false, mAE2 = false, - mHodgepodge = false, mAvaritia = false; + mGTPlusPlus = false, mTranslocator = false, mTConstruct = false, mGalacticraft = false, mHodgepodge = false, + mAvaritia = false; + /** + * This is always set to true + */ + @Deprecated + public boolean mAE2 = true; public static int mEUtoRF = 360, mRFtoEU = 20; 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 { |