From f242b3b9e2d62cc2263e9e9288c9feb9613e8132 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 22 Aug 2019 20:51:35 -0400 Subject: Update --- .../jewelrycraft/item/ItemBaseJewelry.java | 85 +++++++++++++++------- 1 file changed, 59 insertions(+), 26 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 da0315f..13e8546 100755 --- a/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java @@ -6,6 +6,7 @@ import java.util.List; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import darkknight.jewelrycraft.JewelrycraftMod; +import darkknight.jewelrycraft.api.IJewelryItem; import darkknight.jewelrycraft.api.ModifierEffects; import darkknight.jewelrycraft.config.ConfigHandler; import darkknight.jewelrycraft.util.JewelryNBT; @@ -20,10 +21,13 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraftforge.event.entity.player.PlayerEvent; +@SuppressWarnings({ "rawtypes", "unchecked" }) public abstract class ItemBaseJewelry extends Item { public ItemBaseJewelry() { super(); + setMaxStackSize(1); + setCreativeTab(JewelrycraftMod.jewelrycraft); } @@ -54,10 +58,16 @@ 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(); + String itemName = ("" + StatCollector.translateToLocal(getUnlocalizedNameInefficiently(stack) + ".name")) + .trim(); + + if (JewelryNBT.ingot(stack) != null && Item.getIdFromItem(JewelryNBT.ingot(stack).getItem()) > 0) { + String ingotName = JewelryNBT.ingot(stack).getDisplayName().replace("Ingot", " ").trim(); + + return ingotName + " " + itemName; + } + + return itemName; } /** @@ -72,10 +82,12 @@ public abstract class ItemBaseJewelry extends Item { 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"), " ")); + String metalInfo = StatCollector.translateToLocal("info." + Variables.MODID + ".metal"); + String ingotInfo = StatCollector.translateToLocal("info." + Variables.MODID + ".ingot"); + + list.add(metalInfo + ": " + EnumChatFormatting.YELLOW + ingot.getDisplayName().replace(ingotInfo, " ")); } ItemStack gem = JewelryNBT.gem(stack); @@ -87,11 +99,14 @@ public abstract class ItemBaseJewelry extends Item { ArrayList modifier = JewelryNBT.modifier(stack); - if (!modifier.isEmpty()) + if (!modifier.isEmpty()) { list.add(StatCollector.translateToLocal("info." + Variables.MODID + ".modifiers") + ": "); - for (int i = 0; i < modifier.size(); i++) + } + + for (int i = 0; i < modifier.size(); i++) { list.add(EnumChatFormatting.DARK_PURPLE + modifier.get(i).getDisplayName() + " x" + modifier.get(i).stackSize); + } } } @@ -100,9 +115,11 @@ public abstract class ItemBaseJewelry extends Item { * @param player */ public void action(ItemStack item, EntityPlayer player) { - for (ModifierEffects mod : ModifierEffects.getEffects()) - if (JewelryNBT.doesModifierExist(item, mod.getModifier())) + for (ModifierEffects mod : ModifierEffects.getEffects()) { + if (JewelryNBT.doesModifierExist(item, mod.getModifier())) { mod.action(item, player, this); + } + } } /** @@ -112,9 +129,12 @@ public abstract class ItemBaseJewelry extends Item { * @return */ public boolean onPlayerAttackedCacellable(ItemStack item, EntityPlayer player, DamageSource source, float amount) { - for (ModifierEffects mod : ModifierEffects.getEffects()) - if (JewelryNBT.doesModifierExist(item, mod.getModifier())) + for (ModifierEffects mod : ModifierEffects.getEffects()) { + if (JewelryNBT.doesModifierExist(item, mod.getModifier())) { return mod.onPlayerAttackedCancellable(item, player, source, this, amount); + } + } + return false; } @@ -125,9 +145,12 @@ public abstract class ItemBaseJewelry extends Item { * @return */ public boolean onEntityAttackedCacellable(ItemStack item, EntityPlayer player, Entity target, float amount) { - for (ModifierEffects mod : ModifierEffects.getEffects()) - if (JewelryNBT.doesModifierExist(item, mod.getModifier())) + for (ModifierEffects mod : ModifierEffects.getEffects()) { + if (JewelryNBT.doesModifierExist(item, mod.getModifier())) { return mod.onEntityAttackedCancellable(item, player, target, this, amount); + } + } + return false; } @@ -150,32 +173,42 @@ public abstract class ItemBaseJewelry extends Item { * @return */ public void onEntityAttacked(ItemStack item, EntityPlayer player, Entity target, float amount) { - for (ModifierEffects mod : ModifierEffects.getEffects()) - if (JewelryNBT.doesModifierExist(item, mod.getModifier())) + for (ModifierEffects mod : ModifierEffects.getEffects()) { + if (JewelryNBT.doesModifierExist(item, mod.getModifier())) { mod.onEntityAttacked(item, player, target, this, amount); + } + } } public void onPlayerDead(ItemStack item, EntityPlayer player, DamageSource source) { - for (ModifierEffects mod : ModifierEffects.getEffects()) - if (JewelryNBT.doesModifierExist(item, mod.getModifier())) + for (ModifierEffects mod : ModifierEffects.getEffects()) { + if (JewelryNBT.doesModifierExist(item, mod.getModifier())) { mod.onPlayerDead(item, player, source, this); + } + } } public void onPlayerRespawn(ItemStack item, PlayerEvent.Clone event) { - for (ModifierEffects mod : ModifierEffects.getEffects()) - if (JewelryNBT.doesModifierExist(item, mod.getModifier())) + for (ModifierEffects mod : ModifierEffects.getEffects()) { + 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())) + for (ModifierEffects mod : ModifierEffects.getEffects()) { + 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())) + for (ModifierEffects mod : ModifierEffects.getEffects()) { + if (JewelryNBT.doesModifierExist(item, mod.getModifier())) { mod.onJewelryUnequipped(item, this); + } + } } -} +} \ No newline at end of file -- cgit v1.2.3