Fixed a Jenkins issue

27 files changed, 367 insertions, 320 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/JewelrycraftMod.java b/src/main/java/darkknight/jewelrycraft/JewelrycraftMod.java
index f708e78..6f04bd6 100644
--- a/src/main/java/darkknight/jewelrycraft/JewelrycraftMod.java
+++ b/src/main/java/darkknight/jewelrycraft/JewelrycraftMod.java
@@ -11,14 +11,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Logger;
 import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.Entity;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.gen.structure.MapGenStructureIO;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.oredict.OreDictionary;
-import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.Mod.Instance;
@@ -28,55 +22,29 @@ import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.event.FMLServerStartingEvent;
-import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
-import cpw.mods.fml.common.registry.EntityRegistry;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.VillagerRegistry;
-import cpw.mods.fml.relauncher.Side;
 import darkknight.jewelrycraft.block.BlockList;
-import darkknight.jewelrycraft.client.gui.GuiHandler;
 import darkknight.jewelrycraft.commands.JewelrycraftCommands;
 import darkknight.jewelrycraft.config.ConfigHandler;
 import darkknight.jewelrycraft.curses.CurseList;
-import darkknight.jewelrycraft.damage.DamageSourceList;
-import darkknight.jewelrycraft.effects.EffectsList;
-import darkknight.jewelrycraft.entities.EntityHalfHeart;
-import darkknight.jewelrycraft.entities.EntityHeart;
-import darkknight.jewelrycraft.events.BlockEventHandler;
-import darkknight.jewelrycraft.events.BucketHandler;
-import darkknight.jewelrycraft.events.EntityEventHandler;
-import darkknight.jewelrycraft.events.EventCommonHandler;
-import darkknight.jewelrycraft.events.KeyBindings;
+import darkknight.jewelrycraft.entities.EntityList;
+import darkknight.jewelrycraft.events.EventList;
 import darkknight.jewelrycraft.item.ItemList;
-import darkknight.jewelrycraft.network.PacketClearColorCache;
-import darkknight.jewelrycraft.network.PacketKeyPressEvent;
-import darkknight.jewelrycraft.network.PacketRequestLiquidData;
-import darkknight.jewelrycraft.network.PacketRequestPlayerInfo;
-import darkknight.jewelrycraft.network.PacketRequestSetSlot;
-import darkknight.jewelrycraft.network.PacketSendServerPlayersInfo;
-import darkknight.jewelrycraft.network.PacketSendLiquidData;
-import darkknight.jewelrycraft.network.PacketSendClientPlayerInfo;
+import darkknight.jewelrycraft.network.PacketHandler;
 import darkknight.jewelrycraft.proxy.CommonProxy;
 import darkknight.jewelrycraft.recipes.CraftingRecipes;
-import darkknight.jewelrycraft.util.JewelrycraftUtil;
 import darkknight.jewelrycraft.util.Variables;
-import darkknight.jewelrycraft.worldGen.Generation;
-import darkknight.jewelrycraft.worldGen.village.ComponentJewelry;
-import darkknight.jewelrycraft.worldGen.village.JCTrades;
-import darkknight.jewelrycraft.worldGen.village.VillageJewelryHandler;
+import darkknight.jewelrycraft.worldGen.village.VillageHandler;
 
-@Mod (modid = Variables.MODID, name = Variables.MODNAME, version = Variables.VERSION, guiFactory = Variables.CONFIG_GUI)
+@Mod (modid = Variables.MODID, name = Variables.MODNAME, version = Variables.VERSION, guiFactory = Variables.CONFIG_GUI, acceptedMinecraftVersions = "[1.7.10,1.8)", canBeDeactivated = true)
 public class JewelrycraftMod
 {
     @Instance (Variables.MODID)
     public static JewelrycraftMod instance;
-    
     @SidedProxy (clientSide = Variables.CLIENT_PROXY, serverSide = Variables.SERVER_PROXY)
     public static CommonProxy proxy;
     public static final Logger logger = Logger.getLogger("Jewelrycraft");
     public static File dir;
-    
     public static CreativeTabs jewelrycraft = new CreativeTabs(Variables.MODID){
         @Override
         public Item getTabIconItem()
@@ -84,13 +52,13 @@ public class JewelrycraftMod
             return Item.getItemFromBlock(BlockList.jewelCraftingTable);
         }
     };
-    
     public static CreativeTabs liquids = new CreativeTabLiquids("Liquids");
     public static NBTTagCompound saveData = new NBTTagCompound();
     public static NBTTagCompound clientData = new NBTTagCompound();
     public static File liquidsConf;
     public static SimpleNetworkWrapper netWrapper;
     public static boolean fancyRender;
+    List<String> authorList = new ArrayList<String>();
     
     /**
      * Pre initialization of mod stuff.
@@ -101,97 +69,40 @@ public class JewelrycraftMod
     @EventHandler
     public void preInit(FMLPreInitializationEvent e) throws IOException
     {
+        ModMetadata metadata = e.getModMetadata();
+        dir = e.getModConfigurationDirectory();
         ConfigHandler.INSTANCE.loadConfig(e);
         BlockList.preInit(e);
         ItemList.preInit(e);
         CraftingRecipes.preInit(e);
         CurseList.preInit(e);
-        OreDictionary.registerOre("ingotShadow", new ItemStack(ItemList.shadowIngot));
-        OreDictionary.registerOre("oreShadow", new ItemStack(BlockList.shadowOre));
-        VillagerRegistry.instance().registerVillagerId(3000);
-        VillagerRegistry.instance().registerVillageTradeHandler(3000, new JCTrades());
-        VillagerRegistry.instance().registerVillageCreationHandler(new VillageJewelryHandler());
-        try{
-            MapGenStructureIO.func_143031_a(ComponentJewelry.class, Variables.MODID + ":Jewelry");
-        }
-        catch(Throwable e2){
-            logger.severe("Error registering Jewelrycraft Structures with Vanilla Minecraft: this is expected in versions earlier than 1.7.10");
-        }
-        MinecraftForge.EVENT_BUS.register(new EntityEventHandler());
-        MinecraftForge.EVENT_BUS.register(new BlockEventHandler());
-        MinecraftForge.EVENT_BUS.register(BucketHandler.INSTANCE);
-        FMLCommonHandler.instance().bus().register(new EventCommonHandler());
-        BucketHandler.INSTANCE.buckets.put(BlockList.moltenMetal, ItemList.bucket);
-        
-        ModMetadata metadata = e.getModMetadata();
-        List<String> authorList = new ArrayList<String>();
-        
+        PacketHandler.preInit(e);
+        EntityList.preInit(e);
+        VillageHandler.preInit(e);
+        EventList.preInit(e);
         authorList.add("OnyxDarkKnight");
         authorList.add("bspkrs");
         authorList.add("domi1819");
-        
-        dir = e.getModConfigurationDirectory();
-        proxy.preInit();
-        netWrapper = NetworkRegistry.INSTANCE.newSimpleChannel(Variables.MODID);
-        netWrapper.registerMessage(PacketRequestLiquidData.class, PacketRequestLiquidData.class, 0, Side.SERVER);
-        netWrapper.registerMessage(PacketSendLiquidData.class, PacketSendLiquidData.class, 1, Side.CLIENT);
-        netWrapper.registerMessage(PacketClearColorCache.class, PacketClearColorCache.class, 2, Side.CLIENT);
-        netWrapper.registerMessage(PacketKeyPressEvent.class, PacketKeyPressEvent.class, 3, Side.SERVER);
-        netWrapper.registerMessage(PacketRequestPlayerInfo.class, PacketRequestPlayerInfo.class, 4, Side.SERVER);
-        netWrapper.registerMessage(PacketSendClientPlayerInfo.class, PacketSendClientPlayerInfo.class, 5, Side.CLIENT);
-        netWrapper.registerMessage(PacketSendServerPlayersInfo.class, PacketSendServerPlayersInfo.class, 6, Side.CLIENT);
-        netWrapper.registerMessage(PacketRequestSetSlot.class, PacketRequestSetSlot.class, 7, Side.SERVER);
-        
         metadata.autogenerated = false;
         metadata.authorList = authorList;
         metadata.url = "https://github.com/sor1n/Jewelrycraft";
-        
-        createEntity(EntityHeart.class, Variables.MODID + ".Heart", 0xFF0000, 0xFF0000, false);
-        createEntity(EntityHalfHeart.class, Variables.MODID + ".Half-Heart", 0x000000, 0xFF0000, false);
-
-    }
-
-    public void createEntity(Class<? extends Entity> entity, String entityName, int solidColor, int spotColor, boolean hasSpawnEgg)
-    {
-        int randomID = EntityRegistry.findGlobalUniqueEntityId();
-        if(hasSpawnEgg) EntityRegistry.registerGlobalEntityID(entity, entityName, randomID, solidColor, spotColor);
-        else EntityRegistry.registerGlobalEntityID(entity, entityName, randomID);
-        EntityRegistry.registerModEntity(entity, entityName, randomID, this, 40, 3, true);
     }
     
-    /**
-     * Initializes the world generation and key bindings.
-     *
-     * @param e FMLInitializationEvent
-     */
     @EventHandler
     public void init(FMLInitializationEvent e)
     {
-        GameRegistry.registerWorldGenerator(new Generation(), 0);
-        if (FMLCommonHandler.instance().getSide() == Side.CLIENT) FMLCommonHandler.instance().bus().register(new KeyBindings());
-        new GuiHandler();
-        FMLCommonHandler.instance().bus().register(ConfigHandler.INSTANCE);
+        EventList.init(e);
     }
     
-    /**
-     * Post initialization of metals, modifiers and others.
-     *
-     * @param e FMLPostInitializationEvent
-     */
     @EventHandler
     public void postInit(FMLPostInitializationEvent e)
     {
-        JewelrycraftUtil.addMetals();
-        JewelrycraftUtil.jamcrafters();
-        EffectsList.postInit(e);
-        DamageSourceList.postInit(e);
-        proxy.postInit();
+        EventList.postInit(e);
     }
