Fixed a Jenkins issue

10 files changed, 52 insertions, 49 deletions

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