From a2d626bc61811759c7856a41e6104da066e48241 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sat, 23 Apr 2016 13:32:03 +0100 Subject: [PATCH] Fixes #523 --- .../blocks/storage/BlockEnergyStorage.java | 86 ------------------- .../techreborn/items/tools/ItemWrench.java | 16 +--- .../tiles/storage/TileEnergyStorage.java | 5 ++ 3 files changed, 7 insertions(+), 100 deletions(-) diff --git a/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java b/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java index 2fee05d7f..5789aacf6 100644 --- a/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java +++ b/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java @@ -69,45 +69,6 @@ public abstract class BlockEnergyStorage extends BaseTileBlock implements IRotat return new BlockStateContainer(this, FACING); } - @Override - public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) - { - super.onBlockAdded(worldIn, pos, state); - this.setDefaultFacing(worldIn, pos, state); - } - - private void setDefaultFacing(World worldIn, BlockPos pos, IBlockState state) - { - if (!worldIn.isRemote) - { - IBlockState sate = worldIn.getBlockState(pos.north()); - Block block = sate.getBlock(); - IBlockState state1 = worldIn.getBlockState(pos.south()); - Block block1 = state1.getBlock(); - IBlockState state2 = worldIn.getBlockState(pos.west()); - Block block2 = state2.getBlock(); - IBlockState state3 = worldIn.getBlockState(pos.east()); - Block block3 = state3.getBlock(); - EnumFacing enumfacing = state.getValue(FACING); - - if (enumfacing == EnumFacing.NORTH && block.isFullBlock(state) && !block1.isFullBlock(state1)) - { - enumfacing = EnumFacing.SOUTH; - } else if (enumfacing == EnumFacing.SOUTH && block1.isFullBlock(state1) && !block.isFullBlock(state)) - { - enumfacing = EnumFacing.NORTH; - } else if (enumfacing == EnumFacing.WEST && block2.isFullBlock(state2) && !block3.isFullBlock(state2)) - { - enumfacing = EnumFacing.EAST; - } else if (enumfacing == EnumFacing.EAST && block3.isFullBlock(state3) && !block2.isFullBlock(state2)) - { - enumfacing = EnumFacing.WEST; - } - - worldIn.setBlockState(pos, state.withProperty(FACING, enumfacing), 2); - } - } - @Override public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) @@ -124,53 +85,6 @@ public abstract class BlockEnergyStorage extends BaseTileBlock implements IRotat setFacing(facing, worldIn, pos); } - - - protected List dropInventory(IBlockAccess world, BlockPos pos, ItemStack itemToDrop) - { - TileEntity tileEntity = world.getTileEntity(pos); - - if (tileEntity == null) - { - return Collections.emptyList(); - } - if (!(tileEntity instanceof IInventory)) - { - return Collections.emptyList(); - } - - IInventory inventory = (IInventory) tileEntity; - - List items = new ArrayList<>(); - - for (int i = 0; i < inventory.getSizeInventory(); i++) - { - ItemStack itemStack = inventory.getStackInSlot(i); - - if (itemStack == null) - { - continue; - } - if (itemStack != null && itemStack.stackSize > 0) - { - if (itemStack.getItem() instanceof ItemBlock) - { - if (((ItemBlock) itemStack.getItem()).block instanceof BlockFluidBase - || ((ItemBlock) itemStack.getItem()).block instanceof BlockStaticLiquid - || ((ItemBlock) itemStack.getItem()).block instanceof BlockDynamicLiquid) - { - continue; - } - } - } - items.add(itemStack.copy()); - } - items.add(itemToDrop.copy()); - return items; - - } - - @Override public int getMetaFromState(IBlockState state) { diff --git a/src/main/java/techreborn/items/tools/ItemWrench.java b/src/main/java/techreborn/items/tools/ItemWrench.java index 77b60f21f..582b0ada5 100644 --- a/src/main/java/techreborn/items/tools/ItemWrench.java +++ b/src/main/java/techreborn/items/tools/ItemWrench.java @@ -58,21 +58,9 @@ public class ItemWrench extends ItemTR implements ITexturedItem return EnumActionResult.FAIL; } - if (!player.isSneaking()) + if (!player.isSneaking() && !player.worldObj.isRemote) { - if (tile instanceof TileEnergyStorage || tile instanceof IWrenchable) - { - if(((IWrenchable)tile).wrenchCanSetFacing(player, side.getOpposite())){ - - tile.getWorld().setBlockState(tile.getPos(), - tile.getWorld().getBlockState(pos).withProperty(BlockBatBox.FACING, side.getOpposite())); - - return EnumActionResult.SUCCESS; - }else{ - - return EnumActionResult.FAIL; - } - } else if (tile instanceof TileMachineBase) + if (tile instanceof TileMachineBase) { if (side != EnumFacing.DOWN && side != EnumFacing.UP) { diff --git a/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java b/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java index 948c42376..e0f52016d 100644 --- a/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java +++ b/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java @@ -90,6 +90,11 @@ public class TileEnergyStorage extends TilePowerAcceptor implements IWrenchable, } } + @Override + public void setFacing(EnumFacing enumFacing) { + worldObj.setBlockState(pos, worldObj.getBlockState(pos).withProperty(BlockEnergyStorage.FACING, enumFacing)); + } + @Override public float getWrenchDropRate() { return 1.0F;