From 404fc0472972682bb28ad12ad28233c6ae3b80ef Mon Sep 17 00:00:00 2001 From: OnyxDarkKnight Date: Sat, 25 Apr 2015 02:31:08 +0100 Subject: Removed javaDoc and trying to fix an error with TiCon --- .../java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java') diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java index 4becb91..dd653ce 100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java @@ -65,7 +65,7 @@ public class GuiJewelryModifier extends GuiContainer { int i = 0; for(ItemStack item: JewelrycraftUtil.objects){ - if (this.searchField.getText() == "" || item.getDisplayName().toLowerCase().contains(this.searchField.getText().toLowerCase())){ + if (item != null && (this.searchField.getText() == "" || item.getDisplayName().toLowerCase().contains(this.searchField.getText().toLowerCase()))){ GL11.glDisable(GL11.GL_LIGHTING); GL11.glColor3f(1F, 1F, 1F); GL11.glEnable(GL11.GL_LIGHTING); @@ -159,11 +159,11 @@ public class GuiJewelryModifier extends GuiContainer JewelrycraftMod.netWrapper.sendToServer(new PacketRequestSetSlot(targetItem)); } if (((GuiButton)buttonList.get(4)).mousePressed(mc, x, y) && !((GuiButton)buttonList.get(2)).enabled){ - JewelryNBT.addModifiers(targetItem, selectedItems); + JewelryNBT.addItem(targetItem, selectedItem); JewelrycraftMod.netWrapper.sendToServer(new PacketRequestSetSlot(targetItem)); } if (((GuiButton)buttonList.get(4)).mousePressed(mc, x, y) && !((GuiButton)buttonList.get(3)).enabled){ - JewelryNBT.addItem(targetItem, selectedItem); + JewelryNBT.addModifiers(targetItem, selectedItems); JewelrycraftMod.netWrapper.sendToServer(new PacketRequestSetSlot(targetItem)); } } -- cgit v1.2.3