From 9d08d6c58a0622d31494d612d5b401a1fed186df Mon Sep 17 00:00:00 2001 From: OnyxDarkKnight Date: Fri, 8 May 2015 18:12:00 +0100 Subject: Fixed a few things as well as working towards having the ability to translate everything --- .../java/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java | 6 +++++- .../jewelrycraft/tileentity/renders/TileEntityMolderRender.java | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/tileentity') diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java index 6df0f07..745eb51 100644 --- a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java +++ b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java @@ -9,6 +9,7 @@ import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import darkknight.jewelrycraft.config.ConfigHandler; +import darkknight.jewelrycraft.util.JewelryNBT; import darkknight.jewelrycraft.util.JewelrycraftUtil; public class TileEntitySmelter extends TileEntity @@ -107,7 +108,10 @@ public class TileEntitySmelter extends TileEntity if (melting > 0) melting--; if (melting == 0){ hasMetal = false; - if (!isOre) moltenMetal = metal; + if (!isOre){ + if(JewelryNBT.ingot(metal) == null) moltenMetal = metal; + else moltenMetal = JewelryNBT.ingot(metal); + } else{ moltenMetal = JewelrycraftUtil.getIngotFromOre(metal); moltenMetal.stackSize *= 2; diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityMolderRender.java b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityMolderRender.java index 6ff27db..62e3945 100644 --- a/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityMolderRender.java +++ b/src/main/java/darkknight/jewelrycraft/tileentity/renders/TileEntityMolderRender.java @@ -104,8 +104,8 @@ public class TileEntityMolderRender extends TileEntitySpecialRenderer 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.38f - 0.005f * me.quantity, -0.29F); - GL11.glScalef(1.1F, 1.0F, 1.4F); + GL11.glTranslatef(-0F, 1.4f - 0.005f * me.quantity, -0.29F); + GL11.glScalef(1.2F, 1.0F, 1.4F); GL11.glRotatef(90F, 1F, 0F, 0f); RenderItem.renderInFrame = true; RenderManager.instance.renderEntityWithPosYaw(moltenMetal, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F); -- cgit v1.2.3