Changed lots of stuff, added new features. Ender Rings!!!

3 files changed, 171 insertions, 245 deletions

diff --git a/common/darkknight/jewelrycraft/renders/TileEntityJewelrsCraftingTableRender.java b/common/darkknight/jewelrycraft/renders/TileEntityJewelrsCraftingTableRender.java
index e68699b..ec5271b 100644
--- a/common/darkknight/jewelrycraft/renders/TileEntityJewelrsCraftingTableRender.java
+++ b/common/darkknight/jewelrycraft/renders/TileEntityJewelrsCraftingTableRender.java
@@ -2,17 +2,16 @@ package darkknight.jewelrycraft.renders;
 
 import org.lwjgl.opengl.GL11;
 
-import darkknight.jewelrycraft.item.ItemRing;
 import darkknight.jewelrycraft.model.ModelJewlersCraftingBench;
 import darkknight.jewelrycraft.tileentity.TileEntityJewelrsCraftingTable;
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.entity.Entity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.entity.item.EntityItem;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
@@ -30,7 +29,6 @@ public class TileEntityJewelrsCraftingTableRender extends TileEntitySpecialRende
 
         ResourceLocation blockTexture = new ResourceLocation("jewelrycraft", texture);
         Minecraft.getMinecraft().renderEngine.bindTexture(blockTexture);
-        Tessellator tessellator = Tessellator.instance;
         int block = te.getBlockMetadata();        
         TileEntityJewelrsCraftingTable jt = (TileEntityJewelrsCraftingTable)te;
 
@@ -47,152 +45,105 @@ public class TileEntityJewelrsCraftingTableRender extends TileEntitySpecialRende
             GL11.glRotatef(180F, 1.0F, 0.0F, 1.0F);
 
         modelTable.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F);
