Ubujira
/
ironbarrels
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Provided BlockIronChest w/ consistent formatting and logic

This commit is contained in:
T145 2017-06-01 12:47:52 -04:00
parent 7f6b1dddde
commit 3b4241525f
1 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/main/java/cpw/mods/ironchest/BlockIronChest.java
View File

@ -79,28 +79,17 @@ public class BlockIronChest extends Block
} }
@Override @Override
//@formatter:off
public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing heldItem, float side, float hitX, float hitY) public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing heldItem, float side, float hitX, float hitY)
//@formatter:on
{ {
TileEntity te = worldIn.getTileEntity(pos); TileEntity te = worldIn.getTileEntity(pos);
if (te == null || !(te instanceof TileEntityIronChest)) if (te instanceof TileEntityIronChest && !worldIn.isRemote && !worldIn.isSideSolid(pos.add(0, 1, 0), EnumFacing.DOWN))
{ {
TileEntityIronChest teic = (TileEntityIronChest) te;
playerIn.openGui(IronChest.instance, teic.getType().ordinal(), worldIn, pos.getX(), pos.getY(), pos.getZ());
return true; return true;
} }
if (worldIn.isSideSolid(pos.add(0, 1, 0), EnumFacing.DOWN))
{
return true;
}
if (worldIn.isRemote)
{
return true;
}
playerIn.openGui(IronChest.instance, ((TileEntityIronChest) te).getType().ordinal(), worldIn, pos.getX(), pos.getY(), pos.getZ());
return true; return true;
} }
@ -158,7 +147,8 @@ public class BlockIronChest extends Block
public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack)
{ {
TileEntity te = worldIn.getTileEntity(pos); TileEntity te = worldIn.getTileEntity(pos);
if (te != null && te instanceof TileEntityIronChest)
if (te instanceof TileEntityIronChest)
{ {
TileEntityIronChest teic = (TileEntityIronChest) te; TileEntityIronChest teic = (TileEntityIronChest) te;
teic.wasPlaced(placer, stack); teic.wasPlaced(placer, stack);
@ -176,14 +166,15 @@ public class BlockIronChest extends Block
@Override @Override
public void breakBlock(World worldIn, BlockPos pos, IBlockState state) public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
{ {
TileEntityIronChest tileentity = (TileEntityIronChest) worldIn.getTileEntity(pos); TileEntity te = worldIn.getTileEntity(pos);
if (tileentity != null) if (te instanceof TileEntityIronChest)
{ {
tileentity.removeAdornments(); TileEntityIronChest teic = (TileEntityIronChest) te;
teic.removeAdornments();
InventoryHelper.dropInventoryItems(worldIn, pos, tileentity); InventoryHelper.dropInventoryItems(worldIn, pos, teic);
} }
super.breakBlock(worldIn, pos, state); super.breakBlock(worldIn, pos, state);
} }
@ -191,14 +182,17 @@ public class BlockIronChest extends Block
public float getExplosionResistance(World world, BlockPos pos, Entity exploder, Explosion explosion) public float getExplosionResistance(World world, BlockPos pos, Entity exploder, Explosion explosion)
{ {
TileEntity te = world.getTileEntity(pos); TileEntity te = world.getTileEntity(pos);
if (te instanceof TileEntityIronChest) if (te instanceof TileEntityIronChest)
{ {
TileEntityIronChest teic = (TileEntityIronChest) te; TileEntityIronChest teic = (TileEntityIronChest) te;
if (teic.getType().isExplosionResistant()) if (teic.getType().isExplosionResistant())
{ {
return 10000F; return 10000F;
} }
} }
return super.getExplosionResistance(world, pos, exploder, explosion); return super.getExplosionResistance(world, pos, exploder, explosion);
} }
@ -231,10 +225,11 @@ public class BlockIronChest extends Block
} }
if (axis == EnumFacing.UP || axis == EnumFacing.DOWN) if (axis == EnumFacing.UP || axis == EnumFacing.DOWN)
{ {
TileEntity tileEntity = worldObj.getTileEntity(pos); TileEntity te = worldObj.getTileEntity(pos);
if (tileEntity instanceof TileEntityIronChest)
if (te instanceof TileEntityIronChest)
{ {
TileEntityIronChest icte = (TileEntityIronChest) tileEntity; TileEntityIronChest icte = (TileEntityIronChest) te;
icte.rotateAround(); icte.rotateAround();
} }
return true; return true;
@ -247,7 +242,7 @@ public class BlockIronChest extends Block
public boolean eventReceived(IBlockState state, World worldIn, BlockPos pos, int id, int param) public boolean eventReceived(IBlockState state, World worldIn, BlockPos pos, int id, int param)
{ {
super.eventReceived(state, worldIn, pos, id, param); super.eventReceived(state, worldIn, pos, id, param);
TileEntity tileentity = worldIn.getTileEntity(pos); TileEntity te = worldIn.getTileEntity(pos);
return tileentity != null && tileentity.receiveClientEvent(id, param); return te != null && te.receiveClientEvent(id, param);
} }
} }