diff options
| author | HoleFish <48403212+HoleFish@users.noreply.github.com> | 2024-10-22 03:07:05 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-21 21:07:05 +0200 |
| commit | 42946c9ac1fdb250d8648a1128285a2409e4265c (patch) | |
| tree | f4db1d5f5a98e453225b85f729dd547c20993e99 /src/main/java/gregtech/common/tileentities/machines | |
| parent | a58d9b7ef8651f579f7c82cd986c94f75b984670 (diff) | |
| download | GT5-Unofficial-42946c9ac1fdb250d8648a1128285a2409e4265c.tar.gz GT5-Unofficial-42946c9ac1fdb250d8648a1128285a2409e4265c.tar.bz2 GT5-Unofficial-42946c9ac1fdb250d8648a1128285a2409e4265c.zip | |
Make some machine drops stackable with new ones (#3392)
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines')
4 files changed, 9 insertions, 7 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/MTEHatchOutputBusME.java b/src/main/java/gregtech/common/tileentities/machines/MTEHatchOutputBusME.java index 9e396b8b27..1f6905926a 100644 --- a/src/main/java/gregtech/common/tileentities/machines/MTEHatchOutputBusME.java +++ b/src/main/java/gregtech/common/tileentities/machines/MTEHatchOutputBusME.java @@ -50,7 +50,8 @@ import gregtech.api.util.GTUtility; public class MTEHatchOutputBusME extends MTEHatchOutputBus implements IPowerChannelState { - private long baseCapacity = 1_600; + private static final long DEFAULT_CAPACITY = 1_600; + private long baseCapacity = DEFAULT_CAPACITY; private BaseActionSource requestSource = null; private @Nullable AENetworkProxy gridProxy = null; @@ -268,7 +269,7 @@ public class MTEHatchOutputBusME extends MTEHatchOutputBus implements IPowerChan @Override public void setItemNBT(NBTTagCompound aNBT) { super.setItemNBT(aNBT); - aNBT.setLong("baseCapacity", baseCapacity); + if (baseCapacity != DEFAULT_CAPACITY) aNBT.setLong("baseCapacity", baseCapacity); } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/MTEHatchOutputME.java b/src/main/java/gregtech/common/tileentities/machines/MTEHatchOutputME.java index 7ebe9929c3..40980c5f14 100644 --- a/src/main/java/gregtech/common/tileentities/machines/MTEHatchOutputME.java +++ b/src/main/java/gregtech/common/tileentities/machines/MTEHatchOutputME.java @@ -58,7 +58,8 @@ import gregtech.api.util.GTUtility; public class MTEHatchOutputME extends MTEHatchOutput implements IPowerChannelState { - private long baseCapacity = 128_000; + private static final long DEFAULT_CAPACITY = 128_000; + private long baseCapacity = DEFAULT_CAPACITY; private BaseActionSource requestSource = null; private @Nullable AENetworkProxy gridProxy = null; @@ -302,7 +303,7 @@ public class MTEHatchOutputME extends MTEHatchOutput implements IPowerChannelSta @Override public void setItemNBT(NBTTagCompound aNBT) { super.setItemNBT(aNBT); - aNBT.setLong("baseCapacity", baseCapacity); + if (baseCapacity != DEFAULT_CAPACITY) aNBT.setLong("baseCapacity", baseCapacity); } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/MTEMiner.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTEMiner.java index 7707564b93..d799955c19 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/MTEMiner.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTEMiner.java @@ -343,7 +343,7 @@ public class MTEMiner extends MTEBasicMachine implements IDrillingLogicDelegateO @Override public void setItemNBT(NBTTagCompound aNBT) { super.setItemNBT(aNBT); - aNBT.setInteger("radiusConfig", radiusConfig); + if (radiusConfig != RADIUS[mTier]) aNBT.setInteger("radiusConfig", radiusConfig); } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/MTEPump.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTEPump.java index b8d9803951..9bc720aa19 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/MTEPump.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTEPump.java @@ -253,8 +253,8 @@ public class MTEPump extends MTEBasicMachine { @Override public void setItemNBT(NBTTagCompound aNBT) { super.setItemNBT(aNBT); - aNBT.setInteger("radiusConfig", radiusConfig); - aNBT.setBoolean("mDisallowRetract", mDisallowRetract); + if (radiusConfig != getMaxDistanceForTier(mTier)) aNBT.setInteger("radiusConfig", radiusConfig); + if (!mDisallowRetract) aNBT.setBoolean("mDisallowRetract", false); } @Override |