I rearranged files and added a few cool stuff.

4 files changed, 111 insertions, 55 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java
index f9cbd19..f9152a7 100644
--- a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java
+++ b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java
@@ -48,7 +48,6 @@ import darkknight.jewelrycraft.entities.EntityHeart;
 import darkknight.jewelrycraft.item.ItemBaseJewelry;
 import darkknight.jewelrycraft.item.ItemBracelet;
 import darkknight.jewelrycraft.item.ItemList;
-import darkknight.jewelrycraft.lib.Reference;
 import darkknight.jewelrycraft.network.PacketClearColorCache;
 import darkknight.jewelrycraft.network.PacketRequestPlayerInfo;
 import darkknight.jewelrycraft.network.PacketSendCurseStats;
@@ -57,6 +56,7 @@ import darkknight.jewelrycraft.util.BlockUtils;
 import darkknight.jewelrycraft.util.JewelryNBT;
 import darkknight.jewelrycraft.util.JewelrycraftUtil;
 import darkknight.jewelrycraft.util.PlayerUtils;
+import darkknight.jewelrycraft.util.Variables;
 
 /**
  * Code taken from OpenBlocks
@@ -74,7 +74,7 @@ public class EntityEventHandler
         final Entity entity = event.entity;
         if (!event.world.isRemote && entity instanceof EntityPlayer){
             EntityPlayer player = (EntityPlayer)entity;
-            NBTTagCompound persistTag = PlayerUtils.getModPlayerPersistTag(player, "Jewelrycraft");
+            NBTTagCompound persistTag = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);
             boolean shouldGiveManual = ItemList.guide != null && !persistTag.getBoolean("givenGuide");
             if (shouldGiveManual){
                 ItemStack manual = new ItemStack(ItemList.guide);
@@ -108,7 +108,7 @@ public class EntityEventHandler
         }
         if (entity instanceof EntityPlayer){
             EntityPlayer player = (EntityPlayer)entity;
-            NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, "Jewelrycraft");
+            NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);
             playerInfo.setBoolean("fancyRender", JewelrycraftMod.fancyRender);
             if (playerInfo.getBoolean("stunned") && playerInfo.getInteger("stunTime") > 0){
                 player.motionX *= 0D;
@@ -124,7 +124,7 @@ public class EntityEventHandler
                 if (playerInfo.hasKey("ext" + i)){
                     NBTTagCompound nbt = (NBTTagCompound)playerInfo.getTag("ext" + i);
                     ItemStack item = ItemStack.loadItemStackFromNBT(nbt);
-                    ((ItemBaseJewelry)item.getItem()).action(item, player);
+                    if(item != null) ((ItemBaseJewelry)item.getItem()).action(item, player);
                 }
             if (!player.worldObj.isRemote){
                 if (playerInfo.hasKey("reselectCurses") && !playerInfo.getBoolean("reselectCurses")){
@@ -133,7 +133,7 @@ public class EntityEventHandler
                 }
                 if (playerInfo.hasKey("playerCursePointsChanged") && playerInfo.getBoolean("playerCursePointsChanged")){
                     int points = playerInfo.getInteger("cursePoints");
-                    for(int i = 1; i <= JewelrycraftMod.MAX_CURSES; i++)
+                    for(int i = 1; i <= Variables.MAX_CURSES; i++)
                         if (points > (i - 1) * 1750) addCurse(player, playerInfo, i);
                     if (!playerInfo.hasKey("curseTime") || !playerInfo.hasKey("reselectCurses") || playerInfo.getBoolean("reselectCurses")){
                         playerInfo.setInteger("curseTime", 23000);
@@ -161,7 +161,7 @@ public class EntityEventHandler
         Entity entity = event.entityLiving;
         if (entity instanceof EntityPlayer && !(event.source.getEntity() instanceof EntityPlayer)){
             EntityPlayer player = (EntityPlayer)entity;
-            NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, "Jewelrycraft");
+            NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);
             if (event.source.getEntity() != null && event.source.getEntity().getEntityData().getBoolean("stunned")) event.setCanceled(true);
             if (!player.worldObj.isRemote) for(int i = 0; i < 18; i++)
                 if (playerInfo.hasKey("ext" + i)){
@@ -220,7 +220,7 @@ public class EntityEventHandler
                 if (playerInfo.getInteger(curse.getName()) > 0) curse.attackedAction(player.worldObj, player);
         }else if (event.source.getEntity() instanceof EntityPlayer){
             EntityPlayer player = (EntityPlayer)event.source.getEntity();
-            NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, "Jewelrycraft");
+            NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);
             for(int i = 0; i < 18; i++)
                 if (playerInfo.hasKey("ext" + i)){
                     NBTTagCompound nbt = (NBTTagCompound)playerInfo.getTag("ext" + i);
@@ -249,10 +249,10 @@ public class EntityEventHandler
     {
         EntityPlayer player = event.entityPlayer;
         if (!player.worldObj.isRemote){
-            NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, "Jewelrycraft");
-            if (playerInfo.hasKey("cursePoints") && playerInfo.getInteger("cursePoints") > 0){
+            NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);
+            if (playerInfo.hasKey("cursePoints")){
                 int points = playerInfo.getInteger("cursePoints");
-                for(int i = 1; i <= JewelrycraftMod.MAX_CURSES; i++)
+                for(int i = 1; i <= Variables.MAX_CURSES; i++)
                     if (points > (i - 1) * 1750) addCurse(player, playerInfo, i);
                 if (!playerInfo.hasKey("curseTime") || !playerInfo.hasKey("reselectCurses") || playerInfo.getBoolean("reselectCurses")){
                     playerInfo.setInteger("curseTime", 23000);
@@ -298,7 +298,7 @@ public class EntityEventHandler
     @SubscribeEvent
     public void itemToss(ItemTossEvent event)
     {
-        NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(event.player, "Jewelrycraft");
+        NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(event.player, Variables.MODID);
         for(Curse curse: Curse.getCurseList())
             if (playerInfo.getInteger(curse.getName()) > 0 && curse.itemToss()){
                 EntityItem entityitem = new EntityItem(event.player.worldObj, event.player.posX + 0.5D, event.player.posY + 0.5D, event.player.posZ + 0.5D, event.entityItem.getEntityItem());
@@ -354,7 +354,7 @@ public class EntityEventHandler
         }
         if (entity instanceof EntityPlayer){
             EntityPlayer player = (EntityPlayer)entity;
-            NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, "Jewelrycraft");
+            NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);
             playerInfo.setFloat("BlueHeart", 0f);
             playerInfo.setFloat("BlackHeart", 0f);
             playerInfo.setFloat("WhiteHeart", 0f); 
@@ -381,8 +381,8 @@ public class EntityEventHandler
     public void onWorldLoad(WorldEvent.Load event)
     {
         if (!event.world.isRemote){
-            new File(JewelrycraftMod.dir + File.separator + "Jewelrycraft").mkdirs();
-            JewelrycraftMod.liquidsConf = new File(JewelrycraftMod.dir + File.separator + "Jewelrycraft", "JLP" + event.world.getWorldInfo().getWorldName() + ".cfg");
+            new File(JewelrycraftMod.dir + File.separator + Variables.MODID).mkdirs();
+            JewelrycraftMod.liquidsConf = new File(JewelrycraftMod.dir + File.separator + Variables.MODID, "JLP" + event.world.getWorldInfo().getWorldName() + ".cfg");
             try{
                 if (!JewelrycraftMod.liquidsConf.exists()) JewelrycraftMod.liquidsConf.createNewFile();
             }
@@ -427,7 +427,7 @@ public class EntityEventHandler
     {
         if (event.entity instanceof EntityPlayer){
             EntityPlayer player = (EntityPlayer)event.entity;
-            NBTTagCompound persistTag = PlayerUtils.getModPlayerPersistTag(player, "Jewelrycraft");
+            NBTTagCompound persistTag = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);
             if (persistTag.getBoolean("nearStartedRitual")){
                 event.red = 0f;
                 event.green = 0f;
@@ -454,7 +454,7 @@ public class EntityEventHandler
     {
         if (event.entity instanceof EntityPlayer){
             EntityPlayer player = (EntityPlayer)event.entity;
-            NBTTagCompound persistTag = PlayerUtils.getModPlayerPersistTag(player, "Jewelrycraft");
+            NBTTagCompound persistTag = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);
             if (persistTag.getBoolean("nearStartedRitual")){
                 GL11.glFogi(GL11.GL_FOG_MODE, GL11.GL_EXP);
                 GL11.glFogf(GL11.GL_FOG_DENSITY, 0.6F);
diff --git a/src/main/java/darkknight/jewelrycraft/events/KeyBindings.java b/src/main/java/darkknight/jewelrycraft/events/KeyBindings.java
index a032047..948a422 100644
--- a/src/main/java/darkknight/jewelrycraft/events/KeyBindings.java
+++ b/src/main/java/darkknight/jewelrycraft/events/KeyBindings.java
@@ -7,11 +7,12 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.InputEvent;
 import darkknight.jewelrycraft.JewelrycraftMod;
 import darkknight.jewelrycraft.network.PacketKeyPressEvent;
+import darkknight.jewelrycraft.util.Variables;
 
 public class KeyBindings
 {
-    public static KeyBinding render = new KeyBinding("Pretty Render", Keyboard.KEY_Z, "Jewelrycraft");
-    public static KeyBinding inventory = new KeyBinding("Jewelry Inventory", Keyboard.KEY_J, "Jewelrycraft");
+    public static KeyBinding render = new KeyBinding("Pretty Render", Keyboard.KEY_Z, Variables.MODNAME);
+    public static KeyBinding inventory = new KeyBinding("Jewelry Inventory", Keyboard.KEY_J, Variables.MODNAME);
     
     /**
      * 
diff --git a/src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java b/src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java
index d85620a..146b7d6 100644
--- a/src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java
+++ b/src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java
@@ -1,40 +1,43 @@
 package darkknight.jewelrycraft.events;
 
-import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.List;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.model.ModelBiped;
+import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.event.RenderPlayerEvent;
 import org.lwjgl.opengl.GL11;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import darkknight.jewelrycraft.entities.renders.RenderHelper;
-import darkknight.jewelrycraft.lib.Reference;
-import darkknight.jewelrycraft.model.ModelMask;
-import darkknight.jewelrycraft.tileentity.renders.MaskRender;
+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
 {
-    ModelMask maskModel = new ModelMask();
     MaskRender mask = new MaskRender();
-    
-    public static String[] infamyCache = new String[] {};
+    EarringsRender earrings = new EarringsRender();
+    BraceletRender bracelet = new BraceletRender();
+    public static String[] infamyCache = new String[]{};
     
     @SubscribeEvent
     public void renderScreen(RenderPlayerEvent.Specials.Post event)
-    {        
-        if (infamyCache != null)
-        {
-            Iterator<EntityPlayer> players = event.entityPlayer.worldObj.playerEntities.iterator();
-            
-            while(players.hasNext())
-            {
+    {
+        ModelBiped main = event.renderer.modelBipedMain;
+        Iterator<EntityPlayer> players = event.entityPlayer.worldObj.playerEntities.iterator();
+        if (infamyCache != null){
+            while (players.hasNext()){
                 EntityPlayer player = players.next();
-                if (checkPlayerInfamy(player.getDisplayName()) && event.entityPlayer.getDisplayName().equals(player.getDisplayName()))
-                {
+                NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);
+//                System.out.println(event.entityPlayer + " | " + player + " | " + playerInfo);
+                if (checkPlayerInfamy(player.getDisplayName()) && event.entityPlayer.getDisplayName().equals(player.getDisplayName()) && playerInfo.getInteger("cursePoints") > 0){
                     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;
@@ -50,19 +53,71 @@ public class PlayerRenderHandler
                     mask.doRender(event.entityPlayer, 0F, 0F, 0F, 0F, 0F);
                     GL11.glPopMatrix();
                 }
+                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);
+                    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();
+                    }
             }
         }
     }
-
+    
     /**
      * @param string
      * @return
      */
     private boolean checkPlayerInfamy(String string)
     {
-        for (int i = 0; i < infamyCache.length; i++)
+        for(int i = 0; i < infamyCache.length; i++)
             if (infamyCache[i].equals(string)) return true;
-        
         return false;
     }
 }