-        //GL11.glTranslatef(0.05F, 0F, -0.5F);
         if (jt != null)
         {
-            if (jt.hasJewel)
+            if (jt.hasJewelry && jt.jewelry.getIconIndex().getIconName() != "")
             {
-                if(jt.jewel.getIconIndex().getIconName() != "")
-                {
-                    String domain = "";
-                    if(jt.jewel.getIconIndex().getIconName().substring(0, jt.jewel.getIconIndex().getIconName().indexOf(":") + 1) != "")
-                        domain = jt.jewel.getIconIndex().getIconName().substring(0, jt.jewel.getIconIndex().getIconName().indexOf(":") + 1).replace(":", " ").trim();
-                    else
-                        domain = "minecraft";
-                    String texture = jt.jewel.getIconIndex().getIconName().substring(jt.jewel.getIconIndex().getIconName().lastIndexOf(":") + 1) + ".png";
-                    ResourceLocation lava = new ResourceLocation(domain, "textures/items/" + texture);
-                    Minecraft.getMinecraft().renderEngine.bindTexture(lava);
-                    jt.jewel.getIconIndex().getInterpolatedU(0);
-                    double minu = jt.jewel.getIconIndex().getInterpolatedU(0);
-                    double minv = jt.jewel.getIconIndex().getInterpolatedV(-64);
-                    double maxu = jt.jewel.getIconIndex().getInterpolatedU(256);
-                    double maxv = jt.jewel.getIconIndex().getInterpolatedV(256 - 64);
-                    GL11.glPushMatrix();
-                    GL11.glScalef(1f / 16f, 1f / 16f, 1f / 16f);
-                    GL11.glDisable(GL11.GL_LIGHTING);
-                    if (jt.jewel.hasTagCompound())
-                    {
-                        if (jt.jewel.getTagCompound().hasKey("ingot"))
-                        {
-                            NBTTagCompound ingotNBT = (NBTTagCompound) jt.jewel.getTagCompound().getTag("ingot");
-                            ItemStack ingotStack = new ItemStack(0, 0, 0);
-                            ingotStack.readFromNBT(ingotNBT);
-                            ItemRing.addMetal(jt.jewel, ingotStack);
-                            int color = jt.jewel.getItem().getColorFromItemStack(jt.jewel, 0);
-                            float red = (float)(color >> 16 & 255) / 255.0F;
-                            float green = (float)(color >> 8 & 255) / 255.0F;
-                            float blue = (float)(color & 255) / 255.0F;
-                            if(!jt.jewel.getDisplayName().contains("Ingot")) GL11.glColor4f(red, green, blue, 1F);
-                        }
-                    }
-                    tessellator.startDrawingQuads();
-                    for(float f=0; f<=1; f+=0.1){
-                        tessellator.addVertexWithUV(3, 9, -5+f, minu, minv);
-                        tessellator.addVertexWithUV(-2.2, 9, -5+f, maxu, minv);
-                        tessellator.addVertexWithUV(-2.2, 14, -5+f, maxu, maxv);
-                        tessellator.addVertexWithUV(3, 14, -5+f, minu, maxv);
+                GL11.glPushMatrix();
+                GL11.glDisable(GL11.GL_LIGHTING);
+                EntityItem entityitem = new EntityItem(te.worldObj, 0.0D, 0.0D, 0.0D, jt.jewelry);
+                entityitem.getEntityItem().stackSize = 1;
+                entityitem.hoverStart = 0.0F;
 
-                        tessellator.addVertexWithUV(-3, 9, -5+f, minu, minv);
-                        tessellator.addVertexWithUV(2.2, 9, -5+f, maxu, minv);
-                        tessellator.addVertexWithUV(2.2, 14, -5+f, maxu, maxv);
-                        tessellator.addVertexWithUV(-3, 14, -5+f, minu, maxv);
-                    }
-                    tessellator.draw();
-                    GL11.glColor4f(1, 1F, 1F, 1.0F);
-                    GL11.glEnable(GL11.GL_LIGHTING);
-                    GL11.glPopMatrix();
+                GL11.glRotatef(180F, 1F, 0F, 0F);
+                GL11.glScalef(0.5F, 0.5F, 0.5F);
+                GL11.glTranslatef(0.05F, -1.6F, 0.5F);
+                GL11.glRotatef(jt.angle, 0F, 1F, 0F);
+                if(RenderManager.instance.options.fancyGraphics)
+                    RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F);
+                else
+                {
+                    GL11.glRotatef(180F, 0F, 1F, 0F);
+                    RenderManager.instance.options.fancyGraphics = true;
+                    RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F);
+                    RenderManager.instance.options.fancyGraphics = false;
                 }
+
+                GL11.glEnable(GL11.GL_LIGHTING);
+                GL11.glPopMatrix();
             }
