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

redstone, oh how i loathe ye

Browse Source
This commit is contained in:
Florian Nücke 2013-10-18 21:48:41 +02:00
parent 7d73f3afc5
commit 87aa1f44a9
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
li/cil/oc/common/tileentity/Computer.scala
View File

@ -119,13 +119,13 @@ class Computer(isClient: Boolean) extends Rotatable with component.Computer.Envi
override def input(side: ForgeDirection) = { override def input(side: ForgeDirection) = {
val global = toGlobal(side) val global = toGlobal(side)
worldObj.isBlockProvidingPowerTo( worldObj.getIndirectPowerLevelTo(
xCoord + global.offsetX, yCoord + global.offsetY, zCoord + global.offsetZ, global.getOpposite.ordinal) xCoord + global.offsetX, yCoord + global.offsetY, zCoord + global.offsetZ, global.ordinal())
} }
override protected def onRedstoneInputChanged(side: ForgeDirection) { override protected def onRedstoneInputChanged(side: ForgeDirection) {
super.onRedstoneInputChanged(side) super.onRedstoneInputChanged(side)
computer.signal("redstone_changed", toLocal(side).ordinal()) computer.signal("redstone_changed", side.ordinal())
} }
override protected def onRedstoneOutputChanged(side: ForgeDirection) { override protected def onRedstoneOutputChanged(side: ForgeDirection) {

1
li/cil/oc/server/component/Redstone.scala
View File

@ -61,7 +61,6 @@ trait Redstone extends Node {
override def receive(message: Message) = super.receive(message).orElse { override def receive(message: Message) = super.receive(message).orElse {
message.data match { message.data match {
case Array(side: ForgeDirection) if message.name == "redstone.input" && side != ForgeDirection.UNKNOWN => case Array(side: ForgeDirection) if message.name == "redstone.input" && side != ForgeDirection.UNKNOWN =>
checkRedstoneInputChanged()
result(_input(side.ordinal())) result(_input(side.ordinal()))
case Array(side: ForgeDirection) if message.name == "redstone.output" && side != ForgeDirection.UNKNOWN => case Array(side: ForgeDirection) if message.name == "redstone.output" && side != ForgeDirection.UNKNOWN =>
result(output(side)) result(output(side))