Changes

6 files changed, 67 insertions, 46 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/JewelrycraftMod.java b/src/main/java/darkknight/jewelrycraft/JewelrycraftMod.java
index d17cacd..3ead767 100644
--- a/src/main/java/darkknight/jewelrycraft/JewelrycraftMod.java
+++ b/src/main/java/darkknight/jewelrycraft/JewelrycraftMod.java
@@ -87,6 +87,12 @@ public class JewelrycraftMod
         ItemList.preInit(e);
         CraftingRecipes.preInit(e);
         OreDictionary.registerOre("ingotShadow", new ItemStack(ItemList.shadowIngot));
+        OreDictionary.registerOre("ingot2", new ItemStack(ItemList.ingot2));
+        OreDictionary.registerOre("ingot3", new ItemStack(ItemList.ingot3));
+        OreDictionary.registerOre("ingot4", new ItemStack(ItemList.ingot4));
+        OreDictionary.registerOre("ingot5", new ItemStack(ItemList.ingot5));
+        OreDictionary.registerOre("ingot6", new ItemStack(ItemList.ingot6));
+        OreDictionary.registerOre("ingot7", new ItemStack(ItemList.ingot7));
         OreDictionary.registerOre("oreShadow", new ItemStack(BlockList.shadowOre));
         
         VillagerRegistry.instance().registerVillagerId(3000);
diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockMoltenMetal.java b/src/main/java/darkknight/jewelrycraft/block/BlockMoltenMetal.java
index d896a21..4ba57de 100644
--- a/src/main/java/darkknight/jewelrycraft/block/BlockMoltenMetal.java
+++ b/src/main/java/darkknight/jewelrycraft/block/BlockMoltenMetal.java
@@ -264,7 +264,7 @@ public class BlockMoltenMetal extends BlockFluidClassic {
     
     public static boolean isColorPretty(int r, int g, int b)
     {
-        if(r > 50 || g > 50 || b > 50 || (r > 50 && g > 50 && b > 50 && r < 230 && b < 230 && g < 230)) return true;
+        if((r > 80 || g > 80 || b > 80) || (r > 80 && g > 80 && b > 80 && r < 230 && b < 230 && g < 230)) return true;
         else return false;
     }
     
diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemList.java b/src/main/java/darkknight/jewelrycraft/item/ItemList.java
index 370c1d3..1113a55 100644
--- a/src/main/java/darkknight/jewelrycraft/item/ItemList.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemList.java
@@ -13,46 +13,61 @@ import darkknight.jewelrycraft.block.BlockList;
 
 public class ItemList
 {
-	public static Item     thiefGloves;
-	public static Item     shadowIngot;
-	public static Item     molds;
-	public static Item     clayMolds;
-	public static Item     crystal;
-	public static ItemRing     ring;
-	public static ItemNecklace     necklace;
-	public static Item     guide;
-	public static ItemMoltenMetalBucket     bucket;
-	public static ItemMoltenMetal     metal;
-
-	private static boolean isInitialized = false;
-
-	public static void preInit(FMLPreInitializationEvent e)
-	{
-		if (!isInitialized)
-		{
-			thiefGloves = new ItemThiefGloves().setUnlocalizedName("Jewelrycraft.thiefGloves").setTextureName("jewelrycraft:thiefGloves").setCreativeTab(JewelrycraftMod.jewelrycraft);
-			shadowIngot = new Item().setUnlocalizedName("Jewelrycraft.ingotShadow").setTextureName("jewelrycraft:ingotShadow").setCreativeTab(JewelrycraftMod.jewelrycraft);
-			molds = new ItemMolds().setUnlocalizedName("Jewelrycraft.mold").setTextureName("Mold").setCreativeTab(JewelrycraftMod.jewelrycraft);
-			clayMolds = new ItemClayMolds().setUnlocalizedName("Jewelrycraft.mold").setTextureName("Mold").setCreativeTab(JewelrycraftMod.jewelrycraft);
-			ring = (ItemRing) new ItemRing().setUnlocalizedName("Jewelrycraft.ring").setTextureName("jewelrycraft:ring");
-			crystal = new ItemCrystal().setUnlocalizedName("Jewelrycraft.crystal").setTextureName("jewelrycraft:crystal").setCreativeTab(JewelrycraftMod.jewelrycraft);
-			necklace = (ItemNecklace) new ItemNecklace().setUnlocalizedName("Jewelrycraft.necklace").setTextureName("jewelrycraft:necklace");
-			guide = new ItemGuide().setUnlocalizedName("Jewelrycraft.guide").setTextureName("jewelrycraft:guide").setCreativeTab(JewelrycraftMod.jewelrycraft);
-			bucket = (ItemMoltenMetalBucket) new ItemMoltenMetalBucket().setUnlocalizedName("Jewelrycraft.bucket");
-			metal = (ItemMoltenMetal) new ItemMoltenMetal().setUnlocalizedName("Jewelrycraft.bucket");
-
-			GameRegistry.registerItem(thiefGloves, "thiefGloves");
-			GameRegistry.registerItem(shadowIngot, "shadowIngot");
-			GameRegistry.registerItem(molds, "molds");
-			GameRegistry.registerItem(clayMolds, "clayMolds");
-			GameRegistry.registerItem(ring, "ring");
-			GameRegistry.registerItem(necklace, "necklace");
-			GameRegistry.registerItem(crystal, "crystal");
-			GameRegistry.registerItem(guide, "guide");
-			GameRegistry.registerItem(bucket, "moltenMetalBucket");
-			GameRegistry.registerItem(metal, "moltenMetal");
-
-			isInitialized = true;
-		}
-	}
+    public static Item thiefGloves;
+    public static Item shadowIngot, ingot2, ingot3, ingot4, ingot5, ingot6, ingot7;
+    public static Item molds;
+    public static Item clayMolds;
+    public static Item crystal;
+    public static ItemRing ring;
+    public static ItemNecklace necklace;
+    public static Item guide;
+    public static ItemMoltenMetalBucket bucket;
+    public static ItemMoltenMetal metal;
+    
+    private static boolean isInitialized = false;
+    
+    public static void preInit(FMLPreInitializationEvent e)
+    {
+        if (!isInitialized)
+        {
+            thiefGloves = new ItemThiefGloves().setUnlocalizedName("Jewelrycraft.thiefGloves").setTextureName("jewelrycraft:thiefGloves").setCreativeTab(JewelrycraftMod.jewelrycraft);
+            shadowIngot = new Item().setUnlocalizedName("Jewelrycraft.ingotShadow").setTextureName("jewelrycraft:ingotShadow").setCreativeTab(JewelrycraftMod.jewelrycraft);
+            molds = new ItemMolds().setUnlocalizedName("Jewelrycraft.mold").setTextureName("Mold").setCreativeTab(JewelrycraftMod.jewelrycraft);
+            clayMolds = new ItemClayMolds().setUnlocalizedName("Jewelrycraft.mold").setTextureName("Mold").setCreativeTab(JewelrycraftMod.jewelrycraft);
+            ring = (ItemRing) new ItemRing().setUnlocalizedName("Jewelrycraft.ring").setTextureName("jewelrycraft:ring");
+            crystal = new ItemCrystal().setUnlocalizedName("Jewelrycraft.crystal").setTextureName("jewelrycraft:crystal").setCreativeTab(JewelrycraftMod.jewelrycraft);
+            necklace = (ItemNecklace) new ItemNecklace().setUnlocalizedName("Jewelrycraft.necklace").setTextureName("jewelrycraft:necklace");
+            guide = new ItemGuide().setUnlocalizedName("Jewelrycraft.guide").setTextureName("jewelrycraft:guide").setCreativeTab(JewelrycraftMod.jewelrycraft);
+            bucket = (ItemMoltenMetalBucket) new ItemMoltenMetalBucket().setUnlocalizedName("Jewelrycraft.bucket");
+            metal = (ItemMoltenMetal) new ItemMoltenMetal().setUnlocalizedName("Jewelrycraft.bucket");
+            
+            // Test Ingots
+            ingot2 = new Item().setUnlocalizedName("Jewelrycraft.ingot2").setTextureName("jewelrycraft:test/ingot2").setCreativeTab(JewelrycraftMod.jewelrycraft);
+            ingot3 = new Item().setUnlocalizedName("Jewelrycraft.ingot3").setTextureName("jewelrycraft:ingot3").setCreativeTab(JewelrycraftMod.jewelrycraft);
+            ingot4 = new Item().setUnlocalizedName("Jewelrycraft.ingot4").setTextureName("jewelrycraft:ingot4").setCreativeTab(JewelrycraftMod.jewelrycraft);
+            ingot5 = new Item().setUnlocalizedName("Jewelrycraft.ingot5").setTextureName("jewelrycraft:test/ingot5").setCreativeTab(JewelrycraftMod.jewelrycraft);
+            ingot6 = new Item().setUnlocalizedName("Jewelrycraft.ingot6").setTextureName("jewelrycraft:ingot6").setCreativeTab(JewelrycraftMod.jewelrycraft);
+            ingot7 = new Item().setUnlocalizedName("Jewelrycraft.ingot7").setTextureName("jewelrycraft:ingot7").setCreativeTab(JewelrycraftMod.jewelrycraft);
+            
+            GameRegistry.registerItem(thiefGloves, "thiefGloves");
+            GameRegistry.registerItem(shadowIngot, "shadowIngot");
+            GameRegistry.registerItem(molds, "molds");
+            GameRegistry.registerItem(clayMolds, "clayMolds");
+            GameRegistry.registerItem(ring, "ring");
+            GameRegistry.registerItem(necklace, "necklace");
+            GameRegistry.registerItem(crystal, "crystal");
+            GameRegistry.registerItem(guide, "guide");
+            GameRegistry.registerItem(bucket, "moltenMetalBucket");
+            GameRegistry.registerItem(metal, "moltenMetal");
+            
+            GameRegistry.registerItem(ingot2, "ingot2");
+            GameRegistry.registerItem(ingot3, "ingot3");
+            GameRegistry.registerItem(ingot4, "ingot4");
+            GameRegistry.registerItem(ingot5, "ingot5");
+            GameRegistry.registerItem(ingot6, "ingot6");
+            GameRegistry.registerItem(ingot7, "ingot7");
+            
+            isInitialized = true;
+        }
+    }
 }
diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetal.java b/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetal.java
index 5f0bc58..81c1614 100644
--- a/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetal.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetal.java
@@ -122,7 +122,7 @@ public class ItemMoltenMetal extends Item
     
     public static boolean isColorPretty(int r, int g, int b)
     {
-        if(r > 50 || g > 50 || b > 50 || (r > 50 && g > 50 && b > 50 && r < 230 && b < 230 && g < 230)) return true;
+        if((r > 80 || g > 80 || b > 80) || (r > 80 && g > 80 && b > 80 && r < 230 && b < 230 && g < 230)) return true;
         else return false;
     }
 }
diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetalBucket.java b/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetalBucket.java
index a50e5bf..bd1ea72 100644
--- a/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetalBucket.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetalBucket.java
@@ -290,7 +290,7 @@ public class ItemMoltenMetalBucket extends Item
     
     public static boolean isColorPretty(int r, int g, int b)
     {
-        if(r > 50 || g > 50 || b > 50 || (r > 50 && g > 50 && b > 50 && r < 230 && b < 230 && g < 230)) return true;
+        if((r > 80 || g > 80 || b > 80) || (r > 80 && g > 80 && b > 80 && r < 230 && b < 230 && g < 230)) return true;
         else return false;
     }
 
diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemRing.java b/src/main/java/darkknight/jewelrycraft/item/ItemRing.java
index 40c0df2..265730a 100644
--- a/src/main/java/darkknight/jewelrycraft/item/ItemRing.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemRing.java
@@ -174,7 +174,7 @@ public class ItemRing extends Item
     
     public static boolean isColorPretty(int r, int g, int b)
     {
-        if(r > 50 || g > 50 || b > 50 || (r > 50 && g > 50 && b > 50 && r < 230 && b < 230 && g < 230)) return true;
+        if((r > 80 || g > 80 || b > 80) || (r > 80 && g > 80 && b > 80 && r < 230 && b < 230 && g < 230)) return true;
         else return false;
     }