Liquids!

4 files changed, 159 insertions, 30 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/renders/RendererSmelter.java b/src/main/java/darkknight/jewelrycraft/renders/RendererSmelter.java
new file mode 100644
index 0000000..ca5da8b
--- /dev/null
+++ b/src/main/java/darkknight/jewelrycraft/renders/RendererSmelter.java
@@ -0,0 +1,67 @@
+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/TileEntityDisplayerRender.java b/src/main/java/darkknight/jewelrycraft/renders/TileEntityDisplayerRender.java
index b7acffc..8956eb4 100644
--- a/src/main/java/darkknight/jewelrycraft/renders/TileEntityDisplayerRender.java
+++ b/src/main/java/darkknight/jewelrycraft/renders/TileEntityDisplayerRender.java
@@ -11,20 +11,17 @@ 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.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemMap;
 import net.minecraft.item.ItemStack;
-import net.minecraft.server.MinecraftServer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
-import net.minecraft.world.WorldServer;
-import net.minecraftforge.common.util.FakePlayer;
 
 import org.lwjgl.opengl.GL11;
 
-import com.mojang.authlib.GameProfile;
-
 import darkknight.jewelrycraft.model.ModelDisplayer;
 import darkknight.jewelrycraft.tileentity.TileEntityDisplayer;
 
@@ -58,14 +55,15 @@ public class TileEntityDisplayerRender extends TileEntitySpecialRenderer
             renderLabel(Integer.toString(disp.quantity), 0F, (-0.171F)*ind, 0F, block, disp, Color.GRAY.getRGB());
             GL11.glPopMatrix();
             ind++;
-            if(!(disp.object.getItem() instanceof ItemMap) && disp.object != null && disp.object != new ItemStack(Item.getItemById(0), 0, 0) && disp.object.getTooltip(te.getWorldObj().getClosestPlayer(x, y, z, 2D), true) != null)
+            EntityPlayer player = te.getWorldObj().getClosestPlayer(te.xCoord, te.yCoord, te.zCoord, 50D);
+            if(disp.object.getItem() != Items.map && player != null && disp.object.getTooltip(player, true) != null)
             {
-                for(int i = 1; i < disp.object.getTooltip(te.getWorldObj().getClosestPlayer(x, y, z, 2D), true).size(); i++)
+                for(int i = 1; i < disp.object.getTooltip(player, true).size(); i++)
                 {
-                    if(disp.object.getTooltip(te.getWorldObj().getClosestPlayer(x, y, z, 2D), true).get(i).toString() != "")
+                    if(disp.object.getTooltip(player, true).get(i).toString() != "")
                     {
                         GL11.glPushMatrix();
-                        renderLabel(disp.object.getTooltip(te.getWorldObj().getClosestPlayer(x, y, z, 2D), true).get(i).toString(), 0F, (-0.171F)*ind, 0F, block, disp, Color.GRAY.getRGB());
+                        renderLabel(disp.object.getTooltip(player, true).get(i).toString(), 0F, (-0.171F)*ind, 0F, block, disp, Color.GRAY.getRGB());
                         GL11.glPopMatrix();
                         ind++;
                     }
diff --git a/src/main/java/darkknight/jewelrycraft/renders/TileEntityMolderRender.java b/src/main/java/darkknight/jewelrycraft/renders/TileEntityMolderRender.java
index 4dcec8c..1d31358 100644
--- a/src/main/java/darkknight/jewelrycraft/renders/TileEntityMolderRender.java
+++ b/src/main/java/darkknight/jewelrycraft/renders/TileEntityMolderRender.java
@@ -2,8 +2,10 @@ package darkknight.jewelrycraft.renders;
 
 import org.lwjgl.opengl.GL11;
 
+import darkknight.jewelrycraft.item.ItemList;
 import darkknight.jewelrycraft.model.ModelMolder;
 import darkknight.jewelrycraft.tileentity.TileEntityMolder;
+import darkknight.jewelrycraft.util.JewelryNBT;
 
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
@@ -14,6 +16,8 @@ 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.Item;
+import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
@@ -81,6 +85,25 @@ public class TileEntityMolderRender extends TileEntitySpecialRenderer
                 GL11.glEnable(GL11.GL_LIGHTING);
                 GL11.glPopMatrix();
             }
+            if(me.hasMoltenMetal && me.moltenMetal != null && me.moltenMetal != new ItemStack(Item.getItemById(0), 0, 0))
+            {
+                GL11.glPushMatrix();
+                GL11.glDisable(GL11.GL_LIGHTING);
+                ItemStack metal = new ItemStack(ItemList.metal);
+                JewelryNBT.addMetal(metal, new ItemStack(me.moltenMetal.getItem()));
+                EntityItem moltenMetal = new EntityItem(te.getWorldObj(), 0.0D, 0.0D, 0.0D, metal);
+                moltenMetal.getEntityItem().stackSize = 1;
+                moltenMetal.hoverStart = 0.0F;
+
+                GL11.glTranslatef(-0F, 1.43f - 0.115f*me.quantity, -0.3F);
+                GL11.glScalef(1.2F, 1.0F, 1.45F);
+                GL11.glRotatef(90F, 1F, 0F, 0f);
+                RenderItem.renderInFrame = true;
+                RenderManager.instance.renderEntityWithPosYaw(moltenMetal, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F);
+                RenderItem.renderInFrame = false;
+                GL11.glEnable(GL11.GL_LIGHTING);
+                GL11.glPopMatrix();
+            }
         }
         GL11.glPopMatrix();
         GL11.glPopMatrix();
