Added just a butt ton of stuff, also thanks to pau101 for helping me with the Hand Pedestal animation :)

1 files changed, 252 insertions, 127 deletions

diff --git a/java/darkknight/jewelrycraft/util/JewelryNBT.java b/java/darkknight/jewelrycraft/util/JewelryNBT.java
index 3f38f94..9526a4d 100644
--- a/java/darkknight/jewelrycraft/util/JewelryNBT.java
+++ b/java/darkknight/jewelrycraft/util/JewelryNBT.java
@@ -2,14 +2,10 @@ package darkknight.jewelrycraft.util;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Random;
-
-import darkknight.jewelrycraft.item.ItemRing;
 import net.minecraft.block.Block;
 import net.minecraft.entity.EntityList;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -28,8 +24,7 @@ public class JewelryNBT
     {
         NBTTagCompound itemStackData;
         if (item.hasTagCompound()) itemStackData = item.getTagCompound();
-        else
-        {
+        else{
             itemStackData = new NBTTagCompound();
             item.setTagCompound(itemStackData);
         }
@@ -44,12 +39,10 @@ public class JewelryNBT
      */
     public static void addGem(ItemStack item, ItemStack gem)
     {
-        if (gem != null)
-        {
+        if (gem != null){
             NBTTagCompound itemStackData;
             if (item.hasTagCompound()) itemStackData = item.getTagCompound();
-            else
-            {
+            else{
                 itemStackData = new NBTTagCompound();
                 item.setTagCompound(itemStackData);
             }
@@ -65,17 +58,14 @@ public class JewelryNBT
      */
     public static void addModifiers(ItemStack item, ArrayList<ItemStack> modifier)
     {
-        if (modifier != null)
-        {
+        if (modifier != null){
             NBTTagCompound itemStackData;
             if (item.hasTagCompound()) itemStackData = item.getTagCompound();
-            else
-            {
+            else{
                 itemStackData = new NBTTagCompound();
                 item.setTagCompound(itemStackData);
             }
-            for (int i = 0; i < modifier.size(); i++)
-            {
+            for(int i = 0; i < modifier.size(); i++){
                 NBTTagCompound modifierNBT = new NBTTagCompound();
                 modifier.get(i).writeToNBT(modifierNBT);
                 itemStackData.setTag("modifier" + i, modifierNBT);
@@ -92,8 +82,7 @@ public class JewelryNBT
     {
         NBTTagCompound itemStackData;
         if (item.hasTagCompound()) itemStackData = item.getTagCompound();
-        else
-        {
+        else{
             itemStackData = new NBTTagCompound();
             item.setTagCompound(itemStackData);
         }
@@ -102,12 +91,15 @@ public class JewelryNBT
         itemStackData.setTag("entity", entityNBT);
     }
     
+    /**
+     * @param item
+     * @param entity
+     */
     public static void addEntityID(ItemStack item, EntityLivingBase entity)
     {
         NBTTagCompound itemStackData;
         if (item.hasTagCompound()) itemStackData = item.getTagCompound();
-        else
-        {
+        else{
             itemStackData = new NBTTagCompound();
             item.setTagCompound(itemStackData);
         }
@@ -117,12 +109,17 @@ public class JewelryNBT
         itemStackData.setTag("entityID", entityNBT);
     }
     
+    /**
+     * @param item
+     * @param x
+     * @param y
+     * @param z
+     */
     public static void addCoordonates(ItemStack item, double x, double y, double z)
     {
         NBTTagCompound itemStackData;
         if (item.hasTagCompound()) itemStackData = item.getTagCompound();
-        else
-        {
+        else{
             itemStackData = new NBTTagCompound();
             item.setTagCompound(itemStackData);
         }
@@ -135,12 +132,18 @@ public class JewelryNBT
         itemStackData.setTag("z", coords);
     }
     
+    /**
+     * @param item
+     * @param world
+     * @param x
+     * @param y
+     * @param z
+     */
     public static void addTileEntityBlock(ItemStack item, World world, int x, int y, int z)
     {
         NBTTagCompound itemStackData;
         if (item.hasTagCompound()) itemStackData = item.getTagCompound();
-        else
-        {
+        else{
             itemStackData = new NBTTagCompound();
             item.setTagCompound(itemStackData);
         }
@@ -160,12 +163,16 @@ public class JewelryNBT
         itemStackData.setTag("blockZ", block);
     }
     
+    /**
+     * @param item
+     * @param block
+     * @param metadata
+     */
     public static void addBlock(ItemStack item, int block, int metadata)
     {
         NBTTagCompound itemStackData;
         if (item.hasTagCompound()) itemStackData = item.getTagCompound();
-        else
-        {
+        else{
             itemStackData = new NBTTagCompound();
             item.setTagCompound(itemStackData);
         }
@@ -176,12 +183,17 @@ public class JewelryNBT
         itemStackData.setTag("metadata", blockNBT);
     }
     
+    /**
+     * @param item
+     * @param x
+     * @param y
+     * @param z
+     */
     public static void addBlockCoordonates(ItemStack item, int x, int y, int z)
     {
         NBTTagCompound itemStackData;
         if (item.hasTagCompound()) itemStackData = item.getTagCompound();
-        else
-        {
+        else{
             itemStackData = new NBTTagCompound();
             item.setTagCompound(itemStackData);
         }
@@ -194,12 +206,19 @@ public class JewelryNBT
         itemStackData.setTag("blockZ", coords);
     }
     
+    /**
+     * @param item
+     * @param x
+     * @param y
+     * @param z
+     * @param dim
+     * @param name
+     */
     public static void addCoordonatesAndDimension(ItemStack item, double x, double y, double z, int dim, String name)
     {
         NBTTagCompound itemStackData;
         if (item.hasTagCompound()) itemStackData = item.getTagCompound();
-        else
-        {
+        else{
             itemStackData = new NBTTagCompound();
             item.setTagCompound(itemStackData);
         }
@@ -216,24 +235,29 @@ public class JewelryNBT
         itemStackData.setTag("dimName", coords);
     }
     
+    /**
+     * @param item
+     */
     public static void addFakeEnchantment(ItemStack item)
     {
         NBTTagCompound itemStackData;
         if (item.hasTagCompound()) itemStackData = item.getTagCompound();
-        else
-        {
+        else{
             itemStackData = new NBTTagCompound();
             item.setTagCompound(itemStackData);
         }
         itemStackData.setTag("ench", new NBTTagList());
     }
     
+    /**
+     * @param item
+     * @param color
+     */
     public static void addIngotColor(ItemStack item, int color)
     {
         NBTTagCompound itemStackData;
         if (item.hasTagCompound()) itemStackData = item.getTagCompound();
-        else
-        {
+        else{
             itemStackData = new NBTTagCompound();
             item.setTagCompound(itemStackData);
         }
@@ -243,12 +267,15 @@ public class JewelryNBT
     }
     
     // TODO
+    /**
+     * @param item
+     * @param color
+     */
     public static void addGemColor(ItemStack item, int color)
     {
         NBTTagCompound itemStackData;
         if (item.hasTagCompound()) itemStackData = item.getTagCompound();
-        else
-        {
+        else{
             itemStackData = new NBTTagCompound();
             item.setTagCompound(itemStackData);
         }
@@ -257,35 +284,44 @@ public class JewelryNBT
         itemStackData.setTag("gemColor", colors);
     }
     
-    @SuppressWarnings("rawtypes")
+    /**
+     * @param item
+     * @param list
+     */
+    @SuppressWarnings ("rawtypes")
     public static void addEntities(ItemStack item, List list)
     {
         NBTTagCompound itemStackData;
         if (item.hasTagCompound()) itemStackData = item.getTagCompound();
-        else
-        {
+        else{
             itemStackData = new NBTTagCompound();
             item.setTagCompound(itemStackData);
         }
         NBTTagCompound entityNBT = new NBTTagCompound();
-        for (int i = 0; i < list.size(); i++)
-            ((EntityLivingBase) list.get(i)).writeToNBT(entityNBT);
+        for(int i = 0; i < list.size(); i++)
+            ((EntityLivingBase)list.get(i)).writeToNBT(entityNBT);
         itemStackData.setTag("entities", entityNBT);
     }
     
     // TODO NBT Tag Removing
+    /**
+     * @param item
+     * @param tag
+     */
     public static void removeNBT(ItemStack item, String tag)
     {
         NBTTagCompound itemStackData;
         if (item.hasTagCompound()) itemStackData = item.getTagCompound();
-        else
-        {
+        else{
             itemStackData = new NBTTagCompound();
             item.setTagCompound(itemStackData);
         }
         itemStackData.removeTag(tag);
     }
     
+    /**
+     * @param item
+     */
     public static void removeEntity(ItemStack item)
     {
         JewelryNBT.removeNBT(item, "entityID");
@@ -293,6 +329,9 @@ public class JewelryNBT
         JewelryNBT.removeNBT(item, "ench");
     }
     
+    /**
+     * @param item
+     */
     public static void removeBlock(ItemStack item)
     {
         JewelryNBT.removeNBT(item, "blockID");
@@ -304,12 +343,16 @@ public class JewelryNBT
     }
     
     // TODO NTB Tag Checking
+    /**
+     * @param item
+     * @param tag
+     * @return
+     */
     public static boolean hasTag(ItemStack item, String tag)
     {
         NBTTagCompound itemStackData;
         if (item.hasTagCompound()) itemStackData = item.getTagCompound();
-        else
-        {
+        else{
             itemStackData = new NBTTagCompound();
             item.setTagCompound(itemStackData);
         }
@@ -317,53 +360,86 @@ public class JewelryNBT
         return false;
     }
     
+    /**
+     * @param stack
+     * @param gem
+     * @return
+     */
     public static boolean isGemX(ItemStack stack, ItemStack gem)
     {
         if (gem(stack) != null && gem(stack).getItem() == gem.getItem() && gem(stack).getItemDamage() == gem.getItemDamage()) return true;
         return false;
     }
     
-    public static boolean isModifierX(ItemStack stack, ItemStack modifier)
+    /**
+     * @param stack
+     * @param modifier
+     * @return
+     */
+    public static int doesModifierExist(ItemStack stack, ItemStack modifier)
     {
-        if (modifier(stack) != null)
-        {
+        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 true;
+            for(int i = 0; i < list.size(); i++)
+                if (list.get(i).getItem() == modifier.getItem() && list.get(i).getItemDamage() == modifier.getItemDamage()) return i;
         }
-        return false;
+        return -1;
     }
     
+    /**
+     * @param stack
+     * @param ingot
+     * @return
+     */
     public static boolean isIngotX(ItemStack stack, ItemStack ingot)
     {
         if (ingot(stack) != null && ingot(stack).getItem() == ingot.getItem() && ingot(stack).getItemDamage() == ingot.getItemDamage()) return true;
         return false;
     }
     
+    /**
+     * @param stack
+     * @param player
+     * @param entity
+     * @return
+     */
     public static boolean isEntityX(ItemStack stack, EntityPlayer player, EntityLivingBase entity)
     {
         if (entity != null && entity instanceof EntityLivingBase && entity(stack, player) != null && entity(stack, player).equals(entity)) return true;
         return false;
     }
     
+    /**
+     * @param stack
+     * @param dimName
+     * @return
+     */
     public static boolean isDimNameX(ItemStack stack, String dimName)
     {
         if (ingot(stack) != null && dimName(stack).equals(dimName)) return true;
         return false;
     }
     
+    /**
+     * @param stack
+     * @param dimension
+     * @return
+     */
     public static boolean isDimensionX(ItemStack stack, int dimension)
     {
         if (dimension(stack) != -2 && dimension(stack) == dimension) return true;
         return false;
     }
     
-    // TODO Return components based on NBT    
+    // TODO Return components based on NBT
+    /**
+     * @param stack
+     * @return
+     */
     public static ItemStack gem(ItemStack stack)
     {
-        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.hasTagCompound() && stack.getTagCompound().hasKey("gem"))
-        {
-            NBTTagCompound jewelNBT = (NBTTagCompound) stack.getTagCompound().getTag("gem");
+        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.hasTagCompound() && stack.getTagCompound().hasKey("gem")){
+            NBTTagCompound jewelNBT = (NBTTagCompound)stack.getTagCompound().getTag("gem");
             ItemStack gem = new ItemStack(Item.getItemById(0), 0, 0);
             gem.readFromNBT(jewelNBT);
             return gem;
@@ -371,16 +447,18 @@ public class JewelryNBT
         return null;
     }
     
+    /**
+     * @param stack
+     * @return
+     */
     public static ArrayList<ItemStack> modifier(ItemStack stack)
     {
-        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.hasTagCompound())
-        {
+        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.hasTagCompound()){
             int size = stack.getTagCompound().getInteger("modifierSize");
             ArrayList<ItemStack> list = new ArrayList<ItemStack>();
-            for (int i = 0; i < size; i++)
-            {
+            for(int i = 0; i < size; i++){
                 ItemStack modifier = new ItemStack(Item.getItemById(0), 0, 0);
-                NBTTagCompound modifierNBT = (NBTTagCompound) stack.getTagCompound().getTag("modifier" + i);
+                NBTTagCompound modifierNBT = (NBTTagCompound)stack.getTagCompound().getTag("modifier" + i);
                 modifier.readFromNBT(modifierNBT);
                 list.add(modifier);
             }
@@ -389,11 +467,14 @@ public class JewelryNBT
         return null;
     }
     
+    /**
+     * @param stack
+     * @return
+     */
     public static ItemStack ingot(ItemStack stack)
     {
-        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.hasTagCompound() && stack.getTagCompound().hasKey("ingot"))
-        {
-            NBTTagCompound ingotNBT = (NBTTagCompound) stack.getTagCompound().getTag("ingot");
+        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.hasTagCompound() && stack.getTagCompound().hasKey("ingot")){
+            NBTTagCompound ingotNBT = (NBTTagCompound)stack.getTagCompound().getTag("ingot");
             ItemStack ingot = new ItemStack(Item.getItemById(0), 0, 0);
             ingot.readFromNBT(ingotNBT);
             return ingot;
@@ -401,167 +482,206 @@ public class JewelryNBT
         return null;
     }
     
+    /**
+     * @param stack
+     * @param player
+     * @return
+     */
     public static EntityLivingBase entity(ItemStack stack, EntityPlayer player)
     {
-        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.getTagCompound().hasKey("entityID") && stack.getTagCompound().hasKey("entity"))
-        {
-            NBTTagCompound enID = (NBTTagCompound) stack.getTagCompound().getTag("entityID");
-            NBTTagCompound en = (NBTTagCompound) stack.getTagCompound().getTag("entity");
+        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.getTagCompound().hasKey("entityID") && stack.getTagCompound().hasKey("entity")){
+            NBTTagCompound enID = (NBTTagCompound)stack.getTagCompound().getTag("entityID");
+            NBTTagCompound en = (NBTTagCompound)stack.getTagCompound().getTag("entity");
             int entityID = 0;
             entityID = enID.getInteger("entityID");
-            EntityLivingBase entity = (EntityLivingBase) EntityList.createEntityByID(entityID, player.worldObj);
-            if (entity != null && entity instanceof EntityLivingBase)
-            {
+            EntityLivingBase entity = (EntityLivingBase)EntityList.createEntityByID(entityID, player.worldObj);
+            if (entity != null && entity instanceof EntityLivingBase){
                 entity.readFromNBT(en);
                 return entity;
-            }
-            else return null;
+            }else return null;
         }
         return null;
     }
     
+    /**
+     * @param stack
+     * @return
+     */
     public static TileEntity tileEntity(ItemStack stack)
     {
-        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.getTagCompound().hasKey("tile"))
-        {
-            NBTTagCompound tileNBT = (NBTTagCompound) stack.getTagCompound().getTag("tile");
-            TileEntity tile = (TileEntity) TileEntity.createAndLoadEntity(tileNBT);
-            if (tile != null && tile instanceof TileEntity)
-            {
+        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.getTagCompound().hasKey("tile")){
+            NBTTagCompound tileNBT = (NBTTagCompound)stack.getTagCompound().getTag("tile");
+            TileEntity tile = TileEntity.createAndLoadEntity(tileNBT);
+            if (tile != null && tile instanceof TileEntity){
                 tile.readFromNBT(tileNBT);
                 return tile;
-            }
-            else return null;
+            }else return null;
         }
         return null;
     }
     
+    /**
+     * @param stack
+     * @return
+     */
     public static String dimName(ItemStack stack)
     {
-        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.hasTagCompound() && stack.getTagCompound().hasKey("dimName"))
-        {
-            NBTTagCompound dim = (NBTTagCompound) stack.getTagCompound().getTag("dimName");
+        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.hasTagCompound() && stack.getTagCompound().hasKey("dimName")){
+            NBTTagCompound dim = (NBTTagCompound)stack.getTagCompound().getTag("dimName");
             String name = dim.getString("dimName");
             return name;
         }
         return null;
     }
     
+    /**
+     * @param stack
+     * @return
+     */
     public static String modeName(ItemStack stack)
     {
-        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.hasTagCompound() && stack.getTagCompound().hasKey("mode"))
-        {
-            NBTTagCompound dim = (NBTTagCompound) stack.getTagCompound().getTag("mode");
+        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.hasTagCompound() && stack.getTagCompound().hasKey("mode")){
+            NBTTagCompound dim = (NBTTagCompound)stack.getTagCompound().getTag("mode");
             String name = dim.getString("mode");
             return name;
         }
         return null;
     }
     
+    /**
+     * @param stack
+     * @return
+     */
     public static int dimension(ItemStack stack)
     {
-        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.hasTagCompound() && stack.getTagCompound().hasKey("dimension"))
-        {
-            NBTTagCompound dim = (NBTTagCompound) stack.getTagCompound().getTag("dimension");
+        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.hasTagCompound() && stack.getTagCompound().hasKey("dimension")){
+            NBTTagCompound dim = (NBTTagCompound)stack.getTagCompound().getTag("dimension");
             int dimension = dim.getInteger("dimension");
             return dimension;
         }
         return -2;
     }
     
+    /**
+     * @param stack
+     * @return
+     */
     public static int blockCoordX(ItemStack stack)
     {
-        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.getTagCompound().hasKey("blockX"))
-        {
-            NBTTagCompound x = (NBTTagCompound) stack.getTagCompound().getTag("blockX");
+        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.getTagCompound().hasKey("blockX")){
+            NBTTagCompound x = (NBTTagCompound)stack.getTagCompound().getTag("blockX");
             int posX = x.getInteger("blockX");
             return posX;
         }
         return -1;
     }
     
+    /**
+     * @param stack
+     * @return
+     */
     public static int blockCoordY(ItemStack stack)
     {
-        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.getTagCompound().hasKey("blockY"))
-        {
-            NBTTagCompound y = (NBTTagCompound) stack.getTagCompound().getTag("blockY");
+        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.getTagCompound().hasKey("blockY")){
+            NBTTagCompound y = (NBTTagCompound)stack.getTagCompound().getTag("blockY");
             int posY = y.getInteger("blockY");
             return posY;
         }
         return -1;
     }
     
+    /**
+     * @param stack
+     * @return
+     */
     public static int blockCoordZ(ItemStack stack)
     {
-        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.getTagCompound().hasKey("blockZ"))
-        {
-            NBTTagCompound z = (NBTTagCompound) stack.getTagCompound().getTag("blockZ");
+        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.getTagCompound().hasKey("blockZ")){
+            NBTTagCompound z = (NBTTagCompound)stack.getTagCompound().getTag("blockZ");
             int posZ = z.getInteger("blockZ");
             return posZ;
         }
         return -1;
     }
     
+    /**
+     * @param stack
+     * @return
+     */
     public static int blockID(ItemStack stack)
     {
-        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.getTagCompound().hasKey("blockID"))
-        {
-            NBTTagCompound blockID = (NBTTagCompound) stack.getTagCompound().getTag("blockID");
+        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.getTagCompound().hasKey("blockID")){
+            NBTTagCompound blockID = (NBTTagCompound)stack.getTagCompound().getTag("blockID");
             int blockId = blockID.getInteger("blockID");
             return blockId;
         }
         return -1;
     }
     
+    /**
+     * @param stack
+     * @return
+     */
     public static int blockMetadata(ItemStack stack)
     {
-        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.getTagCompound().hasKey("metadata"))
-        {
-            NBTTagCompound metadataNBT = (NBTTagCompound) stack.getTagCompound().getTag("metadata");
+        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.getTagCompound().hasKey("metadata")){
+            NBTTagCompound metadataNBT = (NBTTagCompound)stack.getTagCompound().getTag("metadata");
             int metadata = metadataNBT.getInteger("metadata");
             return metadata;
         }
         return -1;
     }
     
+    /**
+     * @param stack
+     * @return
+     */
     public static double playerPosX(ItemStack stack)
     {
-        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.getTagCompound().hasKey("x"))
-        {
-            NBTTagCompound x = (NBTTagCompound) stack.getTagCompound().getTag("x");
+        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.getTagCompound().hasKey("x")){
+            NBTTagCompound x = (NBTTagCompound)stack.getTagCompound().getTag("x");
             double posX = x.getDouble("x");
             return posX;
         }
         return -1;
     }
     
+    /**
+     * @param stack
+     * @return
+     */
     public static double playerPosY(ItemStack stack)
     {
-        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.getTagCompound().hasKey("y"))
-        {
-            NBTTagCompound y = (NBTTagCompound) stack.getTagCompound().getTag("y");
+        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.getTagCompound().hasKey("y")){
+            NBTTagCompound y = (NBTTagCompound)stack.getTagCompound().getTag("y");
             double posY = y.getDouble("y");
             return posY;
         }
         return -1;
     }
     
+    /**
+     * @param stack
+     * @return
+     */
     public static double playerPosZ(ItemStack stack)
     {
-        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.getTagCompound().hasKey("z"))
-        {
-            NBTTagCompound z = (NBTTagCompound) stack.getTagCompound().getTag("z");
+        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.getTagCompound().hasKey("z")){
+            NBTTagCompound z = (NBTTagCompound)stack.getTagCompound().getTag("z");
             double posZ = z.getDouble("z");
             return posZ;
         }
         return -1;
     }
     
+    /**
+     * @param stack
+     * @return
+     */
     public static int ingotColor(ItemStack stack)
     {
-        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.hasTagCompound() && stack.getTagCompound().hasKey("ingotColor"))
-        {
-            NBTTagCompound colors = (NBTTagCompound) stack.getTagCompound().getTag("ingotColor");
+        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.hasTagCompound() && stack.getTagCompound().hasKey("ingotColor")){
+            NBTTagCompound colors = (NBTTagCompound)stack.getTagCompound().getTag("ingotColor");
             int color = colors.getInteger("ingotColor");
             return color;
         }
@@ -569,31 +689,36 @@ public class JewelryNBT
     }
     
     // TODO
+    /**
+     * @param stack
+     * @return
+     */
     public static int gemColor(ItemStack stack)
     {
-        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.hasTagCompound() && stack.getTagCompound().hasKey("gemColor"))
-        {
-            NBTTagCompound colors = (NBTTagCompound) stack.getTagCompound().getTag("gemColor");
+        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.hasTagCompound() && stack.getTagCompound().hasKey("gemColor")){
+            NBTTagCompound colors = (NBTTagCompound)stack.getTagCompound().getTag("gemColor");
             int color = colors.getInteger("gemColor");
             return color;
         }
         return 16777215;
     }
     
-    @SuppressWarnings(
-    { "rawtypes", "unchecked", "null" })
+    /**
+     * @param stack
+     * @param player
+     * @return
+     */
+    @SuppressWarnings ({"rawtypes", "unchecked", "null"})
     public static List entities(ItemStack stack, EntityPlayer player)
     {
-        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.getTagCompound().hasKey("entities"))
-        {
-            NBTTagCompound enID = (NBTTagCompound) stack.getTagCompound().getTag("entitiesID");
+        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && stack.getTagCompound().hasKey("entities")){
+            NBTTagCompound enID = (NBTTagCompound)stack.getTagCompound().getTag("entitiesID");
             List list = null;
             int[] entityID;
             EntityLivingBase entity;
             entityID = enID.getIntArray("entitiesID");
-            for (int i = 0; i < entityID.length; i++)
-            {
-                entity = (EntityLivingBase) EntityList.createEntityByID(entityID[i], player.worldObj);
+            for(int element: entityID){
+                entity = (EntityLivingBase)EntityList.createEntityByID(element, player.worldObj);
                 list.add(entity);
             }
             return list;