-            if (jt.hasEndItem)
+            if (jt.hasEndItem && jt.endItem.getIconIndex().getIconName() != "")
             {
-                if(jt.endItem.getIconIndex().getIconName() != "")
+                GL11.glPushMatrix();
+                GL11.glDisable(GL11.GL_LIGHTING);
+                EntityItem entityitem = new EntityItem(te.worldObj, 0.0D, 0.0D, 0.0D, jt.endItem);
+                entityitem.getEntityItem().stackSize = 1;
+                entityitem.hoverStart = 0.0F;
+
+                GL11.glRotatef(180F, 1F, 0F, 0F);
+                GL11.glScalef(0.5F, 0.5F, 0.5F);
+                GL11.glTranslatef(0.05F, -1.6F, 0.5F);
+                GL11.glRotatef(jt.angle, 0F, 1F, 0F);
+                if(RenderManager.instance.options.fancyGraphics)
+                    RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F);
+                else
                 {
-                    String domain = "";
-                    if(jt.endItem.getIconIndex().getIconName().substring(0, jt.endItem.getIconIndex().getIconName().indexOf(":") + 1) != "")
-                        domain = jt.endItem.getIconIndex().getIconName().substring(0, jt.endItem.getIconIndex().getIconName().indexOf(":") + 1).replace(":", " ").trim();
-                    else
-                        domain = "minecraft";
-                    String texture = jt.endItem.getIconIndex().getIconName().substring(jt.endItem.getIconIndex().getIconName().lastIndexOf(":") + 1) + ".png";
-                    ResourceLocation lava = new ResourceLocation(domain, "textures/items/" + texture);
-                    Minecraft.getMinecraft().renderEngine.bindTexture(lava);
-                    jt.endItem.getIconIndex().getInterpolatedU(0);
-                    double minu = jt.endItem.getIconIndex().getInterpolatedU(0);
-                    double minv = jt.endItem.getIconIndex().getInterpolatedV(-64);
-                    double maxu = jt.endItem.getIconIndex().getInterpolatedU(256);
-                    double maxv = jt.endItem.getIconIndex().getInterpolatedV(256 - 64);
-                    GL11.glPushMatrix();
-                    GL11.glScalef(1f / 16f, 1f / 16f, 1f / 16f);
-                    GL11.glDisable(GL11.GL_LIGHTING);
-                    if (jt.endItem.hasTagCompound())
-                    {
-                        if (jt.endItem.getTagCompound().hasKey("ingot"))
-                        {
-                            NBTTagCompound ingotNBT = (NBTTagCompound) jt.endItem.getTagCompound().getTag("ingot");
-                            ItemStack ingotStack = new ItemStack(0, 0, 0);
-                            ingotStack.readFromNBT(ingotNBT);
-                            ItemRing.addMetal(jt.endItem, ingotStack);
-                            int color = jt.endItem.getItem().getColorFromItemStack(jt.endItem, 0);
-                            float red = (float)(color >> 16 & 255) / 255.0F;
-                            float green = (float)(color >> 8 & 255) / 255.0F;
-                            float blue = (float)(color & 255) / 255.0F;
-                            if(!jt.endItem.getDisplayName().contains("Ingot")) GL11.glColor4f(red, green, blue, 1F);
-                        }
-                    }
-                    tessellator.startDrawingQuads();
-                    for(float f=0; f<=1; f+=0.001){
-                        tessellator.addVertexWithUV(3, 9, -5+f, minu, minv);
-                        tessellator.addVertexWithUV(-2.2, 9, -5+f, maxu, minv);
-                        tessellator.addVertexWithUV(-2.2, 14, -5+f, maxu, maxv);
-                        tessellator.addVertexWithUV(3, 14, -5+f, minu, maxv);
+                    GL11.glRotatef(180F, 0F, 1F, 0F);
+                    RenderManager.instance.options.fancyGraphics = true;
+                    RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F);
+                    RenderManager.instance.options.fancyGraphics = false;
+                }
 
-                        tessellator.addVertexWithUV(-3, 9, -5+f, minu, minv);
-                        tessellator.addVertexWithUV(2.2, 9, -5+f, maxu, minv);
-                        tessellator.addVertexWithUV(2.2, 14, -5+f, maxu, maxv);
-                        tessellator.addVertexWithUV(-3, 14, -5+f, minu, maxv);
-                    }
-                    tessellator.draw();
-                    GL11.glColor4f(1, 1F, 1F, 1.0F);
-                    GL11.glEnable(GL11.GL_LIGHTING);
-                    GL11.glPopMatrix();
+                GL11.glEnable(GL11.GL_LIGHTING);
+                GL11.glPopMatrix();
+            }
+            if (jt.hasModifier && jt.modifier.getIconIndex().getIconName() != "")
+            {
+                GL11.glPushMatrix();
+                GL11.glDisable(GL11.GL_LIGHTING);
+                EntityItem entityitem = new EntityItem(te.worldObj, 0.0D, 0.0D, 0.0D, jt.modifier);
+                entityitem.getEntityItem().stackSize = 1;
+                entityitem.hoverStart = 0.0F;
+
+                GL11.glRotatef(180F, 1F, 0F, 0F);
+                GL11.glScalef(0.5F, 0.5F, 0.5F);
+                GL11.glTranslatef(0.6F, -1.5F, -0.4F);
+                GL11.glRotatef(jt.angle, 0F, 1F, 0F);
+                if(RenderManager.instance.options.fancyGraphics)
+                    RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F);
+                else
+                {
+                    GL11.glRotatef(180F, 0F, 1F, 0F);
+                    RenderManager.instance.options.fancyGraphics = true;
+                    RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F);
+                    RenderManager.instance.options.fancyGraphics = false;
                 }
