Trying to prettify stuff

8 files changed, 27 insertions, 91 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/CreativeTabLiquids.java b/src/main/java/darkknight/jewelrycraft/CreativeTabLiquids.java
index 2551628..e4329c8 100644
--- a/src/main/java/darkknight/jewelrycraft/CreativeTabLiquids.java
+++ b/src/main/java/darkknight/jewelrycraft/CreativeTabLiquids.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;
@@ -35,14 +36,15 @@ public class CreativeTabLiquids extends CreativeTabs
 		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++;
+            Iterator<ItemStack> i = OreDictionary.getOres(OreDictionary.getOreNames()[index]).iterator();
+
+            while (i.hasNext())
+            {
+                ItemStack nextStack = i.next();
+                
+                if ((nextStack.getItem().getUnlocalizedName().toLowerCase().contains("ingot") || nextStack.getItem().getUnlocalizedName().toLowerCase().contains("alloy")) && !metal.contains(nextStack)) metal.add(nextStack);
+            }
+            index++;
 		}   
 		for(int i = 0; i < metal.size(); i++) par1List.add(ItemList.bucket.getModifiedItemStack(metal.get(i)));
 	}
diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockMoltenMetal.java b/src/main/java/darkknight/jewelrycraft/block/BlockMoltenMetal.java
index f15b794..d896a21 100644
--- a/src/main/java/darkknight/jewelrycraft/block/BlockMoltenMetal.java
+++ b/src/main/java/darkknight/jewelrycraft/block/BlockMoltenMetal.java
@@ -264,8 +264,8 @@ public class BlockMoltenMetal extends BlockFluidClassic {
     
     public static boolean isColorPretty(int r, int g, int b)
     {
-        if(r > 80 || g > 80 || b > 80 || (r > 80 && g > 80 && b > 80 && r < 180 && b < 180 && g < 180)) return true;
-        return false;
+        if(r > 50 || g > 50 || b > 50 || (r > 50 && g > 50 && b > 50 && r < 230 && b < 230 && g < 230)) return true;
+        else return false;
     }
     
     public static String coords(int x, int y, int z)
diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetal.java b/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetal.java
index f40b861..5f0bc58 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 > 80 || g > 80 || b > 80 || (r > 80 && g > 80 && b > 80 && r < 180 && b < 180 && g < 180)) return true;
-        return false;
+        if(r > 50 || g > 50 || b > 50 || (r > 50 && g > 50 && b > 50 && 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 0d9081c..a50e5bf 100644
--- a/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetalBucket.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetalBucket.java
@@ -290,8 +290,8 @@ public class ItemMoltenMetalBucket extends Item
     
     public static boolean isColorPretty(int r, int g, int b)
     {
-        if(r > 80 || g > 80 || b > 80 || (r > 80 && g > 80 && b > 80 && r < 180 && b < 180 && g < 180)) return true;
-        return false;
+        if(r > 50 || g > 50 || b > 50 || (r > 50 && g > 50 && b > 50 && r < 230 && b < 230 && g < 230)) return true;
+        else return false;
     }
 
 	public ItemStack getModifiedItemStack(ItemStack ingot)
diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemRing.java b/src/main/java/darkknight/jewelrycraft/item/ItemRing.java
index 1ef602b..40c0df2 100644
--- a/src/main/java/darkknight/jewelrycraft/item/ItemRing.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemRing.java
@@ -174,8 +174,8 @@ public class ItemRing extends Item
     
     public static boolean isColorPretty(int r, int g, int b)
     {
-        if(r > 80 || g > 80 || b > 80 || (r > 80 && g > 80 && b > 80 && r < 180 && b < 180 && g < 180)) return true;
-        return false;
+        if(r > 50 || g > 50 || b > 50 || (r > 50 && g > 50 && b > 50 && r < 230 && b < 230 && g < 230)) return true;
+        else return false;
     }
 
     public String getItemStackDisplayName(ItemStack stack)
diff --git a/src/main/java/darkknight/jewelrycraft/recipes/CraftingRecipes.java b/src/main/java/darkknight/jewelrycraft/recipes/CraftingRecipes.java
index 0400a59..366d8a8 100644
--- a/src/main/java/darkknight/jewelrycraft/recipes/CraftingRecipes.java
+++ b/src/main/java/darkknight/jewelrycraft/recipes/CraftingRecipes.java
@@ -4,6 +4,7 @@ import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.FurnaceRecipes;
+import net.minecraftforge.oredict.ShapedOreRecipe;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.registry.GameRegistry;
 import darkknight.jewelrycraft.block.BlockList;
@@ -22,7 +23,7 @@ public class CraftingRecipes
             GameRegistry.addRecipe(new ItemStack(ItemList.clayMolds, 1, 0), "xx", 'x', Items.clay_ball);
             GameRegistry.addRecipe(new ItemStack(ItemList.clayMolds, 1, 1), " x ", "x x", " x ", 'x', Items.clay_ball);
             GameRegistry.addRecipe(new ItemStack(ItemList.clayMolds, 1, 2), "x x", "x x", " x ", 'x', Items.clay_ball);
-            GameRegistry.addRecipe(new ItemStack(ItemList.crystal, 1, 15), " x ", "x x", " x ", 'x', Blocks.glass);
+            GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ItemList.crystal, 1, 15), " x ", "x x", " x ", 'x', Blocks.glass));
             for(int i=0; i < 15; i++)
             {
                 GameRegistry.addShapelessRecipe(new ItemStack(ItemList.crystal, 1, i), new Object[]{new ItemStack(ItemList.crystal, 1, 15), new ItemStack(Items.dye, 1, i)});
@@ -34,11 +35,11 @@ public class CraftingRecipes
             GameRegistry.addShapelessRecipe(new ItemStack(ItemList.guide), new Object[]{new ItemStack(Items.book), new ItemStack(ItemList.molds, 1, 2)});
             
             //Blocks
-            GameRegistry.addRecipe(new ItemStack(BlockList.molder), "x x", "xxx", 'x', Blocks.cobblestone);
-            GameRegistry.addRecipe(new ItemStack(BlockList.smelter), "xyx", "x x", "xzx", 'x', Blocks.cobblestone, 'y', Items.bucket, 'z', Items.lava_bucket);
-            GameRegistry.addRecipe(new ItemStack(BlockList.jewelCraftingTable), "xxx", "y y", "y y", 'x', Blocks.planks, 'y', Blocks.cobblestone);
-            GameRegistry.addRecipe(new ItemStack(BlockList.displayer, 2), " x ", "xxx", "yyy", 'x', Items.iron_ingot, 'y', Blocks.emerald_block);
-            GameRegistry.addRecipe(new ItemStack(BlockList.shadowBlock, 1), "xxx", "xxx", "xxx", 'x', ItemList.shadowIngot);
+            GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BlockList.molder), "x x", "xxx", 'x', Blocks.cobblestone));
+            GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BlockList.smelter), "xyx", "x x", "xzx", 'x', Blocks.cobblestone, 'y', Items.bucket, 'z', Items.lava_bucket));
+            GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BlockList.jewelCraftingTable), "xxx", "y y", "y y", 'x', Blocks.planks, 'y', Blocks.cobblestone));
+            GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BlockList.displayer, 2), " x ", "xxx", "yyy", 'x', Items.iron_ingot, 'y', Blocks.emerald_block));
+            GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BlockList.shadowBlock, 1), "xxx", "xxx", "xxx", 'x', ItemList.shadowIngot));
             GameRegistry.addRecipe(new ItemStack(BlockList.jewelAltar, 1), "sws", "bwb", "bbb", 's', Blocks.end_stone, 'w', new ItemStack(Blocks.wool, 1, 5), 'b', Blocks.nether_brick);
             
             //Smelting
