1 files changed, 8 insertions, 13 deletions
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();