+                GL11.glEnable(GL11.GL_LIGHTING);
+                GL11.glPopMatrix();
             }
-            if (jt.hasModifier)
+            if (jt.hasJewel && jt.jewel.getIconIndex().getIconName() != "")
             {
-                if(jt.modifier.getIconIndex().getIconName() != "")
+                GL11.glPushMatrix();
+                GL11.glDisable(GL11.GL_LIGHTING);
+                EntityItem entityitem = new EntityItem(te.worldObj, 0.0D, 0.0D, 0.0D, jt.jewel);
+                entityitem.getEntityItem().stackSize = 1;
+                entityitem.hoverStart = 0.0F;
+                
+                GL11.glRotatef(180F, 1F, 0F, 0F);
+                GL11.glScalef(0.5F, 0.5F, 0.5F);
+                GL11.glTranslatef(-0.6F, -1.5F, -0.4F);
+                GL11.glRotatef(jt.angle, 0F, 1F, 0F);
+                if(RenderManager.instance.options.fancyGraphics)
+                    RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F);
+                else
                 {
-                    String domain = "";
-                    if(jt.modifier.getIconIndex().getIconName().substring(0, jt.modifier.getIconIndex().getIconName().indexOf(":") + 1) != "")
-                        domain = jt.modifier.getIconIndex().getIconName().substring(0, jt.modifier.getIconIndex().getIconName().indexOf(":") + 1).replace(":", " ").trim();
-                    else
-                        domain = "minecraft";
-                    String texture = jt.modifier.getIconIndex().getIconName().substring(jt.modifier.getIconIndex().getIconName().lastIndexOf(":") + 1) + ".png";
-                    ResourceLocation lava = new ResourceLocation(domain, "textures/items/" + texture);
-                    Minecraft.getMinecraft().renderEngine.bindTexture(lava);
-                    jt.modifier.getIconIndex().getInterpolatedU(0);
-                    double minu = jt.modifier.getIconIndex().getInterpolatedU(-64);
-                    double minv = jt.modifier.getIconIndex().getInterpolatedV(0);
-                    double maxu = jt.modifier.getIconIndex().getInterpolatedU(256-64);
-                    double maxv = jt.modifier.getIconIndex().getInterpolatedV(256);
-                    GL11.glPushMatrix();
-                    GL11.glScalef(1f / 16f, 1f / 16f, 1f / 16f);
-                    GL11.glDisable(GL11.GL_LIGHTING);
-                    tessellator.startDrawingQuads();
-                    for(float f=0; f<=1; f+=0.001){
-                        tessellator.addVertexWithUV(8, 7.5, 3+f, minu, minv);
-                        tessellator.addVertexWithUV(2.8, 7.5, 3+f, maxu, minv);
-                        tessellator.addVertexWithUV(2.8, 13, 3+f, maxu, maxv);
-                        tessellator.addVertexWithUV(8, 13, 3+f, minu, maxv);
-
-                        tessellator.addVertexWithUV(2, 7.5, 3+f, minu, minv);
-                        tessellator.addVertexWithUV(7.2, 7.5, 3+f, maxu, minv);
-                        tessellator.addVertexWithUV(7.2, 13, 3+f, maxu, maxv);
-                        tessellator.addVertexWithUV(2, 13, 3+f, minu, maxv);
-                    }
-                    tessellator.draw();
-                    GL11.glColor4f(1, 1F, 1F, 1.0F);
-                    GL11.glEnable(GL11.GL_LIGHTING);
-                    GL11.glPopMatrix();
+                    GL11.glRotatef(180F, 0F, 1F, 0F);
+                    RenderManager.instance.options.fancyGraphics = true;
+                    RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F);
+                    RenderManager.instance.options.fancyGraphics = false;
                 }
