make tank/chest keep its contents when harvsted

5 files changed, 100 insertions, 9 deletions

diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java
index 7110ed20f9..c7bd5d0029 100644
--- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java
+++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java
@@ -34,7 +34,8 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
         super(aID, aName, aNameRegional, aTier, 3, new String[]{
                 "This Chest stores " + GT_Utility.formatNumbers(commonSizeCompute(aTier)) + " Blocks",
                 "Use a screwdriver to enable",
-                "voiding items on overflow"
+                "voiding items on overflow",
+                "Can keep its contents when harvested"
         });
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java
index 20d333783e..ca3289e218 100644
--- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java
+++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java
@@ -3,11 +3,16 @@ package gregtech.common.tileentities.storage;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
 
 public class GT_MetaTileEntity_QuantumChest extends GT_MetaTileEntity_DigitalChestBase {
     public int mItemCount = 0;
     public ItemStack mItemStack = null;
+    NBTTagList mInvData = null;
+
     public GT_MetaTileEntity_QuantumChest(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier);
     }
@@ -24,16 +29,53 @@ public class GT_MetaTileEntity_QuantumChest extends GT_MetaTileEntity_DigitalChe
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
         return new GT_MetaTileEntity_QuantumChest(mName, mTier, mDescriptionArray, mTextures);
     }
+
     @Override
-    protected String chestName(){ return  "Quantum Chest"; }
+    public void setItemNBT(NBTTagCompound aNBT) {
+        mInvData = new NBTTagList();
+        for (int i = 0; i < 3; i++) {
+            if (mInventory[i] != null) {
+                NBTTagCompound tNBT = new NBTTagCompound();
+                tNBT.setByte("Count", (byte) mInventory[i].stackSize);
+                tNBT.setShort("Damage", (short) mInventory[i].getItemDamage());
+                tNBT.setShort("id", (short) Item.getIdFromItem(mInventory[i].getItem()));
+                tNBT.setInteger("IntSlot", i);
+                if (mInventory[i].hasTagCompound()) {
+                    tNBT.setTag("tag", mInventory[i].getTagCompound());
+                }
+                mInvData.appendTag(tNBT);
+            }
+        }
+        if (mItemStack != null)
+            aNBT.setTag("mItemStack", getItemStack().writeToNBT(new NBTTagCompound()));
+        aNBT.setTag("Inventory", mInvData);
+        aNBT.setInteger("mItemCount", getItemCount());
+        aNBT.setBoolean("mVoidOverflow", mVoidOverflow);
+        super.setItemNBT(aNBT);
+    }
+
     @Override
-    protected int getItemCount() { return mItemCount; }
+    protected String chestName() {
+        return  "Quantum Chest";
+    }
+
+    @Override
+    protected int getItemCount() {
+        return mItemCount;
+    }
+
     @Override
     public void setItemCount(int aCount) {
         mItemCount = aCount;
     }
+
     @Override
-    protected ItemStack getItemStack(){ return  mItemStack; }
+    protected ItemStack getItemStack() {
+        return  mItemStack;
+    }
+
     @Override
-    protected void setItemStack(ItemStack s){ mItemStack = s; }
+    protected void setItemStack(ItemStack s) {
+        mItemStack = s;
+    }
 }
diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java
index ea935f1360..9d01277cc4 100644
--- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java
+++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java
@@ -7,6 +7,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
 import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_Utility;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.common.util.ForgeDirection;
 
