AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-18 11:48:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed keyboard behavior some.

Browse Source 
I'm not really happy with this fix, because it adds special behavior for multiblock screens where it shouldn't be, but meh.
This commit is contained in:
Florian Nücke 2014-07-10 11:25:11 +02:00
parent 139ffc9f4a
commit d24907b7ab
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/scala/li/cil/oc/common/component/TextBuffer.scala
View File

@ -127,7 +127,12 @@ class TextBuffer(val owner: Container) extends ManagedComponent with api.compone
@Callback(doc = """function():table -- The list of keyboards attached to the screen.""")
def getKeyboards(context: Context, args: Arguments): Array[AnyRef] = {
context.pause(0.25)
Array(node.neighbors.filter(_.host.isInstanceOf[Keyboard]).map(_.address).toArray)
node.host match {
case screen: tileentity.Screen =>
Array(screen.screens.map(_.node).flatMap(_.neighbors.filter(_.host.isInstanceOf[Keyboard]).map(_.address)).toArray)
case _ =>
Array(node.neighbors.filter(_.host.isInstanceOf[Keyboard]).map(_.address).toArray)
}
}
// ----------------------------------------------------------------------- //
@ -571,15 +576,16 @@ object TextBuffer {
}
override def keyDown(character: Char, code: Int, player: EntityPlayer) {
owner.node.sendToVisible("keyboard.keyDown", player, Char.box(character), Int.box(code))
sendToKeyboards("keyboard.keyDown", player, Char.box(character), Int.box(code))
}
override def keyUp(character: Char, code: Int, player: EntityPlayer) {
owner.node.sendToVisible("keyboard.keyUp", player, Char.box(character), Int.box(code))
sendToKeyboards("keyboard.keyUp", player, Char.box(character), Int.box(code))
}
override def clipboard(value: String, player: EntityPlayer) {
owner.node.sendToVisible("keyboard.clipboard", player, value)
sendToKeyboards("keyboard.clipboard", player, value)
}
override def mouseDown(x: Int, y: Int, button: Int, player: EntityPlayer) {
@ -601,6 +607,15 @@ object TextBuffer {
if (Settings.get.inputUsername) owner.node.sendToReachable("computer.checked_signal", player, "scroll", Int.box(x), Int.box(y), Int.box(delta), player.getCommandSenderName)
else owner.node.sendToReachable("computer.checked_signal", player, "scroll", Int.box(x), Int.box(y), Int.box(delta))
}
private def sendToKeyboards(name: String, values: AnyRef*) {
owner.owner match {
case screen: tileentity.Screen =>
screen.screens.foreach(_.node.sendToNeighbors(name, values: _*))
case _ =>
owner.node.sendToNeighbors(name, values: _*)
}
}
}
}