+                GL11.glEnable(GL11.GL_LIGHTING);
+                GL11.glPopMatrix();
             }
         }
 
diff --git a/common/darkknight/jewelrycraft/renders/TileEntityMolderRender.java b/common/darkknight/jewelrycraft/renders/TileEntityMolderRender.java
index aca01aa..c9480ce 100644
--- a/common/darkknight/jewelrycraft/renders/TileEntityMolderRender.java
+++ b/common/darkknight/jewelrycraft/renders/TileEntityMolderRender.java
@@ -2,7 +2,6 @@ package darkknight.jewelrycraft.renders;
 
 import org.lwjgl.opengl.GL11;
 
-import darkknight.jewelrycraft.item.ItemRing;
 import darkknight.jewelrycraft.model.ModelMolder;
 import darkknight.jewelrycraft.tileentity.TileEntityMolder;
 
@@ -15,7 +14,6 @@ import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.item.EntityItem;
-import net.minecraft.item.ItemBlock;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
@@ -34,37 +32,24 @@ public class TileEntityMolderRender extends TileEntitySpecialRenderer
 
         ResourceLocation blockTexture = new ResourceLocation("jewelrycraft", texture);
         Minecraft.getMinecraft().renderEngine.bindTexture(blockTexture);
-        Tessellator tessellator = Tessellator.instance;
+        int block = me.getBlockMetadata();
 
         GL11.glPushMatrix();
