I rearranged files and added a few cool stuff.

3 files changed, 30 insertions, 4 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/util/JewelryNBT.java b/src/main/java/darkknight/jewelrycraft/util/JewelryNBT.java
index 9526a4d..f16c074 100644
--- a/src/main/java/darkknight/jewelrycraft/util/JewelryNBT.java
+++ b/src/main/java/darkknight/jewelrycraft/util/JewelryNBT.java
@@ -376,13 +376,29 @@ public class JewelryNBT
      * @param modifier
      * @return
      */
-    public static int doesModifierExist(ItemStack stack, ItemStack modifier)
+    public static boolean doesModifierExist(ItemStack stack, ItemStack modifier)
     {
         if (modifier(stack) != null){
             ArrayList<ItemStack> list = modifier(stack);
             for(int i = 0; i < list.size(); i++)
-                if (list.get(i).getItem() == modifier.getItem() && list.get(i).getItemDamage() == modifier.getItemDamage()) return i;
+                if (list.get(i).getItem() == modifier.getItem() && list.get(i).getItemDamage() == modifier.getItemDamage()) return true;
         }
+        return false;
+    }
+    
+    public static int modifierSize(ItemStack stack, ItemStack modifier)
+    {
+        if (modifier(stack) != null){
+            ArrayList<ItemStack> list = modifier(stack);
+            for(int i = 0; i < list.size(); i++)
+                if (list.get(i).getItem() == modifier.getItem() && list.get(i).getItemDamage() == modifier.getItemDamage()) return list.get(i).stackSize;
+        }
+        return -1;
+    }
+    
+    public static int numberOfModifiers(ItemStack stack)
+    {
+        if (modifier(stack) != null) return modifier(stack).size();
         return -1;
     }
     
diff --git a/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java b/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java
index cd2328c..1d6e4b1 100644
--- a/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java
+++ b/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java
@@ -66,14 +66,14 @@ public class JewelrycraftUtil
      */
     public static void addCursePoints(EntityPlayer player, int points)
     {
-        NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, "Jewelrycraft");
+        NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);
         playerInfo.setInteger("cursePoints", playerInfo.hasKey("cursePoints") ? (playerInfo.getInteger("cursePoints") + points) : points);
         playerInfo.setBoolean("playerCursePointsChanged", true);
     }
     
     public static int getCursePoints(EntityPlayer player)
     {
-        NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, "Jewelrycraft");
+        NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);
         return playerInfo.getInteger("cursePoints");
     }
     
diff --git a/src/main/java/darkknight/jewelrycraft/util/Variables.java b/src/main/java/darkknight/jewelrycraft/util/Variables.java
new file mode 100644
index 0000000..f45f5c6
--- /dev/null
+++ b/src/main/java/darkknight/jewelrycraft/util/Variables.java
@@ -0,0 +1,10 @@
+package darkknight.jewelrycraft.util;
+
+public class Variables
+{
+    public static final String MODID = "jewelrycraft2";
+    public static final String MODNAME = "Jewelrycraft 2";
+    public static final String VERSION = "1.0";
+    public static final String PACKET_CHANNEL = "jewelrycraft2";
+    public static final int MAX_CURSES = 10;
+}