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/item/ItemBaseJewelry.java | 133 ++++++--------------- 1 file changed, 38 insertions(+), 95 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java') diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java b/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java index 2c2311c..da0315f 100755 --- a/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java @@ -36,16 +36,13 @@ public abstract class ItemBaseJewelry extends Item { @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack stack, int pass) { if (pass == 0 && JewelryNBT.ingot(stack) != null) { - return JewelrycraftUtil - .getColor(JewelryNBT.ingot(stack)); + return JewelrycraftUtil.getColor(JewelryNBT.ingot(stack)); } if (pass == 1 && JewelryNBT.gem(stack) != null) { - return JewelrycraftUtil - .getColor(JewelryNBT.gem(stack)); + return JewelrycraftUtil.getColor(JewelryNBT.gem(stack)); } else if (JewelryNBT.ingot(stack) != null) { - return JewelrycraftUtil - .getColor(JewelryNBT.ingot(stack)); + return JewelrycraftUtil.getColor(JewelryNBT.ingot(stack)); } return 16777215; @@ -57,24 +54,14 @@ public abstract class ItemBaseJewelry extends Item { */ @Override public String getItemStackDisplayName(ItemStack stack) { - if (JewelryNBT.ingot(stack) != null && Item.getIdFromItem( - JewelryNBT.ingot(stack).getItem()) > 0) - return JewelryNBT.ingot(stack).getDisplayName() - .replace("Ingot", " ").trim() - + " " - + ("" + StatCollector - .translateToLocal( - getUnlocalizedNameInefficiently( - stack) - + ".name")).trim(); - return ("" + StatCollector.translateToLocal( - getUnlocalizedNameInefficiently(stack) - + ".name")).trim(); + if (JewelryNBT.ingot(stack) != null && Item.getIdFromItem(JewelryNBT.ingot(stack).getItem()) > 0) + return JewelryNBT.ingot(stack).getDisplayName().replace("Ingot", " ").trim() + " " + + ("" + StatCollector.translateToLocal(getUnlocalizedNameInefficiently(stack) + ".name")).trim(); + return ("" + StatCollector.translateToLocal(getUnlocalizedNameInefficiently(stack) + ".name")).trim(); } /** - * allows items to add custom lines of information to the mouseover - * description. + * allows items to add custom lines of information to the mouseover description. * * @param stack * @param player @@ -82,49 +69,28 @@ public abstract class ItemBaseJewelry extends Item { * @param par4 */ @Override - public void addInformation(ItemStack stack, EntityPlayer player, - List list, boolean par4) { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { if (stack.hasTagCompound() && ConfigHandler.JEWELRY_INFO) { ItemStack ingot = JewelryNBT.ingot(stack); - if (ingot != null && Item.getIdFromItem(JewelryNBT - .ingot(stack).getItem()) > 0) { - list.add(StatCollector.translateToLocal( - "info." + Variables.MODID - + ".metal") - + ": " - + EnumChatFormatting.YELLOW - + ingot.getDisplayName() - .replace(StatCollector - .translateToLocal( - "info." + Variables.MODID - + ".ingot"), - " ")); + if (ingot != null && Item.getIdFromItem(JewelryNBT.ingot(stack).getItem()) > 0) { + list.add(StatCollector.translateToLocal("info." + Variables.MODID + ".metal") + ": " + + EnumChatFormatting.YELLOW + ingot.getDisplayName() + .replace(StatCollector.translateToLocal("info." + Variables.MODID + ".ingot"), " ")); } ItemStack gem = JewelryNBT.gem(stack); if (gem != null) { - list.add(StatCollector.translateToLocal( - "info." + Variables.MODID - + ".gem") - + ": " - + EnumChatFormatting.BLUE - + gem.getDisplayName()); + list.add(StatCollector.translateToLocal("info." + Variables.MODID + ".gem") + ": " + + EnumChatFormatting.BLUE + gem.getDisplayName()); } - ArrayList modifier = JewelryNBT - .modifier(stack); + ArrayList modifier = JewelryNBT.modifier(stack); if (!modifier.isEmpty()) - list.add(StatCollector.translateToLocal( - "info." + Variables.MODID - + ".modifiers") - + ": "); + list.add(StatCollector.translateToLocal("info." + Variables.MODID + ".modifiers") + ": "); for (int i = 0; i < modifier.size(); i++) - list.add(EnumChatFormatting.DARK_PURPLE - + modifier.get(i) - .getDisplayName() - + " x" + list.add(EnumChatFormatting.DARK_PURPLE + modifier.get(i).getDisplayName() + " x" + modifier.get(i).stackSize); } } @@ -135,8 +101,7 @@ public abstract class ItemBaseJewelry extends Item { */ public void action(ItemStack item, EntityPlayer player) { for (ModifierEffects mod : ModifierEffects.getEffects()) - if (JewelryNBT.doesModifierExist(item, - mod.getModifier())) + if (JewelryNBT.doesModifierExist(item, mod.getModifier())) mod.action(item, player, this); } @@ -146,15 +111,10 @@ public abstract class ItemBaseJewelry extends Item { * @param source * @return */ - public boolean onPlayerAttackedCacellable(ItemStack item, - EntityPlayer player, DamageSource source, - float amount) { + public boolean onPlayerAttackedCacellable(ItemStack item, EntityPlayer player, DamageSource source, float amount) { for (ModifierEffects mod : ModifierEffects.getEffects()) - if (JewelryNBT.doesModifierExist(item, - mod.getModifier())) - return mod.onPlayerAttackedCancellable( - item, player, source, this, - amount); + if (JewelryNBT.doesModifierExist(item, mod.getModifier())) + return mod.onPlayerAttackedCancellable(item, player, source, this, amount); return false; } @@ -164,14 +124,10 @@ public abstract class ItemBaseJewelry extends Item { * @param target * @return */ - public boolean onEntityAttackedCacellable(ItemStack item, - EntityPlayer player, Entity target, float amount) { + public boolean onEntityAttackedCacellable(ItemStack item, EntityPlayer player, Entity target, float amount) { for (ModifierEffects mod : ModifierEffects.getEffects()) - if (JewelryNBT.doesModifierExist(item, - mod.getModifier())) - return mod.onEntityAttackedCancellable( - item, player, target, this, - amount); + if (JewelryNBT.doesModifierExist(item, mod.getModifier())) + return mod.onEntityAttackedCancellable(item, player, target, this, amount); return false; } @@ -181,13 +137,10 @@ public abstract class ItemBaseJewelry extends Item { * @param source * @return */ - public void onPlayerAttacked(ItemStack item, EntityPlayer player, - DamageSource source, float amount) { + public void onPlayerAttacked(ItemStack item, EntityPlayer player, DamageSource source, float amount) { for (ModifierEffects mod : ModifierEffects.getEffects()) - if (JewelryNBT.doesModifierExist(item, - mod.getModifier())) - mod.onPlayerAttacked(item, player, source, - this, amount); + if (JewelryNBT.doesModifierExist(item, mod.getModifier())) + mod.onPlayerAttacked(item, player, source, this, amount); } /** @@ -196,43 +149,33 @@ public abstract class ItemBaseJewelry extends Item { * @param target * @return */ - public void onEntityAttacked(ItemStack item, EntityPlayer player, - Entity target, float amount) { + public void onEntityAttacked(ItemStack item, EntityPlayer player, Entity target, float amount) { for (ModifierEffects mod : ModifierEffects.getEffects()) - if (JewelryNBT.doesModifierExist(item, - mod.getModifier())) - mod.onEntityAttacked(item, player, target, - this, amount); + if (JewelryNBT.doesModifierExist(item, mod.getModifier())) + mod.onEntityAttacked(item, player, target, this, amount); } - public void onPlayerDead(ItemStack item, EntityPlayer player, - DamageSource source) { + public void onPlayerDead(ItemStack item, EntityPlayer player, DamageSource source) { for (ModifierEffects mod : ModifierEffects.getEffects()) - if (JewelryNBT.doesModifierExist(item, - mod.getModifier())) - mod.onPlayerDead(item, player, source, - this); + if (JewelryNBT.doesModifierExist(item, mod.getModifier())) + mod.onPlayerDead(item, player, source, this); } - public void onPlayerRespawn(ItemStack item, - PlayerEvent.Clone event) { + public void onPlayerRespawn(ItemStack item, PlayerEvent.Clone event) { for (ModifierEffects mod : ModifierEffects.getEffects()) - if (JewelryNBT.doesModifierExist(item, - mod.getModifier())) + if (JewelryNBT.doesModifierExist(item, mod.getModifier())) mod.onPlayerRespawn(item, event, this); } public void onJewelryEquipped(ItemStack item) { for (ModifierEffects mod : ModifierEffects.getEffects()) - if (JewelryNBT.doesModifierExist(item, - mod.getModifier())) + if (JewelryNBT.doesModifierExist(item, mod.getModifier())) mod.onJewelryEquipped(item, this); } public void onJewelryUnequipped(ItemStack item) { for (ModifierEffects mod : ModifierEffects.getEffects()) - if (JewelryNBT.doesModifierExist(item, - mod.getModifier())) + if (JewelryNBT.doesModifierExist(item, mod.getModifier())) mod.onJewelryUnequipped(item, this); } } -- cgit v1.2.3