Lots of fixes and improvements

1 files changed, 6 insertions, 7 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java b/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java
index 905665e..7575c06 100644
--- a/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java
+++ b/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java
@@ -82,15 +82,14 @@ public class JewelrycraftUtil
         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())
             {
-                ItemStack stack = OreDictionary.getOres(OreDictionary.getOreNames()[index]).get(index2).copy();
-                if(stack.getItemDamage() == Short.MAX_VALUE) stack.setItemDamage(0);
-                if(stack.getUnlocalizedName().toLowerCase().contains("ingot") && !JewelrycraftUtil.metal.contains(stack))
-                    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++;
         }   
         if(!metal.contains(new ItemStack(Items.gold_ingot)))metal.add(new ItemStack(Items.gold_ingot));