-
+    
     @Mod.EventHandler
     public void serverLoad(FMLServerStartingEvent event)
     {
         event.registerServerCommand(new JewelrycraftCommands());
     }
-
 }
diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockList.java b/src/main/java/darkknight/jewelrycraft/block/BlockList.java
index a42a1f3..5051074 100644
--- a/src/main/java/darkknight/jewelrycraft/block/BlockList.java
+++ b/src/main/java/darkknight/jewelrycraft/block/BlockList.java
@@ -2,11 +2,14 @@ package darkknight.jewelrycraft.block;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
+import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.oredict.OreDictionary;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.registry.GameRegistry;
 import darkknight.jewelrycraft.JewelrycraftMod;
+import darkknight.jewelrycraft.item.ItemList;
 import darkknight.jewelrycraft.tileentity.TileEntityAltar;
 import darkknight.jewelrycraft.tileentity.TileEntityBlockShadow;
 import darkknight.jewelrycraft.tileentity.TileEntityDisplayer;
@@ -26,52 +29,47 @@ public class BlockList
     public static Fluid moltenMetalFluid;
     private static boolean isInitialized = false;
     
-    /**
-     * @param e
-     */
     public static void preInit(FMLPreInitializationEvent e)
     {
-        if (!isInitialized){
-            shadowOre = new BlockJCOre().setHardness(3.0F).setResistance(5.0F).setStepSound(Block.soundTypePiston).setBlockTextureName(Variables.MODID + ":oreShadow").setBlockName(Variables.MODID + ".oreShadow").setCreativeTab(JewelrycraftMod.jewelrycraft);
-            smelter = new BlockSmelter().setHardness(5.0F).setResistance(6.0F).setStepSound(Block.soundTypePiston).setBlockName(Variables.MODID + ".smelter").setCreativeTab(JewelrycraftMod.jewelrycraft);
-            molder = new BlockMolder(Material.rock).setHardness(5.0F).setResistance(6.0F).setStepSound(Block.soundTypePiston).setBlockName(Variables.MODID + ".molder").setCreativeTab(JewelrycraftMod.jewelrycraft);
-            displayer = new BlockDisplayer(Material.iron).setHardness(5.0F).setResistance(6.0F).setStepSound(Block.soundTypeMetal).setBlockName(Variables.MODID + ".displayer").setCreativeTab(JewelrycraftMod.jewelrycraft);
-            jewelCraftingTable = new BlockJewelrsCraftingTable(Material.rock).setHardness(3.0F).setResistance(5.0F).setStepSound(Block.soundTypePiston).setBlockName(Variables.MODID + ".jewelCraftingTable").setCreativeTab(JewelrycraftMod.jewelrycraft);
-            shadowBlock = new BlockShadow().setHardness(5.0F).setResistance(7.0F).setStepSound(Block.soundTypeMetal).setBlockTextureName(Variables.MODID + ":blockShadow").setBlockName(Variables.MODID + ".blockShadow").setCreativeTab(JewelrycraftMod.jewelrycraft);
-            jewelAltar = new BlockJewelAltar().setHardness(5.0F).setResistance(2.0F).setStepSound(Block.soundTypeMetal).setBlockTextureName(Variables.MODID + ":altar").setBlockName(Variables.MODID + ".altar").setCreativeTab(JewelrycraftMod.jewelrycraft);
-            shadowEye = new BlockShadowEye().setHardness(5.0F).setResistance(6.0F).setStepSound(Block.soundTypePiston).setBlockName(Variables.MODID + ".shadowEye").setCreativeTab(JewelrycraftMod.jewelrycraft);
-            handPedestal = new BlockHandPedestal(Material.rock).setHardness(5.0F).setResistance(6.0F).setStepSound(Block.soundTypePiston).setBlockName(Variables.MODID + ".handPedestal").setCreativeTab(JewelrycraftMod.jewelrycraft);
-            shadowHand = new BlockShadowHand(Material.rock).setStepSound(Block.soundTypePiston).setBlockName(Variables.MODID + ".shadowHand").setCreativeTab(JewelrycraftMod.jewelrycraft).setBlockUnbreakable();
-            midasTouchBlock = new BlockMidasTouch(Material.iron).setHardness(3.0F).setResistance(10.0F).setStepSound(Block.soundTypeMetal).setBlockName(Variables.MODID + ".midasTouchBlock");
-            
-            GameRegistry.registerBlock(shadowOre, "shadowOre");
-            GameRegistry.registerBlock(shadowBlock, "shadowBlock");
-            GameRegistry.registerBlock(smelter, "Smelter");
-            GameRegistry.registerBlock(molder, "Molder");
-            GameRegistry.registerBlock(jewelCraftingTable, "jewelCraftingTable");
-            GameRegistry.registerBlock(displayer, "Displayer");
-            GameRegistry.registerBlock(jewelAltar, "Altar");
-            GameRegistry.registerBlock(shadowEye, "Shadow Eye");
-            GameRegistry.registerBlock(handPedestal, "Stone Bricks Pedestal");
-            GameRegistry.registerBlock(shadowHand, "Shadow Hand");
-            GameRegistry.registerBlock(midasTouchBlock, "Midas Touch Block");
-            
-            GameRegistry.registerTileEntity(TileEntitySmelter.class, Variables.MODID + ":smelter");
-            GameRegistry.registerTileEntity(TileEntityMolder.class, Variables.MODID + ":molder");
-            GameRegistry.registerTileEntity(TileEntityJewelrsCraftingTable.class, Variables.MODID + ":table");
-            GameRegistry.registerTileEntity(TileEntityDisplayer.class, Variables.MODID + ":displayer");
-            GameRegistry.registerTileEntity(TileEntityBlockShadow.class, Variables.MODID + ":blockShadow");
-            GameRegistry.registerTileEntity(TileEntityAltar.class, Variables.MODID + ":altar");
-            GameRegistry.registerTileEntity(TileEntityShadowEye.class, Variables.MODID + ":shadowEye");
-            GameRegistry.registerTileEntity(TileEntityHandPedestal.class, Variables.MODID + ":handPedestal");
-            GameRegistry.registerTileEntity(TileEntityShadowHand.class, Variables.MODID + ":shadowHand");
-            GameRegistry.registerTileEntity(TileEntityMidasTouch.class, Variables.MODID + ":midsaTouch");
-            
-            moltenMetalFluid = new Fluid("metal.molten").setLuminosity(15).setDensity(3000).setTemperature(2000).setViscosity(6000);
-            if (!FluidRegistry.registerFluid(moltenMetalFluid)) moltenMetalFluid = FluidRegistry.getFluid("metal.molten");
-            moltenMetal = new BlockMoltenMetal(moltenMetalFluid, Material.lava);
-            GameRegistry.registerBlock(moltenMetal, "moltenMetalLiquid");
-            isInitialized = true;
-        }
+        shadowOre = new BlockJCOre().setHardness(3.0F).setResistance(5.0F).setStepSound(Block.soundTypePiston).setBlockTextureName(Variables.MODID + ":oreShadow").setBlockName(Variables.MODID + ".oreShadow").setCreativeTab(JewelrycraftMod.jewelrycraft);
+        smelter = new BlockSmelter().setHardness(5.0F).setResistance(6.0F).setStepSound(Block.soundTypePiston).setBlockName(Variables.MODID + ".smelter").setCreativeTab(JewelrycraftMod.jewelrycraft);
+        molder = new BlockMolder(Material.rock).setHardness(5.0F).setResistance(6.0F).setStepSound(Block.soundTypePiston).setBlockName(Variables.MODID + ".molder").setCreativeTab(JewelrycraftMod.jewelrycraft);
+        displayer = new BlockDisplayer(Material.iron).setHardness(5.0F).setResistance(6.0F).setStepSound(Block.soundTypeMetal).setBlockName(Variables.MODID + ".displayer").setCreativeTab(JewelrycraftMod.jewelrycraft);
+        jewelCraftingTable = new BlockJewelrsCraftingTable(Material.rock).setHardness(3.0F).setResistance(5.0F).setStepSound(Block.soundTypePiston).setBlockName(Variables.MODID + ".jewelCraftingTable").setCreativeTab(JewelrycraftMod.jewelrycraft);
+        shadowBlock = new BlockShadow().setHardness(5.0F).setResistance(7.0F).setStepSound(Block.soundTypeMetal).setBlockTextureName(Variables.MODID + ":blockShadow").setBlockName(Variables.MODID + ".blockShadow").setCreativeTab(JewelrycraftMod.jewelrycraft);
+        jewelAltar = new BlockJewelAltar().setHardness(5.0F).setResistance(2.0F).setStepSound(Block.soundTypeMetal).setBlockTextureName(Variables.MODID + ":altar").setBlockName(Variables.MODID + ".altar").setCreativeTab(JewelrycraftMod.jewelrycraft);
+        shadowEye = new BlockShadowEye().setHardness(5.0F).setResistance(6.0F).setStepSound(Block.soundTypePiston).setBlockName(Variables.MODID + ".shadowEye").setCreativeTab(JewelrycraftMod.jewelrycraft);
+        handPedestal = new BlockHandPedestal(Material.rock).setHardness(5.0F).setResistance(6.0F).setStepSound(Block.soundTypePiston).setBlockName(Variables.MODID + ".handPedestal").setCreativeTab(JewelrycraftMod.jewelrycraft);
+        shadowHand = new BlockShadowHand(Material.rock).setStepSound(Block.soundTypePiston).setBlockName(Variables.MODID + ".shadowHand").setCreativeTab(JewelrycraftMod.jewelrycraft).setBlockUnbreakable();
+        midasTouchBlock = new BlockMidasTouch(Material.iron).setHardness(3.0F).setResistance(10.0F).setStepSound(Block.soundTypeMetal).setBlockName(Variables.MODID + ".midasTouchBlock");        
+        moltenMetalFluid = new Fluid("metal.molten").setLuminosity(15).setDensity(3000).setTemperature(2000).setViscosity(6000);
+        if (!FluidRegistry.registerFluid(moltenMetalFluid)) moltenMetalFluid = FluidRegistry.getFluid("metal.molten");
+        moltenMetal = new BlockMoltenMetal(moltenMetalFluid, Material.lava);
+        
+        GameRegistry.registerBlock(shadowOre, "shadowOre");
+        GameRegistry.registerBlock(shadowBlock, "shadowBlock");
+        GameRegistry.registerBlock(smelter, "Smelter");
+        GameRegistry.registerBlock(molder, "Molder");
+        GameRegistry.registerBlock(jewelCraftingTable, "jewelCraftingTable");
+        GameRegistry.registerBlock(displayer, "Displayer");
+        GameRegistry.registerBlock(jewelAltar, "Altar");
+        GameRegistry.registerBlock(shadowEye, "Shadow Eye");
+        GameRegistry.registerBlock(handPedestal, "Stone Bricks Pedestal");
+        GameRegistry.registerBlock(shadowHand, "Shadow Hand");
+        GameRegistry.registerBlock(midasTouchBlock, "Midas Touch Block");
+        GameRegistry.registerBlock(moltenMetal, "moltenMetalLiquid");
+        
+        GameRegistry.registerTileEntity(TileEntitySmelter.class, Variables.MODID + ":smelter");
+        GameRegistry.registerTileEntity(TileEntityMolder.class, Variables.MODID + ":molder");
+        GameRegistry.registerTileEntity(TileEntityJewelrsCraftingTable.class, Variables.MODID + ":table");
+        GameRegistry.registerTileEntity(TileEntityDisplayer.class, Variables.MODID + ":displayer");
+        GameRegistry.registerTileEntity(TileEntityBlockShadow.class, Variables.MODID + ":blockShadow");
+        GameRegistry.registerTileEntity(TileEntityAltar.class, Variables.MODID + ":altar");
+        GameRegistry.registerTileEntity(TileEntityShadowEye.class, Variables.MODID + ":shadowEye");
+        GameRegistry.registerTileEntity(TileEntityHandPedestal.class, Variables.MODID + ":handPedestal");
+        GameRegistry.registerTileEntity(TileEntityShadowHand.class, Variables.MODID + ":shadowHand");
+        GameRegistry.registerTileEntity(TileEntityMidasTouch.class, Variables.MODID + ":midsaTouch");
+        
+        OreDictionary.registerOre("oreShadow", new ItemStack(BlockList.shadowOre));
     }
 }
diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java
index f03f54b..e0688e8 100644
--- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java
+++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java
@@ -48,10 +48,10 @@ public class GuiJewelryModifier extends GuiContainer
         Minecraft.getMinecraft().getTextureManager().bindTexture(texture);
         drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize);
         if (selectedX != 0 && selectedY != 0 && page == selectedPage) drawTexturedModalRect(selectedX, selectedY, 211, 0, 18, 18);
-        for(Map items: selectedItemsPos){
+        for(Map<Integer, Map<Integer, Integer>> items: selectedItemsPos){
             for(Object itemPage: items.keySet()){
-                if (page == (Integer)itemPage) for(Object x: ((Map)items.get(itemPage)).keySet())
-                    drawTexturedModalRect((int)x, (int)((Map)items.get(itemPage)).get(x), 211, 0, 18, 18);
+                if (page == (Integer)itemPage) for(int x: ((Map<Integer, Integer>)items.get(itemPage)).keySet())
+                    drawTexturedModalRect(x, (int)((Map<Integer, Integer>)items.get(itemPage)).get(x), 211, 0, 18, 18);
             }
         }
         this.searchField.drawTextBox();
diff --git a/src/main/java/darkknight/jewelrycraft/curses/Curse.java b/src/main/java/darkknight/jewelrycraft/curses/Curse.java
index 75b4056..fd2a27b 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/Curse.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/Curse.java
@@ -7,12 +7,13 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.world.World;
+import net.minecraftforge.client.event.RenderHandEvent;
 import net.minecraftforge.client.event.RenderPlayerEvent;
 
 public class Curse
 {
-    protected int id, texturepack;
-    protected String name, description;
+    protected int textureID;
+    protected String name, description, texturePackName;
     protected Random rand = new Random();
     private static ArrayList<Curse> curses = new ArrayList<Curse>();
     public static ArrayList<Curse> availableCurses = new ArrayList<Curse>();
@@ -22,11 +23,11 @@ public class Curse
      * @param name the name of the curse
      * @param texturepack the ID of the pack the texture is located in
      */
-    protected Curse(int id, String name, int texturepack)
+    protected Curse(String name, int txtID, String texturepack)
     {
-        this.id = id;
         this.name = name;
-        this.texturepack = texturepack;
+        this.texturePackName = texturepack;
+        this.textureID = txtID;
         curses.add(this);
         availableCurses.add(this);
     }
@@ -54,19 +55,19 @@ public class Curse
     }
     
     /**
-     * @return the curse ID
+     * @return the texture pack ID
      */
-    public int getID()
+    public String getTexturePack()
     {
-        return id;
+        return texturePackName;
     }
     
     /**
-     * @return the texture pack ID
+     * @return the texture ID
      */
-    public int getTexturePack()
+    public int getTextureID()
     {
-        return texturepack;
+        return textureID;
     }
     
     /**
@@ -113,6 +114,9 @@ public class Curse
     public void playerRender(EntityPlayer player, RenderPlayerEvent.Specials.Post event)
     {}
     
+    public void playerHandRender(EntityPlayer player, RenderHandEvent event)
+    {}
+    
     public boolean itemToss()
     {
         return false;
diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java b/src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java
index 62483cd..963e588 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java
@@ -7,9 +7,9 @@ import net.minecraft.world.World;
 
 public class CurseBlind extends Curse
 {
-    public CurseBlind(int id, String name, int text)
+    public CurseBlind(String name, int txtID, String pack)
     {
-        super(id, name, text);
+        super(name, txtID, pack);
     }
     
     @Override
diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java b/src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java
index 8718524..b3d4967 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java
@@ -5,9 +5,9 @@ import net.minecraft.world.World;
 
 public class CurseFlamingSoul extends Curse
 {
-    public CurseFlamingSoul(int id, String name, int text)
+    public CurseFlamingSoul(String name, int txtID, String pack)
     {
-        super(id, name, text);
+        super(name, txtID, pack);
     }
     
     @Override
diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java b/src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java
index 1626925..0093991 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java
@@ -7,9 +7,9 @@ import net.minecraft.world.World;
 
 public class CurseGreed extends Curse
 {    
-    public CurseGreed(int id, String name, int text)
+    public CurseGreed(String name, int txtID, String pack)
     {
-        super(id, name, text);
+        super(name, txtID, pack);
     }
     
     @Override
diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java b/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java
index ad80ec8..1f1628b 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java
@@ -22,9 +22,9 @@ import darkknight.jewelrycraft.util.Variables;
 public class CurseInfamy extends Curse
 {
     MaskRender mask = new MaskRender();
-    public CurseInfamy(int id, String name, int text)
+    public CurseInfamy(String name, int txtID, String pack)
     {
-        super(id, name, text);
+        super(name, txtID, pack);
     }
     
     @Override
@@ -41,6 +41,7 @@ public class CurseInfamy extends Curse
         }
     }
     
+    @Override
     public void playerRender(EntityPlayer player, RenderPlayerEvent.Specials.Post event)
     {
         float yaw = player.prevRotationYawHead + (player.rotationYawHead - player.prevRotationYawHead) * event.partialRenderTick;
diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseList.java b/src/main/java/darkknight/jewelrycraft/curses/CurseList.java
index e31db02..8013dce 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseList.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseList.java
@@ -21,18 +21,18 @@ public class CurseList
     
     public static void preInit(FMLPreInitializationEvent e)
     {
-        rotten = new CurseRottenHeart(0, Variables.MODNAME + ":" + "Rotten Heart", 0);
-        flaming = new CurseFlamingSoul(1, Variables.MODNAME + ":" + "Flaming Soul", 0);
-        greed = new CurseGreed(2, Variables.MODNAME + ":" + "Greed", 0);
-        blind = new CurseBlind(3, Variables.MODNAME + ":" + "Blind", 0);
-        infamy = new CurseInfamy(4, Variables.MODNAME + ":" + "Infamy", 0);
-        midasTouch = new CurseMidasTouch(5, Variables.MODNAME + ":" + "Midas Touch", 0);
-        rabbitsPaw = new CurseRabbitsPaw(6, Variables.MODNAME + ":" + "Rabbit's Paw", 0);
-        pentagram = new CursePentagram(7, Variables.MODNAME + ":" + "Pentagram", 0);
-//        vampireHunger = new CurseMidasTouch(8, Variables.MODNAME + ":" + "Vampire Hunger", 0);
-//        humbleBundle = new CurseMidasTouch(9, Variables.MODNAME + ":" + "Humble Bundle", 0);
-//        deathsTouch = new CurseMidasTouch(10, Variables.MODNAME + ":" + "Deaths Touch", 0);
-//        antichrist = new CurseMidasTouch(11, Variables.MODNAME + ":" + "Antichrist", 0);
-//        moneyEqualsPower = new CurseMidasTouch(12, Variables.MODNAME + ":" + "Money Equals Power", 0);
+        rotten = new CurseRottenHeart(Variables.MODNAME + ":" + "Rotten Heart", 0, Variables.MODID + "_curses_0");
+        flaming = new CurseFlamingSoul(Variables.MODNAME + ":" + "Flaming Soul", 1, Variables.MODID + "_curses_0");
+        greed = new CurseGreed(Variables.MODNAME + ":" + "Greed", 2, Variables.MODID + "_curses_0");
+        blind = new CurseBlind(Variables.MODNAME + ":" + "Blind", 3, Variables.MODID + "_curses_0");
+        infamy = new CurseInfamy(Variables.MODNAME + ":" + "Infamy", 4, Variables.MODID + "_curses_0");
+        midasTouch = new CurseMidasTouch(Variables.MODNAME + ":" + "Midas Touch", 5, Variables.MODID + "_curses_0");
+        rabbitsPaw = new CurseRabbitsPaw(Variables.MODNAME + ":" + "Rabbit's Paw", 6, Variables.MODID + "_curses_0");
+        pentagram = new CursePentagram(Variables.MODNAME + ":" + "Pentagram", 7, Variables.MODID + "_curses_0");
+//        vampireHunger = new CurseMidasTouch(8, Variables.MODNAME + ":" + "Vampire Hunger", 8, 0);
+//        humbleBundle = new CurseMidasTouch(9, Variables.MODNAME + ":" + "Humble Bundle", 9, 0);
+//        deathsTouch = new CurseMidasTouch(10, Variables.MODNAME + ":" + "Deaths Touch", 10, 0);
+//        antichrist = new CurseMidasTouch(11, Variables.MODNAME + ":" + "Antichrist", 11, 0);
+//        moneyEqualsPower = new CurseMidasTouch(12, Variables.MODNAME + ":" + "Money Equals Power", 12, 0);
     }
 }
diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java b/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java
index a2a6da7..8ea21ad 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java
@@ -29,9 +29,9 @@ import darkknight.jewelrycraft.util.JewelrycraftUtil;
 
 public class CurseMidasTouch extends Curse
 {
-    public CurseMidasTouch(int id, String name, int text)
+    public CurseMidasTouch(String name, int txtID, String pack)
     {
-        super(id, name, text);
+        super(name, txtID, pack);
     }
     
     @Override
diff --git a/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java b/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java
index 4ea4ee7..a8f6900 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java
@@ -1,47 +1,44 @@
 package darkknight.jewelrycraft.curses;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.ItemRenderer;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderPlayerEvent;
 import org.lwjgl.opengl.GL11;
-import darkknight.jewelrycraft.item.render.MaskRender;
 import darkknight.jewelrycraft.util.Variables;
 
 public class CursePentagram extends Curse
 {
-    ResourceLocation curse = new ResourceLocation(Variables.MODID, "textures/gui/curses.png");
     float rot = 0F;
     
-    public CursePentagram(int id, String name, int text)
+    public CursePentagram(String name, int txtID, String pack)
     {
-        super(id, name, text);
+        super(name, txtID, pack);
     }
     
     @Override
     public void attackedByPlayerAction(World world, EntityPlayer player, Entity target)
     {}
     
+    @Override
     public void playerRender(EntityPlayer player, RenderPlayerEvent.Specials.Post event)
     {
+        ResourceLocation PENTAGRAM_TEXTURE = new ResourceLocation(Variables.MODID, "textures/gui/" + CurseList.pentagram.getTexturePack() + ".png");
         GL11.glPushMatrix();
-        GL11.glColor4f(1, 1, 1, 1);
+        GL11.glEnable(GL11.GL_BLEND);
+        GL11.glBlendFunc(GL11.GL_ONE, GL11.GL_SRC_COLOR);
         Tessellator tessellator = Tessellator.instance;
         TextureManager texturemanager = Minecraft.getMinecraft().getTextureManager();
-        texturemanager.bindTexture(curse);
+        texturemanager.bindTexture(PENTAGRAM_TEXTURE);
         GL11.glRotatef(rot, 0F, 1F, 0F);
         GL11.glScalef(0.1F, 0.1F, 0.1F);
         GL11.glTranslatef(-16F, 15F, -16F);
         GL11.glRotatef(90F, 1F, 0F, 0F);
-        rot+=3F;
+        rot += 3F;
         if (rot > 360F) rot = 0F;
         float f = 0.00390625F;
         float f1 = 0.00390625F;
@@ -57,6 +54,7 @@ public class CursePentagram extends Curse
         tessellator.addVertexWithUV((double)(x + width), (double)(y + 0), (double)0, (double)((float)(u + width) * f), (double)((float)(v + 0) * f1));
         tessellator.addVertexWithUV((double)(x + 0), (double)(y + 0), (double)0, (double)((float)(u + 0) * f), (double)((float)(v + 0) * f1));
         tessellator.draw();
+        GL11.glDisable(GL11.GL_BLEND);
         GL11.glPopMatrix();
     }
     
diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java b/src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java
index 0e831c2..26ef684 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java
@@ -17,9 +17,9 @@ import net.minecraft.world.World;
 
 public class CurseRabbitsPaw extends Curse
 {
-    public CurseRabbitsPaw(int id, String name, int text)
+    public CurseRabbitsPaw(String name, int txtID, String pack)
     {
-        super(id, name, text);
+        super(name, txtID, pack);
     }
     
     @Override
diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java b/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java
index f7fcfae..3583833 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java
@@ -7,9 +7,9 @@ import net.minecraft.world.World;
 
 public class CurseRottenHeart extends Curse
 {
-    public CurseRottenHeart(int id, String name, int text)
+    public CurseRottenHeart(String name, int txtID, String pack)
     {
-        super(id, name, text);
+        super(name, txtID, pack);
     }
     
     @Override
diff --git a/src/main/java/darkknight/jewelrycraft/entities/EntityList.java b/src/main/java/darkknight/jewelrycraft/entities/EntityList.java
new file mode 100644
index 0000000..e8198aa
--- /dev/null
+++ b/src/main/java/darkknight/jewelrycraft/entities/EntityList.java
@@ -0,0 +1,24 @@
+package darkknight.jewelrycraft.entities;
+
+import net.minecraft.entity.Entity;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.registry.EntityRegistry;
+import darkknight.jewelrycraft.JewelrycraftMod;
+import darkknight.jewelrycraft.util.Variables;
+
+public class EntityList
+{
+    public static void preInit(FMLPreInitializationEvent e)
+    {        
+        createEntity(EntityHeart.class, Variables.MODID + ".Heart", 0xFF0000, 0xFF0000, false);
+        createEntity(EntityHalfHeart.class, Variables.MODID + ".Half-Heart", 0x000000, 0xFF0000, false);
+    }
+
+    public static void createEntity(Class<? extends Entity> entity, String entityName, int solidColor, int spotColor, boolean hasSpawnEgg)
+    {
+        int randomID = EntityRegistry.findGlobalUniqueEntityId();
+        if(hasSpawnEgg) EntityRegistry.registerGlobalEntityID(entity, entityName, randomID, solidColor, spotColor);
+        else EntityRegistry.registerGlobalEntityID(entity, entityName, randomID);
+        EntityRegistry.registerModEntity(entity, entityName, randomID, JewelrycraftMod.instance, 40, 3, true);
+    }
+}
diff --git a/src/main/java/darkknight/jewelrycraft/entities/renders/HeartRender.java b/src/main/java/darkknight/jewelrycraft/entities/renders/HeartRender.java
index f015596..f9da0da 100644
--- a/src/main/java/darkknight/jewelrycraft/entities/renders/HeartRender.java
+++ b/src/main/java/darkknight/jewelrycraft/entities/renders/HeartRender.java
@@ -19,7 +19,6 @@ public class HeartRender extends RenderLiving
     public HeartRender(ModelBase modelBase, float shadowSize)
     {
         super(modelBase, shadowSize);
-//        texture = new ResourceLocation("jewelrycraft", "textures/entities/RedHeart.png");
     }
  
     @Override
diff --git a/src/main/java/darkknight/jewelrycraft/events/EventList.java b/src/main/java/darkknight/jewelrycraft/events/EventList.java
new file mode 100644
index 0000000..4b3fff4
--- /dev/null
+++ b/src/main/java/darkknight/jewelrycraft/events/EventList.java
@@ -0,0 +1,51 @@
+/**
+ * 
+ */
+package darkknight.jewelrycraft.events;
+
+import net.minecraftforge.common.MinecraftForge;
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import darkknight.jewelrycraft.JewelrycraftMod;
+import darkknight.jewelrycraft.block.BlockList;
+import darkknight.jewelrycraft.client.gui.GuiHandler;
+import darkknight.jewelrycraft.config.ConfigHandler;
+import darkknight.jewelrycraft.damage.DamageSourceList;
+import darkknight.jewelrycraft.effects.EffectsList;
+import darkknight.jewelrycraft.item.ItemList;
+import darkknight.jewelrycraft.util.JewelrycraftUtil;
+import darkknight.jewelrycraft.worldGen.Generation;
+
+public class EventList
+{
+    public static void preInit(FMLPreInitializationEvent e)
+    {
+        MinecraftForge.EVENT_BUS.register(new EntityEventHandler());
+        MinecraftForge.EVENT_BUS.register(new BlockEventHandler());
+        MinecraftForge.EVENT_BUS.register(BucketHandler.INSTANCE);
+        FMLCommonHandler.instance().bus().register(new EventCommonHandler());
+        BucketHandler.INSTANCE.buckets.put(BlockList.moltenMetal, ItemList.bucket);
+        JewelrycraftMod.proxy.preInit();
+    }
+    
+    public static void init(FMLInitializationEvent e)
+    {
+        GameRegistry.registerWorldGenerator(new Generation(), 0);
+        if (FMLCommonHandler.instance().getSide() == Side.CLIENT) FMLCommonHandler.instance().bus().register(new KeyBindings());
+        new GuiHandler();
+        FMLCommonHandler.instance().bus().register(ConfigHandler.INSTANCE);
+    }
+    
+    public static void postInit(FMLPostInitializationEvent e)
+    {
+        JewelrycraftUtil.addMetals();
+        JewelrycraftUtil.jamcrafters();
+        EffectsList.postInit(e);
+        DamageSourceList.postInit(e);
+        JewelrycraftMod.proxy.postInit();
+    }
+}
diff --git a/src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java b/src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java
index c5595fa..b69374b 100644
--- a/src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java
+++ b/src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java
@@ -4,22 +4,21 @@ import java.util.Iterator;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.client.event.RenderHandEvent;
 import net.minecraftforge.client.event.RenderPlayerEvent;
 import org.lwjgl.opengl.GL11;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import darkknight.jewelrycraft.curses.Curse;
 import darkknight.jewelrycraft.curses.CurseList;
-import darkknight.jewelrycraft.entities.renders.RenderHelper;
 import darkknight.jewelrycraft.item.render.BraceletRender;
 import darkknight.jewelrycraft.item.render.EarringsRender;
-import darkknight.jewelrycraft.item.render.MaskRender;
-import darkknight.jewelrycraft.model.ModelBracelet;
 import darkknight.jewelrycraft.util.JewelryNBT;
-import darkknight.jewelrycraft.util.PlayerUtils;
 import darkknight.jewelrycraft.util.Variables;
 
 public class PlayerRenderHandler
@@ -27,84 +26,96 @@ public class PlayerRenderHandler
     EarringsRender earrings = new EarringsRender();
     BraceletRender bracelet = new BraceletRender();
     public static NBTTagCompound playersInfo = new NBTTagCompound();
+    float size = 0.055F;
     
     @SubscribeEvent
     public void renderScreen(RenderPlayerEvent.Specials.Post event)
     {
         ModelBiped main = event.renderer.modelBipedMain;
+        ModelRenderer rightArm = event.renderer.modelBipedMain.bipedRightArm;
+        ModelRenderer leftArm = event.renderer.modelBipedMain.bipedLeftArm;
+        ModelRenderer head = event.renderer.modelBipedMain.bipedHead;
         Iterator<EntityPlayer> players = event.entityPlayer.worldObj.playerEntities.iterator();
+        int[] gemColor = {-1, -1, -1, -1};
+        int[] ingotColor = {-1, -1, -1, -1};
+        int earringGem = -1;
+        int earringIngot = -1;
         if (playersInfo != null){
             while (players.hasNext()){
                 EntityPlayer player = players.next();
                 NBTTagCompound playerInfo = (NBTTagCompound)playersInfo.getTag(player.getDisplayName());
                 for(Curse curse: Curse.getCurseList())
-                    if (playerInfo.getInteger(curse.getName()) > 0 && event.entityPlayer.getDisplayName().equals(player.getDisplayName()) && playerInfo.getInteger("cursePoints") > 0) 
-                        curse.playerRender(player, event);
+                    if (playerInfo.getInteger(curse.getName()) > 0 && event.entityPlayer.getDisplayName().equals(player.getDisplayName()) && playerInfo.getInteger("cursePoints") > 0) curse.playerRender(player, event);
                 if (playerInfo.hasKey("ext17") && event.entityPlayer.getDisplayName().equals(player.getDisplayName())){
                     NBTTagCompound nbt = (NBTTagCompound)playerInfo.getTag("ext17");
                     ItemStack item = ItemStack.loadItemStackFromNBT(nbt);
-                    float yaw = player.prevRotationYawHead + (player.rotationYawHead - player.prevRotationYawHead) * event.partialRenderTick;
-                    float yawOffset = player.prevRenderYawOffset + (player.renderYawOffset - player.prevRenderYawOffset) * event.partialRenderTick;
-                    float pitch = player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * event.partialRenderTick;
                     GL11.glPushMatrix();
-                    GL11.glColor4f(1, 1, 1, 1);
-                    GL11.glRotatef(yawOffset, 0, -1, 0);
-                    GL11.glRotatef(yaw - 90, 0, 1, 0);
-                    GL11.glRotatef(pitch, 0, 0, -1);
-                    GL11.glRotatef(90F, 0, 1F, 0F);
-                    RenderHelper.translateToHeadLevel(player);
-                    GL11.glScalef(0.07f, 0.07f, 0.07f);
-                    GL11.glTranslatef(0.0F, 3.0F, -2.0F);
-                    int gemColor = -1;
-                    int ingotColor = -1;
-                    if (JewelryNBT.gem(item) != null) gemColor = JewelryNBT.gemColor(item);
-                    if (JewelryNBT.ingot(item) != null) ingotColor = JewelryNBT.ingotColor(item);
-                    earrings.doRender(event.entityPlayer, 0F, 0F, (float)ingotColor, (float)gemColor, 0F);
+                    if (head.rotateAngleX == 0.0F && head.rotateAngleY == 0.0F && head.rotateAngleZ == 0.0F){
+                        if (head.rotationPointX != 0.0F || head.rotationPointY != 0.0F || head.rotationPointZ != 0.0F) GL11.glTranslatef(head.rotationPointX * size, head.rotationPointY * size, head.rotationPointZ * size);
+                    }else{
+                        GL11.glTranslatef(head.rotationPointX * size, head.rotationPointY * size, head.rotationPointZ * size);
+                        if (head.rotateAngleZ != 0.0F) GL11.glRotatef(head.rotateAngleZ * (180F / (float)Math.PI), 0.0F, 0.0F, 1.0F);
+                        if (head.rotateAngleY != 0.0F) GL11.glRotatef(head.rotateAngleY * (180F / (float)Math.PI), 0.0F, 1.0F, 0.0F);
+                        if (head.rotateAngleX != 0.0F) GL11.glRotatef(head.rotateAngleX * (180F / (float)Math.PI), 1.0F, 0.0F, 0.0F);
+                    }
+                    GL11.glScalef(0.0625f, 0.0625f, 0.0625f);
+                    GL11.glTranslatef(0.0F, 1.0F, -2.0F);
+                    if (JewelryNBT.gem(item) != null) earringGem = JewelryNBT.gemColor(item);
+                    if (JewelryNBT.ingot(item) != null) earringIngot = JewelryNBT.ingotColor(item);
+                    earrings.doRender(event.entityPlayer, 0F, 0F, (float)earringIngot, (float)earringGem, 0F);
                     GL11.glPopMatrix();
                 }
                 for(int i = 10; i <= 13; i++)
                     if (playerInfo.hasKey("ext" + i) && event.entityPlayer.getDisplayName().equals(player.getDisplayName())){
                         NBTTagCompound nbt = (NBTTagCompound)playerInfo.getTag("ext" + i);
                         ItemStack item = ItemStack.loadItemStackFromNBT(nbt);
-                        GL11.glPushMatrix();
-                        GL11.glColor4f(1, 1, 1, 1);
-                        GL11.glTranslatef((i / 12 == 1) ? -0.275F : 0.475F, 0.2F + ((i / 12 == 1) ? (i - 12) * 0.08F : (i - 10) * 0.08F), 0F);
-                        if (player.isSneaking()) GL11.glTranslatef(0F, 0F, -((i == 10 || i == 12) ? (0.1F) : 0.05F));
-                        if (i / 12 == 1){
-                            GL11.glScalef(0.05f, 0.03f, 0.05f);
-                            GL11.glRotatef(main.bipedRightArm.rotateAngleX * (180F / (float)Math.PI), 1F, 0F, 0F);
-                            GL11.glRotatef(main.bipedRightArm.rotateAngleY * (180F / (float)Math.PI), 0F, 1F, 0F);
-                            GL11.glRotatef(main.bipedRightArm.rotateAngleZ * (180F / (float)Math.PI), 0F, 0F, 1F);
-                            int gemColor = -1;
-                            int ingotColor = -1;
-                            if (JewelryNBT.gem(item) != null) gemColor = JewelryNBT.gemColor(item);
-                            if (JewelryNBT.ingot(item) != null) ingotColor = JewelryNBT.ingotColor(item);
-                            bracelet.doRender(event.entityPlayer, 0F, 0F, (float)ingotColor, (float)gemColor, 0.0F);
-                        }else{
-                            GL11.glScalef(0.05f, 0.03f, 0.05f);
-                            GL11.glRotatef(main.bipedLeftArm.rotateAngleX * (180F / (float)Math.PI), 1F, 0F, 0F);
-                            GL11.glRotatef(main.bipedLeftArm.rotateAngleY * (180F / (float)Math.PI), 0F, 1F, 0F);
-                            GL11.glRotatef(main.bipedLeftArm.rotateAngleZ * (180F / (float)Math.PI), 0F, 0F, 1F);
-                            int gemColor = -1;
-                            int ingotColor = -1;
-                            if (JewelryNBT.gem(item) != null) gemColor = JewelryNBT.gemColor(item);
-                            if (JewelryNBT.ingot(item) != null) ingotColor = JewelryNBT.ingotColor(item);
-                            bracelet.doRender(event.entityPlayer, 0F, 0F, (float)ingotColor, (float)gemColor, 0F);
-                        }
-                        GL11.glPopMatrix();
+                        if (JewelryNBT.gem(item) != null) gemColor[i - 10] = JewelryNBT.gemColor(item);
+                        if (JewelryNBT.ingot(item) != null) ingotColor[i - 10] = JewelryNBT.ingotColor(item);
+                    }
+                if ((playerInfo.hasKey("ext10") || playerInfo.hasKey("ext11")) && event.entityPlayer.getDisplayName().equals(player.getDisplayName())){
+                    GL11.glPushMatrix();
+                    GL11.glColor4f(1, 1, 1, 1);
+                    if (rightArm.rotateAngleX == 0.0F && rightArm.rotateAngleY == 0.0F && rightArm.rotateAngleZ == 0.0F){
+                        if (rightArm.rotationPointX != 0.0F || rightArm.rotationPointY != 0.0F || rightArm.rotationPointZ != 0.0F) GL11.glTranslatef(rightArm.rotationPointX * size, rightArm.rotationPointY * size, rightArm.rotationPointZ * size);
+                    }else{
+                        GL11.glTranslatef(rightArm.rotationPointX * size, rightArm.rotationPointY * size, rightArm.rotationPointZ * size);
+                        if (rightArm.rotateAngleZ != 0.0F) GL11.glRotatef(rightArm.rotateAngleZ * (180F / (float)Math.PI), 0.0F, 0.0F, 1.0F);
+                        if (rightArm.rotateAngleY != 0.0F) GL11.glRotatef(rightArm.rotateAngleY * (180F / (float)Math.PI), 0.0F, 1.0F, 0.0F);
+                        if (rightArm.rotateAngleX != 0.0F) GL11.glRotatef(rightArm.rotateAngleX * (180F / (float)Math.PI), 1.0F, 0.0F, 0.0F);
+                    }
+                    GL11.glScalef(0.05f, 0.03f, 0.05f);
+                    bracelet.doRender(event.entityPlayer, (float)ingotColor[0], (float)gemColor[0], (float)ingotColor[1], (float)gemColor[1], 0.0F);
+                    GL11.glPopMatrix();
+                }
+                if ((playerInfo.hasKey("ext12") || playerInfo.hasKey("ext13")) && event.entityPlayer.getDisplayName().equals(player.getDisplayName())){
+                    GL11.glPushMatrix();
+                    GL11.glColor4f(1, 1, 1, 1);
+                    if (leftArm.rotateAngleX == 0.0F && leftArm.rotateAngleY == 0.0F && leftArm.rotateAngleZ == 0.0F){
+                        if (leftArm.rotationPointX != 0.0F || leftArm.rotationPointY != 0.0F || leftArm.rotationPointZ != 0.0F) GL11.glTranslatef(leftArm.rotationPointX * size, leftArm.rotationPointY * size, leftArm.rotationPointZ * size);
+                    }else{
+                        GL11.glTranslatef(leftArm.rotationPointX * size + 0.2F, leftArm.rotationPointY * size, leftArm.rotationPointZ * size);
+                        if (leftArm.rotateAngleZ != 0.0F) GL11.glRotatef(leftArm.rotateAngleZ * (180F / (float)Math.PI), 0.0F, 0.0F, 1.0F);
+                        if (leftArm.rotateAngleY != 0.0F) GL11.glRotatef(leftArm.rotateAngleY * (180F / (float)Math.PI), 0.0F, 1.0F, 0.0F);
+                        if (leftArm.rotateAngleX != 0.0F) GL11.glRotatef(leftArm.rotateAngleX * (180F / (float)Math.PI), 1.0F, 0.0F, 0.0F);
                     }
+                    GL11.glScalef(0.05f, 0.03f, 0.05f);
+                    bracelet.doRender(event.entityPlayer, (float)ingotColor[2], (float)gemColor[2], (float)ingotColor[3], (float)gemColor[3], 0F);
+                    GL11.glPopMatrix();
+                }
             }
         }
     }
     
-    /**
-     * @param string
-     * @return
-     */
-    private boolean checkPlayerInfamy(String string)
+    float rot = 0F;
+    
+    @SubscribeEvent
+    public void renderHand(RenderHandEvent event)
     {
-        NBTTagCompound playerInfo = (NBTTagCompound)playersInfo.getTag(string);
-        if(playerInfo.getInteger(CurseList.infamy.getName()) > 0) return true;
-        return false;
+        if (playersInfo != null){
+            EntityPlayer player = Minecraft.getMinecraft().thePlayer;
+            NBTTagCompound playerInfo = (NBTTagCompound)playersInfo.getTag(player.getDisplayName());
+            for(Curse curse: Curse.getCurseList())
+                if (playerInfo.getInteger(curse.getName()) > 0 && playerInfo.getInteger("cursePoints") > 0) curse.playerHandRender(player, event);
+        }
     }
 }
