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

1 files changed, 26 insertions, 74 deletions

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();