From 6c5b1726b2a06f648141e3101d3f686faf6806ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Thu, 14 Nov 2013 22:26:54 +0100 Subject: [PATCH] fixed rednet interop; reduced powersupply output --- li/cil/oc/common/tileentity/Redstone.scala | 4 ++-- li/cil/oc/server/component/PowerSupply.scala | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/li/cil/oc/common/tileentity/Redstone.scala b/li/cil/oc/common/tileentity/Redstone.scala index 531e5037f..cca2f271b 100644 --- a/li/cil/oc/common/tileentity/Redstone.scala +++ b/li/cil/oc/common/tileentity/Redstone.scala @@ -185,13 +185,13 @@ with IConnectable with IBundledEmitter with IBundledUpdatable with IRedstoneEmit def connectsAroundCorner(wire: IWire, blockFace: Int, fromDirection: Int) = false @Optional.Method(modid = "RedLogic") - def getBundledCableStrength(blockFace: Int, toDirection: Int): Array[Byte] = _bundledOutput(toDirection) + def getBundledCableStrength(blockFace: Int, toDirection: Int): Array[Byte] = _bundledOutput(ForgeDirection.getOrientation(toDirection).getOpposite.ordinal()) @Optional.Method(modid = "RedLogic") def onBundledInputChanged() = checkRedstoneInputChanged() @Optional.Method(modid = "RedLogic") - def getEmittedSignalStrength(blockFace: Int, toDirection: Int): Short = _output(toDirection) + def getEmittedSignalStrength(blockFace: Int, toDirection: Int): Short = (_output(ForgeDirection.getOrientation(toDirection).getOpposite.ordinal()) & 0xFF).toShort @Optional.Method(modid = "RedLogic") def onRedstoneInputChanged() = checkRedstoneInputChanged() diff --git a/li/cil/oc/server/component/PowerSupply.scala b/li/cil/oc/server/component/PowerSupply.scala index 52da046a6..c19316bd1 100644 --- a/li/cil/oc/server/component/PowerSupply.scala +++ b/li/cil/oc/server/component/PowerSupply.scala @@ -11,7 +11,7 @@ class PowerSupply extends ManagedComponent { override def update() { super.update() - node.changeBuffer(2) + node.changeBuffer(1.25) } @LuaCallback(value = "localBufferSize", direct = true)