Lots of fixes and improvements

1 files changed, 20 insertions, 19 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/CreativeTabRings.java b/src/main/java/darkknight/jewelrycraft/CreativeTabRings.java
index 4061dcf..5cbe496 100644
--- a/src/main/java/darkknight/jewelrycraft/CreativeTabRings.java
+++ b/src/main/java/darkknight/jewelrycraft/CreativeTabRings.java
@@ -1,5 +1,7 @@
 package darkknight.jewelrycraft;
+
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 import net.minecraft.creativetab.CreativeTabs;
@@ -13,42 +15,41 @@ import darkknight.jewelrycraft.util.JewelrycraftUtil;
 public class CreativeTabRings extends CreativeTabs
 {
     public static ArrayList<ItemStack> metal = new ArrayList<ItemStack>();
-
-    public CreativeTabRings(String par2Str) 
+    
+    public CreativeTabRings(String par2Str)
     {
         super(par2Str);
         metal.add(new ItemStack(Items.gold_ingot));
         metal.add(new ItemStack(Items.iron_ingot));
     }
-
+    
     @Override
     public Item getTabIconItem()
     {
         return ItemList.ring;
     }
-
-    @SuppressWarnings({ "rawtypes", "unchecked" })
+    
+    @SuppressWarnings(
+    { "rawtypes", "unchecked" })
     public void displayAllReleventItems(List par1List)
     {
         int index = 0, index2 = 0;
-        while(index < OreDictionary.getOreNames().length)
+        while (index < OreDictionary.getOreNames().length)
         {
-            while(index2 < OreDictionary.getOres(OreDictionary.getOreNames()[index]).size())
+            Iterator<ItemStack> i = OreDictionary.getOres(OreDictionary.getOreNames()[index]).iterator();
+            
+            while (i.hasNext())
             {
-                if(OreDictionary.getOres(OreDictionary.getOreNames()[index]).get(index2).getUnlocalizedName().toLowerCase().contains("ingot") && !metal.contains(OreDictionary.getOres(OreDictionary.getOreNames()[index]).get(index2)))
-                    metal.add(OreDictionary.getOres(OreDictionary.getOreNames()[index]).get(index2));
-                index2++;
+                ItemStack nextStack = i.next();
+                
+                if ((nextStack.getItem().getUnlocalizedName().toLowerCase().contains("ingot") || nextStack.getItem().getUnlocalizedName().toLowerCase().contains("alloy")) && !metal.contains(nextStack)) metal.add(nextStack);
             }
-            index2 = 0;
             index++;
-        }   
-        for(int i = 0; i < metal.size(); i++)
-            for(int j = 0; j < JewelrycraftUtil.modifiers.size(); j++)
-                for(int k = 0; k < JewelrycraftUtil.jewel.size(); k++) 
-                {
-                    par1List.add(ItemList.ring.getModifiedItemStack(metal.get(i), null, JewelrycraftUtil.jewel.get(k)));
+        }
+        for (int i = 0; i < metal.size(); i++)
+            for (int j = 0; j < JewelrycraftUtil.modifiers.size(); j++)
+                for (int k = 0; k < JewelrycraftUtil.jewel.size(); k++)
                     par1List.add(ItemList.ring.getModifiedItemStack(metal.get(i), JewelrycraftUtil.modifiers.get(j), JewelrycraftUtil.jewel.get(k)));
-                }
     }
-
+    
 }