AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-15 10:21:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

activating keyboards activates the screen they're attached to

Browse Source
This commit is contained in:
Florian Nücke 2013-11-24 16:18:58 +01:00
parent 33583dd52d
commit 3fa660acb7
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
li/cil/oc/common/block/Keyboard.scala
View File

@ -5,6 +5,7 @@ import li.cil.oc.api
import li.cil.oc.common.tileentity import li.cil.oc.common.tileentity
import net.minecraft.client.renderer.texture.IconRegister import net.minecraft.client.renderer.texture.IconRegister
import net.minecraft.entity.EntityLivingBase import net.minecraft.entity.EntityLivingBase
import net.minecraft.entity.player.EntityPlayer
import net.minecraft.item.ItemStack import net.minecraft.item.ItemStack
import net.minecraft.util.Icon import net.minecraft.util.Icon
import net.minecraft.world.{IBlockAccess, World} import net.minecraft.world.{IBlockAccess, World}
@ -75,5 +76,19 @@ class Keyboard(val parent: SpecialDelegator) extends SpecialDelegate {
world.setBlockToAir(x, y, z) world.setBlockToAir(x, y, z)
} }
override def onBlockActivated(world: World, x: Int, y: Int, z: Int, player: EntityPlayer, side: ForgeDirection, hitX: Float, hitY: Float, hitZ: Float) =
world.getBlockTileEntity(x, y, z) match {
case keyboard: tileentity.Keyboard =>
val (sx, sy, sz) = (
x + keyboard.facing.getOpposite.offsetX,
y + keyboard.facing.getOpposite.offsetY,
z + keyboard.facing.getOpposite.offsetZ)
Delegator.subBlock(world, sx, sy, sz) match {
case Some(screen: Screen) => screen.onBlockActivated(world, sx, sy, sz, player, keyboard.facing.getOpposite, 0, 0, 0)
case _ => super.onBlockActivated(world, x, y, z, player, side, hitX, hitY, hitZ)
}
case _ => super.onBlockActivated(world, x, y, z, player, side, hitX, hitY, hitZ)
}
override protected val validRotations = ForgeDirection.VALID_DIRECTIONS override protected val validRotations = ForgeDirection.VALID_DIRECTIONS
} }