diff --git a/src/main/java/darkknight/jewelrycraft/events/ScreenHandler.java b/src/main/java/darkknight/jewelrycraft/events/ScreenHandler.java
index 5a7b728..5f15ed5 100644
--- a/src/main/java/darkknight/jewelrycraft/events/ScreenHandler.java
+++ b/src/main/java/darkknight/jewelrycraft/events/ScreenHandler.java
@@ -9,7 +9,6 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
 import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType;
-import net.minecraftforge.event.entity.player.PlayerOpenContainerEvent;
 import org.lwjgl.opengl.GL11;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import darkknight.jewelrycraft.curses.Curse;
@@ -20,14 +19,11 @@ public class ScreenHandler extends Gui
     private Minecraft mc;
     public static NBTTagCompound tagCache = null;
     public static int cooldown;
-    static ResourceLocation texture;
-    static ResourceLocation hearts = new ResourceLocation(Variables.MODID, "textures/gui/hearts.png");
     
-    public ScreenHandler(Minecraft mc, ResourceLocation tex)
+    public ScreenHandler(Minecraft mc)
     {
         super();
         this.mc = mc;
-        texture = tex;
     }
     
     @SubscribeEvent
@@ -39,18 +35,18 @@ public class ScreenHandler extends Gui
             int size = 32;
             ScaledResolution resolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
             if (tagCache.hasKey("cursePoints") && tagCache.getInteger("cursePoints") > 0){
-                mc.renderEngine.bindTexture(hearts);
+                mc.renderEngine.bindTexture(Variables.MISC_TEXTURE);
                 for(Curse curse: Curse.getCurseList()){
                     if (tagCache.hasKey(curse.getName()) && tagCache.getInteger(curse.getName()) > 0){
                         drawTexturedModalRect(-16, -16 + (size - 6) * count, 0, 32, 144, 60);
                         count++;
                     }
                 }
-                mc.renderEngine.bindTexture(texture);
                 count = 0;
                 for(Curse curse: Curse.getCurseList())
                     if (tagCache.hasKey(curse.getName()) && tagCache.getInteger(curse.getName()) > 0){
-                        int tag = curse.getID();
+                        mc.renderEngine.bindTexture(new ResourceLocation(Variables.MODID, "textures/gui/" + curse.getTexturePack() + ".png"));
+                        int tag = curse.getTextureID();
                         GL11.glPushMatrix();
                         GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
                         GL11.glDisable(GL11.GL_LIGHTING);
@@ -63,10 +59,9 @@ public class ScreenHandler extends Gui
                 size = 16;
                 for(Curse curse: Curse.getCurseList())
                     if (tagCache.hasKey(curse.getName()) && tagCache.getInteger(curse.getName()) > 0){
-                        int tag = curse.getID();
                         mc.fontRenderer.drawStringWithShadow(curse.getName().split(":")[1], 30, 11 + (size + 10) * count, 16777215);
                         if (tagCache.getInteger(curse.getName()) == 2){
-                            mc.renderEngine.bindTexture(hearts);
+                            mc.renderEngine.bindTexture(Variables.MISC_TEXTURE);
                             GL11.glPushMatrix();
                             GL11.glEnable(GL11.GL_BLEND);
                             GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
@@ -79,7 +74,7 @@ public class ScreenHandler extends Gui
             }
             GL11.glPushMatrix();
             GL11.glColor4f(1f, 1f, 1f, 1.0f);
-            mc.renderEngine.bindTexture(hearts);
+            mc.renderEngine.bindTexture(Variables.MISC_TEXTURE);
             count = 0;
             size = 16;
             if (tagCache.getFloat("BlueHeart") > 0){
@@ -87,13 +82,13 @@ public class ScreenHandler extends Gui
                     mc.fontRenderer.drawStringWithShadow("x" + (MathHelper.ceiling_float_int(tagCache.getFloat("BlueHeart")) / 2.0F), 15 + 35*count, resolution.getScaledHeight() - 16, 16777215);
             }
             count++;
-            mc.renderEngine.bindTexture(hearts);
+            mc.renderEngine.bindTexture(Variables.MISC_TEXTURE);
             if (tagCache.getFloat("BlackHeart") > 0){
                     drawTexturedModalRect(5 + 35*count, resolution.getScaledHeight() - 20, 1 * size, 0 * size, size, size);
                     mc.fontRenderer.drawStringWithShadow("x" + (MathHelper.ceiling_float_int(tagCache.getFloat("BlackHeart")) / 2.0F), 15 + 35*count, resolution.getScaledHeight() - 16, 16777215);
             }
             count++;
-            mc.renderEngine.bindTexture(hearts);
+            mc.renderEngine.bindTexture(Variables.MISC_TEXTURE);
             if (tagCache.getFloat("WhiteHeart") > 0)
                 drawTexturedModalRect(5 + 35*count, resolution.getScaledHeight() - 20, 2 * size, 1 * size, size, size);
             GL11.glPopMatrix();
diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemGoldObj.java b/src/main/java/darkknight/jewelrycraft/item/ItemGoldObj.java
index 8b87de0..929d442 100644
--- a/src/main/java/darkknight/jewelrycraft/item/ItemGoldObj.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemGoldObj.java
@@ -7,6 +7,7 @@ import java.util.List;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemFood;
 import net.minecraft.item.ItemStack;
@@ -43,12 +44,12 @@ public class ItemGoldObj extends Item
     {
         ItemStack item = JewelryNBT.item(stack);
         if (item != null) return item.getIconIndex();
-        return itemIcon;
+        return new ItemStack(Blocks.end_portal).getIconIndex();
     }
     
     public String getItemStackDisplayName(ItemStack stack)
     {
-        return "Golden " + ((Item.getItemById(Integer.valueOf(stack.getTagCompound().getTag("target").toString().split(",")[0].substring(4).replace("s", ""))) != null && stack != null && JewelryNBT.item(stack) != null) ? JewelryNBT.item(stack).getDisplayName() : "Object");
+        return "Golden " + (stack != null && (Item.getItemById(Integer.valueOf(stack.getTagCompound().getTag("target").toString().split(",")[0].substring(4).replace("s", ""))) != null && JewelryNBT.item(stack) != null) ? JewelryNBT.item(stack).getDisplayName() : "Object");
     }
     
     public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean displayInfo)
diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemList.java b/src/main/java/darkknight/jewelrycraft/item/ItemList.java
index 01f16ca..1ec3fc3 100644
--- a/src/main/java/darkknight/jewelrycraft/item/ItemList.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemList.java
@@ -1,6 +1,8 @@
 package darkknight.jewelrycraft.item;
 
 import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.oredict.OreDictionary;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.registry.GameRegistry;
 import darkknight.jewelrycraft.JewelrycraftMod;
@@ -29,37 +31,36 @@ public class ItemList
      */
     public static void preInit(FMLPreInitializationEvent e)
     {
-        if (!isInitialized){
-            thiefGloves = new ItemThiefGloves().setUnlocalizedName(Variables.MODID + ".thiefGloves").setTextureName(Variables.MODID + ":thiefGloves").setCreativeTab(JewelrycraftMod.jewelrycraft);
-            shadowIngot = new Item().setUnlocalizedName(Variables.MODID + ".ingotShadow").setTextureName(Variables.MODID + ":ingotShadow").setCreativeTab(JewelrycraftMod.jewelrycraft);
-            molds = new ItemMolds().setUnlocalizedName(Variables.MODID + ".mold").setTextureName("Mold").setCreativeTab(JewelrycraftMod.jewelrycraft);
-            clayMolds = new ItemClayMolds().setUnlocalizedName(Variables.MODID + ".mold").setTextureName("Mold").setCreativeTab(JewelrycraftMod.jewelrycraft);
-            ring = (ItemRing)new ItemRing().setUnlocalizedName(Variables.MODID + ".ring").setTextureName(Variables.MODID + ":ring").setCreativeTab(JewelrycraftMod.jewelrycraft);
-            necklace = (ItemNecklace)new ItemNecklace().setUnlocalizedName(Variables.MODID + ".necklace").setTextureName(Variables.MODID + ":necklace").setCreativeTab(JewelrycraftMod.jewelrycraft);
-            bracelet = (ItemBracelet)new ItemBracelet().setUnlocalizedName(Variables.MODID + ".bracelet").setTextureName(Variables.MODID + ":bracelet").setCreativeTab(JewelrycraftMod.jewelrycraft);
-            earrings = (ItemEarrings)new ItemEarrings().setUnlocalizedName(Variables.MODID + ".earrings").setTextureName(Variables.MODID + ":earrings").setCreativeTab(JewelrycraftMod.jewelrycraft);
-            crystal = new ItemCrystal().setUnlocalizedName(Variables.MODID + ".crystal").setTextureName(Variables.MODID + ":crystal").setCreativeTab(JewelrycraftMod.jewelrycraft);
-            guide = new ItemGuide().setUnlocalizedName(Variables.MODID + ".guide").setTextureName(Variables.MODID + ":guide").setCreativeTab(JewelrycraftMod.jewelrycraft);
-            bucket = (ItemMoltenMetalBucket)new ItemMoltenMetalBucket().setUnlocalizedName(Variables.MODID + ".bucket");
-            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");
-            
-            GameRegistry.registerItem(thiefGloves, "thiefGloves");
-            GameRegistry.registerItem(shadowIngot, "shadowIngot");
-            GameRegistry.registerItem(molds, "molds");
-            GameRegistry.registerItem(clayMolds, "clayMolds");
-            GameRegistry.registerItem(ring, "ring");
-            GameRegistry.registerItem(necklace, "necklace");
-            GameRegistry.registerItem(bracelet, "bracelet");
-            GameRegistry.registerItem(earrings, "earrings");
-            GameRegistry.registerItem(crystal, "crystal");
-            GameRegistry.registerItem(guide, "guide");
-            GameRegistry.registerItem(bucket, "moltenMetalBucket");
-            GameRegistry.registerItem(metal, "moltenMetal");
-            GameRegistry.registerItem(jewelryModifier, "jewelryModifier");
-            GameRegistry.registerItem(goldObj, "goldObject");
-            isInitialized = true;
-        }
+        thiefGloves = new ItemThiefGloves().setUnlocalizedName(Variables.MODID + ".thiefGloves").setTextureName(Variables.MODID + ":thiefGloves").setCreativeTab(JewelrycraftMod.jewelrycraft);
+        shadowIngot = new Item().setUnlocalizedName(Variables.MODID + ".ingotShadow").setTextureName(Variables.MODID + ":ingotShadow").setCreativeTab(JewelrycraftMod.jewelrycraft);
+        molds = new ItemMolds().setUnlocalizedName(Variables.MODID + ".mold").setTextureName("Mold").setCreativeTab(JewelrycraftMod.jewelrycraft);
+        clayMolds = new ItemClayMolds().setUnlocalizedName(Variables.MODID + ".mold").setTextureName("Mold").setCreativeTab(JewelrycraftMod.jewelrycraft);
+        ring = (ItemRing)new ItemRing().setUnlocalizedName(Variables.MODID + ".ring").setTextureName(Variables.MODID + ":ring").setCreativeTab(JewelrycraftMod.jewelrycraft);
+        necklace = (ItemNecklace)new ItemNecklace().setUnlocalizedName(Variables.MODID + ".necklace").setTextureName(Variables.MODID + ":necklace").setCreativeTab(JewelrycraftMod.jewelrycraft);
+        bracelet = (ItemBracelet)new ItemBracelet().setUnlocalizedName(Variables.MODID + ".bracelet").setTextureName(Variables.MODID + ":bracelet").setCreativeTab(JewelrycraftMod.jewelrycraft);
+        earrings = (ItemEarrings)new ItemEarrings().setUnlocalizedName(Variables.MODID + ".earrings").setTextureName(Variables.MODID + ":earrings").setCreativeTab(JewelrycraftMod.jewelrycraft);
+        crystal = new ItemCrystal().setUnlocalizedName(Variables.MODID + ".crystal").setTextureName(Variables.MODID + ":crystal").setCreativeTab(JewelrycraftMod.jewelrycraft);
+        guide = new ItemGuide().setUnlocalizedName(Variables.MODID + ".guide").setTextureName(Variables.MODID + ":guide").setCreativeTab(JewelrycraftMod.jewelrycraft);
+        bucket = (ItemMoltenMetalBucket)new ItemMoltenMetalBucket().setUnlocalizedName(Variables.MODID + ".bucket");
+        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");
+        
+        GameRegistry.registerItem(thiefGloves, "thiefGloves");
+        GameRegistry.registerItem(shadowIngot, "shadowIngot");
+        GameRegistry.registerItem(molds, "molds");
+        GameRegistry.registerItem(clayMolds, "clayMolds");
+        GameRegistry.registerItem(ring, "ring");
+        GameRegistry.registerItem(necklace, "necklace");
+        GameRegistry.registerItem(bracelet, "bracelet");
+        GameRegistry.registerItem(earrings, "earrings");
+        GameRegistry.registerItem(crystal, "crystal");
+        GameRegistry.registerItem(guide, "guide");
+        GameRegistry.registerItem(bucket, "moltenMetalBucket");
+        GameRegistry.registerItem(metal, "moltenMetal");
+        GameRegistry.registerItem(jewelryModifier, "jewelryModifier");
+        GameRegistry.registerItem(goldObj, "goldObject");
+        
+        OreDictionary.registerOre("ingotShadow", new ItemStack(ItemList.shadowIngot));
     }
 }
diff --git a/src/main/java/darkknight/jewelrycraft/item/render/BraceletRender.java b/src/main/java/darkknight/jewelrycraft/item/render/BraceletRender.java
index 15b6be4..e9609ae 100644
--- a/src/main/java/darkknight/jewelrycraft/item/render/BraceletRender.java
+++ b/src/main/java/darkknight/jewelrycraft/item/render/BraceletRender.java
@@ -23,7 +23,9 @@ public class BraceletRender extends TileEntitySpecialRenderer
     {
         GL11.glPushMatrix();
         Minecraft.getMinecraft().renderEngine.bindTexture(texture);
-        bracelet.render(entity, 0F, 0F, 0F, (float)z, f, 1.0F);
+        if ((float)z != -1) bracelet.render(entity, 0F, 0F, 0F, (float)z, f, 1.0F);
+        GL11.glTranslatef(0F, 3F, 0F);
+        if ((float)x != -1) bracelet.render(entity, 0F, 0F, 0F, (float)x, (float)y, 1.0F);
         GL11.glPopMatrix();
     }
 }