diff --git a/src/main/java/darkknight/jewelrycraft/renders/TileEntitySmelterRender.java b/src/main/java/darkknight/jewelrycraft/renders/TileEntitySmelterRender.java
index 0c981c6..c3c3147 100644
--- a/src/main/java/darkknight/jewelrycraft/renders/TileEntitySmelterRender.java
+++ b/src/main/java/darkknight/jewelrycraft/renders/TileEntitySmelterRender.java
@@ -1,5 +1,7 @@
 package darkknight.jewelrycraft.renders;
 
+import java.io.IOException;
+
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.OpenGlHelper;
@@ -10,21 +12,29 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 
 import org.lwjgl.opengl.GL11;
 
 import darkknight.jewelrycraft.block.BlockList;
+import darkknight.jewelrycraft.block.BlockMoltenMetal;
+import darkknight.jewelrycraft.item.ItemList;
 import darkknight.jewelrycraft.model.ModelSmelter;
 import darkknight.jewelrycraft.tileentity.TileEntitySmelter;
+import darkknight.jewelrycraft.util.JewelryNBT;
 
 public class TileEntitySmelterRender extends TileEntitySpecialRenderer
 {
     ModelSmelter modelSmelter = new ModelSmelter();
     String       texture      = "textures/tileentities/Smelter.png";
+    
+    public static final float p = 1 / 16, p3 = 3 * p, p13 = 13 * p, p15 = 15 * p;
 
     @Override
     public void renderTileEntityAt(TileEntity te, double x, double y, double z, float scale)
@@ -57,6 +67,36 @@ public class TileEntitySmelterRender extends TileEntitySpecialRenderer
         entityitem.getEntityItem().stackSize = 1;
         entityitem.hoverStart = 0.0F;
 
+        GL11.glPushMatrix();
+        GL11.glPopMatrix();
+        
+        Tessellator t = Tessellator.instance;
+        float minU, minV, maxU, maxV;
+        IIcon lava = Blocks.lava.getIcon(1, 0);
+        
+        t.setBrightness(15728864);
+        
+        int meta = te.getWorldObj().getBlockMetadata(te.xCoord, te.yCoord, te.zCoord);
+        
+        minU = lava.getMinU();
+        minV = lava.getMinV();
+        maxU = lava.getMaxU();
+        maxV = lava.getMaxV();        
+        /*maxU = lava.getInterpolatedU(10);
+        maxV = lava.getInterpolatedV(14);*/
+        
+        
+        
+        t.startDrawingQuads();
+        
+        t.addVertexWithUV(te.xCoord, te.yCoord + p15, te.zCoord, minU, minV);
+        t.addVertexWithUV(te.xCoord, te.yCoord + p15, te.zCoord + 1, minU, maxV);
+        t.addVertexWithUV(te.xCoord + 1, te.yCoord + p15, te.zCoord + 1, maxU, maxV);
+        t.addVertexWithUV(te.xCoord + 1, te.yCoord + p15, te.zCoord, maxU, minV);
+        
+        t.draw();
+        
+        /*
         GL11.glTranslatef(-0F, 1.25F, -0.3F);
         GL11.glScalef(1.25F, 1.0F, 1.47F);
         GL11.glRotatef(90F, 1F, 0F, 0f);
@@ -73,12 +113,13 @@ 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();
         if (st != null)
         {
-            if (st.hasMetal && st.metal != null && st.metal.getIconIndex() != null && st.metal.getIconIndex().getIconName() != "")
+            if (st.hasMetal && st.metal != null && st.metal != new ItemStack(Item.getItemById(0), 0, 0) && st.metal.getIconIndex() != null && st.metal.getIconIndex().getIconName() != "")
             {
                 GL11.glPushMatrix();
                 GL11.glDisable(GL11.GL_LIGHTING);
@@ -101,25 +142,25 @@ public class TileEntitySmelterRender extends TileEntitySpecialRenderer
                 GL11.glEnable(GL11.GL_LIGHTING);
                 GL11.glPopMatrix();
             }
-//            if(st.hasMoltenMetal && st.moltenMetal != null)
-//            {
-//
-//                GL11.glPushMatrix();
-//                GL11.glDisable(GL11.GL_LIGHTING);
-//                EntityItem moltenMetal = new EntityItem(te.getWorldObj(), 0.0D, 0.0D, 0.0D, new ItemStack(BlockList.moltenMetal));
-//                moltenMetal.getEntityItem().stackSize = 1;
-//                moltenMetal.hoverStart = 0.0F;
-//
-//                GL11.glColor4f(0f, 0f, 1f, 1f);
-//                GL11.glTranslatef(-0F, 0.75F, -0.3F);
-//                GL11.glScalef(1.25F, 1.0F, 1.47F);
-//                GL11.glRotatef(90F, 1F, 0F, 0f);
-//                RenderItem.renderInFrame = true;
-//                RenderManager.instance.renderEntityWithPosYaw(moltenMetal, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F);
-//                RenderItem.renderInFrame = false;
-//                GL11.glEnable(GL11.GL_LIGHTING);
-//                GL11.glPopMatrix();
-//            }
+            if(st.hasMoltenMetal && st.moltenMetal != null && st.moltenMetal != new ItemStack(Item.getItemById(0), 0, 0))
+            {
+                GL11.glPushMatrix();
+                GL11.glDisable(GL11.GL_LIGHTING);
+                ItemStack metal = new ItemStack(ItemList.metal);
+                JewelryNBT.addMetal(metal, new ItemStack(st.moltenMetal.getItem()));
+                EntityItem moltenMetal = new EntityItem(te.getWorldObj(), 0.0D, 0.0D, 0.0D, metal);
+                moltenMetal.getEntityItem().stackSize = 1;
+                moltenMetal.hoverStart = 0.0F;
+
+                GL11.glTranslatef(-0F, 1.1f -.5F*st.quantity, -0.3F);
+                GL11.glScalef(1.25F, 1.0F, 1.47F);
+                GL11.glRotatef(90F, 1F, 0F, 0f);
+                RenderItem.renderInFrame = true;
+                RenderManager.instance.renderEntityWithPosYaw(moltenMetal, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F);
+                RenderItem.renderInFrame = false;
+                GL11.glEnable(GL11.GL_LIGHTING);
+                GL11.glPopMatrix();
+            }
         }
 
         GL11.glPopMatrix();