summaryrefslogtreecommitdiff
path: root/src/main/java/darkknight/jewelrycraft/curses/Curse.java
diff options
context:
space:
mode:
authorOnyxDarkKnight <sor1n.iliutza16@gmail.com>2015-04-25 00:05:51 +0100
committerOnyxDarkKnight <sor1n.iliutza16@gmail.com>2015-04-25 00:05:51 +0100
commit84d260f4d50b4fc91c7263e87981170941d8da70 (patch)
tree98243affb35551f16f376ebf69f174a0dfbb7605 /src/main/java/darkknight/jewelrycraft/curses/Curse.java
parent3e53920504f6daf81ccea6144eb00a68658860c2 (diff)
Fixed a Jenkins issue
Diffstat (limited to 'src/main/java/darkknight/jewelrycraft/curses/Curse.java')
-rw-r--r--src/main/java/darkknight/jewelrycraft/curses/Curse.java26
1 files changed, 15 insertions, 11 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;