\ No newline at end of file
diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketHandler.java b/src/main/java/darkknight/jewelrycraft/network/PacketHandler.java
index 3cbea83..0ec7db4 100644
--- a/src/main/java/darkknight/jewelrycraft/network/PacketHandler.java
+++ b/src/main/java/darkknight/jewelrycraft/network/PacketHandler.java
@@ -1,4 +1,24 @@
 package darkknight.jewelrycraft.network;
 
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.network.NetworkRegistry;
+import cpw.mods.fml.relauncher.Side;
+import darkknight.jewelrycraft.JewelrycraftMod;
+import darkknight.jewelrycraft.util.Variables;
+
 public class PacketHandler
-{}
+{
+
+    public static void preInit(FMLPreInitializationEvent e)
+    {
+        JewelrycraftMod.netWrapper = NetworkRegistry.INSTANCE.newSimpleChannel(Variables.MODID);
+        JewelrycraftMod.netWrapper.registerMessage(PacketRequestLiquidData.class, PacketRequestLiquidData.class, 0, Side.SERVER);
+        JewelrycraftMod.netWrapper.registerMessage(PacketSendLiquidData.class, PacketSendLiquidData.class, 1, Side.CLIENT);
+        JewelrycraftMod.netWrapper.registerMessage(PacketClearColorCache.class, PacketClearColorCache.class, 2, Side.CLIENT);
+        JewelrycraftMod.netWrapper.registerMessage(PacketKeyPressEvent.class, PacketKeyPressEvent.class, 3, Side.SERVER);
+        JewelrycraftMod.netWrapper.registerMessage(PacketRequestPlayerInfo.class, PacketRequestPlayerInfo.class, 4, Side.SERVER);
+        JewelrycraftMod.netWrapper.registerMessage(PacketSendClientPlayerInfo.class, PacketSendClientPlayerInfo.class, 5, Side.CLIENT);
+        JewelrycraftMod.netWrapper.registerMessage(PacketSendServerPlayersInfo.class, PacketSendServerPlayersInfo.class, 6, Side.CLIENT);
+        JewelrycraftMod.netWrapper.registerMessage(PacketRequestSetSlot.class, PacketRequestSetSlot.class, 7, Side.SERVER);
+    }
+}
diff --git a/src/main/java/darkknight/jewelrycraft/proxy/ClientProxy.java b/src/main/java/darkknight/jewelrycraft/proxy/ClientProxy.java
index 3709b5f..091b88b 100644
--- a/src/main/java/darkknight/jewelrycraft/proxy/ClientProxy.java
+++ b/src/main/java/darkknight/jewelrycraft/proxy/ClientProxy.java
@@ -2,12 +2,10 @@ package darkknight.jewelrycraft.proxy;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.Item;
-import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.MinecraftForgeClient;
 import net.minecraftforge.common.MinecraftForge;
 import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.client.registry.RenderingRegistry;
