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/curses/CurseMidasTouch.java | 193 ++++++--------------- 1 file changed, 49 insertions(+), 144 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java') diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java b/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java index d576803..875f5c1 100755 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java @@ -20,14 +20,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemArmor; -import net.minecraft.item.ItemAxe; -import net.minecraft.item.ItemHoe; -import net.minecraft.item.ItemPickaxe; -import net.minecraft.item.ItemSpade; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemSword; +import net.minecraft.item.*; import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; import net.minecraft.world.World; @@ -39,32 +32,17 @@ public class CurseMidasTouch extends Curse { } @Override - public void attackedByPlayerAction(LivingAttackEvent event, - World world, EntityPlayer player, Entity target) { - if (!world.isRemote && target instanceof EntityLivingBase - && !(target instanceof EntityHeart) - && !(target instanceof EntityHalfHeart) - && player.inventory - .getCurrentItem() == null) { - world.setBlock(MathHelper - .floor_double(target.posX), - MathHelper.floor_double( - target.posY), - MathHelper.floor_double( - target.posZ), - BlockList.midasTouchBlock, 0, 2); + public void attackedByPlayerAction(LivingAttackEvent event, World world, EntityPlayer player, Entity target) { + if (!world.isRemote && target instanceof EntityLivingBase && !(target instanceof EntityHeart) + && !(target instanceof EntityHalfHeart) && player.inventory.getCurrentItem() == null) { + world.setBlock(MathHelper.floor_double(target.posX), MathHelper.floor_double(target.posY), + MathHelper.floor_double(target.posZ), BlockList.midasTouchBlock, 0, 2); TileEntityMidasTouch midasTouchVictim = new TileEntityMidasTouch(); midasTouchVictim.setEntity(target); - world.setTileEntity( - MathHelper.floor_double( - target.posX), - MathHelper.floor_double( - target.posY), - MathHelper.floor_double( - target.posZ), - midasTouchVictim); + world.setTileEntity(MathHelper.floor_double(target.posX), MathHelper.floor_double(target.posY), + MathHelper.floor_double(target.posZ), midasTouchVictim); target.setDead(); } @@ -74,15 +52,11 @@ public class CurseMidasTouch extends Curse { public void action(World world, EntityPlayer player) { ItemStack curItem = player.inventory.getCurrentItem(); - if (curItem != null - && curItem.getItem() != ItemList.goldObj - && !isGoldenObject(curItem.getItem())) { + if (curItem != null && curItem.getItem() != ItemList.goldObj && !isGoldenObject(curItem.getItem())) { int index = player.inventory.currentItem; ItemStack item = curItem; - ItemStack result = new ItemStack(ItemList.goldObj, - item.stackSize, - item.getItemDamage()); + ItemStack result = new ItemStack(ItemList.goldObj, item.stackSize, item.getItemDamage()); JewelryNBT.addItem(result, item); @@ -90,135 +64,67 @@ public class CurseMidasTouch extends Curse { result = changeItem(curItem); } - player.inventory.setInventorySlotContents(index, - result); + player.inventory.setInventorySlotContents(index, result); } } public ItemStack changeItem(ItemStack currItem) { if (currItem.getItem() instanceof ItemSword) { - return new ItemStack(Items.golden_sword, - currItem.stackSize, - currItem.getItemDamage()); + return new ItemStack(Items.golden_sword, currItem.stackSize, currItem.getItemDamage()); } else if (currItem.getItem() instanceof ItemSpade) { - return new ItemStack(Items.golden_shovel, - currItem.stackSize, - currItem.getItemDamage()); + return new ItemStack(Items.golden_shovel, currItem.stackSize, currItem.getItemDamage()); } else if (currItem.getItem() instanceof ItemPickaxe) { - return new ItemStack(Items.golden_pickaxe, - currItem.stackSize, - currItem.getItemDamage()); + return new ItemStack(Items.golden_pickaxe, currItem.stackSize, currItem.getItemDamage()); } else if (currItem.getItem() instanceof ItemAxe) { - return new ItemStack(Items.golden_axe, - currItem.stackSize, - currItem.getItemDamage()); + return new ItemStack(Items.golden_axe, currItem.stackSize, currItem.getItemDamage()); } else if (currItem.getItem() instanceof ItemHoe) { - return new ItemStack(Items.golden_hoe, - currItem.stackSize, - currItem.getItemDamage()); - } else if (currItem.getItem() instanceof ItemArmor - && ((ItemArmor) currItem - .getItem()).armorType == 0) { - return new ItemStack(Items.golden_helmet, - currItem.stackSize, - currItem.getItemDamage()); - } else if (currItem.getItem() instanceof ItemArmor - && ((ItemArmor) currItem - .getItem()).armorType == 1) { - return new ItemStack(Items.golden_chestplate, - currItem.stackSize, - currItem.getItemDamage()); - } else if (currItem.getItem() instanceof ItemArmor - && ((ItemArmor) currItem - .getItem()).armorType == 2) { - return new ItemStack(Items.golden_leggings, - currItem.stackSize, - currItem.getItemDamage()); - } else if (currItem.getItem() instanceof ItemArmor - && ((ItemArmor) currItem - .getItem()).armorType == 3) { - return new ItemStack(Items.golden_boots, - currItem.stackSize, - currItem.getItemDamage()); - } else if (currItem.getItem().getUnlocalizedName() - .toLowerCase().contains("horsearmor")) { - return new ItemStack(Items.golden_horse_armor, - currItem.stackSize, 0); - } else if (currItem.getItem().getUnlocalizedName() - .toLowerCase().contains("nugget") - || currItem.getItem() - .getItemStackDisplayName( - currItem) - .toLowerCase() - .contains(" nugget") - || currItem.getItem() - .getItemStackDisplayName( - currItem) - .toLowerCase() - .contains("nugget ")) { - return new ItemStack(Items.gold_nugget, - currItem.stackSize, 0); - } else if (currItem.getItem().getUnlocalizedName() - .toLowerCase().contains("ingot") - || currItem.getItem() - .getItemStackDisplayName( - currItem) - .toLowerCase() - .contains(" ingot") - || currItem.getItem() - .getItemStackDisplayName( - currItem) - .toLowerCase() - .contains("ingot ")) { - return new ItemStack(Items.gold_ingot, - currItem.stackSize, 0); - } else if (Block.getBlockFromItem(currItem - .getItem()) instanceof BlockPressurePlate - || Block.getBlockFromItem(currItem - .getItem()) instanceof BlockPressurePlateWeighted) { - return new ItemStack( - Blocks.light_weighted_pressure_plate, - currItem.stackSize, 0); - } else if (Block.getBlockFromItem(currItem - .getItem()) instanceof BlockCompressed) { - return new ItemStack(Blocks.gold_block, - currItem.stackSize, 0); + return new ItemStack(Items.golden_hoe, currItem.stackSize, currItem.getItemDamage()); + } else if (currItem.getItem() instanceof ItemArmor && ((ItemArmor) currItem.getItem()).armorType == 0) { + return new ItemStack(Items.golden_helmet, currItem.stackSize, currItem.getItemDamage()); + } else if (currItem.getItem() instanceof ItemArmor && ((ItemArmor) currItem.getItem()).armorType == 1) { + return new ItemStack(Items.golden_chestplate, currItem.stackSize, currItem.getItemDamage()); + } else if (currItem.getItem() instanceof ItemArmor && ((ItemArmor) currItem.getItem()).armorType == 2) { + return new ItemStack(Items.golden_leggings, currItem.stackSize, currItem.getItemDamage()); + } else if (currItem.getItem() instanceof ItemArmor && ((ItemArmor) currItem.getItem()).armorType == 3) { + return new ItemStack(Items.golden_boots, currItem.stackSize, currItem.getItemDamage()); + } else if (currItem.getItem().getUnlocalizedName().toLowerCase().contains("horsearmor")) { + return new ItemStack(Items.golden_horse_armor, currItem.stackSize, 0); + } else if (currItem.getItem().getUnlocalizedName().toLowerCase().contains("nugget") + || currItem.getItem().getItemStackDisplayName(currItem).toLowerCase().contains(" nugget") + || currItem.getItem().getItemStackDisplayName(currItem).toLowerCase().contains("nugget ")) { + return new ItemStack(Items.gold_nugget, currItem.stackSize, 0); + } else if (currItem.getItem().getUnlocalizedName().toLowerCase().contains("ingot") + || currItem.getItem().getItemStackDisplayName(currItem).toLowerCase().contains(" ingot") + || currItem.getItem().getItemStackDisplayName(currItem).toLowerCase().contains("ingot ")) { + return new ItemStack(Items.gold_ingot, currItem.stackSize, 0); + } else if (Block.getBlockFromItem(currItem.getItem()) instanceof BlockPressurePlate + || Block.getBlockFromItem(currItem.getItem()) instanceof BlockPressurePlateWeighted) { + return new ItemStack(Blocks.light_weighted_pressure_plate, currItem.stackSize, 0); + } else if (Block.getBlockFromItem(currItem.getItem()) instanceof BlockCompressed) { + return new ItemStack(Blocks.gold_block, currItem.stackSize, 0); } return null; } public boolean isGoldenObject(Item item) { - return item.equals(Items.gold_ingot) - || item.equals(Items.gold_nugget) - || item.equals(Items.golden_helmet) - || item.equals(Items.golden_chestplate) - || item.equals(Items.golden_leggings) - || item.equals(Items.golden_boots) - || item.equals(Items.golden_sword) - || item.equals(Items.golden_shovel) - || item.equals(Items.golden_pickaxe) - || item.equals(Items.golden_axe) - || item.equals(Items.golden_apple) - || item.equals(Items.golden_hoe) - || item.equals(Items.golden_horse_armor) - || Block.getBlockFromItem(item) - .equals(Blocks.gold_block) - || Block.getBlockFromItem(item).equals( - Blocks.light_weighted_pressure_plate); + return item.equals(Items.gold_ingot) || item.equals(Items.gold_nugget) || item.equals(Items.golden_helmet) + || item.equals(Items.golden_chestplate) || item.equals(Items.golden_leggings) + || item.equals(Items.golden_boots) || item.equals(Items.golden_sword) + || item.equals(Items.golden_shovel) || item.equals(Items.golden_pickaxe) + || item.equals(Items.golden_axe) || item.equals(Items.golden_apple) || item.equals(Items.golden_hoe) + || item.equals(Items.golden_horse_armor) || Block.getBlockFromItem(item).equals(Blocks.gold_block) + || Block.getBlockFromItem(item).equals(Blocks.light_weighted_pressure_plate); } @Override public String getDescription() { - return StatCollector.translateToLocal("curse." - + Variables.MODID - + ".midastouch.description"); + return StatCollector.translateToLocal("curse." + Variables.MODID + ".midastouch.description"); } @Override public String getDisplayName() { - return StatCollector.translateToLocal("curse." - + Variables.MODID + ".midastouch"); + return StatCollector.translateToLocal("curse." + Variables.MODID + ".midastouch"); } @Override @@ -236,8 +142,7 @@ public class CurseMidasTouch extends Curse { } @Override - public int weight(World world, EntityPlayer player, - Random random) { + public int weight(World world, EntityPlayer player, Random random) { return 2; } } -- cgit v1.2.3