From 20bef6e26d948698398bd16aeab8c9e6b89110e4 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 22 Aug 2019 20:01:40 -0400 Subject: Format/import cleanup --- .../jewelrycraft/block/BlockDisplayer.java | 166 ++++++--------------- 1 file changed, 46 insertions(+), 120 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/block/BlockDisplayer.java') diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockDisplayer.java b/src/main/java/darkknight/jewelrycraft/block/BlockDisplayer.java index d84cbf7..2547149 100755 --- a/src/main/java/darkknight/jewelrycraft/block/BlockDisplayer.java +++ b/src/main/java/darkknight/jewelrycraft/block/BlockDisplayer.java @@ -54,8 +54,7 @@ public class BlockDisplayer extends BlockContainer { * @return whether to render the specified side */ @Override - public boolean shouldSideBeRendered(IBlockAccess iblockaccess, - int i, int j, int k, int l) { + public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l) { return false; } @@ -88,98 +87,57 @@ public class BlockDisplayer extends BlockContainer { * @return whether to activate the item on the block */ @Override - public boolean onBlockActivated(World world, int i, int j, int k, - EntityPlayer entityPlayer, int par6, float par7, + public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9) { - TileEntityDisplayer te = (TileEntityDisplayer) world - .getTileEntity(i, j, k); + TileEntityDisplayer te = (TileEntityDisplayer) world.getTileEntity(i, j, k); ItemStack item = entityPlayer.inventory.getCurrentItem(); if (te != null) { - if (item != null && item != new ItemStack( - Item.getItemById(0), 0, 0) - && !world.isRemote) { + if (item != null && item != new ItemStack(Item.getItemById(0), 0, 0) && !world.isRemote) { if (!te.hasObject) { te.object = item.copy(); te.quantity += item.stackSize; te.object.stackSize = 1; te.hasObject = true; if (!entityPlayer.capabilities.isCreativeMode) - entityPlayer.inventory - .decrStackSize(entityPlayer.inventory.currentItem, - item.stackSize); + entityPlayer.inventory.decrStackSize(entityPlayer.inventory.currentItem, item.stackSize); te.isDirty = true; - } else if (te.object.getItem() == item - .getItem() - && te.object != null - && te.object != new ItemStack( - Item.getItemById( - 0), - 0, 0) - && te.object.getItemDamage() == item - .getItemDamage()) - if (te.object.hasTagCompound() - && item.hasTagCompound() - && te.object.getTagCompound() - .equals(item.getTagCompound())) { + } else if (te.object.getItem() == item.getItem() && te.object != null + && te.object != new ItemStack(Item.getItemById(0), 0, 0) + && te.object.getItemDamage() == item.getItemDamage()) + if (te.object.hasTagCompound() && item.hasTagCompound() + && te.object.getTagCompound().equals(item.getTagCompound())) { te.quantity += item.stackSize; if (!entityPlayer.capabilities.isCreativeMode) - entityPlayer.inventory - .decrStackSize(entityPlayer.inventory.currentItem, - item.stackSize); + entityPlayer.inventory.decrStackSize(entityPlayer.inventory.currentItem, item.stackSize); te.isDirty = true; - } else if (!te.object - .hasTagCompound() - && !item.hasTagCompound()) { + } else if (!te.object.hasTagCompound() && !item.hasTagCompound()) { te.quantity += item.stackSize; if (!entityPlayer.capabilities.isCreativeMode) - entityPlayer.inventory - .decrStackSize(entityPlayer.inventory.currentItem, - item.stackSize); + entityPlayer.inventory.decrStackSize(entityPlayer.inventory.currentItem, item.stackSize); te.isDirty = true; } - } else if (item == null || item == new ItemStack( - Item.getItemById(0), 0, 0)) + } else if (item == null || item == new ItemStack(Item.getItemById(0), 0, 0)) if (!entityPlayer.capabilities.isCreativeMode) - for (int inv = 0; inv < entityPlayer.inventory - .getSizeInventory(); inv++) { - item = entityPlayer.inventory - .getStackInSlot(inv); - if (item != null && te.object - .getItem() == item - .getItem() - && te.object != null - && te.object != new ItemStack( - Item.getItemById( - 0), - 0, - 0) - && te.object.getItemDamage() == item - .getItemDamage()) - if (te.object.hasTagCompound() - && item.hasTagCompound() - && te.object.getTagCompound() - .equals(item.getTagCompound())) { + for (int inv = 0; inv < entityPlayer.inventory.getSizeInventory(); inv++) { + item = entityPlayer.inventory.getStackInSlot(inv); + if (item != null && te.object.getItem() == item.getItem() && te.object != null + && te.object != new ItemStack(Item.getItemById(0), 0, 0) + && te.object.getItemDamage() == item.getItemDamage()) + if (te.object.hasTagCompound() && item.hasTagCompound() + && te.object.getTagCompound().equals(item.getTagCompound())) { te.quantity += item.stackSize; if (!entityPlayer.capabilities.isCreativeMode) - entityPlayer.inventory - .decrStackSize(inv, - item.stackSize); + entityPlayer.inventory.decrStackSize(inv, item.stackSize); te.isDirty = true; te.markDirty(); - } else if (!te.object - .hasTagCompound() - && !item.hasTagCompound()) { + } else if (!te.object.hasTagCompound() && !item.hasTagCompound()) { te.quantity += item.stackSize; if (!entityPlayer.capabilities.isCreativeMode) - entityPlayer.inventory - .decrStackSize(inv, - item.stackSize); + entityPlayer.inventory.decrStackSize(inv, item.stackSize); te.isDirty = true; } } - else if (entityPlayer.capabilities.isCreativeMode - && te.hasObject - && te.object.getItem() != null) { + else if (entityPlayer.capabilities.isCreativeMode && te.hasObject && te.object.getItem() != null) { te.quantity += 64; te.isDirty = true; } @@ -196,61 +154,38 @@ public class BlockDisplayer extends BlockContainer { * @param player */ @Override - public void onBlockClicked(World world, int i, int j, int k, - EntityPlayer player) { - TileEntityDisplayer te = (TileEntityDisplayer) world - .getTileEntity(i, j, k); + public void onBlockClicked(World world, int i, int j, int k, EntityPlayer player) { + TileEntityDisplayer te = (TileEntityDisplayer) world.getTileEntity(i, j, k); if (te != null && !world.isRemote) - if (te.hasObject && te.object != null - && te.object != new ItemStack( - Item.getItemById( - 0), - 0, 0) - && player.inventory - .addItemStackToInventory( - te.object)) + if (te.hasObject && te.object != null && te.object != new ItemStack(Item.getItemById(0), 0, 0) + && player.inventory.addItemStackToInventory(te.object)) if (!player.isSneaking()) { - if (te.quantity > te.object - .getMaxStackSize()) { - te.object.stackSize = te.object - .getMaxStackSize() - - 1; - player.inventory.addItemStackToInventory( - te.object); + if (te.quantity > te.object.getMaxStackSize()) { + te.object.stackSize = te.object.getMaxStackSize() - 1; + player.inventory.addItemStackToInventory(te.object); te.object.stackSize = 1; - te.quantity -= te.object - .getMaxStackSize(); + te.quantity -= te.object.getMaxStackSize(); te.isDirty = true; } else { - te.object.stackSize = te.quantity - - 1; - player.inventory.addItemStackToInventory( - te.object); + te.object.stackSize = te.quantity - 1; + player.inventory.addItemStackToInventory(te.object); te.hasObject = false; - te.object = new ItemStack( - Item.getItemById( - 0), - 0, 0); + te.object = new ItemStack(Item.getItemById(0), 0, 0); te.quantity = 0; te.isDirty = true; } te.isDirty = true; } else { if (te.quantity >= 2) { - player.inventory.addItemStackToInventory( - te.object); + player.inventory.addItemStackToInventory(te.object); te.object.stackSize = 1; te.quantity--; te.isDirty = true; } else { - player.inventory.addItemStackToInventory( - te.object); + player.inventory.addItemStackToInventory(te.object); te.object.stackSize = 1; te.hasObject = false; - te.object = new ItemStack( - Item.getItemById( - 0), - 0, 0); + te.object = new ItemStack(Item.getItemById(0), 0, 0); te.quantity = 0; te.isDirty = true; } @@ -265,10 +200,8 @@ public class BlockDisplayer extends BlockContainer { * @param z * @param stack */ - public void dropItem(World world, double x, double y, double z, - ItemStack stack) { - EntityItem entityitem = new EntityItem(world, x + 0.5D, - y + 1.5D, z + 0.5D, stack); + public void dropItem(World world, double x, double y, double z, ItemStack stack) { + EntityItem entityitem = new EntityItem(world, x + 0.5D, y + 1.5D, z + 0.5D, stack); entityitem.motionX = 0; entityitem.motionZ = 0; entityitem.motionY = 0.11000000298023224D; @@ -284,14 +217,11 @@ public class BlockDisplayer extends BlockContainer { * @param par6 */ @Override - public void breakBlock(World world, int i, int j, int k, - Block block, int par6) { - TileEntityDisplayer te = (TileEntityDisplayer) world - .getTileEntity(i, j, k); + public void breakBlock(World world, int i, int j, int k, Block block, int par6) { + TileEntityDisplayer te = (TileEntityDisplayer) world.getTileEntity(i, j, k); if (te != null && te.hasObject) { te.object.stackSize = te.quantity; - dropItem(te.getWorldObj(), te.xCoord, te.yCoord, - te.zCoord, te.object); + dropItem(te.getWorldObj(), te.xCoord, te.yCoord, te.zCoord, te.object); world.removeTileEntity(i, j, k); } super.breakBlock(world, i, j, k, block, par6); @@ -306,13 +236,9 @@ public class BlockDisplayer extends BlockContainer { * @param par6ItemStack */ @Override - public void onBlockPlacedBy(World world, int i, int j, int k, - EntityLivingBase entityLiving, + public void onBlockPlacedBy(World world, int i, int j, int k, EntityLivingBase entityLiving, ItemStack par6ItemStack) { - int rotation = MathHelper - .floor_double(entityLiving.rotationYaw - * 4.0F / 360.0F + 0.5D) - & 3; + int rotation = MathHelper.floor_double(entityLiving.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; world.setBlockMetadataWithNotify(i, j, k, rotation, 2); } -- cgit v1.2.3