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 <dream-master@gmx.net>
---
 .../gregtech/common/tileentities/machines/MTEHatchOutputBusME.java   | 5 +++--
 .../java/gregtech/common/tileentities/machines/MTEHatchOutputME.java | 5 +++--
 .../java/gregtech/common/tileentities/machines/basic/MTEMiner.java   | 2 +-
 .../java/gregtech/common/tileentities/machines/basic/MTEPump.java    | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'src/main/java/gregtech/common/tileentities/machines')

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
-- 
cgit