diff --git a/src/main/java/techreborn/blocks/tier2/BlockDigitalChest.java b/src/main/java/techreborn/blocks/tier2/BlockDigitalChest.java index f954a8396..edf6aef5e 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockDigitalChest.java +++ b/src/main/java/techreborn/blocks/tier2/BlockDigitalChest.java @@ -24,17 +24,18 @@ package techreborn.blocks.tier2; +import java.util.List; + import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; +import reborncore.common.util.WorldUtils; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; @@ -66,18 +67,12 @@ public class BlockDigitalChest extends BlockMachineBase { } @Override - public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { -/* if (RebornCoreConfig.wrenchRequired){ - drops.add(isAdvanced() ? advancedFrameStack.copy() : basicFrameStack.copy()); - } - else { - super.getDrops(drops, world, pos, state, fortune); - }*/ - - TileEntity storageTile = world.getTileEntity(pos); + public void breakBlock(World worldIn, BlockPos pos, IBlockState state) { + TileEntity storageTile = worldIn.getTileEntity(pos); if (storageTile != null && storageTile instanceof TileTechStorageBase) { - drops.addAll( ( (TileTechStorageBase) storageTile).getContentDrops() ); + List stacks = ((TileTechStorageBase) storageTile).getContentDrops(); + WorldUtils.dropItems(stacks, worldIn, pos); } - super.getDrops(drops, world, pos, state, fortune); + super.breakBlock(worldIn, pos, state); } } diff --git a/src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java b/src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java index 4492d38d4..ad1d4eb73 100644 --- a/src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java +++ b/src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java @@ -24,18 +24,18 @@ package techreborn.blocks.tier3; +import java.util.List; + import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.common.RebornCoreConfig; import reborncore.common.blocks.BlockMachineBase; +import reborncore.common.util.WorldUtils; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; @@ -67,18 +67,12 @@ public class BlockQuantumChest extends BlockMachineBase { } @Override - public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { -/* if (RebornCoreConfig.wrenchRequired){ - drops.add(isAdvanced() ? advancedFrameStack.copy() : basicFrameStack.copy()); - } - else { - super.getDrops(drops, world, pos, state, fortune); - }*/ - - TileEntity storageTile = world.getTileEntity(pos); + public void breakBlock(World worldIn, BlockPos pos, IBlockState state) { + TileEntity storageTile = worldIn.getTileEntity(pos); if (storageTile != null && storageTile instanceof TileTechStorageBase) { - drops.addAll(((TileTechStorageBase) storageTile).getContentDrops()); + List stacks = ((TileTechStorageBase) storageTile).getContentDrops(); + WorldUtils.dropItems(stacks, worldIn, pos); } - super.getDrops(drops, world, pos, state, fortune); + super.breakBlock(worldIn, pos, state); } } diff --git a/src/main/java/techreborn/tiles/TileTechStorageBase.java b/src/main/java/techreborn/tiles/TileTechStorageBase.java index ad711507d..0e6816f51 100644 --- a/src/main/java/techreborn/tiles/TileTechStorageBase.java +++ b/src/main/java/techreborn/tiles/TileTechStorageBase.java @@ -115,8 +115,9 @@ public class TileTechStorageBase extends TileLegacyMachineBase ArrayList stacks = new ArrayList<>(); if (!this.getStoredItemType().isEmpty()) { - if (!this.getStackInSlot(1).isEmpty()) + if (!this.getStackInSlot(1).isEmpty()) { stacks.add(this.getStackInSlot(1)); + } for (int i = 0; i < this.getStoredCount() / 64; i++) { ItemStack droped = this.storedItem.copy(); droped.setCount(64);