@@ -16,8 +17,10 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_QTANK_GLOW;
 
 public class GT_MetaTileEntity_QuantumTank extends GT_MetaTileEntity_BasicTank {
     public GT_MetaTileEntity_QuantumTank(int aID, String aName, String aNameRegional, int aTier) {
-        super(aID, aName, aNameRegional, aTier, 3,
-                "Stores " + GT_Utility.formatNumbers(commonSizeCompute(aTier)) + "L of fluid");
+        super(aID, aName, aNameRegional, aTier, 3, new String[]{
+                "Stores " + GT_Utility.formatNumbers(commonSizeCompute(aTier)) + "L of fluid",
+                "Can keep its contents when harvested"
+        });
     }
 
     private static int commonSizeCompute(int tier) {
@@ -51,6 +54,13 @@ public class GT_MetaTileEntity_QuantumTank extends GT_MetaTileEntity_BasicTank {
     }
 
     @Override
+    public void setItemNBT(NBTTagCompound aNBT) {
+        if (mFluid != null)
+            aNBT.setTag("mFluid", mFluid.writeToNBT(new NBTTagCompound()));
+        super.setItemNBT(aNBT);
+    }
+
+    @Override
     public boolean isSimpleMachine() {
         return true;
     }
diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperChest.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperChest.java
index e566ba9ed5..4614cc409e 100644
--- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperChest.java
+++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperChest.java
@@ -3,11 +3,15 @@ package gregtech.common.tileentities.storage;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
 
 public class GT_MetaTileEntity_SuperChest extends GT_MetaTileEntity_DigitalChestBase {
     public int mItemCount = 0;
     public ItemStack mItemStack = null;
+    NBTTagList mInvData = null;
 
     public GT_MetaTileEntity_SuperChest(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier);
@@ -22,6 +26,30 @@ public class GT_MetaTileEntity_SuperChest extends GT_MetaTileEntity_DigitalChest
     }
 
     @Override
+    public void setItemNBT(NBTTagCompound aNBT) {
+        mInvData = new NBTTagList();
+        for (int i = 0; i < 3; i++) {
+            if (mInventory[i] != null) {
+                NBTTagCompound tNBT = new NBTTagCompound();
+                tNBT.setByte("Count", (byte) mInventory[i].stackSize);
+                tNBT.setShort("Damage", (short) mInventory[i].getItemDamage());
+                tNBT.setShort("id", (short) Item.getIdFromItem(mInventory[i].getItem()));
+                tNBT.setInteger("IntSlot", i);
+                if (mInventory[i].hasTagCompound()) {
+                    tNBT.setTag("tag", mInventory[i].getTagCompound());
+                }
+                mInvData.appendTag(tNBT);
+            }
+        }
+        if (mItemStack != null)
+            aNBT.setTag("mItemStack", getItemStack().writeToNBT(new NBTTagCompound()));
+        aNBT.setTag("Inventory", mInvData);
+        aNBT.setInteger("mItemCount", getItemCount());
+        aNBT.setBoolean("mVoidOverflow", mVoidOverflow);
+        super.setItemNBT(aNBT);
+    }
+
+    @Override
     protected ItemStack getItemStack() {
         return mItemStack;
     }
diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperTank.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperTank.java
index edb69abb20..120208db10 100644
--- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperTank.java
+++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperTank.java
@@ -7,6 +7,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
 import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_Utility;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.common.util.ForgeDirection;
 
@@ -16,8 +17,10 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_QTANK_GLOW;
 
 public class GT_MetaTileEntity_SuperTank extends GT_MetaTileEntity_BasicTank {
     public GT_MetaTileEntity_SuperTank(int aID, String aName, String aNameRegional, int aTier) {
-        super(aID, aName, aNameRegional, aTier, 3,
-                "Stores " + GT_Utility.formatNumbers(commonSizeCompute(aTier)) + "L of fluid");
+        super(aID, aName, aNameRegional, aTier, 3, new String[]{
+                "Stores " + GT_Utility.formatNumbers(commonSizeCompute(aTier)) + "L of fluid",
+                "Can keep its contents when harvested"
+        });
     }
 
     private static int commonSizeCompute(int tier) {
@@ -51,6 +54,13 @@ public class GT_MetaTileEntity_SuperTank extends GT_MetaTileEntity_BasicTank {
     }
 
     @Override
+    public void setItemNBT(NBTTagCompound aNBT) {
+        if (mFluid != null)
+            aNBT.setTag("mFluid", mFluid.writeToNBT(new NBTTagCompound()));
+        super.setItemNBT(aNBT);
+    }
+
+    @Override
     public boolean isSimpleMachine() {
         return true;
     }