-        GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
+        if (block == 0)
+            GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
+        else if (block == 1){
+            GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
+            GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F);
+        }
+        else if (block == 2)
+            GL11.glRotatef(180F, 1.0F, 0.0F, 0.0F);
+        else if (block == 3)
+            GL11.glRotatef(180F, 1.0F, 0.0F, 1.0F);
         modelMolder.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F);
         if (me != null)
         {
             if (me.hasMold)
             {
-//                String name = me.mold.getDisplayName().substring(0, 1).toLowerCase() + me.mold.getDisplayName().trim().substring(1).replace(" M", "M");
-//                String texture = "textures/items/" + name + ".png";
-//                ResourceLocation lava = new ResourceLocation("jewelrycraft", texture);
-//                Minecraft.getMinecraft().renderEngine.bindTexture(lava);
-//                double minu = me.mold.getIconIndex().getInterpolatedU(16D);
-//                double minv = me.mold.getIconIndex().getInterpolatedV(-96D);
-//                double maxu = me.mold.getIconIndex().getInterpolatedU(16.0D * 256D);
-//                double maxv = me.mold.getIconIndex().getInterpolatedV(-96.0D * 256D);
-//                GL11.glDisable(GL11.GL_LIGHTING);
-//                GL11.glScalef(1f / 16f, 1f / 16f, 1f / 16f);
-//                GL11.glRotatef(180F, 0F, 1F, 0F);
-                //GL11.glRotatef(90F, 1, 0F, 0F);
-//                GL11.glEnable(GL11.GL_LIGHTING);
-//                for (float f = 0; f <= 2; f += 0.01)
-//                {
-//                    tessellator.startDrawingQuads();
-//                    tessellator.addVertexWithUV(5, 21 + f, 5, minu, minv);
-//                    tessellator.addVertexWithUV(-5, 21 + f, 5, maxu, minv);
-//                    tessellator.addVertexWithUV(-5, 21 + f, -5, maxu, maxv);
-//                    tessellator.addVertexWithUV(5, 21 + f, -5, minu, maxv);
-//                    tessellator.draw();
-//                }
                 GL11.glPushMatrix();
                 GL11.glDisable(GL11.GL_LIGHTING);
                 EntityItem entityitem = new EntityItem(te.worldObj, 0.0D, 0.0D, 0.0D, me.mold);
@@ -79,55 +64,22 @@ public class TileEntityMolderRender extends TileEntitySpecialRenderer
                 GL11.glEnable(GL11.GL_LIGHTING);
                 GL11.glPopMatrix();
             }
-            if (me.hasJewelBase)
+            if (me.hasJewelBase && me.jewelBase.getIconIndex().getIconName() != "")
             {
-                if(me.jewelBase.getIconIndex().getIconName() != "")
-                {
-//                    String domain = "";
-//                    if(me.jewelBase.getIconIndex().getIconName().substring(0, me.jewelBase.getIconIndex().getIconName().indexOf(":") + 1) != "")
-//                        domain = me.jewelBase.getIconIndex().getIconName().substring(0, me.jewelBase.getIconIndex().getIconName().indexOf(":") + 1).replace(":", " ").trim();
-//                    else
-//                        domain = "minecraft";
-//                    String texture = me.jewelBase.getIconIndex().getIconName().substring(me.jewelBase.getIconIndex().getIconName().lastIndexOf(":") + 1) + ".png";
-//                    ResourceLocation lava = new ResourceLocation(domain, "textures/items/" + texture);
-//                    Minecraft.getMinecraft().renderEngine.bindTexture(lava);
-//                    double minu = me.jewelBase.getIconIndex().getInterpolatedU(16D);
-//                    double minv = me.jewelBase.getIconIndex().getInterpolatedV(-96D);
-//                    double maxu = me.jewelBase.getIconIndex().getInterpolatedU(16.0D * 256D);
-//                    double maxv = me.jewelBase.getIconIndex().getInterpolatedV(-96.0D * 256D);
-                    
-//                    GL11.glScalef(1f / 16f, 1f / 16f, 1f / 16f);
-//                    GL11.glRotatef(180F, 0F, 1F, 0F);
-//                    int color = me.jewelBase.getItem().getColorFromItemStack(me.jewelBase, 0);
-//                    float red = (float)(color >> 16 & 255) / 255.0F;
-//                    float green = (float)(color >> 8 & 255) / 255.0F;
-//                    float blue = (float)(color & 255) / 255.0F;
-//                    if(!me.jewelBase.getDisplayName().contains("Ingot")) GL11.glColor4f(red, green, blue, 1F);
-//                    for(float f = 0; f <= 0.3; f+=0.01)
-//                    {
-//                        tessellator.startDrawingQuads();
-//                        tessellator.addVertexWithUV(5, 20.8 + f, 5, minu, minv);
-//                        tessellator.addVertexWithUV(-5, 20.8 + f, 5, maxu, minv);
-//                        tessellator.addVertexWithUV(-5, 20.8 + f, -5, maxu, maxv);
-//                        tessellator.addVertexWithUV(5, 20.8 + f, -5, minu, maxv);
-//                        tessellator.draw();
-//                    }
-                    GL11.glPushMatrix();
-                    GL11.glDisable(GL11.GL_LIGHTING);
-                    ItemRing.addMetal(me.jewelBase, me.ringMetal);
-                    EntityItem entityitem = new EntityItem(te.worldObj, 0.0D, 0.0D, 0.0D, me.jewelBase);
-                    entityitem.getEntityItem().stackSize = 1;
-                    entityitem.hoverStart = 0.0F;
-                    GL11.glTranslatef(0F, 1.312F, -0.25F);
-                    GL11.glScalef(1.25F, 1.0F, 1.25F);
-                    GL11.glRotatef(90F, 1F, 0F, 0f);
-                    RenderItem.renderInFrame = true;
-                    RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F);
-                    RenderItem.renderInFrame = false;
-                    GL11.glColor4f(1, 1F, 1F, 1.0F);
-                    GL11.glEnable(GL11.GL_LIGHTING);
-                    GL11.glPopMatrix();
-                }
+                GL11.glPushMatrix();
+                GL11.glDisable(GL11.GL_LIGHTING);
+                EntityItem entityitem = new EntityItem(te.worldObj, 0.0D, 0.0D, 0.0D, me.jewelBase);
+                entityitem.getEntityItem().stackSize = 1;
+                entityitem.hoverStart = 0.0F;
+                GL11.glTranslatef(0F, 1.312F, -0.25F);
+                GL11.glScalef(1.25F, 1.0F, 1.25F);
+                GL11.glRotatef(90F, 1F, 0F, 0f);
+                RenderItem.renderInFrame = true;
+                RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F);
+                RenderItem.renderInFrame = false;
+                GL11.glColor4f(1, 1F, 1F, 1.0F);
+                GL11.glEnable(GL11.GL_LIGHTING);
+                GL11.glPopMatrix();
             }
         }
         GL11.glPopMatrix();
