From 26d28c9b93133a6cfc5d2544c662e9d77955b6f5 Mon Sep 17 00:00:00 2001 From: OnyxDarkKnight Date: Mon, 16 Dec 2013 16:34:17 +0200 Subject: Rings and molder --- .../renders/TileEntityMolderRender.java | 29 +--------------------- .../renders/TileEntitySmelterRender.java | 19 +++++++------- 2 files changed, 11 insertions(+), 37 deletions(-) (limited to 'common/darkknight/jewelrycraft/renders') diff --git a/common/darkknight/jewelrycraft/renders/TileEntityMolderRender.java b/common/darkknight/jewelrycraft/renders/TileEntityMolderRender.java index 3a91770..054cabd 100644 --- a/common/darkknight/jewelrycraft/renders/TileEntityMolderRender.java +++ b/common/darkknight/jewelrycraft/renders/TileEntityMolderRender.java @@ -36,33 +36,6 @@ public class TileEntityMolderRender extends TileEntitySpecialRenderer modelMolder.render((Entity)null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); if(me != null) { - if(me.hasJewelBase) - { - String texture = "textures/items/" + me.jewelBase.getDisplayName() + ".png"; - ResourceLocation lava = new ResourceLocation(null, "textures/items/iron_ingot.png"); - Minecraft.getMinecraft().renderEngine.bindTexture(lava); - me.jewelBase.getIconIndex().getInterpolatedU(0); - int decal = 32; - double minu = me.jewelBase.getIconIndex().getInterpolatedU(0); - double minv = me.jewelBase.getIconIndex().getInterpolatedV(0); - double maxu = me.jewelBase.getIconIndex().getInterpolatedU(16); - double maxv = me.jewelBase.getIconIndex().getInterpolatedV(16); - GL11.glPushMatrix(); - GL11.glScalef(1f/16f, 1f/16f, 1f/16f); - GL11.glDisable(GL11.GL_LIGHTING); - - for(float f = 0; f <= 1; f+=0.05) - { - 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.glEnable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); - } if(me.hasMold) { String name = me.mold.getDisplayName().substring(0, 1).toLowerCase() + me.mold.getDisplayName().trim().substring(1).replace(" M", "M"); @@ -81,7 +54,7 @@ public class TileEntityMolderRender extends TileEntitySpecialRenderer GL11.glScalef(1f/16f, 1f/16f, 1f/16f); GL11.glDisable(GL11.GL_LIGHTING); - for(float f = 0; f <= 1; f+=0.05) + for(float f = 0; f <= 2; f+=0.01) { tessellator.startDrawingQuads(); tessellator.addVertexWithUV(5, 21+f, 5, minu, minv); diff --git a/common/darkknight/jewelrycraft/renders/TileEntitySmelterRender.java b/common/darkknight/jewelrycraft/renders/TileEntitySmelterRender.java index adee8ec..48e5353 100644 --- a/common/darkknight/jewelrycraft/renders/TileEntitySmelterRender.java +++ b/common/darkknight/jewelrycraft/renders/TileEntitySmelterRender.java @@ -3,6 +3,7 @@ package darkknight.jewelrycraft.renders; import org.lwjgl.opengl.GL11; import darkknight.jewelrycraft.model.ModelSmelter; +import darkknight.jewelrycraft.tileentity.TileEntitySmelter; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; @@ -40,11 +41,11 @@ public class TileEntitySmelterRender extends TileEntitySpecialRenderer modelSmelter.render((Entity)null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); Minecraft.getMinecraft().renderEngine.bindTexture(lava); - Block.lavaStill.getIcon(0, 0).getInterpolatedU(0); - double minu = Block.lavaStill.getIcon(2, 0).getInterpolatedU(0); - double minv = Block.lavaStill.getIcon(2, 0).getInterpolatedV(0); - double maxu = Block.lavaStill.getIcon(2, 0).getInterpolatedU(256); - double maxv = Block.lavaStill.getIcon(2, 0).getInterpolatedV(256); + 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); @@ -55,10 +56,10 @@ public class TileEntitySmelterRender extends TileEntitySpecialRenderer tessellator.addVertexWithUV(-5, 20, -6, maxu, maxv); tessellator.addVertexWithUV(5, 20, -6, minu, maxv); - tessellator.addVertexWithUV(4, 20, -6, maxu, maxv); - tessellator.addVertexWithUV(-4, 20, -6, maxu, minv); - tessellator.addVertexWithUV(-4, 20, -7, minu, minv); - tessellator.addVertexWithUV(4, 20, -7, 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); -- cgit v1.2.3