Fixed a few things as well as working towards having the ability to translate everything

10 files changed, 30 insertions, 11 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java b/src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java
index 2a9f94e..e751822 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java
@@ -1,9 +1,11 @@
 package darkknight.jewelrycraft.curses;
 
 import darkknight.jewelrycraft.api.Curse;
+import darkknight.jewelrycraft.util.Variables;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
 public class CurseBlind extends Curse
@@ -21,6 +23,6 @@ public class CurseBlind extends Curse
     
     public String getDescription()
     {
-        return "You see the light slowly fading in front of you";
+        return StatCollector.translateToLocal("curse." + Variables.MODID + ".blind.description");
     }
 }
diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java b/src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java
index 8e38255..d1c6515 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java
@@ -1,8 +1,10 @@
 package darkknight.jewelrycraft.curses;
 
 import darkknight.jewelrycraft.api.Curse;
+import darkknight.jewelrycraft.util.Variables;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
 public class CurseFlamingSoul extends Curse
@@ -19,6 +21,6 @@ public class CurseFlamingSoul extends Curse
     
     public String getDescription()
     {
-        return "Is it me or is it getting hot in here?";
+        return StatCollector.translateToLocal("curse." + Variables.MODID + ".flamingsoul.description");
     }
 }
diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java b/src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java
index cc45877..de555b9 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java
@@ -1,9 +1,11 @@
 package darkknight.jewelrycraft.curses;
 
 import darkknight.jewelrycraft.api.Curse;
+import darkknight.jewelrycraft.util.Variables;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
 public class CurseGreed extends Curse
@@ -26,6 +28,6 @@ public class CurseGreed extends Curse
     
     public String getDescription()
     {
-        return "You might need that later";
+        return StatCollector.translateToLocal("curse." + Variables.MODID + ".greed.description");
     }
 }
diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseHumbleBundle.java b/src/main/java/darkknight/jewelrycraft/curses/CurseHumbleBundle.java
index 4ced57a..8ad6b12 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseHumbleBundle.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseHumbleBundle.java
@@ -10,9 +10,11 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 import net.minecraftforge.event.world.BlockEvent;
 import darkknight.jewelrycraft.api.Curse;
+import darkknight.jewelrycraft.util.Variables;
 
 /**
  * @author Sorin
@@ -53,6 +55,6 @@ public class CurseHumbleBundle extends Curse
     
     public String getDescription()
     {
-        return "Get two for the price of one";
+        return StatCollector.translateToLocal("curse." + Variables.MODID + ".humblebundle.description");
     }
 }
diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java b/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java
index fbc3a88..82f3b97 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java
@@ -11,6 +11,7 @@ import net.minecraft.entity.SharedMonsterAttributes;
 import net.minecraft.entity.monster.EntityMob;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderPlayerEvent;
 import darkknight.jewelrycraft.api.Curse;
@@ -66,6 +67,6 @@ public class CurseInfamy extends Curse
     
     public String getDescription()
     {
-        return "What have you done?!";
+        return StatCollector.translateToLocal("curse." + Variables.MODID + ".infamy.description");
     }
 }
diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java b/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java
index 68a1440..3ce54cf 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java
@@ -19,6 +19,7 @@ import net.minecraft.item.ItemSpade;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.ItemSword;
 import net.minecraft.util.MathHelper;
+import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 import darkknight.jewelrycraft.api.Curse;
 import darkknight.jewelrycraft.block.BlockList;
@@ -27,6 +28,7 @@ import darkknight.jewelrycraft.entities.EntityHeart;
 import darkknight.jewelrycraft.item.ItemList;
 import darkknight.jewelrycraft.tileentity.TileEntityMidasTouch;
 import darkknight.jewelrycraft.util.JewelryNBT;
+import darkknight.jewelrycraft.util.Variables;
 
 public class CurseMidasTouch extends Curse
 {
@@ -90,6 +92,6 @@ public class CurseMidasTouch extends Curse
     
     public String getDescription()
     {
-        return "Be careful what you wish for...";
+        return StatCollector.translateToLocal("curse." + Variables.MODID + ".midastouch.description");
     }
 }
diff --git a/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java b/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java
index e2a41f0..a794a75 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java
@@ -6,6 +6,7 @@ import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderPlayerEvent;
 import org.lwjgl.opengl.GL11;
@@ -75,6 +76,6 @@ public class CursePentagram extends Curse
     
     public String getDescription()
     {
-        return "The Dark Lord has misterious ways of showing you his love.";
+        return StatCollector.translateToLocal("curse." + Variables.MODID + ".pentagram.description");
     }
 }
diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java b/src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java
index 5bee390..f853217 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java
@@ -7,6 +7,8 @@ import java.util.ArrayList;
 import darkknight.jewelrycraft.api.Curse;
 import darkknight.jewelrycraft.entities.EntityHalfHeart;
 import darkknight.jewelrycraft.entities.EntityHeart;
+import darkknight.jewelrycraft.util.JewelrycraftUtil;
+import darkknight.jewelrycraft.util.Variables;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;
@@ -14,6 +16,7 @@ import net.minecraft.entity.item.EntityXPOrb;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.MathHelper;
+import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
 public class CurseRabbitsPaw extends Curse
@@ -37,7 +40,7 @@ public class CurseRabbitsPaw extends Curse
     {
         String[] types = {"Red", "Blue", "White", "Black"};
         String type = types[rand.nextInt(4)];
-        if (rand.nextInt(3) == 0){
+        if (rand.nextInt(3) == 0 && target.getCreatureAttribute() != JewelrycraftUtil.HEART){
             if (type == "White"){
                 EntityHeart h = new EntityHalfHeart(world);
                 h.setType(type);
@@ -58,6 +61,6 @@ public class CurseRabbitsPaw extends Curse
     
     public String getDescription()
     {
-        return "The Dark One is giving you a gift. Don't lose it.";
+        return StatCollector.translateToLocal("curse." + Variables.MODID + ".rabbitspaw.description");
     }
 }
diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java b/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java
index 4cfd635..471d0e5 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java
@@ -1,9 +1,11 @@
 package darkknight.jewelrycraft.curses;
 
 import darkknight.jewelrycraft.api.Curse;
+import darkknight.jewelrycraft.util.Variables;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
 public class CurseRottenHeart extends Curse
@@ -21,6 +23,6 @@ public class CurseRottenHeart extends Curse
     
     public String getDescription()
     {
-        return "Your heart slowly rots inside";
+        return StatCollector.translateToLocal("curse." + Variables.MODID + ".rottenheart.description");
     }
 }
diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseVampireHunger.java b/src/main/java/darkknight/jewelrycraft/curses/CurseVampireHunger.java
index 18b676a..8c72e8e 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseVampireHunger.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseVampireHunger.java
@@ -5,8 +5,10 @@ package darkknight.jewelrycraft.curses;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 import darkknight.jewelrycraft.api.Curse;
+import darkknight.jewelrycraft.util.Variables;
 
 /**
  * @author Sorin
@@ -26,6 +28,6 @@ public class CurseVampireHunger extends Curse
     
     public String getDescription()
     {
-        return "You feel the need for blood";
+        return StatCollector.translateToLocal("curse." + Variables.MODID + ".vampirehunger.description");
     }
 }