Make some machine drops stackable with new ones (#3392)

Co-authored-by: Martin Robertz <dream-master@gmx.net>

12 files changed, 32 insertions, 20 deletions

diff --git a/src/main/java/bartworks/common/tileentities/multis/MTECircuitAssemblyLine.java b/src/main/java/bartworks/common/tileentities/multis/MTECircuitAssemblyLine.java
index 324d041efc..54810bcf6d 100644
--- a/src/main/java/bartworks/common/tileentities/multis/MTECircuitAssemblyLine.java
+++ b/src/main/java/bartworks/common/tileentities/multis/MTECircuitAssemblyLine.java
@@ -263,8 +263,7 @@ public class MTECircuitAssemblyLine extends MTEEnhancedMultiBlockBase<MTECircuit
     @Override
     public void setItemNBT(NBTTagCompound aNBT) {
         if (isImprinted()) aNBT.setTag(IMPRINT_KEY, this.type);
-        aNBT.setInteger(RUNNING_MODE_KEY, mode);
-        super.saveNBTData(aNBT);
+        super.setItemNBT(aNBT);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/automation/MTEItemDistributor.java b/src/main/java/gregtech/common/tileentities/automation/MTEItemDistributor.java
index 36f1e1be58..4dbd8237ca 100644
--- a/src/main/java/gregtech/common/tileentities/automation/MTEItemDistributor.java
+++ b/src/main/java/gregtech/common/tileentities/automation/MTEItemDistributor.java
@@ -187,7 +187,14 @@ public class MTEItemDistributor extends MTEBuffer {
     @Override
     public void setItemNBT(NBTTagCompound aNBT) {
         super.setItemNBT(aNBT);
-        aNBT.setByteArray("mItemsPerSide", itemsPerSide);
+        boolean hasSettings = false;
+        for (byte i : itemsPerSide) {
+            if (i != 0) {
+                hasSettings = true;
+                break;
+            }
+        }
+        if (hasSettings) aNBT.setByteArray("mItemsPerSide", itemsPerSide);
     }
 
     @Override
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
diff --git a/src/main/java/gregtech/common/tileentities/storage/MTEQuantumChest.java b/src/main/java/gregtech/common/tileentities/storage/MTEQuantumChest.java
index 5402ded873..9ef1e9e892 100644
--- a/src/main/java/gregtech/common/tileentities/storage/MTEQuantumChest.java
+++ b/src/main/java/gregtech/common/tileentities/storage/MTEQuantumChest.java
@@ -40,6 +40,7 @@ public class MTEQuantumChest extends MTEDigitalChestBase {
     @Override
     public void setItemNBT(NBTTagCompound aNBT) {
         mInvData = new NBTTagList();
+        boolean hasInvData = false;
         for (int i = 0; i < 3; i++) {
             if (mInventory[i] != null) {
                 NBTTagCompound tNBT = new NBTTagCompound();
@@ -51,12 +52,13 @@ public class MTEQuantumChest extends MTEDigitalChestBase {
                     tNBT.setTag("tag", mInventory[i].getTagCompound());
                 }
                 mInvData.appendTag(tNBT);
+                hasInvData = true;
             }
         }
         if (mItemStack != null) aNBT.setTag("mItemStack", getItemStack().writeToNBT(new NBTTagCompound()));
-        aNBT.setTag("Inventory", mInvData);
-        aNBT.setInteger("mItemCount", getItemCount());
-        aNBT.setBoolean("mVoidOverflow", mVoidOverflow);
+        if (hasInvData) aNBT.setTag("Inventory", mInvData);
+        if (getItemCount() > 0) aNBT.setInteger("mItemCount", getItemCount());
+        if (mVoidOverflow) aNBT.setBoolean("mVoidOverflow", true);
 
         super.setItemNBT(aNBT);
     }
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) {
diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEEyeOfHarmony.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEEyeOfHarmony.java
index 403208a393..2c6c9bf1e7 100644
--- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEEyeOfHarmony.java
+++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEEyeOfHarmony.java
@@ -1724,7 +1724,7 @@ public class MTEEyeOfHarmony extends TTMultiblockBase implements IConstructable,
 
     @Override
     public void setItemNBT(NBTTagCompound NBT) {
-        NBT.setLong(ASTRAL_ARRAY_AMOUNT_NBT_TAG, astralArrayAmount);
+        if (astralArrayAmount > 0) NBT.setLong(ASTRAL_ARRAY_AMOUNT_NBT_TAG, astralArrayAmount);
     }
 
     @Override