Lots of fixes and improvements

1 files changed, 7 insertions, 8 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/CreativeTabNecklaces.java b/src/main/java/darkknight/jewelrycraft/CreativeTabNecklaces.java
index 3f1fe92..524d31e 100644
--- a/src/main/java/darkknight/jewelrycraft/CreativeTabNecklaces.java
+++ b/src/main/java/darkknight/jewelrycraft/CreativeTabNecklaces.java
@@ -1,5 +1,6 @@
 package darkknight.jewelrycraft;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 import darkknight.jewelrycraft.item.ItemList;
@@ -34,22 +35,20 @@ public class CreativeTabNecklaces extends CreativeTabs
         int index = 0, index2 = 0;
         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.necklace.getModifiedItemStack(metal.get(i), null, JewelrycraftUtil.jewel.get(k)));
                     par1List.add(ItemList.necklace.getModifiedItemStack(metal.get(i), JewelrycraftUtil.modifiers.get(j), JewelrycraftUtil.jewel.get(k)));
-                }
     }
 
 }