give player debuff when holding a filled chest/tank

3 files changed, 31 insertions, 2 deletions

diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java
index 74e3e3653d..55743f445d 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java
@@ -15,11 +15,19 @@ import gregtech.api.util.GT_ItsNotMyFaultException;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_Log;
 import gregtech.api.util.GT_Utility;
+import gregtech.common.tileentities.storage.GT_MetaTileEntity_QuantumChest;
+import gregtech.common.tileentities.storage.GT_MetaTileEntity_QuantumTank;
+import gregtech.common.tileentities.storage.GT_MetaTileEntity_SuperChest;
+import gregtech.common.tileentities.storage.GT_MetaTileEntity_SuperTank;
 import net.minecraft.block.Block;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
 
@@ -211,4 +219,25 @@ public class GT_Item_Machines extends ItemBlock {
         }
         return true;
     }
+
+    @Override
+    public void onUpdate(ItemStack aStack, World aWorld, Entity aPlayer, int aTimer, boolean aIsInHand) {
+        super.onUpdate(aStack, aWorld, aPlayer, aTimer, aIsInHand);
+        short tDamage = (short) getDamage(aStack);
+        EntityLivingBase tPlayer = (EntityPlayer) aPlayer;
+        if (GregTech_API.METATILEENTITIES[tDamage] instanceof GT_MetaTileEntity_SuperChest ||
+                GregTech_API.METATILEENTITIES[tDamage] instanceof GT_MetaTileEntity_QuantumChest ||
+                GregTech_API.METATILEENTITIES[tDamage] instanceof GT_MetaTileEntity_SuperTank ||
+                GregTech_API.METATILEENTITIES[tDamage] instanceof GT_MetaTileEntity_QuantumTank) {
+            NBTTagCompound tNBT = aStack.stackTagCompound;
+            if (tNBT == null) return;
+            if ((tNBT.hasKey("mItemCount") && tNBT.getInteger("mItemCount") > 0) ||
+                    tNBT.hasKey("mFluid")) {
+                tPlayer.addPotionEffect(new PotionEffect(Potion.hunger.id, 12000, 4));
+                tPlayer.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 12000, 4));
+                tPlayer.addPotionEffect(new PotionEffect(Potion.digSlowdown.id, 12000, 4));
+                tPlayer.addPotionEffect(new PotionEffect(Potion.weakness.id, 12000, 4));
+            }
+        }
+    }
 }
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 9d01277cc4..1637a126e4 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
@@ -55,7 +55,7 @@ public class GT_MetaTileEntity_QuantumTank extends GT_MetaTileEntity_BasicTank {
 
     @Override
     public void setItemNBT(NBTTagCompound aNBT) {
-        if (mFluid != null)
+        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_SuperTank.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperTank.java
index 120208db10..1aa9f98d82 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
@@ -55,7 +55,7 @@ public class GT_MetaTileEntity_SuperTank extends GT_MetaTileEntity_BasicTank {
 
     @Override
     public void setItemNBT(NBTTagCompound aNBT) {
-        if (mFluid != null)
+        if (mFluid != null && mFluid.amount > 0)
             aNBT.setTag("mFluid", mFluid.writeToNBT(new NBTTagCompound()));
         super.setItemNBT(aNBT);
     }