From 17c10d87711b3e587c5fb2fb55cdc4eb8a61b75a Mon Sep 17 00:00:00 2001 From: OnyxDarkKnight Date: Tue, 28 Apr 2015 13:25:17 +0100 Subject: - 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 --- .../darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java | 8 ++++---- .../darkknight/jewelrycraft/client/gui/GuiTabIntroduction.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/client') 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)); } } diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabIntroduction.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabIntroduction.java index b6f4ca6..ebed63b 100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabIntroduction.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTabIntroduction.java @@ -30,7 +30,7 @@ public class GuiTabIntroduction extends GuiTab Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text); break; case 2: - text = "block in this giude. Please be aware that even if you can add anything as a modifier and can have multiple modifiers on one jewelry, this mod is still in alpha and does not have that many modifiers implemtnted and currently don't have any different effects depending on"; + text = "block in this guide. Please be aware that even if you can add anything as a modifier and can have multiple modifiers on one jewelry, this mod is still in alpha and does not have that many modifiers implemented and currently don't have any different effects depending on"; Page.addTextPage(gui, gui.getLeft() + xPos, gui.getTop(), text); break; case 3: -- cgit v1.2.3