-import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.registry.VillagerRegistry;
 import darkknight.jewelrycraft.block.BlockList;
 import darkknight.jewelrycraft.client.InventoryTabVanilla;
@@ -53,10 +51,8 @@ public class ClientProxy extends CommonProxy
     @Override
     public void preInit()
     {
-        ResourceLocation pedestalResourceLocation = new ResourceLocation(Variables.MODID, "textures/tileentities/BricksPedestal.png");
-        TileEntityHandPedestalRender pedestalRender = new TileEntityHandPedestalRender(new ModelHandPedestal(pedestalResourceLocation), pedestalResourceLocation);
-        ResourceLocation shadowResourceLocation = new ResourceLocation(Variables.MODID, "textures/tileentities/ShadowHand.png");
-        TileEntityShadowHandRender shadowHandRender = new TileEntityShadowHandRender(new ModelShadowHand(shadowResourceLocation), shadowResourceLocation);
+        TileEntityHandPedestalRender pedestalRender = new TileEntityHandPedestalRender(new ModelHandPedestal(Variables.PEDESTAL_TEXTURE), Variables.PEDESTAL_TEXTURE);
+        TileEntityShadowHandRender shadowHandRender = new TileEntityShadowHandRender(new ModelShadowHand(Variables.SHADOW_HAND_TEXTURE), Variables.SHADOW_HAND_TEXTURE);
         
         ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySmelter.class, new TileEntitySmelterRender());
         ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMolder.class, new TileEntityMolderRender());
