From cdbbd891c43e082a36a32e49420bf87b6edd28e0 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Wed, 4 Sep 2019 22:24:39 -0400 Subject: More affix work --- .../client/gui/container/ContainerJewelryTab.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/client') diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryTab.java b/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryTab.java index 6a118dc..344df7e 100755 --- a/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryTab.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryTab.java @@ -46,14 +46,15 @@ public class ContainerJewelryTab extends Container { if (slotID >= 0 && slotID <= 17 && !player.worldObj.isRemote) { try { if (player.inventory.getItemStack() == null && inventoryItemStacks.get(slotID) != null - && ((ItemStack) inventoryItemStacks.get(slotID)).getItem() instanceof ItemBaseJewelry) + && ((ItemStack) inventoryItemStacks.get(slotID)).getItem() instanceof ItemBaseJewelry) { ((ItemBaseJewelry) ((ItemStack) inventoryItemStacks.get(slotID)).getItem()) - .onJewelryUnequipped((ItemStack) inventoryItemStacks.get(slotID)); - else if (player.inventory.getItemStack() != null + .onJewelryUnequipped((ItemStack) inventoryItemStacks.get(slotID), player); + } else if (player.inventory.getItemStack() != null && player.inventory.getItemStack().getItem() instanceof ItemBaseJewelry - && inventoryItemStacks.get(slotID) == null) + && inventoryItemStacks.get(slotID) == null) { ((ItemBaseJewelry) player.inventory.getItemStack().getItem()) - .onJewelryEquipped(player.inventory.getItemStack()); + .onJewelryEquipped(player.inventory.getItemStack(), player); + } if (player.inventory.getItemStack() == null && inventoryItemStacks.get(slotID) != null && ((ItemStack) inventoryItemStacks.get(slotID)).getItem() instanceof IJewelryItem) ((IJewelryItem) ((ItemStack) inventoryItemStacks.get(slotID)).getItem()) -- cgit v1.2.3