From 20bef6e26d948698398bd16aeab8c9e6b89110e4 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 22 Aug 2019 20:01:40 -0400 Subject: Format/import cleanup --- .../tileentity/TileEntityShadowEye.java | 529 +++++++-------------- 1 file changed, 160 insertions(+), 369 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/tileentity/TileEntityShadowEye.java') diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityShadowEye.java b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityShadowEye.java index c5b5aef..65be5cb 100755 --- a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityShadowEye.java +++ b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityShadowEye.java @@ -27,13 +27,12 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; public class TileEntityShadowEye extends TileEntity { - public int opening, timer, t = 20, soundTimer; - public boolean active, shouldAddData; - public ArrayList pedestalItems = new ArrayList(); - ResourceLocation particleTexture = new ResourceLocation( - Variables.MODID, "textures/particle/shadows.png"); - public EntityPlayer target; - public ModelShadowEye model = new ModelShadowEye(); + public int opening, timer, t = 20, soundTimer; + public boolean active, shouldAddData; + public ArrayList pedestalItems = new ArrayList(); + ResourceLocation particleTexture = new ResourceLocation(Variables.MODID, "textures/particle/shadows.png"); + public EntityPlayer target; + public ModelShadowEye model = new ModelShadowEye(); public TileEntityShadowEye() { opening = 1; @@ -62,27 +61,16 @@ public class TileEntityShadowEye extends TileEntity { @Override public void updateEntity() { super.updateEntity(); - boolean valid = isValidStructure(worldObj, xCoord, yCoord, - zCoord, blockMetadata); + boolean valid = isValidStructure(worldObj, xCoord, yCoord, zCoord, blockMetadata); boolean canStartRitual = valid - && ((TileEntityHandPedestal) worldObj - .getTileEntity(xCoord, - yCoord - 3, - zCoord)).heldItemStack != null - && getNumberOfItems(worldObj, xCoord, - yCoord, zCoord) > 0; + && ((TileEntityHandPedestal) worldObj.getTileEntity(xCoord, yCoord - 3, zCoord)).heldItemStack != null + && getNumberOfItems(worldObj, xCoord, yCoord, zCoord) > 0; if (active) { timer--; - if (canStartRitual && canChangePedestals(worldObj, - xCoord, yCoord, zCoord) - && opening == 4) - changePedestals(worldObj, xCoord, yCoord, - zCoord); + if (canStartRitual && canChangePedestals(worldObj, xCoord, yCoord, zCoord) && opening == 4) + changePedestals(worldObj, xCoord, yCoord, zCoord); } - if (active && target != null - && this.getDistanceFrom(target.posX, - target.posY, - target.posZ) > 27D) { + if (active && target != null && this.getDistanceFrom(target.posX, target.posY, target.posZ) > 27D) { active = false; timer = -1; shouldAddData = false; @@ -98,17 +86,11 @@ public class TileEntityShadowEye extends TileEntity { t = 20; } } - if (opening == 2 && timer <= 0 && t == 10 - && shouldAddData) { + if (opening == 2 && timer <= 0 && t == 10 && shouldAddData) { addData(worldObj, xCoord, yCoord, zCoord); - TileEntityHandPedestal target = (TileEntityHandPedestal) worldObj - .getTileEntity(xCoord, yCoord - 3, - zCoord); - if (target != null && target - .getHeldItemStack() != null) - JewelryNBT.addModifiers( - target.getHeldItemStack(), - pedestalItems); + TileEntityHandPedestal target = (TileEntityHandPedestal) worldObj.getTileEntity(xCoord, yCoord - 3, zCoord); + if (target != null && target.getHeldItemStack() != null) + JewelryNBT.addModifiers(target.getHeldItemStack(), pedestalItems); revertPedestals(worldObj, xCoord, yCoord, zCoord); } if (active && timer <= 0) { @@ -124,38 +106,23 @@ public class TileEntityShadowEye extends TileEntity { active = false; timer = -1; if (!worldObj.isRemote) { - JewelrycraftUtil.addCursePoints( - target, 50); - target.addChatMessage( - new ChatComponentText( - EnumChatFormatting.BLACK - + "The Shadows don't like to be disturbed for no reason!")); - target.addChatMessage( - new ChatComponentText( - EnumChatFormatting.DARK_PURPLE - + "You feel a strange aura encumbering you.")); + JewelrycraftUtil.addCursePoints(target, 50); + target.addChatMessage(new ChatComponentText( + EnumChatFormatting.BLACK + "The Shadows don't like to be disturbed for no reason!")); + target.addChatMessage(new ChatComponentText( + EnumChatFormatting.DARK_PURPLE + "You feel a strange aura encumbering you.")); } } } if (active && opening == 4) { for (int l = 0; l <= 100; l++) worldObj.spawnParticle("depthsuspend", - xCoord + 6.5F - worldObj.rand - .nextInt(12) - - worldObj.rand.nextFloat(), - yCoord - 2F + worldObj.rand - .nextInt(9) - - worldObj.rand.nextFloat(), - zCoord + 6.5F - worldObj.rand - .nextInt(12) - - worldObj.rand.nextFloat(), - 0, 0, 0); + xCoord + 6.5F - worldObj.rand.nextInt(12) - worldObj.rand.nextFloat(), + yCoord - 2F + worldObj.rand.nextInt(9) - worldObj.rand.nextFloat(), + zCoord + 6.5F - worldObj.rand.nextInt(12) - worldObj.rand.nextFloat(), 0, 0, 0); if (soundTimer == 0) - worldObj.playSound(xCoord + 0.5D, - yCoord + 0.5D, - zCoord + 0.5D, - "jewelrycraft2:Ritual", - 1.0F, 1.0F, false); + worldObj.playSound(xCoord + 0.5D, yCoord + 0.5D, zCoord + 0.5D, "jewelrycraft2:Ritual", 1.0F, 1.0F, + false); if (soundTimer < 20 * 14) soundTimer++; else @@ -163,346 +130,211 @@ public class TileEntityShadowEye extends TileEntity { } } - public boolean isValidStructure(World world, int x, int y, int z, - int metadata) { - if (world.getBlockMetadata(x, y, z) == 0 - || world.getBlockMetadata(x, y, z) == 2) { + public boolean isValidStructure(World world, int x, int y, int z, int metadata) { + if (world.getBlockMetadata(x, y, z) == 0 || world.getBlockMetadata(x, y, z) == 2) { // Layers from top to bottom // 1st Layer - if (world.getBlock(x, y + 1, - z) != Blocks.stone_slab - || world.getBlockMetadata(x, y + 1, - z) != 5) + if (world.getBlock(x, y + 1, z) != Blocks.stone_slab || world.getBlockMetadata(x, y + 1, z) != 5) return false; - if (world.getBlock(x + 1, y + 1, - z) != Blocks.stone_slab - || world.getBlockMetadata(x + 1, - y + 1, z) != 5) + if (world.getBlock(x + 1, y + 1, z) != Blocks.stone_slab || world.getBlockMetadata(x + 1, y + 1, z) != 5) return false; - if (world.getBlock(x - 1, y + 1, - z) != Blocks.stone_slab - || world.getBlockMetadata(x - 1, - y + 1, z) != 5) + if (world.getBlock(x - 1, y + 1, z) != Blocks.stone_slab || world.getBlockMetadata(x - 1, y + 1, z) != 5) return false; // 2nd Layer - if (world.getBlock(x + 2, y, - z) != Blocks.stone_brick_stairs - || world.getBlockMetadata(x + 2, y, - z) != 1) + if (world.getBlock(x + 2, y, z) != Blocks.stone_brick_stairs || world.getBlockMetadata(x + 2, y, z) != 1) return false; - if (world.getBlock(x + 1, y, - z) != Blocks.stone_brick_stairs - || world.getBlockMetadata(x + 1, y, - z) != 4) + if (world.getBlock(x + 1, y, z) != Blocks.stone_brick_stairs || world.getBlockMetadata(x + 1, y, z) != 4) return false; - if (world.getBlock(x - 1, y, - z) != Blocks.stone_brick_stairs - || world.getBlockMetadata(x - 1, y, - z) != 5) + if (world.getBlock(x - 1, y, z) != Blocks.stone_brick_stairs || world.getBlockMetadata(x - 1, y, z) != 5) return false; - if (world.getBlock(x - 2, y, - z) != Blocks.stone_brick_stairs - || world.getBlockMetadata(x - 2, y, - z) != 0) + if (world.getBlock(x - 2, y, z) != Blocks.stone_brick_stairs || world.getBlockMetadata(x - 2, y, z) != 0) return false; // 3rd Layer - if (world.getBlock(x + 2, y - 1, - z) != Blocks.stonebrick) + if (world.getBlock(x + 2, y - 1, z) != Blocks.stonebrick) return false; - if (world.getBlock(x - 2, y - 1, - z) != Blocks.stonebrick) + if (world.getBlock(x - 2, y - 1, z) != Blocks.stonebrick) return false; // 4th Layer - if (world.getBlock(x + 2, y - 2, - z) != Blocks.stonebrick) + if (world.getBlock(x + 2, y - 2, z) != Blocks.stonebrick) return false; - if (world.getBlock(x - 2, y - 2, - z) != Blocks.stonebrick) + if (world.getBlock(x - 2, y - 2, z) != Blocks.stonebrick) return false; // 5th Layer - if (world.getBlock(x + 2, y - 3, - z) != Blocks.stonebrick) + if (world.getBlock(x + 2, y - 3, z) != Blocks.stonebrick) return false; - if (world.getBlock(x - 2, y - 3, - z) != Blocks.stonebrick) + if (world.getBlock(x - 2, y - 3, z) != Blocks.stonebrick) return false; - } else if (world.getBlockMetadata(x, y, z) == 1 - || world.getBlockMetadata(x, y, z) == 3) { + } else if (world.getBlockMetadata(x, y, z) == 1 || world.getBlockMetadata(x, y, z) == 3) { // Layers from top to bottom // 1st Layer - if (world.getBlock(x, y + 1, - z) != Blocks.stone_slab - || world.getBlockMetadata(x, y + 1, - z) != 5) + if (world.getBlock(x, y + 1, z) != Blocks.stone_slab || world.getBlockMetadata(x, y + 1, z) != 5) return false; - if (world.getBlock(x, y + 1, - z + 1) != Blocks.stone_slab - || world.getBlockMetadata(x, y + 1, - z + 1) != 5) + if (world.getBlock(x, y + 1, z + 1) != Blocks.stone_slab || world.getBlockMetadata(x, y + 1, z + 1) != 5) return false; - if (world.getBlock(x, y + 1, - z - 1) != Blocks.stone_slab - || world.getBlockMetadata(x, y + 1, - z - 1) != 5) + if (world.getBlock(x, y + 1, z - 1) != Blocks.stone_slab || world.getBlockMetadata(x, y + 1, z - 1) != 5) return false; // 2nd Layer - if (world.getBlock(x, y, - z + 2) != Blocks.stone_brick_stairs - || world.getBlockMetadata(x, y, - z + 2) != 3) + if (world.getBlock(x, y, z + 2) != Blocks.stone_brick_stairs || world.getBlockMetadata(x, y, z + 2) != 3) return false; - if (world.getBlock(x, y, - z + 1) != Blocks.stone_brick_stairs - || world.getBlockMetadata(x, y, - z + 1) != 6) + if (world.getBlock(x, y, z + 1) != Blocks.stone_brick_stairs || world.getBlockMetadata(x, y, z + 1) != 6) return false; - if (world.getBlock(x, y, - z - 1) != Blocks.stone_brick_stairs - || world.getBlockMetadata(x, y, - z - 1) != 7) + if (world.getBlock(x, y, z - 1) != Blocks.stone_brick_stairs || world.getBlockMetadata(x, y, z - 1) != 7) return false; - if (world.getBlock(x, y, - z - 2) != Blocks.stone_brick_stairs - || world.getBlockMetadata(x, y, - z - 2) != 2) + if (world.getBlock(x, y, z - 2) != Blocks.stone_brick_stairs || world.getBlockMetadata(x, y, z - 2) != 2) return false; // 3rd Layer - if (world.getBlock(x, y - 1, - z + 2) != Blocks.stonebrick) + if (world.getBlock(x, y - 1, z + 2) != Blocks.stonebrick) return false; - if (world.getBlock(x, y - 1, - z - 2) != Blocks.stonebrick) + if (world.getBlock(x, y - 1, z - 2) != Blocks.stonebrick) return false; // 4th Layer - if (world.getBlock(x, y - 2, - z + 2) != Blocks.stonebrick) + if (world.getBlock(x, y - 2, z + 2) != Blocks.stonebrick) return false; - if (world.getBlock(x, y - 2, - z - 2) != Blocks.stonebrick) + if (world.getBlock(x, y - 2, z - 2) != Blocks.stonebrick) return false; // 5th Layer - if (world.getBlock(x, y - 3, - z + 2) != Blocks.stonebrick) + if (world.getBlock(x, y - 3, z + 2) != Blocks.stonebrick) return false; - if (world.getBlock(x, y - 3, - z - 2) != Blocks.stonebrick) + if (world.getBlock(x, y - 3, z - 2) != Blocks.stonebrick) return false; } // 3rd Layer - if (world.getBlock(x - 4, y - 1, - z - 4) != BlockList.shadowBlock) + if (world.getBlock(x - 4, y - 1, z - 4) != BlockList.shadowBlock) return false; - if (world.getBlock(x - 4, y - 1, - z + 4) != BlockList.shadowBlock) + if (world.getBlock(x - 4, y - 1, z + 4) != BlockList.shadowBlock) return false; - if (world.getBlock(x + 4, y - 1, - z - 4) != BlockList.shadowBlock) + if (world.getBlock(x + 4, y - 1, z - 4) != BlockList.shadowBlock) return false; - if (world.getBlock(x + 4, y - 1, - z + 4) != BlockList.shadowBlock) + if (world.getBlock(x + 4, y - 1, z + 4) != BlockList.shadowBlock) return false; // 4th Layer - if (world.getBlock(x - 4, y - 2, - z - 4) != Blocks.stonebrick) + if (world.getBlock(x - 4, y - 2, z - 4) != Blocks.stonebrick) return false; - if (world.getBlock(x - 4, y - 2, - z + 4) != Blocks.stonebrick) + if (world.getBlock(x - 4, y - 2, z + 4) != Blocks.stonebrick) return false; - if (world.getBlock(x + 4, y - 2, - z - 4) != Blocks.stonebrick) + if (world.getBlock(x + 4, y - 2, z - 4) != Blocks.stonebrick) return false; - if (world.getBlock(x + 4, y - 2, - z + 4) != Blocks.stonebrick) + if (world.getBlock(x + 4, y - 2, z + 4) != Blocks.stonebrick) return false; // 5th Layer // Pillars - if (world.getBlock(x - 4, y - 3, - z - 4) != Blocks.stonebrick) + if (world.getBlock(x - 4, y - 3, z - 4) != Blocks.stonebrick) return false; - if (world.getBlock(x - 4, y - 3, - z + 4) != Blocks.stonebrick) + if (world.getBlock(x - 4, y - 3, z + 4) != Blocks.stonebrick) return false; - if (world.getBlock(x + 4, y - 3, - z - 4) != Blocks.stonebrick) + if (world.getBlock(x + 4, y - 3, z - 4) != Blocks.stonebrick) return false; - if (world.getBlock(x + 4, y - 3, - z + 4) != Blocks.stonebrick) + if (world.getBlock(x + 4, y - 3, z + 4) != Blocks.stonebrick) return false; // Pedestals - if (!(world.getBlock(x, y - 3, - z) instanceof BlockHandPedestal)) - return false; - if (world.getBlock(x - 4, y - 3, - z + 2) != BlockList.handPedestal - || world.getBlockMetadata(x - 4, y - 3, - z + 2) != 1) - return false; - if (world.getBlock(x - 5, y - 3, - z) != BlockList.handPedestal - || world.getBlockMetadata(x - 5, y - 3, - z) != 2) - return false; - if (world.getBlock(x - 4, y - 3, - z - 2) != BlockList.handPedestal - || world.getBlockMetadata(x - 4, y - 3, - z - 2) != 3) - return false; - if (world.getBlock(x - 2, y - 3, - z - 4) != BlockList.handPedestal - || world.getBlockMetadata(x - 2, y - 3, - z - 4) != 3) - return false; - if (world.getBlock(x, y - 3, - z - 5) != BlockList.handPedestal - || world.getBlockMetadata(x, y - 3, - z - 5) != 4) - return false; - if (world.getBlock(x + 2, y - 3, - z - 4) != BlockList.handPedestal - || world.getBlockMetadata(x + 2, y - 3, - z - 4) != 5) - return false; - if (world.getBlock(x + 4, y - 3, - z - 2) != BlockList.handPedestal - || world.getBlockMetadata(x + 4, y - 3, - z - 2) != 5) - return false; - if (world.getBlock(x + 5, y - 3, - z) != BlockList.handPedestal - || world.getBlockMetadata(x + 5, y - 3, - z) != 6) - return false; - if (world.getBlock(x + 4, y - 3, - z + 2) != BlockList.handPedestal - || world.getBlockMetadata(x + 4, y - 3, - z + 2) != 7) - return false; - if (world.getBlock(x + 2, y - 3, - z + 4) != BlockList.handPedestal - || world.getBlockMetadata(x + 2, y - 3, - z + 4) != 7) - return false; - if (world.getBlock(x, y - 3, - z + 5) != BlockList.handPedestal - || world.getBlockMetadata(x, y - 3, - z + 5) != 0) - return false; - if (world.getBlock(x - 2, y - 3, - z + 4) != BlockList.handPedestal - || world.getBlockMetadata(x - 2, y - 3, - z + 4) != 1) + if (!(world.getBlock(x, y - 3, z) instanceof BlockHandPedestal)) + return false; + if (world.getBlock(x - 4, y - 3, z + 2) != BlockList.handPedestal + || world.getBlockMetadata(x - 4, y - 3, z + 2) != 1) + return false; + if (world.getBlock(x - 5, y - 3, z) != BlockList.handPedestal || world.getBlockMetadata(x - 5, y - 3, z) != 2) + return false; + if (world.getBlock(x - 4, y - 3, z - 2) != BlockList.handPedestal + || world.getBlockMetadata(x - 4, y - 3, z - 2) != 3) + return false; + if (world.getBlock(x - 2, y - 3, z - 4) != BlockList.handPedestal + || world.getBlockMetadata(x - 2, y - 3, z - 4) != 3) + return false; + if (world.getBlock(x, y - 3, z - 5) != BlockList.handPedestal || world.getBlockMetadata(x, y - 3, z - 5) != 4) + return false; + if (world.getBlock(x + 2, y - 3, z - 4) != BlockList.handPedestal + || world.getBlockMetadata(x + 2, y - 3, z - 4) != 5) + return false; + if (world.getBlock(x + 4, y - 3, z - 2) != BlockList.handPedestal + || world.getBlockMetadata(x + 4, y - 3, z - 2) != 5) + return false; + if (world.getBlock(x + 5, y - 3, z) != BlockList.handPedestal || world.getBlockMetadata(x + 5, y - 3, z) != 6) + return false; + if (world.getBlock(x + 4, y - 3, z + 2) != BlockList.handPedestal + || world.getBlockMetadata(x + 4, y - 3, z + 2) != 7) + return false; + if (world.getBlock(x + 2, y - 3, z + 4) != BlockList.handPedestal + || world.getBlockMetadata(x + 2, y - 3, z + 4) != 7) + return false; + if (world.getBlock(x, y - 3, z + 5) != BlockList.handPedestal || world.getBlockMetadata(x, y - 3, z + 5) != 0) + return false; + if (world.getBlock(x - 2, y - 3, z + 4) != BlockList.handPedestal + || world.getBlockMetadata(x - 2, y - 3, z + 4) != 1) return false; return true; } public void addData(World world, int x, int y, int z) { pedestalItems.clear(); - addPedestalInfo((TileEntityHandPedestal) world - .getTileEntity(x + 2, y - 3, z - 4)); - addPedestalInfo((TileEntityHandPedestal) world - .getTileEntity(x - 4, y - 3, z + 2)); - addPedestalInfo((TileEntityHandPedestal) world - .getTileEntity(x, y - 3, z - 5)); - addPedestalInfo((TileEntityHandPedestal) world - .getTileEntity(x - 2, y - 3, z - 4)); - addPedestalInfo((TileEntityHandPedestal) world - .getTileEntity(x - 4, y - 3, z - 2)); - addPedestalInfo((TileEntityHandPedestal) world - .getTileEntity(x - 5, y - 3, z)); - addPedestalInfo((TileEntityHandPedestal) world - .getTileEntity(x + 4, y - 3, z - 2)); - addPedestalInfo((TileEntityHandPedestal) world - .getTileEntity(x + 5, y - 3, z)); - addPedestalInfo((TileEntityHandPedestal) world - .getTileEntity(x + 4, y - 3, z + 2)); - addPedestalInfo((TileEntityHandPedestal) world - .getTileEntity(x + 2, y - 3, z + 4)); - addPedestalInfo((TileEntityHandPedestal) world - .getTileEntity(x, y - 3, z + 5)); - addPedestalInfo((TileEntityHandPedestal) world - .getTileEntity(x - 2, y - 3, z + 4)); + addPedestalInfo((TileEntityHandPedestal) world.getTileEntity(x + 2, y - 3, z - 4)); + addPedestalInfo((TileEntityHandPedestal) world.getTileEntity(x - 4, y - 3, z + 2)); + addPedestalInfo((TileEntityHandPedestal) world.getTileEntity(x, y - 3, z - 5)); + addPedestalInfo((TileEntityHandPedestal) world.getTileEntity(x - 2, y - 3, z - 4)); + addPedestalInfo((TileEntityHandPedestal) world.getTileEntity(x - 4, y - 3, z - 2)); + addPedestalInfo((TileEntityHandPedestal) world.getTileEntity(x - 5, y - 3, z)); + addPedestalInfo((TileEntityHandPedestal) world.getTileEntity(x + 4, y - 3, z - 2)); + addPedestalInfo((TileEntityHandPedestal) world.getTileEntity(x + 5, y - 3, z)); + addPedestalInfo((TileEntityHandPedestal) world.getTileEntity(x + 4, y - 3, z + 2)); + addPedestalInfo((TileEntityHandPedestal) world.getTileEntity(x + 2, y - 3, z + 4)); + addPedestalInfo((TileEntityHandPedestal) world.getTileEntity(x, y - 3, z + 5)); + addPedestalInfo((TileEntityHandPedestal) world.getTileEntity(x - 2, y - 3, z + 4)); } public int getNumberOfItems(World world, int x, int y, int z) { int items = 0; - if (((TileEntityHandPedestal) world.getTileEntity(x + 2, - y - 3, z - 4)).heldItemStack != null) + if (((TileEntityHandPedestal) world.getTileEntity(x + 2, y - 3, z - 4)).heldItemStack != null) items++; - if (((TileEntityHandPedestal) world.getTileEntity(x - 4, - y - 3, z + 2)).heldItemStack != null) + if (((TileEntityHandPedestal) world.getTileEntity(x - 4, y - 3, z + 2)).heldItemStack != null) items++; - if (((TileEntityHandPedestal) world.getTileEntity(x, y - 3, - z - 5)).heldItemStack != null) + if (((TileEntityHandPedestal) world.getTileEntity(x, y - 3, z - 5)).heldItemStack != null) items++; - if (((TileEntityHandPedestal) world.getTileEntity(x - 2, - y - 3, z - 4)).heldItemStack != null) + if (((TileEntityHandPedestal) world.getTileEntity(x - 2, y - 3, z - 4)).heldItemStack != null) items++; - if (((TileEntityHandPedestal) world.getTileEntity(x - 4, - y - 3, z - 2)).heldItemStack != null) + if (((TileEntityHandPedestal) world.getTileEntity(x - 4, y - 3, z - 2)).heldItemStack != null) items++; - if (((TileEntityHandPedestal) world.getTileEntity(x - 5, - y - 3, z)).heldItemStack != null) + if (((TileEntityHandPedestal) world.getTileEntity(x - 5, y - 3, z)).heldItemStack != null) items++; - if (((TileEntityHandPedestal) world.getTileEntity(x + 4, - y - 3, z - 2)).heldItemStack != null) + if (((TileEntityHandPedestal) world.getTileEntity(x + 4, y - 3, z - 2)).heldItemStack != null) items++; - if (((TileEntityHandPedestal) world.getTileEntity(x + 5, - y - 3, z)).heldItemStack != null) + if (((TileEntityHandPedestal) world.getTileEntity(x + 5, y - 3, z)).heldItemStack != null) items++; - if (((TileEntityHandPedestal) world.getTileEntity(x + 4, - y - 3, z + 2)).heldItemStack != null) + if (((TileEntityHandPedestal) world.getTileEntity(x + 4, y - 3, z + 2)).heldItemStack != null) items++; - if (((TileEntityHandPedestal) world.getTileEntity(x + 2, - y - 3, z + 4)).heldItemStack != null) + if (((TileEntityHandPedestal) world.getTileEntity(x + 2, y - 3, z + 4)).heldItemStack != null) items++; - if (((TileEntityHandPedestal) world.getTileEntity(x, y - 3, - z + 5)).heldItemStack != null) + if (((TileEntityHandPedestal) world.getTileEntity(x, y - 3, z + 5)).heldItemStack != null) items++; - if (((TileEntityHandPedestal) world.getTileEntity(x - 2, - y - 3, z + 4)).heldItemStack != null) + if (((TileEntityHandPedestal) world.getTileEntity(x - 2, y - 3, z + 4)).heldItemStack != null) items++; return items; } - public boolean canChangePedestals(World world, int x, int y, - int z) { + public boolean canChangePedestals(World world, int x, int y, int z) { if (world.getBlock(x, y - 3, z) != BlockList.handPedestal) return false; - if (world.getBlock(x + 2, y - 3, - z - 4) != BlockList.handPedestal) + if (world.getBlock(x + 2, y - 3, z - 4) != BlockList.handPedestal) return false; - if (world.getBlock(x - 4, y - 3, - z + 2) != BlockList.handPedestal) + if (world.getBlock(x - 4, y - 3, z + 2) != BlockList.handPedestal) return false; - if (world.getBlock(x, y - 3, - z - 5) != BlockList.handPedestal) + if (world.getBlock(x, y - 3, z - 5) != BlockList.handPedestal) return false; - if (world.getBlock(x - 2, y - 3, - z - 4) != BlockList.handPedestal) + if (world.getBlock(x - 2, y - 3, z - 4) != BlockList.handPedestal) return false; - if (world.getBlock(x - 4, y - 3, - z - 2) != BlockList.handPedestal) + if (world.getBlock(x - 4, y - 3, z - 2) != BlockList.handPedestal) return false; - if (world.getBlock(x - 5, y - 3, - z) != BlockList.handPedestal) + if (world.getBlock(x - 5, y - 3, z) != BlockList.handPedestal) return false; - if (world.getBlock(x + 4, y - 3, - z - 2) != BlockList.handPedestal) + if (world.getBlock(x + 4, y - 3, z - 2) != BlockList.handPedestal) return false; - if (world.getBlock(x + 5, y - 3, - z) != BlockList.handPedestal) + if (world.getBlock(x + 5, y - 3, z) != BlockList.handPedestal) return false; - if (world.getBlock(x + 4, y - 3, - z + 2) != BlockList.handPedestal) + if (world.getBlock(x + 4, y - 3, z + 2) != BlockList.handPedestal) return false; - if (world.getBlock(x + 2, y - 3, - z + 4) != BlockList.handPedestal) + if (world.getBlock(x + 2, y - 3, z + 4) != BlockList.handPedestal) return false; - if (world.getBlock(x, y - 3, - z + 5) != BlockList.handPedestal) + if (world.getBlock(x, y - 3, z + 5) != BlockList.handPedestal) return false; - if (world.getBlock(x - 2, y - 3, - z + 4) != BlockList.handPedestal) + if (world.getBlock(x - 2, y - 3, z + 4) != BlockList.handPedestal) return false; return true; } @@ -525,25 +357,15 @@ public class TileEntityShadowEye extends TileEntity { public void changeHand(World world, int x, int y, int z) { int l = world.getBlockMetadata(x, y, z); - world.playAuxSFX(2001, x, y, z, Block - .getIdFromBlock(world.getBlock(x, y, z))); + world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(world.getBlock(x, y, z))); TileEntityShadowHand tile = new TileEntityShadowHand(); - if (world.getTileEntity(x, y, - z) instanceof TileEntityHandPedestal) { - if (((TileEntityHandPedestal) world.getTileEntity( - x, y, z)).heldItemStack != null) - tile.setHeldItemStack( - ((TileEntityHandPedestal) world - .getTileEntity(x, - y, - z)).heldItemStack - .copy()); + if (world.getTileEntity(x, y, z) instanceof TileEntityHandPedestal) { + if (((TileEntityHandPedestal) world.getTileEntity(x, y, z)).heldItemStack != null) + tile.setHeldItemStack(((TileEntityHandPedestal) world.getTileEntity(x, y, z)).heldItemStack.copy()); if (tile.heldItemStack != null) tile.closeHand(); - ((TileEntityHandPedestal) world.getTileEntity(x, y, - z)).removeHeldItemStack(); - world.setBlock(x, y, z, BlockList.shadowHand, l, - 2); + ((TileEntityHandPedestal) world.getTileEntity(x, y, z)).removeHeldItemStack(); + world.setBlock(x, y, z, BlockList.shadowHand, l, 2); world.setTileEntity(x, y, z, tile); } } @@ -566,66 +388,39 @@ public class TileEntityShadowEye extends TileEntity { public void revertHand(World world, int x, int y, int z) { int l = world.getBlockMetadata(x, y, z); - world.playAuxSFX(2001, x, y, z, Block - .getIdFromBlock(BlockList.handPedestal)); + world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(BlockList.handPedestal)); world.playSoundEffect(x, y + 0.5F, z, "step.wood", 1F, 1F); TileEntityHandPedestal tile = new TileEntityHandPedestal(); - if (world.getTileEntity(x, y, - z) instanceof TileEntityShadowHand) { - if (((TileEntityShadowHand) world.getTileEntity(x, - y, z)).heldItemStack != null) - tile.setHeldItemStack( - ((TileEntityShadowHand) world - .getTileEntity(x, - y, - z)).heldItemStack - .copy()); - ((TileEntityShadowHand) world.getTileEntity(x, y, - z)).removeHeldItemStack(); - world.setBlock(x, y, z, BlockList.handPedestal, l, - 2); + if (world.getTileEntity(x, y, z) instanceof TileEntityShadowHand) { + if (((TileEntityShadowHand) world.getTileEntity(x, y, z)).heldItemStack != null) + tile.setHeldItemStack(((TileEntityShadowHand) world.getTileEntity(x, y, z)).heldItemStack.copy()); + ((TileEntityShadowHand) world.getTileEntity(x, y, z)).removeHeldItemStack(); + world.setBlock(x, y, z, BlockList.handPedestal, l, 2); world.setTileEntity(x, y, z, tile); } } public void addPedestalInfo(TileEntityHandPedestal pedestal) { ItemStack heldItemStack; - if (pedestal != null && (heldItemStack = pedestal - .getHeldItemStack()) != null) { + if (pedestal != null && (heldItemStack = pedestal.getHeldItemStack()) != null) { if (pedestalItems.isEmpty()) pedestalItems.add(heldItemStack.copy()); else { boolean hasItem = false; int index = 0; - for (int ind = 0; ind < pedestalItems - .size() && !hasItem; ind++) - if (heldItemStack.getItem().equals( - pedestalItems.get( - ind) - .getItem()) - && heldItemStack.getItemDamage() == pedestalItems - .get(ind) - .getItemDamage()) { + for (int ind = 0; ind < pedestalItems.size() && !hasItem; ind++) + if (heldItemStack.getItem().equals(pedestalItems.get(ind).getItem()) + && heldItemStack.getItemDamage() == pedestalItems.get(ind).getItemDamage()) { index = ind; hasItem = true; - if (heldItemStack - .hasTagCompound() - && pedestalItems.get( - ind) - .hasTagCompound() - && !heldItemStack - .getTagCompound() - .equals(pedestalItems - .get(ind) - .getTagCompound())) + if (heldItemStack.hasTagCompound() && pedestalItems.get(ind).hasTagCompound() + && !heldItemStack.getTagCompound().equals(pedestalItems.get(ind).getTagCompound())) hasItem = false; } if (!hasItem) - pedestalItems.add(heldItemStack - .copy()); + pedestalItems.add(heldItemStack.copy()); else { - ItemStack object = pedestalItems - .get(index).copy(); + ItemStack object = pedestalItems.get(index).copy(); object.stackSize++; pedestalItems.set(index, object); } @@ -639,9 +434,7 @@ public class TileEntityShadowEye extends TileEntity { @Override @SideOnly(Side.CLIENT) public AxisAlignedBB getRenderBoundingBox() { - AxisAlignedBB bb = AxisAlignedBB.getBoundingBox( - xCoord - 5.5D, yCoord - 5.5D, - zCoord - 5.5D, xCoord + 5.5D, + AxisAlignedBB bb = AxisAlignedBB.getBoundingBox(xCoord - 5.5D, yCoord - 5.5D, zCoord - 5.5D, xCoord + 5.5D, yCoord + 5.5D, zCoord + 5.5D); return bb; } @@ -650,13 +443,11 @@ public class TileEntityShadowEye extends TileEntity { public Packet getDescriptionPacket() { NBTTagCompound nbttagcompound = new NBTTagCompound(); writeToNBT(nbttagcompound); - return new S35PacketUpdateTileEntity(xCoord, yCoord, - zCoord, 1, nbttagcompound); + return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, nbttagcompound); } @Override - public void onDataPacket(NetworkManager net, - S35PacketUpdateTileEntity packet) { + public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity packet) { readFromNBT(packet.func_148857_g()); worldObj.func_147479_m(xCoord, yCoord, zCoord); } -- cgit v1.2.3