diff --git a/common/darkknight/jewelrycraft/renders/TileEntitySmelterRender.java b/common/darkknight/jewelrycraft/renders/TileEntitySmelterRender.java
index 2c00726..c878317 100644
--- a/common/darkknight/jewelrycraft/renders/TileEntitySmelterRender.java
+++ b/common/darkknight/jewelrycraft/renders/TileEntitySmelterRender.java
@@ -9,8 +9,12 @@ import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.entity.RenderItem;
+import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
@@ -18,20 +22,19 @@ import net.minecraft.world.World;
 public class TileEntitySmelterRender extends TileEntitySpecialRenderer
 {
     ModelSmelter modelSmelter = new ModelSmelter();
-    String       texture      = "textures/tileentities/Smelter.png", lava = "texture/blocks/lava_still.png";
-    
+    String       texture      = "textures/tileentities/Smelter.png";
+
     @Override
     public void renderTileEntityAt(TileEntity te, double x, double y, double z, float scale)
     {
         GL11.glPushMatrix();
         GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);
-        
+
         ResourceLocation blockTexture = new ResourceLocation("jewelrycraft", texture);
-        Tessellator tessellator = Tessellator.instance;
-        ResourceLocation lava = new ResourceLocation(null, "textures/blocks/lava_still.png");
         Minecraft.getMinecraft().renderEngine.bindTexture(blockTexture);
+        TileEntitySmelter st = (TileEntitySmelter)te;
         int block = te.getBlockMetadata();
-        
+
         GL11.glPushMatrix();
         if (block == 0)
             GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
@@ -43,42 +46,62 @@ public class TileEntitySmelterRender extends TileEntitySpecialRenderer
             GL11.glRotatef(180F, 1.0F, 0.0F, 0.0F);
         else if (block == 3)
             GL11.glRotatef(180F, 1.0F, 0.0F, 1.0F);
-        
+
         modelSmelter.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F);
-        
-        Minecraft.getMinecraft().renderEngine.bindTexture(lava);
-        Block.lavaStill.getIcon(3, 0).getInterpolatedU(0);
-        double minu = Block.lavaStill.getIcon(3, 0).getInterpolatedU(0);
-        double minv = Block.lavaStill.getIcon(3, 0).getInterpolatedV(((TileEntitySmelter) te).flow);
-        double maxu = Block.lavaStill.getIcon(3, 0).getInterpolatedU(256);
-        double maxv = Block.lavaStill.getIcon(3, 0).getInterpolatedV(16 + ((TileEntitySmelter) te).flow);
+
         GL11.glPushMatrix();
