From dd492c8f1f5de0e6a03e6874f338d69aeab70111 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Sun, 21 Sep 2014 06:03:00 +0200 Subject: [PATCH] Fixed an optional, may or may not help with #574. Fixed Geolyzer+Waila logic. --- src/main/scala/li/cil/oc/common/block/Delegator.scala | 3 ++- src/main/scala/li/cil/oc/common/block/Geolyzer.scala | 2 +- src/main/scala/li/cil/oc/util/mods/Waila.scala | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/scala/li/cil/oc/common/block/Delegator.scala b/src/main/scala/li/cil/oc/common/block/Delegator.scala index 3991c374f..7ef308e79 100644 --- a/src/main/scala/li/cil/oc/common/block/Delegator.scala +++ b/src/main/scala/li/cil/oc/common/block/Delegator.scala @@ -503,8 +503,9 @@ class SpecialDelegator extends Delegator[SpecialDelegate] { } } -@Optional.Interface(iface = "powercrystals.minefactoryreloaded.api.rednet.IConnectableRedNet", modid = Mods.IDs.MineFactoryReloaded) +@Optional.Interface(iface = "powercrystals.minefactoryreloaded.api.rednet.IRedNetOmniNode", modid = Mods.IDs.MineFactoryReloaded) trait RedstoneDelegator[Child <: Delegate] extends Delegator[Child] with IRedNetOmniNode { + @Optional.Method(modid = Mods.IDs.MineFactoryReloaded) override def getConnectionType(world: World, x: Int, y: Int, z: Int, side: ForgeDirection) = RedNetConnectionType.CableAll override def getOutputValue(world: World, x: Int, y: Int, z: Int, side: ForgeDirection, color: Int) = diff --git a/src/main/scala/li/cil/oc/common/block/Geolyzer.scala b/src/main/scala/li/cil/oc/common/block/Geolyzer.scala index 7dabc3735..220065ccf 100644 --- a/src/main/scala/li/cil/oc/common/block/Geolyzer.scala +++ b/src/main/scala/li/cil/oc/common/block/Geolyzer.scala @@ -30,7 +30,7 @@ class Geolyzer(val parent: SimpleDelegator) extends SimpleDelegate { @Optional.Method(modid = Mods.IDs.Waila) override def wailaBody(stack: ItemStack, tooltip: util.List[String], accessor: IWailaDataAccessor, config: IWailaConfigHandler) { - val node = accessor.getNBTData.getCompoundTag(Settings.namespace + "node") + val node = accessor.getNBTData.getCompoundTag("node") if (node.hasKey("address")) { tooltip.add(Localization.Analyzer.Address(node.getString("address")).getUnformattedText) } diff --git a/src/main/scala/li/cil/oc/util/mods/Waila.scala b/src/main/scala/li/cil/oc/util/mods/Waila.scala index 14aec03e8..e00f2613e 100644 --- a/src/main/scala/li/cil/oc/util/mods/Waila.scala +++ b/src/main/scala/li/cil/oc/util/mods/Waila.scala @@ -28,7 +28,7 @@ object Waila { registerKeys(classOf[tileentity.Capacitor], Settings.namespace + "node") registerKeys(classOf[tileentity.Case], Settings.namespace + "address") registerKeys(classOf[tileentity.DiskDrive], Settings.namespace + "items") - registerKeys(classOf[tileentity.Geolyzer], Settings.namespace + "node") + registerKeys(classOf[tileentity.Geolyzer], "node") registerKeys(classOf[tileentity.Hologram], Settings.namespace + "node") registerKeys(classOf[tileentity.Keyboard], Settings.namespace + "keyboard") registerKeys(classOf[tileentity.MotionSensor], Settings.namespace + "node")