- Fixed an issue with the Liquids tab

- Changed Entity registration so it only uses 'registerModEntity' to fix potential issues
- Added crystal blocks
- Changed Jewelry Tab to not override TiCon tabs (sorry TiCon, your system is good, but not for me)
- The player renders in the Jewelry GUI (makes it easier for you to see how the jewelry render)
- The Pentagram now has an actual effect
- The Pentagram now renders beneath your feet when you look down and no longer does it in your inventory; it is also a lot smaller
- Working on Structures
- Created my own WeightedRandomItem (why isn't this in vanilla?)
- Updated the curse API so now people can specify when a curse can be activated (I believe the world is all you need :p)
- Some curses can no longer aquired in hardcore (such as Rotten Heart, Midas Touch etc) which would make it impossible to work with and require a total restart of the game (as the only way to get rid of them is by dying to replace them)

Hooraaay for proper changelogs!

3 files changed, 59 insertions, 5 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemList.java b/src/main/java/darkknight/jewelrycraft/item/ItemList.java
index 0d8c61c..064ee58 100644
--- a/src/main/java/darkknight/jewelrycraft/item/ItemList.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemList.java
@@ -23,6 +23,7 @@ public class ItemList
     public static ItemMoltenMetalBucket bucket;
     public static ItemMoltenMetal metal;
     public static Item goldObj;
+    public static Item structureGen;
     private static boolean isInitialized = false;
     
     /**
@@ -43,6 +44,7 @@ public class ItemList
         metal = (ItemMoltenMetal)new ItemMoltenMetal().setUnlocalizedName(Variables.MODID + ".bucket");
         jewelryModifier = new ItemJewelryModifier().setUnlocalizedName(Variables.MODID + ".jewelryModifier").setTextureName(Variables.MODID + ":jewelryModifier").setCreativeTab(JewelrycraftMod.jewelrycraft);
         goldObj = new ItemGoldObj().setUnlocalizedName(Variables.MODID + ".goldObject");
+        structureGen = new ItemStructureGen().setUnlocalizedName(Variables.MODID + ".structureGen").setTextureName(Variables.MODID + ":structureGen").setCreativeTab(JewelrycraftMod.jewelrycraft);
         
         GameRegistry.registerItem(thiefGloves, "thiefGloves");
         GameRegistry.registerItem(shadowIngot, "shadowIngot");
@@ -57,6 +59,7 @@ public class ItemList
         GameRegistry.registerItem(metal, "moltenMetal");
         GameRegistry.registerItem(jewelryModifier, "jewelryModifier");
         GameRegistry.registerItem(goldObj, "goldObject");
+        GameRegistry.registerItem(structureGen, "structureGen");
         
         OreDictionary.registerOre("ingotShadow", new ItemStack(ItemList.shadowIngot));
     }
diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetalBucket.java b/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetalBucket.java
index 4fe0bd2..c7d32b4 100644
--- a/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetalBucket.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetalBucket.java
@@ -216,11 +216,18 @@ public class ItemMoltenMetalBucket extends Item
     @Override
     public String getItemStackDisplayName(ItemStack stack)
     {
-        if (JewelryNBT.ingot(stack) != null){
-            ItemStack ingot = JewelryNBT.ingot(stack);
-            if (Item.getIdFromItem(ingot.getItem()) == Block.getIdFromBlock(Blocks.stained_glass) || Item.getIdFromItem(ingot.getItem()) == Block.getIdFromBlock(Blocks.stained_hardened_clay) || Item.getIdFromItem(ingot.getItem()) == Block.getIdFromBlock(Blocks.wool) || Item.getIdFromItem(ingot.getItem()) == Block.getIdFromBlock(Blocks.carpet)) ingot.setItemDamage(15 - ingot.getItemDamage());
-            return StatCollector.translateToLocal(getUnlocalizedNameInefficiently(stack) + ".name").trim() + " " + ingot.getDisplayName().replace("Ingot", " ").trim();
+        try{
+            if (JewelryNBT.ingot(stack) != null){
+                ItemStack ingot = JewelryNBT.ingot(stack);
+                if (ingot != null){
+                    if (Item.getIdFromItem(ingot.getItem()) == Block.getIdFromBlock(Blocks.stained_glass) || Item.getIdFromItem(ingot.getItem()) == Block.getIdFromBlock(Blocks.stained_hardened_clay) || Item.getIdFromItem(ingot.getItem()) == Block.getIdFromBlock(Blocks.wool) || Item.getIdFromItem(ingot.getItem()) == Block.getIdFromBlock(Blocks.carpet)) ingot.setItemDamage(15 - ingot.getItemDamage());
+                    return StatCollector.translateToLocal(getUnlocalizedNameInefficiently(stack) + ".name").trim() + " " + ingot.getDisplayName().replace("Ingot", " ").trim();
+                }else return StatCollector.translateToLocal("bucket.unknown");
+            }
+        }
+        catch(Exception e){
+            System.out.println("Error: " + e);
         }
-        return ("" + StatCollector.translateToLocal(getUnlocalizedNameInefficiently(stack) + ".name")).trim() + " Metal";
+        return ("" + StatCollector.translateToLocal(getUnlocalizedNameInefficiently(stack) + ".name")).trim() + " " + StatCollector.translateToLocal("info.jewelrycraft2.metal");
     }
 }
diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemStructureGen.java b/src/main/java/darkknight/jewelrycraft/item/ItemStructureGen.java
new file mode 100644
index 0000000..6b736d2
--- /dev/null
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemStructureGen.java
@@ -0,0 +1,44 @@
+package darkknight.jewelrycraft.item;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.world.World;
+import net.minecraft.world.gen.feature.WorldGenerator;
+import darkknight.jewelrycraft.worldGen.WorldGenStructure1;
+
+public class ItemStructureGen extends Item
+{
+    int structure = 0;
+    WorldGenerator[] structures = new WorldGenerator[]{new WorldGenStructure1(), new WorldGenStructure1(), new WorldGenStructure1()};
+    
+    public ItemStructureGen()
+    {
+        super();
+    }
+    
+    @Override
+    public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player)
+    {
+        if (!world.isRemote){
+            if (!player.isSneaking()){
+                if (structure < structures.length - 1) structure++;
+                else structure = 0;
+            }else
+            {
+                if (structure > 0) structure--;
+                else structure = structures.length - 1;                
+            }
+            player.addChatMessage(new ChatComponentText("Structure no. " + structure));
+        }
+        return stack;
+    }
+    
+    @Override
+    public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int par1, float par2, float par3, float par4)
+    {
+        structures[structure].generate(world, itemRand, x, y + 1, z);
+        return true;
+    }
+}
\ No newline at end of file