From ad5af0377543e05b5830bdacee5c6ad73527798d Mon Sep 17 00:00:00 2001 From: Calclavia Date: Fri, 9 Jan 2015 12:27:06 +0800 Subject: [PATCH] Fixed RenderItemOverlayUtility item lighting --- .../archaic/firebox/TileHotPlate.scala | 111 +++++++++--------- .../archaic/process/TileWorkbench.scala | 3 + 2 files changed, 59 insertions(+), 55 deletions(-) diff --git a/src/main/scala/resonantinduction/archaic/firebox/TileHotPlate.scala b/src/main/scala/resonantinduction/archaic/firebox/TileHotPlate.scala index 814894814..6bf481fbb 100644 --- a/src/main/scala/resonantinduction/archaic/firebox/TileHotPlate.scala +++ b/src/main/scala/resonantinduction/archaic/firebox/TileHotPlate.scala @@ -10,13 +10,13 @@ import net.minecraft.item.crafting.FurnaceRecipes import net.minecraft.nbt.NBTTagCompound import net.minecraft.util.IIcon import net.minecraft.world.IBlockAccess -import resonant.lib.wrapper.ByteBufWrapper._ +import resonant.lib.content.prefab.TInventory import resonant.lib.network.discriminator.PacketType import resonant.lib.network.handle.{TPacketReceiver, TPacketSender} -import resonant.lib.prefab.tile.TileInventory -import resonant.lib.prefab.tile.spatial.SpatialBlock +import resonant.lib.prefab.tile.spatial.{SpatialBlock, SpatialTile} import resonant.lib.transform.region.Cuboid import resonant.lib.transform.vector.{Vector2, Vector3} +import resonant.lib.wrapper.ByteBufWrapper._ import resonant.lib.wrapper.RandomWrapper._ import resonantinduction.core.Reference @@ -30,14 +30,13 @@ object TileHotPlate final val maxSmeltTime: Int = 200 } -class TileHotPlate extends TileInventory(Material.iron) with TPacketSender with TPacketReceiver +class TileHotPlate extends SpatialTile(Material.iron) with TInventory with TPacketSender with TPacketReceiver { /** Amount of smelt time left */ final val smeltTime = Array[Int](0, 0, 0, 0) final val stackSizeCache = Array[Int](0, 0, 0, 0) //Constructor - setSizeInventory(4) bounds = new Cuboid(0, 0, 0, 1, 0.2f, 1) forceItemToRenderAsBlock = true isOpaqueCube = false @@ -86,6 +85,20 @@ class TileHotPlate extends TileInventory(Material.iron) with TPacketSender with } } + def canRun: Boolean = + { + val tileEntity = worldObj.getTileEntity(xCoord, yCoord - 1, zCoord) + + if (tileEntity.isInstanceOf[TileFirebox]) + { + if ((tileEntity.asInstanceOf[TileFirebox]).isBurning) + { + return true + } + } + return false + } + override def randomDisplayTick() { val height = 0.2 @@ -111,48 +124,6 @@ class TileHotPlate extends TileInventory(Material.iron) with TPacketSender with ) } - override def onInventoryChanged() - { - for (i <- 0 until getSizeInventory) - { - if (getStackInSlot(i) != null) - { - if (stackSizeCache(i) != getStackInSlot(i).stackSize) - { - if (smeltTime(i) > 0) - { - smeltTime(i) += (getStackInSlot(i).stackSize - stackSizeCache(i)) * TileHotPlate.maxSmeltTime - } - stackSizeCache(i) = getStackInSlot(i).stackSize - } - } - else - { - stackSizeCache(i) = 0 - } - } - if (worldObj != null) - { - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord) - } - } - - def canRun: Boolean = - { - val tileEntity = worldObj.getTileEntity(xCoord, yCoord - 1, zCoord) - - if (tileEntity.isInstanceOf[TileFirebox]) - { - if ((tileEntity.asInstanceOf[TileFirebox]).isBurning) - { - return true - } - } - return false - } - - def canSmelt(stack: ItemStack): Boolean = stack != null && FurnaceRecipes.smelting.getSmeltingResult(stack) != null - def isSmelting: Boolean = (0 until getSizeInventory).exists(getSmeltTime(_) > 0) def getSmeltTime(i: Int): Int = @@ -165,6 +136,8 @@ class TileHotPlate extends TileInventory(Material.iron) with TPacketSender with return i < getSizeInventory && canSmelt(itemStack) } + def canSmelt(stack: ItemStack): Boolean = stack != null && FurnaceRecipes.smelting.getSmeltingResult(stack) != null + override def write(buf: ByteBuf, id: Int) { super.write(buf, id) @@ -173,6 +146,16 @@ class TileHotPlate extends TileInventory(Material.iron) with TPacketSender with buf <<< nbt } + override def writeToNBT(nbt: NBTTagCompound) + { + super.writeToNBT(nbt) + + (0 until stackSizeCache.size).foreach(i => nbt.setInteger("stackSizeCache" + i, stackSizeCache(i))) + (0 until getSizeInventory).foreach(i => nbt.setInteger("smeltTime" + i, smeltTime(i))) + } + + override def getSizeInventory: Int = 4 + override def read(buf: ByteBuf, id: Int, packetType: PacketType) { super.read(buf, id, packetType) @@ -190,14 +173,6 @@ class TileHotPlate extends TileInventory(Material.iron) with TPacketSender with } - override def writeToNBT(nbt: NBTTagCompound) - { - super.writeToNBT(nbt) - - (0 until stackSizeCache.size).foreach(i => nbt.setInteger("stackSizeCache" + i, stackSizeCache(i))) - (0 until getSizeInventory).foreach(i => nbt.setInteger("smeltTime" + i, smeltTime(i))) - } - @SideOnly(Side.CLIENT) override def registerIcons(iconReg: IIconRegister) { @@ -254,4 +229,30 @@ class TileHotPlate extends TileInventory(Material.iron) with TPacketSender with return true } + override def onInventoryChanged() + { + for (i <- 0 until getSizeInventory) + { + if (getStackInSlot(i) != null) + { + if (stackSizeCache(i) != getStackInSlot(i).stackSize) + { + if (smeltTime(i) > 0) + { + smeltTime(i) += (getStackInSlot(i).stackSize - stackSizeCache(i)) * TileHotPlate.maxSmeltTime + } + stackSizeCache(i) = getStackInSlot(i).stackSize + } + } + else + { + stackSizeCache(i) = 0 + } + } + if (worldObj != null) + { + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord) + } + } + } \ No newline at end of file diff --git a/src/main/scala/resonantinduction/archaic/process/TileWorkbench.scala b/src/main/scala/resonantinduction/archaic/process/TileWorkbench.scala index a46dc4b9e..93b9ddfa5 100644 --- a/src/main/scala/resonantinduction/archaic/process/TileWorkbench.scala +++ b/src/main/scala/resonantinduction/archaic/process/TileWorkbench.scala @@ -156,10 +156,13 @@ class TileWorkbench extends SpatialTile(Material.rock) with TInventory with TPac { GL11.glPushMatrix() RenderItemOverlayUtility.renderTopOverlay(this, Array[ItemStack](getStackInSlot(0)), null, 1, 1, pos.x, pos.y - (if (metadata == 1) 0.2 else 0.5), pos.z, 1.8f) + GL11.glPopMatrix() + GL11.glPushMatrix() GL11.glColor4f(1, 1, 1, 1) GL11.glTranslated(pos.x, pos.y, pos.z) RenderUtility.bind(Reference.domain, Reference.modelPath + "workbench_" + metadata + ".png") TileWorkbench.model(metadata).renderAll() GL11.glPopMatrix() + } }