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 --- .../java/darkknight/jewelrycraft/JewelrycraftMod.java | 17 +++++++++-------- .../jewelrycraft/client/gui/GuiJewelryModifier.java | 8 ++++---- .../jewelrycraft/client/gui/GuiTabIntroduction.java | 2 +- .../darkknight/jewelrycraft/model/ModelSmelter.java | 8 ++++---- .../jewelrycraft/recipes/CraftingRecipes.java | 2 +- .../darkknight/jewelrycraft/util/JewelrycraftUtil.java | 3 +++ 6 files changed, 22 insertions(+), 18 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/darkknight/jewelrycraft/JewelrycraftMod.java b/src/main/java/darkknight/jewelrycraft/JewelrycraftMod.java index a1c6227..ae6cb6d 100644 --- a/src/main/java/darkknight/jewelrycraft/JewelrycraftMod.java +++ b/src/main/java/darkknight/jewelrycraft/JewelrycraftMod.java @@ -58,7 +58,7 @@ public class JewelrycraftMod public static File liquidsConf; public static SimpleNetworkWrapper netWrapper; public static boolean fancyRender; - List authorList = new ArrayList(); +// List authorList = new ArrayList(); /** * Pre initialization of mod stuff. @@ -69,7 +69,7 @@ public class JewelrycraftMod @EventHandler public void preInit(FMLPreInitializationEvent e) throws IOException { - ModMetadata metadata = e.getModMetadata(); +// ModMetadata metadata = e.getModMetadata(); dir = e.getModConfigurationDirectory(); ConfigHandler.INSTANCE.loadConfig(e); BlockList.preInit(e); @@ -80,12 +80,13 @@ public class JewelrycraftMod EntityList.preInit(e); VillageHandler.preInit(e); EventList.preInit(e); - authorList.add("OnyxDarkKnight"); - metadata.autogenerated = false; - metadata.authorList = authorList; - metadata.description = "Jewelrycraft 2 is a mod about creating jewellery and imbuing them with mystical powers. However, they have both positives and negatives. There are also curses, some good, some bad. Maybe acquiring some wouldn't be that bad."; - metadata.credits = "domi1819, MrCompost, pau101, bspkrs"; - metadata.url = "https://github.com/sor1n/Jewelrycraft"; +// authorList.add("OnyxDarkKnight"); +// metadata.autogenerated = false; +// metadata.authorList = authorList; +// metadata.description = "Jewelrycraft 2 is a mod about creating jewellery and imbuing them with mystical powers. However, they have both positives and negatives. There are also curses, some good, some bad. Maybe acquiring some wouldn't be that bad."; +// metadata.credits = "domi1819, MrCompost, pau101, bspkrs, DamienHazard"; +// metadata.url = "http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/2414865-jewelrycraft-2-customizable-jewelry-with-special"; +// metadata.logoFile = "/FullSmelter.png"; } @EventHandler 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: diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelSmelter.java b/src/main/java/darkknight/jewelrycraft/model/ModelSmelter.java index 8fc9c11..d662a71 100644 --- a/src/main/java/darkknight/jewelrycraft/model/ModelSmelter.java +++ b/src/main/java/darkknight/jewelrycraft/model/ModelSmelter.java @@ -45,25 +45,25 @@ public class ModelSmelter extends ModelBase { textureWidth = 64; textureHeight = 32; - Support1 = new ModelRenderer(this, 0, 0); + Support1 = new ModelRenderer(this, 0, 14); Support1.addBox(0F, 0F, 0F, 2, 15, 3); Support1.setRotationPoint(6F, 9F, -1F); Support1.setTextureSize(64, 32); Support1.mirror = true; setRotation(Support1, 0F, 0F, 0F); - Support2 = new ModelRenderer(this, 0, 0); + Support2 = new ModelRenderer(this, 0, 14); Support2.addBox(0F, 0F, 0F, 2, 15, 3); Support2.setRotationPoint(-8F, 9F, -1F); Support2.setTextureSize(64, 32); Support2.mirror = true; setRotation(Support2, 0F, 0F, 0F); - Hold1 = new ModelRenderer(this, 0, 0); + Hold1 = new ModelRenderer(this, 0, 14); Hold1.addBox(0F, 0F, 0F, 2, 1, 1); Hold1.setRotationPoint(4F, 11F, 0F); Hold1.setTextureSize(64, 32); Hold1.mirror = true; setRotation(Hold1, 0F, 0F, 0F); - Hold2 = new ModelRenderer(this, 0, 0); + Hold2 = new ModelRenderer(this, 0, 14); Hold2.addBox(0F, 0F, 0F, 2, 1, 1); Hold2.setRotationPoint(-6F, 11F, 0F); Hold2.setTextureSize(64, 32); diff --git a/src/main/java/darkknight/jewelrycraft/recipes/CraftingRecipes.java b/src/main/java/darkknight/jewelrycraft/recipes/CraftingRecipes.java index ce88f5f..53229f3 100644 --- a/src/main/java/darkknight/jewelrycraft/recipes/CraftingRecipes.java +++ b/src/main/java/darkknight/jewelrycraft/recipes/CraftingRecipes.java @@ -42,7 +42,7 @@ public class CraftingRecipes // Blocks GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BlockList.molder), "x x", "xxx", 'x', Blocks.cobblestone)); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BlockList.smelter), "xyx", "x x", "xzx", 'x', Blocks.cobblestone, 'y', Items.bucket, 'z', Items.lava_bucket)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BlockList.jewelCraftingTable), "xxx", "y y", "y y", 'x', Blocks.planks, 'y', Blocks.cobblestone)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BlockList.jewelCraftingTable), "xxx", "y y", "y y", 'x', Blocks.planks, 'y', Blocks.stone)); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BlockList.displayer, 2), " x ", "xxx", "yyy", 'x', Items.iron_ingot, 'y', Blocks.emerald_block)); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BlockList.shadowBlock, 1), "xxx", "xxx", "xxx", 'x', ItemList.shadowIngot)); GameRegistry.addRecipe(new ItemStack(BlockList.jewelAltar, 1), "sws", "bwb", "bbb", 's', Blocks.end_stone, 'w', new ItemStack(Blocks.wool, 1, 5), 'b', Blocks.nether_brick); diff --git a/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java b/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java index 144f653..a1a6eb9 100644 --- a/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java +++ b/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java @@ -53,6 +53,9 @@ public class JewelrycraftUtil for(Object item: GameData.getItemRegistry()){ ArrayList items = new ArrayList(); if (Loader.isModLoaded("Mantle") && ((Item)item).getUnlocalizedName().equals("Mantle:item.mantle.manual")) continue; + if (Loader.isModLoaded("Fossil/Archeology") && ((Item)item).getUnlocalizedName().equals("Fossil/Archeology") && (((Item)item).getUnlocalizedName().equals("legBone") || + ((Item)item).getUnlocalizedName().equals("uniqueItem") || ((Item)item).getUnlocalizedName().equals("foot") || ((Item)item).getUnlocalizedName().equals("skull") || + ((Item)item).getUnlocalizedName().equals("armBone") || ((Item)item).getUnlocalizedName().equals("dinoRibCage") || ((Item)item).getUnlocalizedName().equals("vertebrae"))) continue; if (item != null && ((Item)item).getHasSubtypes()) ((Item)item).getSubItems((Item)item, null, items); else objects.add(new ItemStack((Item)item)); -- cgit v1.2.3