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>
---
 .../tileentities/machines/basic/MTEAtmosphericReconditioner.java    | 4 ++--
 .../machines/multi/processing/MTEIndustrialMacerator.java           | 2 +-
 .../machines/multi/processing/advanced/MTEAdvDistillationTower.java | 2 +-
 .../xmod/gregtech/common/tileentities/storage/MTEEnergyBuffer.java  | 6 ++++--
 4 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/main/java/gtPlusPlus')

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAtmosphericReconditioner.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAtmosphericReconditioner.java
index 438fe6a536..5a42319548 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAtmosphericReconditioner.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAtmosphericReconditioner.java
@@ -793,8 +793,8 @@ public class MTEAtmosphericReconditioner extends MTEBasicMachine {
 
     @Override
     public void setItemNBT(NBTTagCompound aNBT) {
-        aNBT.setInteger("mOptimalAirFlow", this.mOptimalAirFlow);
-        aNBT.setBoolean("mSaveRotor", mSaveRotor);
+        if (mOptimalAirFlow > 0) aNBT.setInteger("mOptimalAirFlow", this.mOptimalAirFlow);
+        if (mSaveRotor) aNBT.setBoolean("mSaveRotor", true);
         super.setItemNBT(aNBT);
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMacerator.java
index 7896dfb73c..b6666cdc6d 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMacerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMacerator.java
@@ -334,7 +334,7 @@ public class MTEIndustrialMacerator extends GTPPMultiBlockBase<MTEIndustrialMace
     @Override
     public void setItemNBT(NBTTagCompound aNBT) {
         super.setItemNBT(aNBT);
-        aNBT.setByte("mTier", (byte) controllerTier);
+        if (controllerTier > 1) aNBT.setByte("mTier", (byte) controllerTier);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvDistillationTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvDistillationTower.java
index c602e8f41f..f09de3c6af 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvDistillationTower.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvDistillationTower.java
@@ -446,7 +446,7 @@ public class MTEAdvDistillationTower extends GTPPMultiBlockBase<MTEAdvDistillati
 
     @Override
     public void setItemNBT(NBTTagCompound aNBT) {
-        aNBT.setBoolean("mUpgraded", mUpgraded);
+        if (mUpgraded) aNBT.setBoolean("mUpgraded", true);
         super.setItemNBT(aNBT);
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/MTEEnergyBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/MTEEnergyBuffer.java
index db02fe2af7..bc844cd1dd 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/MTEEnergyBuffer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/MTEEnergyBuffer.java
@@ -23,7 +23,8 @@ import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
 public class MTEEnergyBuffer extends GTPPMetaTileEntity {
 
-    protected byte aCurrentOutputAmperage = 4;
+    protected static final byte DEFAULT_OUTPUT_AMPERAGE = 4;
+    protected byte aCurrentOutputAmperage = DEFAULT_OUTPUT_AMPERAGE;
 
     public MTEEnergyBuffer(final int aID, final String aName, final String aNameRegional, final int aTier,
         final String aDescription, final int aSlotCount) {
@@ -403,7 +404,8 @@ public class MTEEnergyBuffer extends GTPPMetaTileEntity {
 
     @Override
     public void setItemNBT(NBTTagCompound aNBT) {
-        aNBT.setByte("aCurrentOutputAmperage", aCurrentOutputAmperage);
+        if (aCurrentOutputAmperage != DEFAULT_OUTPUT_AMPERAGE)
+            aNBT.setByte("aCurrentOutputAmperage", aCurrentOutputAmperage);
         long aEU = this.getBaseMetaTileEntity()
             .getStoredEU();
         if (aEU > 0) {
-- 
cgit