tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Fixed hot plate rendering

Browse source
This commit is contained in:
Calclavia 2014-11-17 10:39:28 +08:00
parent 3156ebd7e8
commit f84cdfa0c5
2 changed files with 205 additions and 206 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/scala/resonantinduction/archaic/engineering/TileEngineeringTable.scala
View file

@ -88,12 +88,14 @@ class TileEngineeringTable extends TileInventory(Material.wood) with IPacketRece
isOpaqueCube(false)
itemBlock(classOf[ItemBlockSaved])
@SideOnly(Side.CLIENT) override def getIcon(side: Int, meta: Int): IIcon =
@SideOnly(Side.CLIENT)
override def getIcon(side: Int, meta: Int): IIcon =
{
return if (side == 1) TileEngineeringTable.iconTop else (if (side == meta) TileEngineeringTable.iconFront else TileEngineeringTable.iconSide)
}
@SideOnly(Side.CLIENT) override def registerIcons(iconRegister: IIconRegister)
@SideOnly(Side.CLIENT)
override def registerIcons(iconRegister: IIconRegister)
{
TileEngineeringTable.iconTop = iconRegister.registerIcon(getTextureName + "_top")
TileEngineeringTable.iconFront = iconRegister.registerIcon(getTextureName + "_front")

57
src/main/scala/resonantinduction/archaic/firebox/TileHotPlate.scala
View file

@ -11,15 +11,14 @@ import net.minecraft.entity.player.EntityPlayer
import net.minecraft.item.ItemStack
import net.minecraft.item.crafting.FurnaceRecipes
import net.minecraft.nbt.NBTTagCompound
import net.minecraft.tileentity.TileEntity
import net.minecraft.util.IIcon
import resonant.content.spatial.block.SpatialBlock
import resonant.lib.content.prefab.java.TileInventory
import resonant.lib.network.discriminator.{PacketTile, PacketType}
import resonant.lib.network.handle.IPacketReceiver
import resonantinduction.core.Reference
import resonant.lib.transform.region.Cuboid
import resonant.lib.transform.vector.{Vector2, Vector3}
import resonantinduction.core.Reference
/**
* For smelting items.
@ -40,15 +39,16 @@ class TileHotPlate extends TileInventory(Material.iron) with IPacketReceiver
//Constructor
setSizeInventory(4)
bounds(new Cuboid(0, 0, 0, 1, 0.2f, 1))
normalRender(false)
forceStandardRender(true)
isOpaqueCube(false)
forceItemToRenderAsBlock = true
isOpaqueCube = false
override def update
override def update()
{
super.update()
if (canRun)
{
var didSmelt: Boolean = false
var didSmelt = false
for (i <- 0 to getSizeInventory)
{
@ -62,7 +62,7 @@ class TileHotPlate extends TileInventory(Material.iron) with IPacketReceiver
}
else if (smeltTime(i) > 0)
{
smeltTime(i) -= 1;
smeltTime(i) -= 1
if (smeltTime(i) == 0)
{
if (!worldObj.isRemote)
@ -84,9 +84,9 @@ class TileHotPlate extends TileInventory(Material.iron) with IPacketReceiver
}
}
override def onInventoryChanged
override def onInventoryChanged()
{
for (i <- 0 to getSizeInventory)
for (i <- 0 until getSizeInventory)
{
if (getStackInSlot(i) != null)
{
@ -112,7 +112,8 @@ class TileHotPlate extends TileInventory(Material.iron) with IPacketReceiver
def canRun: Boolean =
{
val tileEntity: TileEntity = worldObj.getTileEntity(xCoord, yCoord - 1, zCoord)
val tileEntity = worldObj.getTileEntity(xCoord, yCoord - 1, zCoord)
if (tileEntity.isInstanceOf[TileFirebox])
{
if ((tileEntity.asInstanceOf[TileFirebox]).isBurning)
@ -130,22 +131,16 @@ class TileHotPlate extends TileInventory(Material.iron) with IPacketReceiver
def isSmelting: Boolean =
{
{
var i: Int = 0
while (i < getSizeInventory)
{
for (i <- 0 until getSizeInventory)
{
if (getSmeltTime(i) > 0)
{
return true
}
}
({
i += 1;
i - 1
})
}
}
return false
}
@ -197,7 +192,7 @@ class TileHotPlate extends TileInventory(Material.iron) with IPacketReceiver
override def readFromNBT(nbt: NBTTagCompound)
{
super.readFromNBT(nbt)
for (i <- 0 to getSizeInventory)
for (i <- 0 until getSizeInventory)
{
smeltTime(i) = nbt.getInteger("smeltTime" + i)
}
@ -207,19 +202,21 @@ class TileHotPlate extends TileInventory(Material.iron) with IPacketReceiver
{
super.writeToNBT(nbt)
for (i <- 0 to getSizeInventory)
for (i <- 0 until getSizeInventory)
{
nbt.setInteger("smeltTime" + i, smeltTime(i))
}
}
@SideOnly(Side.CLIENT) override def registerIcons(iconReg: IIconRegister)
@SideOnly(Side.CLIENT)
override def registerIcons(iconReg: IIconRegister)
{
super.registerIcons(iconReg)
SpatialBlock.icon.put("electricHotPlate", iconReg.registerIcon(Reference.prefix + "electricHotPlate"))
}
@SideOnly(Side.CLIENT) override def getIcon(side: Int, meta: Int): IIcon =
@SideOnly(Side.CLIENT)
override def getIcon(side: Int, meta: Int): IIcon =
{
return if (meta == 1) SpatialBlock.icon.get("electricHotPlate") else SpatialBlock.icon.get(getTextureName)
}
@ -239,16 +236,16 @@ class TileHotPlate extends TileInventory(Material.iron) with IPacketReceiver
val hitVector: Vector2 = new Vector2(hit.x, hit.z)
val regionLength: Double = 1d / 2d
var j: Int = 0
for (j <- 0 to 2)
for (j <- 0 until 2)
{
for (k <- 0 to 2)
for (k <- 0 until 2)
{
val check: Vector2 = new Vector2(j, k).multiply(regionLength)
val check = new Vector2(j, k) * regionLength
if (check.distance(hitVector) < regionLength)
{
val slotID: Int = j * 2 + k
val slotID = j * 2 + k
interactCurrentItem(this, slotID, player)
onInventoryChanged
onInventoryChanged()
return true
}
}