From 31b3eaaf307e8459c85a6e86b7a8072897a887be Mon Sep 17 00:00:00 2001
From: canitzp <canitzp@googlemail.com>
Date: Fri, 5 Jan 2018 14:38:06 +0100
Subject: [PATCH] Redone some old code, tile entities are now saving their nbt
 to the itemstack again, also the MeeCreeps integration does work now Closes
 #998

---
 .../mod/blocks/BlockGiantChest.java           | 17 ++++----------
 .../mod/blocks/base/BlockContainerBase.java   | 23 ++++++++++++-------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java
index 283d6b9e4..4570b4530 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGiantChest.java
@@ -33,6 +33,7 @@ import net.minecraft.nbt.NBTTagList;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
+import net.minecraft.util.NonNullList;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.IBlockAccess;
@@ -118,9 +119,8 @@ public class BlockGiantChest extends BlockContainerBase{
 
 
     @Override
-    public ArrayList<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune){
-        ArrayList<ItemStack> drops = super.getDrops(world, pos, state, fortune);
-
+    public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune){
+        super.getDrops(drops, world, pos, state, fortune);
         TileEntity tile = world.getTileEntity(pos);
         if(tile instanceof TileEntityGiantChest){
             ItemStackHandlerCustom slots = ((TileEntityGiantChest)tile).slots;
@@ -149,19 +149,12 @@ public class BlockGiantChest extends BlockContainerBase{
                 }
             }
         }
-
-        return drops;
     }
 
     @Override
-    public boolean shouldDropInventory(World world, BlockPos pos){
+    public boolean shouldDropInventory(World world, BlockPos pos) {
         TileEntity tile = world.getTileEntity(pos);
-        if(tile instanceof TileEntityGiantChest){
-            if(ItemUtil.contains(((TileEntityGiantChest)tile).slots.getItems(), new ItemStack(InitItems.itemCrateKeeper), false)){
-                return false;
-            }
-        }
-        return true;
+        return !(tile instanceof TileEntityGiantChest) || !ItemUtil.contains(((TileEntityGiantChest) tile).slots.getItems(), new ItemStack(InitItems.itemCrateKeeper), false);
     }
 
     @Override
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java
index c5f0d752d..8347eb505 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java
@@ -33,6 +33,7 @@ import net.minecraft.nbt.NBTTagInt;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumBlockRenderType;
 import net.minecraft.util.EnumHand;
+import net.minecraft.util.NonNullList;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.Style;
 import net.minecraft.util.text.TextComponentTranslation;
@@ -42,6 +43,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.fluids.FluidTank;
 import net.minecraftforge.fluids.FluidUtil;
 
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
@@ -220,10 +222,6 @@ public abstract class BlockContainerBase extends BlockContainer implements ItemB
                     player.sendMessage(new TextComponentTranslation("info."+ModUtil.MOD_ID+".machineBroke").setStyle(new Style().setColor(TextFormatting.RED)));
                 }
             }
-
-            this.dropBlockAsItem(world, pos, state, 0);
-            //dirty workaround because of Forge calling Item.onBlockStartBreak() twice
-            world.setBlockToAir(pos);
         }
     }
 
@@ -242,9 +240,7 @@ public abstract class BlockContainerBase extends BlockContainer implements ItemB
     }
 
     @Override
-    public ArrayList<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune){
-        ArrayList<ItemStack> drops = new ArrayList<ItemStack>();
-
+    public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune){
         TileEntity tile = world.getTileEntity(pos);
         if(tile instanceof TileEntityBase){
             TileEntityBase base = (TileEntityBase)tile;
@@ -276,9 +272,20 @@ public abstract class BlockContainerBase extends BlockContainer implements ItemB
 
                 drops.add(stack);
             }
+        } else {
+            super.getDrops(drops, world, pos, state, fortune);
         }
+    }
 
-        return drops;
+    @Override
+    public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) {
+        return willHarvest || super.removedByPlayer(state, world, pos, player, false);
+    }
+
+    @Override
+    public void harvestBlock(World worldIn, EntityPlayer player, BlockPos pos, IBlockState state, @Nullable TileEntity te, ItemStack stack) {
+        super.harvestBlock(worldIn, player, pos, state, te, stack);
+        worldIn.setBlockToAir(pos);
     }
 
     @Override