I rearranged files and added a few cool stuff.

3 files changed, 10 insertions, 7 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/entities/EntityHalfHeart.java b/src/main/java/darkknight/jewelrycraft/entities/EntityHalfHeart.java
index 4fc1e39..4fad309 100644
--- a/src/main/java/darkknight/jewelrycraft/entities/EntityHalfHeart.java
+++ b/src/main/java/darkknight/jewelrycraft/entities/EntityHalfHeart.java
@@ -12,6 +12,7 @@ import net.minecraft.world.World;
 import darkknight.jewelrycraft.JewelrycraftMod;
 import darkknight.jewelrycraft.network.PacketRequestPlayerInfo;
 import darkknight.jewelrycraft.util.PlayerUtils;
+import darkknight.jewelrycraft.util.Variables;
 
 /**
  * @author Sorin
@@ -27,7 +28,7 @@ public class EntityHalfHeart extends EntityHeart
     public void onCollideWithPlayer(EntityPlayer player)
     {
         if (!player.worldObj.isRemote){
-            NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, "Jewelrycraft");
+            NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);
             if (getType().equals("Red") && player.getHealth() < player.getMaxHealth()){
                 player.heal(1f);
                 this.setDead();
@@ -35,8 +36,8 @@ public class EntityHalfHeart extends EntityHeart
                 playerInfo.setFloat(getType() + "Heart", 0F);
                 player.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(player.getMaxHealth() + 2f);
                 this.setDead();
-            }else if (!getType().equals("Red") && playerInfo.getFloat(getType() + "Heart") < 20f){
-                playerInfo.setFloat(getType() + "Heart", playerInfo.getFloat(getType() + "Heart") + 1.0F <= 20f ? playerInfo.getFloat(getType() + "Heart") + 1.0F : 20f);
+            }else if (!getType().equals("Red")){
+                playerInfo.setFloat(getType() + "Heart", playerInfo.getFloat(getType() + "Heart") + 1.0F);
                 this.setDead();
             }
         }
diff --git a/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java b/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java
index ebd64e7..899c075 100644
--- a/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java
+++ b/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java
@@ -8,6 +8,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import darkknight.jewelrycraft.JewelrycraftMod;
 import darkknight.jewelrycraft.network.PacketRequestPlayerInfo;
 import darkknight.jewelrycraft.util.PlayerUtils;
+import darkknight.jewelrycraft.util.Variables;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLiving;
@@ -45,13 +46,13 @@ public class EntityHeart extends EntityLiving
     @Override
     public void onCollideWithPlayer(EntityPlayer player)
     {
-        NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, "Jewelrycraft");
+        NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);
         if (getType() == "Red" && player.getHealth() < player.getMaxHealth()){
             player.heal(2f);
             this.setDead();
         }
-        else if (getType() != "Red" && playerInfo.getFloat(getType() + "Heart") < 20f){
-            playerInfo.setFloat(getType() + "Heart", playerInfo.getFloat(getType() + "Heart") + 2.0F <= 20f ? playerInfo.getFloat(getType() + "Heart") + 2.0F : 20f);
+        else if (getType() != "Red"){
+            playerInfo.setFloat(getType() + "Heart", playerInfo.getFloat(getType() + "Heart") + 2.0F);
             JewelrycraftMod.netWrapper.sendToServer(new PacketRequestPlayerInfo());
             this.setDead();
         }
diff --git a/src/main/java/darkknight/jewelrycraft/entities/renders/HeartRender.java b/src/main/java/darkknight/jewelrycraft/entities/renders/HeartRender.java
index 6005bb3..f015596 100644
--- a/src/main/java/darkknight/jewelrycraft/entities/renders/HeartRender.java
+++ b/src/main/java/darkknight/jewelrycraft/entities/renders/HeartRender.java
@@ -7,6 +7,7 @@ import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.util.ResourceLocation;
 import darkknight.jewelrycraft.entities.EntityHeart;
+import darkknight.jewelrycraft.util.Variables;
 
 /**
  * @author Sorin
@@ -33,7 +34,7 @@ public class HeartRender extends RenderLiving
         GL11.glRotatef(55F, 1F, 0F, 0F);
         String type = entity.getType();
         if(type == "" || type == null) type = "Red";
-        texture = new ResourceLocation("jewelrycraft", "textures/entities/"+type+"Heart.png");
+        texture = new ResourceLocation(Variables.MODID, "textures/entities/"+type+"Heart.png");
     }
 
     @Override