From 3d7357fa29e92781778311d5cd9531bf63f586eb Mon Sep 17 00:00:00 2001 From: OnyxDarkKnight Date: Wed, 16 Jul 2014 13:11:34 +0300 Subject: Lots of fixes and improvements --- .../java/darkknight/jewelrycraft/util/JewelrycraftUtil.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java') 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 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)); -- cgit v1.2.3