-        GL11.glScalef(1f / 16f, 1f / 16f, 1f / 16f);
         GL11.glDisable(GL11.GL_LIGHTING);
-        
-        tessellator.startDrawingQuads();
-        tessellator.addVertexWithUV(5, 20, 6, minu, minv);
-        tessellator.addVertexWithUV(-5, 20, 6, maxu, minv);
-        tessellator.addVertexWithUV(-5, 20, -6, maxu, maxv);
-        tessellator.addVertexWithUV(5, 20, -6, minu, maxv);
-        
-        tessellator.addVertexWithUV(-4, 20, -7, maxu, maxv);
-        tessellator.addVertexWithUV(4, 20, -7, maxu, minv);
-        tessellator.addVertexWithUV(4, 20, -6, minu, minv);
-        tessellator.addVertexWithUV(-4, 20, -6, minu, maxv);
-        
-        tessellator.addVertexWithUV(4, 20, 7, maxu, maxv);
-        tessellator.addVertexWithUV(-4, 20, 7, maxu, minv);
-        tessellator.addVertexWithUV(-4, 20, 6, minu, minv);
-        tessellator.addVertexWithUV(4, 20, 6, minu, maxv);
-        tessellator.draw();
+        EntityItem entityitem = new EntityItem(te.worldObj, 0.0D, 0.0D, 0.0D, new ItemStack(Block.lavaStill));
+        entityitem.getEntityItem().stackSize = 1;
+        entityitem.hoverStart = 0.0F;
+
+        GL11.glTranslatef(-0F, 1.25F, -0.3F);
+        GL11.glScalef(1.25F, 1.0F, 1.47F);
+        GL11.glRotatef(90F, 1F, 0F, 0f);
+        RenderItem.renderInFrame = true;
+        RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F);
+        RenderItem.renderInFrame = false;
+
+        GL11.glTranslatef(0F, 0.46F, 0.0F);
+        GL11.glScalef(0.8F, 0.1F, 0F);
+        RenderItem.renderInFrame = true;
+        RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F);
+        RenderItem.renderInFrame = false;
+
+        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;
         GL11.glEnable(GL11.GL_LIGHTING);
         GL11.glPopMatrix();
-        
+        if (st != null)
+        {
+            if (st.hasMetal && st.metal.getIconIndex().getIconName() != "")
+            {
+                GL11.glPushMatrix();
+                GL11.glDisable(GL11.GL_LIGHTING);
+                EntityItem metal = new EntityItem(te.worldObj, 0.0D, 0.0D, 0.0D, st.metal);
+                metal.getEntityItem().stackSize = 1;
+                metal.hoverStart = 0.0F;
+
+                GL11.glRotatef(-50F, 1F, 0F, 0F);
+                GL11.glRotatef(-50F, 0F, 0F, 1F);
+                GL11.glRotatef(180F, 1F, 0F, 0F);
+                GL11.glScalef(0.5F, 0.5F, 0.5F);
+                GL11.glTranslatef(-0.9F, -0.9F, -1.6F);
+                RenderItem.renderInFrame = true;
+                for(double d=0; d<=0.05; d+=0.01)
+                    RenderManager.instance.renderEntityWithPosYaw(metal, 0.0D, 0.0D, 0.0D - d, 0.0F, 0.0F);
+                RenderItem.renderInFrame = false;
+                GL11.glEnable(GL11.GL_LIGHTING);
+                GL11.glPopMatrix();
+            }
+        }
+
         GL11.glPopMatrix();
         GL11.glPopMatrix();
     }
-    
+
     public void adjustLightFixture(World world, int i, int j, int k, Block block)
     {
         Tessellator tess = Tessellator.instance;
@@ -89,5 +112,5 @@ public class TileEntitySmelterRender extends TileEntitySpecialRenderer
         tess.setColorOpaque_F(brightness, brightness, brightness);
         OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float) modulousModifier, divModifier);
     }
-    
+
 }