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 13:25:17 +0100
committerOnyxDarkKnight <sor1n.iliutza16@gmail.com>2015-04-28 13:25:17 +0100
commit17c10d87711b3e587c5fb2fb55cdc4eb8a61b75a (patch)
treee01ce7142a5812998e7c1da0c2f82f3a1ad72195 /src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java
parent78d7a3b4d653f1d7ec311f92677b3f6efbc09fd6 (diff)
- Fixed some grammatical errors in the guide.
- Made the Smelter basin and bucket look metallic - Made the Jeweler's Crafting Table texture to have a wooden top and stone legs - Updated forge to version 10.13.3.1395 - Changed the Jeweler's Crafting Recipe to use stone instead of cobblestone - Fixed Fossils and Archeology from crashing - Added a mcmod.info and a logo to it
Diffstat (limited to 'src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java')
-rw-r--r--src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java
index dd653ce..64c8dda 100644
--- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java
+++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java
@@ -149,21 +149,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));
- 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));
- 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){
- 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){
- JewelryNBT.addModifiers(targetItem, selectedItems);
+ if(!selectedItems.isEmpty()) JewelryNBT.addModifiers(targetItem, selectedItems);
JewelrycraftMod.netWrapper.sendToServer(new PacketRequestSetSlot(targetItem));
}
}