add a quick way to clear tank (#823)

6 files changed, 54 insertions, 39 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 c7bd5d0029..0df416d847 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
@@ -35,7 +35,8 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
                 "This Chest stores " + GT_Utility.formatNumbers(commonSizeCompute(aTier)) + " Blocks",
                 "Use a screwdriver to enable",
                 "voiding items on overflow",
-                "Can keep its contents when harvested"
+                "Can keep its contents when harvested",
+                "Hold shift when harvesting to void its contents"
         });
     }
 
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 ca3289e218..cb7504b515 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
@@ -7,6 +7,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
+import org.lwjgl.input.Keyboard;
 
 public class GT_MetaTileEntity_QuantumChest extends GT_MetaTileEntity_DigitalChestBase {
     public int mItemCount = 0;
@@ -33,24 +34,26 @@ public class GT_MetaTileEntity_QuantumChest extends GT_MetaTileEntity_DigitalChe
     @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());
+        if (!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
+            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);
                 }
-                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);
         }
-        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);
     }
 
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 1637a126e4..191c908bd5 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
@@ -10,6 +10,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.common.util.ForgeDirection;
+import org.lwjgl.input.Keyboard;
 
 import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_QTANK;
@@ -19,7 +20,8 @@ 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, new String[]{
                 "Stores " + GT_Utility.formatNumbers(commonSizeCompute(aTier)) + "L of fluid",
-                "Can keep its contents when harvested"
+                "Can keep its contents when harvested",
+                "Hold shift when harvesting to void its contents"
         });
     }
 
@@ -55,8 +57,10 @@ public class GT_MetaTileEntity_QuantumTank extends GT_MetaTileEntity_BasicTank {
 
     @Override
     public void setItemNBT(NBTTagCompound aNBT) {
-        if (mFluid != null && mFluid.amount > 0)
-            aNBT.setTag("mFluid", mFluid.writeToNBT(new NBTTagCompound()));
+        if (!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
+            if (mFluid != null && mFluid.amount > 0)
+                aNBT.setTag("mFluid", mFluid.writeToNBT(new NBTTagCompound()));
+        }
         super.setItemNBT(aNBT);
     }
 
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 4614cc409e..2f9062bb2f 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
@@ -7,6 +7,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
+import org.lwjgl.input.Keyboard;
 
 public class GT_MetaTileEntity_SuperChest extends GT_MetaTileEntity_DigitalChestBase {
     public int mItemCount = 0;
@@ -28,24 +29,26 @@ 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());
+        if (!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
+            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);
                 }
-                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);
         }
-        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);
     }
 
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 1aa9f98d82..fc1d034be4 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
@@ -10,6 +10,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.common.util.ForgeDirection;
+import org.lwjgl.input.Keyboard;
 
 import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_QTANK;
@@ -19,7 +20,8 @@ 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, new String[]{
                 "Stores " + GT_Utility.formatNumbers(commonSizeCompute(aTier)) + "L of fluid",
-                "Can keep its contents when harvested"
+                "Can keep its contents when harvested",
+                "Hold shift when harvesting to void its contents"
         });
     }
 
@@ -55,8 +57,10 @@ public class GT_MetaTileEntity_SuperTank extends GT_MetaTileEntity_BasicTank {
 
     @Override
     public void setItemNBT(NBTTagCompound aNBT) {
-        if (mFluid != null && mFluid.amount > 0)
-            aNBT.setTag("mFluid", mFluid.writeToNBT(new NBTTagCompound()));
+        if (!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
+            if (mFluid != null && mFluid.amount > 0)
+                aNBT.setTag("mFluid", mFluid.writeToNBT(new NBTTagCompound()));
+        }
         super.setItemNBT(aNBT);
     }
 
diff --git a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
index 449aa556bd..fee1a3887a 100644
--- a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
@@ -507,10 +507,10 @@ public class GT_CraftingRecipeLoader implements Runnable {
                 ItemList.Super_Chest_EV.get(1), ItemList.Super_Chest_IV.get(1), ItemList.Super_Chest_HV.get(1), ItemList.Super_Chest_MV.get(1), ItemList.Super_Chest_LV.get(1),
                 ItemList.Quantum_Chest_EV.get(1), ItemList.Quantum_Chest_IV.get(1), ItemList.Quantum_Chest_HV.get(1), ItemList.Quantum_Chest_MV.get(1), ItemList.Quantum_Chest_LV.get(1),
                 ItemList.Super_Tank_EV.get(1), ItemList.Super_Tank_IV.get(1), ItemList.Super_Tank_HV.get(1), ItemList.Super_Tank_MV.get(1), ItemList.Super_Tank_LV.get(1),
-                ItemList.Quantum_Chest_EV.get(1), ItemList.Quantum_Chest_IV.get(1), ItemList.Quantum_Chest_HV.get(1), ItemList.Quantum_Chest_MV.get(1), ItemList.Quantum_Chest_LV.get(1)
+                ItemList.Quantum_Tank_EV.get(1), ItemList.Quantum_Tank_IV.get(1), ItemList.Quantum_Tank_HV.get(1), ItemList.Quantum_Tank_MV.get(1), ItemList.Quantum_Tank_LV.get(1)
         };
         for (ItemStack tItem : tChestAndTank) {
-            GT_ModHandler.addShapelessCraftingRecipe(tItem, GT_ModHandler.RecipeBits.DISMANTLEABLE, new Object[]{tItem});
+            GT_ModHandler.addShapelessCraftingRecipe(tItem, new Object[]{tItem});
         }
 
         if (GT_Mod.gregtechproxy.mDisableIC2Cables) {