summaryrefslogtreecommitdiff
path: root/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java
diff options
context:
space:
mode:
authorOnyxDarkKnight <sor1n.iliutza16@gmail.com>2015-04-28 23:46:37 +0100
committerOnyxDarkKnight <sor1n.iliutza16@gmail.com>2015-04-28 23:46:37 +0100
commit4774926ed9703b000ecbcff69636dd7ea4abf5d6 (patch)
tree86cb89eac4a22c9509b25f4cc4f974611fecf387 /src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java
parent17c10d87711b3e587c5fb2fb55cdc4eb8a61b75a (diff)
Fixed the mod from crashing with other mods
Diffstat (limited to 'src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java')
-rw-r--r--src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java
index 64c8dda..30b6f64 100644
--- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java
+++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java
@@ -70,7 +70,12 @@ public class GuiJewelryModifier extends GuiContainer
GL11.glColor3f(1F, 1F, 1F);
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glEnable(GL12.GL_RESCALE_NORMAL);
- if (i >= (page - 1) * 48 && i < page * 48) itemRender.renderItemAndEffectIntoGUI(this.fontRendererObj, this.mc.getTextureManager(), item, 88 + 20 * (i % 6), 7 + 17 * (i / 6) - 136 * (page - 1));
+ if (i >= (page - 1) * 48 && i < page * 48) try{
+ itemRender.renderItemAndEffectIntoGUI(this.fontRendererObj, this.mc.getTextureManager(), item, 88 + 20 * (i % 6), 7 + 17 * (i / 6) - 136 * (page - 1));
+ }
+ catch(Exception e){
+ JewelrycraftMod.logger.info("Trying to display an item but gets this error: " + e.getMessage() + "\nThe item causing the issue is: " + item);
+ }
GL11.glDisable(GL11.GL_LIGHTING);
i++;
}
@@ -113,7 +118,7 @@ public class GuiJewelryModifier extends GuiContainer
((GuiButton)buttonList.get(2)).enabled = true;
((GuiButton)buttonList.get(3)).enabled = true;
((GuiButton)button).enabled = false;
- enabled = ((GuiButton)button).id;
+ enabled = ((GuiButton)button).id;
}
}
int i = 0;
@@ -149,21 +154,21 @@ public class GuiJewelryModifier extends GuiContainer
if (((GuiButton)buttonList.get(4)).mousePressed(mc, x, y) && !((GuiButton)buttonList.get(0)).enabled){
JewelryNBT.addIngotColor(targetItem, 16777215);
JewelryNBT.addMetal(targetItem, new ItemStack(Item.getItemById(0), 0, 0));
- if(selectedItem != null) JewelryNBT.addMetal(targetItem, this.selectedItem);
+ if (selectedItem != null) JewelryNBT.addMetal(targetItem, this.selectedItem);
JewelrycraftMod.netWrapper.sendToServer(new PacketRequestSetSlot(targetItem));
}
if (((GuiButton)buttonList.get(4)).mousePressed(mc, x, y) && !((GuiButton)buttonList.get(1)).enabled){
JewelryNBT.addGemColor(targetItem, 16777215);
JewelryNBT.addGem(targetItem, new ItemStack(Item.getItemById(0), 0, 0));
- if(selectedItem != null) JewelryNBT.addGem(targetItem, this.selectedItem);
+ if (selectedItem != null) JewelryNBT.addGem(targetItem, this.selectedItem);
JewelrycraftMod.netWrapper.sendToServer(new PacketRequestSetSlot(targetItem));
}
if (((GuiButton)buttonList.get(4)).mousePressed(mc, x, y) && !((GuiButton)buttonList.get(2)).enabled){
- if(selectedItem != null) JewelryNBT.addItem(targetItem, selectedItem);
+ if (selectedItem != null) JewelryNBT.addItem(targetItem, selectedItem);
JewelrycraftMod.netWrapper.sendToServer(new PacketRequestSetSlot(targetItem));
}
if (((GuiButton)buttonList.get(4)).mousePressed(mc, x, y) && !((GuiButton)buttonList.get(3)).enabled){
- if(!selectedItems.isEmpty()) JewelryNBT.addModifiers(targetItem, selectedItems);
+ if (!selectedItems.isEmpty()) JewelryNBT.addModifiers(targetItem, selectedItems);
JewelrycraftMod.netWrapper.sendToServer(new PacketRequestSetSlot(targetItem));
}
}