@@ -72,11 +68,11 @@ public class ClientProxy extends CommonProxy
         MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(BlockList.smelter), new ItemRender(new TileEntitySmelterRender(), new TileEntitySmelter(), new ModelSmelter()));
         MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(BlockList.molder), new ItemRender(new TileEntityMolderRender(), new TileEntityMolder(), new ModelMolder()));
         MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(BlockList.shadowEye), new ItemRender(new TileEntityShadowEyeRender(), new TileEntityShadowEye(), new ModelShadowEye()));
-        MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(BlockList.handPedestal), new ItemRender(pedestalRender, new TileEntityHandPedestal(), new ModelHandPedestal(pedestalResourceLocation)));
-        MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(BlockList.shadowHand), new ItemRender(shadowHandRender, new TileEntityShadowHand(), new ModelShadowHand(shadowResourceLocation)));
+        MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(BlockList.handPedestal), new ItemRender(pedestalRender, new TileEntityHandPedestal(), new ModelHandPedestal(Variables.PEDESTAL_TEXTURE)));
+        MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(BlockList.shadowHand), new ItemRender(shadowHandRender, new TileEntityShadowHand(), new ModelShadowHand(Variables.SHADOW_HAND_TEXTURE)));
         MinecraftForgeClient.registerItemRenderer(ItemList.goldObj, new ItemRender());
         
