From 42946c9ac1fdb250d8648a1128285a2409e4265c Mon Sep 17 00:00:00 2001 From: HoleFish <48403212+HoleFish@users.noreply.github.com> Date: Tue, 22 Oct 2024 03:07:05 +0800 Subject: Make some machine drops stackable with new ones (#3392) Co-authored-by: Martin Robertz --- .../java/gregtech/common/tileentities/machines/basic/MTEMiner.java | 2 +- .../java/gregtech/common/tileentities/machines/basic/MTEPump.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/java/gregtech/common/tileentities/machines/basic') 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 -- cgit