diff --git a/src/main/java/darkknight/jewelrycraft/renders/RendererSmelter.java b/src/main/java/darkknight/jewelrycraft/renders/RendererSmelter.java
deleted file mode 100644
index ca5da8b..0000000
--- a/src/main/java/darkknight/jewelrycraft/renders/RendererSmelter.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package darkknight.jewelrycraft.renders;
-
-import net.minecraft.block.Block;
-import net.minecraft.client.renderer.RenderBlocks;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.init.Blocks;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
-import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
-
-public class RendererSmelter implements ISimpleBlockRenderingHandler
-{
-    public static int renderID;
-    
-    public static Tessellator t;
-    public static float minU, minV, maxU, maxV;
-    
-    public RendererSmelter(int id)
-    {
-        renderID = id;
-    }
-    
-    @Override
-    public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer)
-    {
-        
-    }
-    
-    @Override
-    public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer)
-    {
-        t = Tessellator.instance;
-        
-        t.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z));
-        
-        t.setColorOpaque_F(0.6F, 0.6F, 0.6F);
-        
-        bindTexture(Blocks.dirt.getIcon(1, 2));
-        
-        t.addVertexWithUV(x, y + 0.5F, z, minU, minV);
-        t.addVertexWithUV(x, y, z, minU, maxV);
-        t.addVertexWithUV(x, y, z + 1F, maxU, maxV);
-        t.addVertexWithUV(x, y + 0.5F, z + 1F, maxU, minV);
-        
-        return true;
-    }
-    
-    public void bindTexture(IIcon texture)
-    {
-        minU = texture.getMinU();
-        minV = texture.getInterpolatedV(8);
-        maxU = texture.getMaxU();
-        maxV = texture.getMaxV();
-    }
-    
-    @Override
-    public boolean shouldRender3DInInventory(int modelId)
-    {
-        return false;
-    }
-    
-    @Override
-    public int getRenderId()
-    {
-        return renderID;
-    }
-}
diff --git a/src/main/java/darkknight/jewelrycraft/renders/TileEntitySmelterRender.java b/src/main/java/darkknight/jewelrycraft/renders/TileEntitySmelterRender.java
index c3c3147..d79c4b4 100644
--- a/src/main/java/darkknight/jewelrycraft/renders/TileEntitySmelterRender.java
+++ b/src/main/java/darkknight/jewelrycraft/renders/TileEntitySmelterRender.java
@@ -96,7 +96,7 @@ public class TileEntitySmelterRender extends TileEntitySpecialRenderer
         
         t.draw();
         
-        /*
+        
         GL11.glTranslatef(-0F, 1.25F, -0.3F);
         GL11.glScalef(1.25F, 1.0F, 1.47F);
         GL11.glRotatef(90F, 1F, 0F, 0f);
@@ -113,7 +113,7 @@ public class TileEntitySmelterRender extends TileEntitySpecialRenderer
         GL11.glTranslatef(0F, -5.6F, 0.0F);
         RenderItem.renderInFrame = true;
         RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F);
-        RenderItem.renderInFrame = false;*/
+        RenderItem.renderInFrame = false;
         
         GL11.glEnable(GL11.GL_LIGHTING);
         GL11.glPopMatrix();