Fixed gutter animation

This commit is contained in:
Calclavia 2014-11-30 14:12:32 +08:00
parent 2ba9e5b52e
commit ed2d858d61
4 changed files with 13 additions and 5 deletions

View file

@ -9,10 +9,10 @@ import net.minecraft.util.IIcon
import net.minecraft.world.{IBlockAccess, World}
import net.minecraftforge.common.util.ForgeDirection
import resonant.api.IRotatable
import resonant.content.prefab.scal.TRotatable
import resonant.content.spatial.block.SpatialBlock
import resonant.lib.content.prefab.TRotatable
import resonantinduction.core.Reference
import resonant.lib.transform.vector.Vector3
import resonantinduction.core.Reference
object TileTurntable
{
@ -23,7 +23,7 @@ class TileTurntable extends SpatialBlock(Material.piston) with TRotatable
{
textureName = "turntable_side"
tickRandomly = true
rotationMask = Integer.parseInt("111111", 2).toByte
rotationMask = 0x3F
override def tickRate(par1World: World): Int = 5

View file

@ -131,6 +131,12 @@ class TileGutter extends TileFluidProvider(Material.rock)
override def activate(player: EntityPlayer, side: Int, vector3: Vector3): Boolean =
{
if (!world.isRemote)
{
fluidNode.onFluidChanged()
println(fluidNode.getFluidAmount)
}
if (player.getCurrentEquippedItem != null)
{
var itemStack: ItemStack = player.getCurrentEquippedItem
@ -165,7 +171,8 @@ class TileGutter extends TileFluidProvider(Material.rock)
return true
}
return FluidUtility.playerActivatedFluidItem(world, xi, yi, zi, player, side)
FluidUtility.playerActivatedFluidItem(world, xi, yi, zi, player, side)
return true
}
return true
}

View file

@ -28,6 +28,7 @@ abstract class TileFluidProvider(material: Material) extends TileAdvanced(materi
def fluidNode_=(newNode: NodeFluid)
{
_fluidNode = newNode
fluidNode.onFluidChanged = () => if (!world.isRemote) sendPacket(0)
fluidNode.onConnectionChanged = () => if (!world.isRemote) sendPacket(1)
nodes.add(fluidNode)
}

View file

@ -7,9 +7,9 @@ import net.minecraft.entity.player.EntityPlayer
import net.minecraft.init.Items
import net.minecraft.item.ItemStack
import net.minecraftforge.common.util.ForgeDirection
import resonant.content.prefab.scal.TRotatable
import resonant.content.spatial.block.SpatialTile
import resonant.engine.ResonantEngine
import resonant.lib.content.prefab.TRotatable
import resonant.lib.grid.node.TSpatialNodeProvider
import resonant.lib.network.ByteBufWrapper._
import resonant.lib.network.discriminator.PacketType