diff --git a/src/main/java/darkknight/jewelrycraft/events/ScreenHandler.java b/src/main/java/darkknight/jewelrycraft/events/ScreenHandler.java
index 7121f3e..5a7b728 100644
--- a/src/main/java/darkknight/jewelrycraft/events/ScreenHandler.java
+++ b/src/main/java/darkknight/jewelrycraft/events/ScreenHandler.java
@@ -13,6 +13,7 @@ import net.minecraftforge.event.entity.player.PlayerOpenContainerEvent;
 import org.lwjgl.opengl.GL11;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import darkknight.jewelrycraft.curses.Curse;
+import darkknight.jewelrycraft.util.Variables;
 
 public class ScreenHandler extends Gui
 {
@@ -20,7 +21,7 @@ public class ScreenHandler extends Gui
     public static NBTTagCompound tagCache = null;
     public static int cooldown;
     static ResourceLocation texture;
-    static ResourceLocation hearts = new ResourceLocation("jewelrycraft", "textures/gui/hearts.png");
+    static ResourceLocation hearts = new ResourceLocation(Variables.MODID, "textures/gui/hearts.png");
     
     public ScreenHandler(Minecraft mc, ResourceLocation tex)
     {
@@ -32,21 +33,20 @@ public class ScreenHandler extends Gui
     @SubscribeEvent
     public void renderScreen(RenderGameOverlayEvent event)
     {
-//        if (event.type != ElementType.TEXT) Gui.drawRect(0, 0, mc.displayWidth, mc.displayHeight, 0xff000000);
         if (event.isCancelable() || event.type != ElementType.ALL || tagCache == null) return;
         if (!mc.gameSettings.showDebugInfo && !(mc.currentScreen instanceof GuiChat)){
             int count = 0;
             int size = 32;
             ScaledResolution resolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
             if (tagCache.hasKey("cursePoints") && tagCache.getInteger("cursePoints") > 0){
-                mc.renderEngine.bindTexture(texture);
+                mc.renderEngine.bindTexture(hearts);
                 for(Curse curse: Curse.getCurseList()){
                     if (tagCache.hasKey(curse.getName()) && tagCache.getInteger(curse.getName()) > 0){
-                        Gui.drawRect(0, (size / 2 + 6) * count, 24 + mc.fontRenderer.getStringWidth(curse.getName().split(":")[1]), 4 + (size / 2 + 6) * count + 16, 0xaf000000);
-                        Gui.drawRect(2, 2 + (size / 2 + 6) * count, 22 + mc.fontRenderer.getStringWidth(curse.getName().split(":")[1]), 2 + (size / 2 + 6) * count + 16, 0x95700064);
+                        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){
@@ -54,8 +54,8 @@ public class ScreenHandler extends Gui
                         GL11.glPushMatrix();
                         GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
                         GL11.glDisable(GL11.GL_LIGHTING);
-                        GL11.glScalef(0.5f, 0.5f, 0.0f);
-                        drawTexturedModalRect(4, 4 + (size + 12) * count, tag % size * size, tag / size * size, size, size);
+                        GL11.glScalef(0.45f, 0.45f, 0.0f);
+                        drawTexturedModalRect(28, 18 + (size + 26) * count, tag % size * size, tag / size * size, size, size);
                         GL11.glPopMatrix();
                         count++;
                     }
@@ -64,14 +64,14 @@ public class ScreenHandler extends Gui
                 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], 20, 7 + (size + 6) * count, 16777215);
+                        mc.fontRenderer.drawStringWithShadow(curse.getName().split(":")[1], 30, 11 + (size + 10) * count, 16777215);
                         if (tagCache.getInteger(curse.getName()) == 2){
                             mc.renderEngine.bindTexture(hearts);
                             GL11.glPushMatrix();
                             GL11.glEnable(GL11.GL_BLEND);
                             GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
                             GL11.glColor4f(1f, 1f, 1f, 0.5f);
-                            drawTexturedModalRect(15 + mc.fontRenderer.getStringWidth(curse.getName().split(":")[1]), 8 + (size + 6) * count, 3 * size, 0, size, size);
+                            drawTexturedModalRect(95, 7 + (size + 10) * count, 3 * size, 0, size, size);
                             GL11.glPopMatrix();
                         }
                         count++;
@@ -83,19 +83,19 @@ public class ScreenHandler extends Gui
             count = 0;
             size = 16;
             if (tagCache.getFloat("BlueHeart") > 0){
-                for(int i = 0; i < (int)tagCache.getFloat("BlueHeart") / 2; i++)
-                    drawTexturedModalRect(2 + 13 * i, resolution.getScaledHeight() / 2 - 25 + 16 * count, 0 * size, 0 * size, size, size);
-                if (tagCache.getFloat("BlueHeart") % 2 != 0) drawTexturedModalRect(2 + 13 * ((int)tagCache.getFloat("BlueHeart") / 2), resolution.getScaledHeight() / 2 - 25 + 16 * count, 0 * size, 1 * size, size, size);
+                    drawTexturedModalRect(5 + 35*count, resolution.getScaledHeight() - 20, 0 * size, 0 * size, size, size);
+                    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);
             if (tagCache.getFloat("BlackHeart") > 0){
-                for(int i = 0; i < MathHelper.ceiling_float_int((tagCache.getFloat("BlackHeart")) / 2.0F); i++)
-                    drawTexturedModalRect(2 + 13 * i, resolution.getScaledHeight() / 2 - 25 + 16 * count, 1 * size, 0 * size, size, size);
-                if (tagCache.getFloat("BlackHeart") % 2 != 0) drawTexturedModalRect(2 + 13 * ((int)tagCache.getFloat("BlackHeart") / 2), resolution.getScaledHeight() / 2 - 25 + 16 * count, 1 * size, 1 * size, size, size);
+                    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);
             if (tagCache.getFloat("WhiteHeart") > 0)
-                drawTexturedModalRect(2, resolution.getScaledHeight() / 2 - 25 + 16 * count, 2 * size, 1 * size, size, size);
+                drawTexturedModalRect(5 + 35*count, resolution.getScaledHeight() - 20, 2 * size, 1 * size, size, size);
             GL11.glPopMatrix();
         }
     }