Fixed inventory drop for DSU. More work on #1543

This commit is contained in:
drcrazy 2018-06-14 18:31:48 +03:00
parent b1682ef791
commit 77e1c54b86
3 changed files with 18 additions and 28 deletions

View file

@ -24,17 +24,18 @@
package techreborn.blocks.tier2; package techreborn.blocks.tier2;
import java.util.List;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.NonNullList;
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 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;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.util.WorldUtils;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
@ -66,18 +67,12 @@ public class BlockDigitalChest extends BlockMachineBase {
} }
@Override @Override
public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { public void breakBlock(World worldIn, BlockPos pos, IBlockState state) {
/* if (RebornCoreConfig.wrenchRequired){ TileEntity storageTile = worldIn.getTileEntity(pos);
drops.add(isAdvanced() ? advancedFrameStack.copy() : basicFrameStack.copy());
}
else {
super.getDrops(drops, world, pos, state, fortune);
}*/
TileEntity storageTile = world.getTileEntity(pos);
if (storageTile != null && storageTile instanceof TileTechStorageBase) { if (storageTile != null && storageTile instanceof TileTechStorageBase) {
drops.addAll( ( (TileTechStorageBase) storageTile).getContentDrops() ); List<ItemStack> stacks = ((TileTechStorageBase) storageTile).getContentDrops();
WorldUtils.dropItems(stacks, worldIn, pos);
} }
super.getDrops(drops, world, pos, state, fortune); super.breakBlock(worldIn, pos, state);
} }
} }

View file

@ -24,18 +24,18 @@
package techreborn.blocks.tier3; package techreborn.blocks.tier3;
import java.util.List;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.NonNullList;
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 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;
import reborncore.common.RebornCoreConfig;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.util.WorldUtils;
import techreborn.client.EGui; import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
@ -67,18 +67,12 @@ public class BlockQuantumChest extends BlockMachineBase {
} }
@Override @Override
public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { public void breakBlock(World worldIn, BlockPos pos, IBlockState state) {
/* if (RebornCoreConfig.wrenchRequired){ TileEntity storageTile = worldIn.getTileEntity(pos);
drops.add(isAdvanced() ? advancedFrameStack.copy() : basicFrameStack.copy());
}
else {
super.getDrops(drops, world, pos, state, fortune);
}*/
TileEntity storageTile = world.getTileEntity(pos);
if (storageTile != null && storageTile instanceof TileTechStorageBase) { if (storageTile != null && storageTile instanceof TileTechStorageBase) {
drops.addAll(((TileTechStorageBase) storageTile).getContentDrops()); List<ItemStack> stacks = ((TileTechStorageBase) storageTile).getContentDrops();
WorldUtils.dropItems(stacks, worldIn, pos);
} }
super.getDrops(drops, world, pos, state, fortune); super.breakBlock(worldIn, pos, state);
} }
} }

View file

@ -115,8 +115,9 @@ public class TileTechStorageBase extends TileLegacyMachineBase
ArrayList<ItemStack> stacks = new ArrayList<>(); ArrayList<ItemStack> stacks = new ArrayList<>();
if (!this.getStoredItemType().isEmpty()) { if (!this.getStoredItemType().isEmpty()) {
if (!this.getStackInSlot(1).isEmpty()) if (!this.getStackInSlot(1).isEmpty()) {
stacks.add(this.getStackInSlot(1)); stacks.add(this.getStackInSlot(1));
}
for (int i = 0; i < this.getStoredCount() / 64; i++) { for (int i = 0; i < this.getStoredCount() / 64; i++) {
ItemStack droped = this.storedItem.copy(); ItemStack droped = this.storedItem.copy();
droped.setCount(64); droped.setCount(64);