Added necklaces, Altar Block, new stuff, better Shadow Ingot texture

1 files changed, 36 insertions, 38 deletions

diff --git a/common/darkknight/jewelrycraft/CreativeTabRings.java b/common/darkknight/jewelrycraft/CreativeTabRings.java
index 2236943..7e2119f 100644
--- a/common/darkknight/jewelrycraft/CreativeTabRings.java
+++ b/common/darkknight/jewelrycraft/CreativeTabRings.java
@@ -1,10 +1,8 @@
 package darkknight.jewelrycraft;
-
 import java.util.ArrayList;
 import java.util.List;
 
 import darkknight.jewelrycraft.item.ItemList;
-import darkknight.jewelrycraft.util.JewelryNBT;
 import darkknight.jewelrycraft.util.JewelrycraftUtil;
 
 import net.minecraft.creativetab.CreativeTabs;
@@ -14,44 +12,44 @@ import net.minecraftforge.oredict.OreDictionary;
 
 public class CreativeTabRings extends CreativeTabs
 {
-	public static ArrayList<ItemStack> metal = new ArrayList<ItemStack>();
-
-	public CreativeTabRings(String par2Str) 
-	{
-		super(par2Str);
-	}
-
-	@Override
-	public ItemStack getIconItemStack()
-	{
-		ItemStack ring = new ItemStack(ItemList.ring);
-		JewelryNBT.addMetal(ring, JewelrycraftUtil.metal.get(0));
-		JewelryNBT.addModifier(ring, JewelrycraftUtil.modifiers.get(3));
-		JewelryNBT.addJewel(ring, JewelrycraftUtil.jewel.get(2));
-		return ring;
-	}
+    public static ArrayList<ItemStack> metal = new ArrayList<ItemStack>();
+
+    public CreativeTabRings(String par2Str) 
+    {
+        super(par2Str);
+        metal.add(new ItemStack(Item.ingotGold));
+        metal.add(new ItemStack(Item.ingotIron));
+    }
+
+    @Override
+    public ItemStack getIconItemStack()
+    {
+        ItemStack ring = new ItemStack(ItemList.ring);
+        return ring;
+    }
 
     @SuppressWarnings({ "rawtypes", "unchecked" })
     public void displayAllReleventItems(List par1List)
-	{
-		int index = 0, index2 = 0;
-		while(index < OreDictionary.getOreNames().length)
-		{
-			while(index2 < OreDictionary.getOres(OreDictionary.getOreNames()[index]).size())
-			{
-				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++;
-			}
-			index2 = 0;
-			index++;
-		}   
-        if(!metal.contains(new ItemStack(Item.ingotGold)))metal.add(new ItemStack(Item.ingotGold));
-        if(!metal.contains(new ItemStack(Item.ingotIron)))metal.add(new ItemStack(Item.ingotIron));
-		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)));
-	}
+    {
+        int index = 0, index2 = 0;
+        while(index < OreDictionary.getOreNames().length)
+        {
+            while(index2 < OreDictionary.getOres(OreDictionary.getOreNames()[index]).size())
+            {
+                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++;
+            }
+            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)));
+                    par1List.add(ItemList.ring.getModifiedItemStack(metal.get(i), JewelrycraftUtil.modifiers.get(j), JewelrycraftUtil.jewel.get(k)));
+                }
+    }
 
 }