Fix Quantum Chest holding its items when broken, fixes #1462
This commit is contained in:
parent
369b8a6266
commit
453fd3856a
2 changed files with 19 additions and 59 deletions
|
@ -24,14 +24,12 @@
|
||||||
|
|
||||||
package techreborn.blocks;
|
package techreborn.blocks;
|
||||||
|
|
||||||
import net.minecraft.block.BlockDynamicLiquid;
|
import net.minecraft.block.state.IBlockState;
|
||||||
import net.minecraft.block.BlockStaticLiquid;
|
|
||||||
import net.minecraft.item.ItemBlock;
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
|
import net.minecraft.world.IBlockAccess;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import net.minecraftforge.fluids.BlockFluidBase;
|
|
||||||
import prospector.shootingstar.ShootingStar;
|
import prospector.shootingstar.ShootingStar;
|
||||||
import prospector.shootingstar.model.ModelCompound;
|
import prospector.shootingstar.model.ModelCompound;
|
||||||
import reborncore.api.tile.IMachineGuiHandler;
|
import reborncore.api.tile.IMachineGuiHandler;
|
||||||
|
@ -44,6 +42,7 @@ import techreborn.tiles.TileDigitalChest;
|
||||||
import techreborn.tiles.TileTechStorageBase;
|
import techreborn.tiles.TileTechStorageBase;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class BlockDigitalChest extends BlockMachineBase {
|
public class BlockDigitalChest extends BlockMachineBase {
|
||||||
|
@ -58,39 +57,20 @@ public class BlockDigitalChest extends BlockMachineBase {
|
||||||
@Override
|
@Override
|
||||||
protected void dropInventory(final World world, final BlockPos pos) {
|
protected void dropInventory(final World world, final BlockPos pos) {
|
||||||
final TileEntity tileEntity = world.getTileEntity(pos);
|
final TileEntity tileEntity = world.getTileEntity(pos);
|
||||||
|
|
||||||
if (tileEntity == null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!(tileEntity instanceof TileTechStorageBase)) {
|
if (!(tileEntity instanceof TileTechStorageBase)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
final TileTechStorageBase inventory = (TileTechStorageBase) tileEntity;
|
final TileTechStorageBase inventory = (TileTechStorageBase) tileEntity;
|
||||||
|
|
||||||
final List<ItemStack> items = new ArrayList<>();
|
final List<ItemStack> items = new ArrayList<>();
|
||||||
|
items.add(inventory.getDropWithNBT());
|
||||||
final List<ItemStack> droppables = inventory.getContentDrops();
|
|
||||||
for (int i = 0; i < droppables.size(); i++) {
|
|
||||||
final ItemStack itemStack = droppables.get(i);
|
|
||||||
|
|
||||||
if (itemStack.isEmpty()) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (!itemStack.isEmpty() && itemStack.getCount() > 0) {
|
|
||||||
if (itemStack.getItem() instanceof ItemBlock) {
|
|
||||||
if (((ItemBlock) itemStack.getItem()).getBlock() instanceof BlockFluidBase
|
|
||||||
|| ((ItemBlock) itemStack.getItem()).getBlock() instanceof BlockStaticLiquid
|
|
||||||
|| ((ItemBlock) itemStack.getItem()).getBlock() instanceof BlockDynamicLiquid) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
items.add(itemStack.copy());
|
|
||||||
}
|
|
||||||
WorldUtils.dropItems(items, world, pos);
|
WorldUtils.dropItems(items, world, pos);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
|
||||||
|
return Collections.emptyList();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public TileEntity createNewTileEntity(final World p_149915_1_, final int p_149915_2_) {
|
public TileEntity createNewTileEntity(final World p_149915_1_, final int p_149915_2_) {
|
||||||
return new TileDigitalChest();
|
return new TileDigitalChest();
|
||||||
|
|
|
@ -24,14 +24,12 @@
|
||||||
|
|
||||||
package techreborn.blocks;
|
package techreborn.blocks;
|
||||||
|
|
||||||
import net.minecraft.block.BlockDynamicLiquid;
|
import net.minecraft.block.state.IBlockState;
|
||||||
import net.minecraft.block.BlockStaticLiquid;
|
|
||||||
import net.minecraft.item.ItemBlock;
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
|
import net.minecraft.world.IBlockAccess;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import net.minecraftforge.fluids.BlockFluidBase;
|
|
||||||
import prospector.shootingstar.ShootingStar;
|
import prospector.shootingstar.ShootingStar;
|
||||||
import prospector.shootingstar.model.ModelCompound;
|
import prospector.shootingstar.model.ModelCompound;
|
||||||
import reborncore.api.tile.IMachineGuiHandler;
|
import reborncore.api.tile.IMachineGuiHandler;
|
||||||
|
@ -44,6 +42,7 @@ import techreborn.tiles.TileQuantumChest;
|
||||||
import techreborn.tiles.TileTechStorageBase;
|
import techreborn.tiles.TileTechStorageBase;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class BlockQuantumChest extends BlockMachineBase {
|
public class BlockQuantumChest extends BlockMachineBase {
|
||||||
|
@ -64,39 +63,20 @@ public class BlockQuantumChest extends BlockMachineBase {
|
||||||
@Override
|
@Override
|
||||||
protected void dropInventory(final World world, final BlockPos pos) {
|
protected void dropInventory(final World world, final BlockPos pos) {
|
||||||
final TileEntity tileEntity = world.getTileEntity(pos);
|
final TileEntity tileEntity = world.getTileEntity(pos);
|
||||||
|
|
||||||
if (tileEntity == null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!(tileEntity instanceof TileTechStorageBase)) {
|
if (!(tileEntity instanceof TileTechStorageBase)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
final TileTechStorageBase inventory = (TileTechStorageBase) tileEntity;
|
final TileTechStorageBase inventory = (TileTechStorageBase) tileEntity;
|
||||||
|
|
||||||
final List<ItemStack> items = new ArrayList<>();
|
final List<ItemStack> items = new ArrayList<>();
|
||||||
|
items.add(inventory.getDropWithNBT());
|
||||||
final List<ItemStack> droppables = inventory.getContentDrops();
|
|
||||||
for (int i = 0; i < droppables.size(); i++) {
|
|
||||||
final ItemStack itemStack = droppables.get(i);
|
|
||||||
|
|
||||||
if (itemStack.isEmpty()) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (!itemStack.isEmpty() && itemStack.getCount() > 0) {
|
|
||||||
if (itemStack.getItem() instanceof ItemBlock) {
|
|
||||||
if (((ItemBlock) itemStack.getItem()).getBlock() instanceof BlockFluidBase
|
|
||||||
|| ((ItemBlock) itemStack.getItem()).getBlock() instanceof BlockStaticLiquid
|
|
||||||
|| ((ItemBlock) itemStack.getItem()).getBlock() instanceof BlockDynamicLiquid) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
items.add(itemStack.copy());
|
|
||||||
}
|
|
||||||
WorldUtils.dropItems(items, world, pos);
|
WorldUtils.dropItems(items, world, pos);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
|
||||||
|
return Collections.emptyList();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public TileEntity createNewTileEntity(final World p_149915_1_, final int p_149915_2_) {
|
public TileEntity createNewTileEntity(final World p_149915_1_, final int p_149915_2_) {
|
||||||
return new TileQuantumChest();
|
return new TileQuantumChest();
|
||||||
|
|
Loading…
Reference in a new issue