-        VillagerRegistry.instance().registerVillagerSkin(3000, new ResourceLocation(Variables.MODID, "textures/entities/jeweler.png"));
+        VillagerRegistry.instance().registerVillagerSkin(3000, Variables.VILLAGER_TEXTURE);
 
         RenderingRegistry.registerEntityRenderingHandler(EntityHeart.class, new HeartRender(new ModelHeart(), 0.25F));
         RenderingRegistry.registerEntityRenderingHandler(EntityHalfHeart.class, new HeartRender(new ModelHalfHeart(), 0.25F));
@@ -85,8 +81,7 @@ public class ClientProxy extends CommonProxy
         TabRegistry.registerTab(new TabJewelry());
         MinecraftForge.EVENT_BUS.register(new TabRegistry());
         MinecraftForge.EVENT_BUS.register(new PlayerRenderHandler());
-        ResourceLocation jeweleryTexture = new ResourceLocation(Variables.MODID, "textures/gui/curses.png");
-        MinecraftForge.EVENT_BUS.register(new ScreenHandler(Minecraft.getMinecraft(), jeweleryTexture));
+        MinecraftForge.EVENT_BUS.register(new ScreenHandler(Minecraft.getMinecraft()));
     }
     
     @Override
diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityDisplayerRender.java b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityDisplayerRender.java
index ab073fa..750c7cb 100644
--- a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityDisplayerRender.java
+++ b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityDisplayerRender.java
@@ -77,6 +77,7 @@ public class TileEntityDisplayerRender extends TileEntitySpecialRenderer
                 GL11.glRotatef(180F, 1F, 0F, 0F);
                 GL11.glTranslatef(0.0F, -0.6F + disp.ringTranslation1 / 5, 0F);
                 GL11.glRotatef(disp.rotAngle, 0F, 1F, 0F);
+                GL11.glColor4f(1F, 1F, 1F, 1F);
                 if (RenderManager.instance.options.fancyGraphics) RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F);
                 else{
                     GL11.glRotatef(180F, 0F, 1F, 0F);
diff --git a/src/main/java/darkknight/jewelrycraft/util/Variables.java b/src/main/java/darkknight/jewelrycraft/util/Variables.java
index aa67e22..d440ab5 100644
--- a/src/main/java/darkknight/jewelrycraft/util/Variables.java
+++ b/src/main/java/darkknight/jewelrycraft/util/Variables.java
@@ -1,13 +1,21 @@
 package darkknight.jewelrycraft.util;
 
+import net.minecraft.util.ResourceLocation;
+
 public class Variables
 {
     public static final String MODID = "jewelrycraft2";
     public static final String MODNAME = "Jewelrycraft 2";
-    public static final String VERSION = "1.0";
+    public static final String VERSION = "1.7.10-1.0.1";
     public static final String PACKET_CHANNEL = "jewelrycraft2";
-    public static final int MAX_CURSES = 10;
+    
     public static final String CONFIG_GUI = "darkknight.jewelrycraft.config.ConfigGuiFactory";
     public static final String CLIENT_PROXY = "darkknight.jewelrycraft.proxy.ClientProxy";
     public static final String SERVER_PROXY = "darkknight.jewelrycraft.proxy.CommonProxy";
+    
+    public static final int MAX_CURSES = 10;
+    public static final ResourceLocation PEDESTAL_TEXTURE = new ResourceLocation(Variables.MODID, "textures/tileentities/BricksPedestal.png");
+    public static final ResourceLocation SHADOW_HAND_TEXTURE = new ResourceLocation(Variables.MODID, "textures/tileentities/ShadowHand.png");
+    public static final ResourceLocation VILLAGER_TEXTURE = new ResourceLocation(Variables.MODID, "textures/entities/jeweler.png");
+    public static final ResourceLocation MISC_TEXTURE = new ResourceLocation(Variables.MODID, "textures/gui/hearts.png");
 }
diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/village/VillageHandler.java b/src/main/java/darkknight/jewelrycraft/worldGen/village/VillageHandler.java
new file mode 100644
index 0000000..95d20ee
--- /dev/null
+++ b/src/main/java/darkknight/jewelrycraft/worldGen/village/VillageHandler.java
@@ -0,0 +1,27 @@
+/**
+ * 
+ */
+package darkknight.jewelrycraft.worldGen.village;
+
+import java.io.IOException;
+import net.minecraft.world.gen.structure.MapGenStructureIO;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.registry.VillagerRegistry;
+import darkknight.jewelrycraft.JewelrycraftMod;
+import darkknight.jewelrycraft.util.Variables;
+
+public class VillageHandler
+{
+    public static void preInit(FMLPreInitializationEvent e) throws IOException
+    {
+        VillagerRegistry.instance().registerVillagerId(3000);
+        VillagerRegistry.instance().registerVillageTradeHandler(3000, new JCTrades());
+        VillagerRegistry.instance().registerVillageCreationHandler(new VillageJewelryHandler());
+        try{
+            MapGenStructureIO.func_143031_a(ComponentJewelry.class, Variables.MODID + ":Jewelry");
+        }
+        catch(Throwable e2){
+            JewelrycraftMod.logger.severe("Error registering Jewelrycraft Structures with Vanilla Minecraft: this is expected in versions earlier than 1.7.10");
+        }
+    }
+}
diff --git a/src/main/resources/assets/jewelrycraft2/textures/gui/curses.png b/src/main/resources/assets/jewelrycraft2/textures/gui/jewelrycraft2_curses_0.png
index 27a9592..27a9592 100644
--- a/src/main/resources/assets/jewelrycraft2/textures/gui/curses.png
+++ b/src/main/resources/assets/jewelrycraft2/textures/gui/jewelrycraft2_curses_0.png