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/BlockSmelter.java | 399 ++++++--------------- 1 file changed, 110 insertions(+), 289 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java') diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java b/src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java index 4da1037..5486908 100755 --- a/src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java +++ b/src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java @@ -45,10 +45,8 @@ public class BlockSmelter extends BlockContainer { return false; } - public void dropItem(World world, double x, double y, double z, - ItemStack stack) { - EntityItem entityitem = new EntityItem(world, x + 0.5D, - y + 1.3D, 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.3D, z + 0.5D, stack); entityitem.motionX = 0; entityitem.motionZ = 0; entityitem.motionY = 0.11000000298023224D; @@ -57,29 +55,19 @@ public class BlockSmelter extends BlockContainer { } @Override - public void breakBlock(World world, int i, int j, int k, - Block block, int meta) { - TileEntitySmelter te = (TileEntitySmelter) world - .getTileEntity(i, j, k); + public void breakBlock(World world, int i, int j, int k, Block block, int meta) { + TileEntitySmelter te = (TileEntitySmelter) world.getTileEntity(i, j, k); if (te != null) { if (te.hasMetal) dropItem(world, i, j, k, te.metal.copy()); - if (te.hasMoltenMetal && te.moltenMetal != null - && Item.getIdFromItem( - te.moltenMetal.getItem()) > 0) { + if (te.hasMoltenMetal && te.moltenMetal != null && Item.getIdFromItem(te.moltenMetal.getItem()) > 0) { int quant = (int) (te.quantity * 10); - ItemStack metalBucket = new ItemStack( - ItemList.bucket); - JewelryNBT.addMetal(metalBucket, - te.moltenMetal.copy()); + ItemStack metalBucket = new ItemStack(ItemList.bucket); + JewelryNBT.addMetal(metalBucket, te.moltenMetal.copy()); if (quant == 9) { - dropItem(world, i, j, k, - new ItemStack(Blocks.cobblestone, - 6)); - dropItem(world, i, j, k, - new ItemStack(Items.lava_bucket)); - dropItem(world, i, j, k, - metalBucket); + dropItem(world, i, j, k, new ItemStack(Blocks.cobblestone, 6)); + dropItem(world, i, j, k, new ItemStack(Items.lava_bucket)); + dropItem(world, i, j, k, metalBucket); } } world.removeTileEntity(i, j, k); @@ -87,146 +75,75 @@ public class BlockSmelter extends BlockContainer { } @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) { - TileEntitySmelter te = (TileEntitySmelter) world - .getTileEntity(i, j, k); + TileEntitySmelter te = (TileEntitySmelter) world.getTileEntity(i, j, k); ItemStack item = entityPlayer.inventory.getCurrentItem(); - if (te != null && te.hasMoltenMetal && te.quantity >= .9f - && !te.pouring && item != null + if (te != null && te.hasMoltenMetal && te.quantity >= .9f && !te.pouring && item != null && item.getItem() == Items.bucket) { te.quantity = 0f; te.hasMoltenMetal = false; - ItemStack metalBucket = new ItemStack( - ItemList.bucket, 1); + ItemStack metalBucket = new ItemStack(ItemList.bucket, 1); ItemStack ingot = te.moltenMetal.copy(); JewelryNBT.addMetal(metalBucket, ingot); --item.stackSize; - entityPlayer.inventory.addItemStackToInventory( - metalBucket); + entityPlayer.inventory.addItemStackToInventory(metalBucket); te.isDirty = true; return true; } if (te != null && !world.isRemote) { if (te.hasMetal && entityPlayer.isSneaking()) { - dropItem(world, te.xCoord, te.yCoord, - te.zCoord, - te.metal.copy()); + dropItem(world, te.xCoord, te.yCoord, te.zCoord, te.metal.copy()); te.hasMetal = false; te.melting = -1; te.isDirty = true; } - if (item != null && item.getItem() != null - && !(item.getItem() instanceof ItemMoltenMetalBucket)) { + if (item != null && item.getItem() != null && !(item.getItem() instanceof ItemMoltenMetalBucket)) { int index = -1; - for (int a = 0; a < JewelrycraftUtil.jamcraftPlayers - .size(); a++) - if (entityPlayer.getUniqueID() - .toString() - .equals(JewelrycraftUtil.jamcraftPlayers - .get(a))) + for (int a = 0; a < JewelrycraftUtil.jamcraftPlayers.size(); a++) + if (entityPlayer.getUniqueID().toString().equals(JewelrycraftUtil.jamcraftPlayers.get(a))) index = a; if (entityPlayer.capabilities.isCreativeMode) index = 1; - boolean canPlace = JewelrycraftUtil - .isMetal(item) - || JewelrycraftUtil.isOre( - item) - || index >= 0 - || JewelryNBT.ingot( - item) != null; - boolean isOre = false, - oreCoincidesWithMetal = false, - itemCoincidesWithMetal = false, - itemCoincidesWithMoltenMetal = false, - overflow = false; + boolean canPlace = JewelrycraftUtil.isMetal(item) || JewelrycraftUtil.isOre(item) || index >= 0 + || JewelryNBT.ingot(item) != null; + boolean isOre = false, oreCoincidesWithMetal = false, itemCoincidesWithMetal = false, + itemCoincidesWithMoltenMetal = false, overflow = false; isOre = JewelrycraftUtil.isOre(item); - if (te.metal != null && te.metal - .getItem() != null) { + if (te.metal != null && te.metal.getItem() != null) { if (JewelryNBT.ingot(item) == null) - itemCoincidesWithMetal = item - .getItem() - .equals(te.metal.getItem()) - && item.getItemDamage() == te.metal - .getItemDamage(); + itemCoincidesWithMetal = item.getItem().equals(te.metal.getItem()) + && item.getItemDamage() == te.metal.getItemDamage(); else - itemCoincidesWithMetal = item - .getItem() - .equals(te.metal.getItem()) - && item.getItemDamage() == te.metal - .getItemDamage() - && JewelryNBT.ingot( - item) - .getItem() - .equals(JewelryNBT - .ingot(te.metal) - .getItem()) - && JewelryNBT.ingot( - item) - .getItemDamage() == JewelryNBT - .ingot(te.metal) - .getItemDamage(); + itemCoincidesWithMetal = item.getItem().equals(te.metal.getItem()) + && item.getItemDamage() == te.metal.getItemDamage() + && JewelryNBT.ingot(item).getItem().equals(JewelryNBT.ingot(te.metal).getItem()) + && JewelryNBT.ingot(item).getItemDamage() == JewelryNBT.ingot(te.metal).getItemDamage(); } - if (te.moltenMetal != null - && te.moltenMetal - .getItem() != null) { + if (te.moltenMetal != null && te.moltenMetal.getItem() != null) { if (JewelryNBT.ingot(item) == null) - itemCoincidesWithMoltenMetal = item - .getItem() - .equals(te.moltenMetal - .getItem()) - && item.getItemDamage() == te.moltenMetal - .getItemDamage(); + itemCoincidesWithMoltenMetal = item.getItem().equals(te.moltenMetal.getItem()) + && item.getItemDamage() == te.moltenMetal.getItemDamage(); else - itemCoincidesWithMoltenMetal = JewelryNBT - .ingot(item) - .getItem() - .equals(te.moltenMetal - .getItem()) - && JewelryNBT.ingot( - item) - .getItemDamage() == te.moltenMetal - .getItemDamage(); + itemCoincidesWithMoltenMetal = JewelryNBT.ingot(item).getItem().equals(te.moltenMetal.getItem()) + && JewelryNBT.ingot(item).getItemDamage() == te.moltenMetal.getItemDamage(); if (isOre) - oreCoincidesWithMetal = te.moltenMetal - .getItem() - .equals(JewelrycraftUtil - .getIngotFromOre( - item) - .getItem()) - && te.moltenMetal - .getItemDamage() == JewelrycraftUtil - .getIngotFromOre( - item) - .getItemDamage(); + oreCoincidesWithMetal = te.moltenMetal.getItem() + .equals(JewelrycraftUtil.getIngotFromOre(item).getItem()) + && te.moltenMetal.getItemDamage() == JewelrycraftUtil.getIngotFromOre(item) + .getItemDamage(); } - overflow = isOre ? te.metal.stackSize - * 0.2f + te.quantity < 0.8f - : te.metal.stackSize * 0.1f - + te.quantity < 0.9f; - boolean isValid = te.hasMoltenMetal ? isOre - ? oreCoincidesWithMetal - : itemCoincidesWithMoltenMetal + overflow = isOre ? te.metal.stackSize * 0.2f + te.quantity < 0.8f + : te.metal.stackSize * 0.1f + te.quantity < 0.9f; + boolean isValid = te.hasMoltenMetal ? isOre ? oreCoincidesWithMetal : itemCoincidesWithMoltenMetal : true; - if (te.quantity < 0.9f && !te.pouring - && canPlace && isValid) { - boolean check = isOre - ? oreCoincidesWithMetal - && te.quantity < 0.8f - : itemCoincidesWithMoltenMetal; - boolean check2 = isOre - ? oreCoincidesWithMetal - : itemCoincidesWithMetal; - if (!te.hasMetal && !te.hasMoltenMetal - || !te.hasMetal && te.hasMoltenMetal - && check) { - entityPlayer.addChatMessage( - new ChatComponentText( - StatCollector.translateToLocalFormatted( - "chatmessage." + Variables.MODID - + ".smelter.nowsmeltingingot", - item.getDisplayName()))); + if (te.quantity < 0.9f && !te.pouring && canPlace && isValid) { + boolean check = isOre ? oreCoincidesWithMetal && te.quantity < 0.8f : itemCoincidesWithMoltenMetal; + boolean check2 = isOre ? oreCoincidesWithMetal : itemCoincidesWithMetal; + if (!te.hasMetal && !te.hasMoltenMetal || !te.hasMetal && te.hasMoltenMetal && check) { + entityPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocalFormatted( + "chatmessage." + Variables.MODID + ".smelter.nowsmeltingingot", + item.getDisplayName()))); te.metal = item.copy(); te.metal.stackSize = 1; te.hasMetal = true; @@ -234,23 +151,11 @@ public class BlockSmelter extends BlockContainer { if (!entityPlayer.capabilities.isCreativeMode) --item.stackSize; te.isDirty = true; - } else if (te.hasMetal - && te.hasMoltenMetal - && check2 - && overflow - || te.hasMetal && !te.hasMoltenMetal - && itemCoincidesWithMetal - && overflow) { + } else if (te.hasMetal && te.hasMoltenMetal && check2 && overflow + || te.hasMetal && !te.hasMoltenMetal && itemCoincidesWithMetal && overflow) { entityPlayer.addChatMessage( - new ChatComponentText( - StatCollector.translateToLocalFormatted( - "Smelting extra " - + (isOre ? "ores" - : "ingots") - + " (" - + (te.metal.stackSize - + 1) - + ")"))); + new ChatComponentText(StatCollector.translateToLocalFormatted("Smelting extra " + + (isOre ? "ores" : "ingots") + " (" + (te.metal.stackSize + 1) + ")"))); te.metal.stackSize++; te.hasMetal = true; te.melting += ConfigHandler.INGOT_MELTING_TIME; @@ -259,43 +164,21 @@ public class BlockSmelter extends BlockContainer { te.isDirty = true; } te.isDirty = true; - } else if ((te.hasMetal - || te.hasMoltenMetal) - && !itemCoincidesWithMoltenMetal - && te.quantity < .9f) - entityPlayer.addChatMessage( - new ChatComponentText( - StatCollector.translateToLocal( - "chatmessage." + Variables.MODID - + ".smelter.contentdoesnotmatch"))); - else if (!item.getUnlocalizedName() - .toLowerCase() - .contains("ingot") - && item.getDisplayName() - .toLowerCase() - .contains("ingot") - && te.quantity < .9f) - entityPlayer.addChatMessage( - new ChatComponentText( - StatCollector.translateToLocal( - "chatmessage." + Variables.MODID - + ".smelter.itemrenamedtoingot"))); + } else if ((te.hasMetal || te.hasMoltenMetal) && !itemCoincidesWithMoltenMetal && te.quantity < .9f) + entityPlayer.addChatMessage(new ChatComponentText(StatCollector + .translateToLocal("chatmessage." + Variables.MODID + ".smelter.contentdoesnotmatch"))); + else if (!item.getUnlocalizedName().toLowerCase().contains("ingot") + && item.getDisplayName().toLowerCase().contains("ingot") && te.quantity < .9f) + entityPlayer.addChatMessage(new ChatComponentText(StatCollector + .translateToLocal("chatmessage." + Variables.MODID + ".smelter.itemrenamedtoingot"))); else if (te.quantity >= .9f) - entityPlayer.addChatMessage( - new ChatComponentText( - StatCollector.translateToLocal( - "chatmessage." + Variables.MODID - + ".smelter.full"))); + entityPlayer.addChatMessage(new ChatComponentText( + StatCollector.translateToLocal("chatmessage." + Variables.MODID + ".smelter.full"))); else - entityPlayer.addChatMessage( - new ChatComponentText( - StatCollector.translateToLocal( - "chatmessage." + Variables.MODID - + ".smelter.cannotsmelt"))); - } else if (item != null && item.getItem() != null - && item.getItem() instanceof ItemMoltenMetalBucket - && !te.hasMoltenMetal - && !te.hasMetal) { + entityPlayer.addChatMessage(new ChatComponentText( + StatCollector.translateToLocal("chatmessage." + Variables.MODID + ".smelter.cannotsmelt"))); + } else if (item != null && item.getItem() != null && item.getItem() instanceof ItemMoltenMetalBucket + && !te.hasMoltenMetal && !te.hasMetal) { te.hasMoltenMetal = true; ItemStack ingot = JewelryNBT.ingot(item); te.moltenMetal = ingot; @@ -303,146 +186,84 @@ public class BlockSmelter extends BlockContainer { te.isDirty = true; if (!entityPlayer.capabilities.isCreativeMode) { --item.stackSize; - dropItem(world, entityPlayer.posX, - entityPlayer.posY, - entityPlayer.posZ, + dropItem(world, entityPlayer.posX, entityPlayer.posY, entityPlayer.posZ, new ItemStack(Items.bucket)); } - } else if (item == null && te.hasMoltenMetal - && te.moltenMetal - .getItem() != null) - entityPlayer.addChatMessage( - new ChatComponentText( - StatCollector.translateToLocalFormatted( - "chatmessage." + Variables.MODID - + ".smelter.hasmolteningot", - te.moltenMetal.getDisplayName() - .replace(" Ingot", - "")))); + } else if (item == null && te.hasMoltenMetal && te.moltenMetal.getItem() != null) + entityPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocalFormatted( + "chatmessage." + Variables.MODID + ".smelter.hasmolteningot", + te.moltenMetal.getDisplayName().replace(" Ingot", "")))); world.setTileEntity(i, j, k, te); } return true; } @Override - public void onBlockClicked(World world, int i, int j, int k, - EntityPlayer player) { - TileEntitySmelter te = (TileEntitySmelter) world - .getTileEntity(i, j, k); + public void onBlockClicked(World world, int i, int j, int k, EntityPlayer player) { + TileEntitySmelter te = (TileEntitySmelter) world.getTileEntity(i, j, k); TileEntityMolder me = null; - if (world.getBlockMetadata(i, j, k) == 0 - && world.getTileEntity(i, j, k - 1) != null - && world.getTileEntity(i, j, k - - 1) instanceof TileEntityMolder) - me = (TileEntityMolder) world.getTileEntity(i, j, - k - 1); - else if (world.getBlockMetadata(i, j, k) == 1 - && world.getTileEntity(i + 1, j, k) != null - && world.getTileEntity(i + 1, j, - k) instanceof TileEntityMolder) - me = (TileEntityMolder) world.getTileEntity(i + 1, - j, k); - else if (world.getBlockMetadata(i, j, k) == 2 - && world.getTileEntity(i, j, k + 1) != null - && world.getTileEntity(i, j, k - + 1) instanceof TileEntityMolder) - me = (TileEntityMolder) world.getTileEntity(i, j, - k + 1); - else if (world.getBlockMetadata(i, j, k) == 3 - && world.getTileEntity(i - 1, j, k) != null - && world.getTileEntity(i - 1, j, - k) instanceof TileEntityMolder) - me = (TileEntityMolder) world.getTileEntity(i - 1, - j, k); + if (world.getBlockMetadata(i, j, k) == 0 && world.getTileEntity(i, j, k - 1) != null + && world.getTileEntity(i, j, k - 1) instanceof TileEntityMolder) + me = (TileEntityMolder) world.getTileEntity(i, j, k - 1); + else if (world.getBlockMetadata(i, j, k) == 1 && world.getTileEntity(i + 1, j, k) != null + && world.getTileEntity(i + 1, j, k) instanceof TileEntityMolder) + me = (TileEntityMolder) world.getTileEntity(i + 1, j, k); + else if (world.getBlockMetadata(i, j, k) == 2 && world.getTileEntity(i, j, k + 1) != null + && world.getTileEntity(i, j, k + 1) instanceof TileEntityMolder) + me = (TileEntityMolder) world.getTileEntity(i, j, k + 1); + else if (world.getBlockMetadata(i, j, k) == 3 && world.getTileEntity(i - 1, j, k) != null + && world.getTileEntity(i - 1, j, k) instanceof TileEntityMolder) + me = (TileEntityMolder) world.getTileEntity(i - 1, j, k); if (te != null && me != null && !world.isRemote) - if (te.hasMoltenMetal - && isConnectedToMolder(world, i, j, - k) - && me.hasMold && !me.hasMoltenMetal + if (te.hasMoltenMetal && isConnectedToMolder(world, i, j, k) && me.hasMold && !me.hasMoltenMetal && !me.hasJewelBase) { te.pouring = true; te.isDirty = true; } else if (te.hasMetal && te.melting > 0) - player.addChatMessage( - new ChatComponentText( - StatCollector.translateToLocalFormatted( - "chatmessage." + Variables.MODID - + ".smelter.metalismelting", - te.metal.getDisplayName()) - + " (" - + (ConfigHandler.INGOT_MELTING_TIME - * te.metal.stackSize - - te.melting) - * 100 - / (ConfigHandler.INGOT_MELTING_TIME - * te.metal.stackSize) - + "%)")); - else if (te.hasMoltenMetal - && !isConnectedToMolder(world, i, - j, k)) - player.addChatMessage( - new ChatComponentText( - StatCollector.translateToLocal( - "chatmessage." + Variables.MODID - + ".smelter.molderismissing"))); + player.addChatMessage(new ChatComponentText(StatCollector.translateToLocalFormatted( + "chatmessage." + Variables.MODID + ".smelter.metalismelting", te.metal.getDisplayName()) + " (" + + (ConfigHandler.INGOT_MELTING_TIME * te.metal.stackSize - te.melting) * 100 + / (ConfigHandler.INGOT_MELTING_TIME * te.metal.stackSize) + + "%)")); + else if (te.hasMoltenMetal && !isConnectedToMolder(world, i, j, k)) + player.addChatMessage(new ChatComponentText( + StatCollector.translateToLocal("chatmessage." + Variables.MODID + ".smelter.molderismissing"))); else if (!me.hasMold && te.hasMoltenMetal) - player.addChatMessage( - new ChatComponentText( - StatCollector.translateToLocal( - "chatmessage." + Variables.MODID - + ".smelter.molderhasnomold"))); + player.addChatMessage(new ChatComponentText( + StatCollector.translateToLocal("chatmessage." + Variables.MODID + ".smelter.molderhasnomold"))); else if (me.hasMoltenMetal && te.hasMoltenMetal) - player.addChatMessage( - new ChatComponentText( - StatCollector.translateToLocal( - "chatmessage." + Variables.MODID - + ".smelter.molderhasmoltenmetal"))); + player.addChatMessage(new ChatComponentText(StatCollector + .translateToLocal("chatmessage." + Variables.MODID + ".smelter.molderhasmoltenmetal"))); else if (me.hasJewelBase && te.hasMoltenMetal) - player.addChatMessage( - new ChatComponentText( - StatCollector.translateToLocal( - "chatmessage." + Variables.MODID - + ".smelter.modlerhasitem"))); + player.addChatMessage(new ChatComponentText( + StatCollector.translateToLocal("chatmessage." + Variables.MODID + ".smelter.modlerhasitem"))); else - player.addChatMessage( - new ChatComponentText( - StatCollector.translateToLocal( - "chatmessage." + Variables.MODID - + ".smelter.empty"))); + player.addChatMessage(new ChatComponentText( + StatCollector.translateToLocal("chatmessage." + Variables.MODID + ".smelter.empty"))); } - public boolean isConnectedToMolder(World world, int i, int j, - int k) { + public boolean isConnectedToMolder(World world, int i, int j, int k) { int blockMeta = world.getBlockMetadata(i, j, k); - if (blockMeta == 0 && world.getBlock(i, j, - k - 1) instanceof BlockMolder) + if (blockMeta == 0 && world.getBlock(i, j, k - 1) instanceof BlockMolder) return true; - else if (blockMeta == 1 && world.getBlock(i + 1, j, - k) instanceof BlockMolder) + else if (blockMeta == 1 && world.getBlock(i + 1, j, k) instanceof BlockMolder) return true; - else if (blockMeta == 2 && world.getBlock(i, j, - k + 1) instanceof BlockMolder) + else if (blockMeta == 2 && world.getBlock(i, j, k + 1) instanceof BlockMolder) return true; - else if (blockMeta == 3 && world.getBlock(i - 1, j, - k) instanceof BlockMolder) + else if (blockMeta == 3 && world.getBlock(i - 1, j, k) instanceof BlockMolder) return true; return false; } @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); } @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; } -- cgit v1.2.3