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

Fixed an optional, may or may not help with #574.

Browse Source 
Fixed Geolyzer+Waila logic.
This commit is contained in:
Florian Nücke 2014-09-21 06:03:00 +02:00
parent b3605329d9
commit dd492c8f1f
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/scala/li/cil/oc/common/block/Delegator.scala
View File

@ -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 { 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 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) = override def getOutputValue(world: World, x: Int, y: Int, z: Int, side: ForgeDirection, color: Int) =

2
src/main/scala/li/cil/oc/common/block/Geolyzer.scala
View File

@ -30,7 +30,7 @@ class Geolyzer(val parent: SimpleDelegator) extends SimpleDelegate {
@Optional.Method(modid = Mods.IDs.Waila) @Optional.Method(modid = Mods.IDs.Waila)
override def wailaBody(stack: ItemStack, tooltip: util.List[String], accessor: IWailaDataAccessor, config: IWailaConfigHandler) { 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")) { if (node.hasKey("address")) {
tooltip.add(Localization.Analyzer.Address(node.getString("address")).getUnformattedText) tooltip.add(Localization.Analyzer.Address(node.getString("address")).getUnformattedText)
} }

2
src/main/scala/li/cil/oc/util/mods/Waila.scala
View File

@ -28,7 +28,7 @@ object Waila {
registerKeys(classOf[tileentity.Capacitor], Settings.namespace + "node") registerKeys(classOf[tileentity.Capacitor], Settings.namespace + "node")
registerKeys(classOf[tileentity.Case], Settings.namespace + "address") registerKeys(classOf[tileentity.Case], Settings.namespace + "address")
registerKeys(classOf[tileentity.DiskDrive], Settings.namespace + "items") 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.Hologram], Settings.namespace + "node")
registerKeys(classOf[tileentity.Keyboard], Settings.namespace + "keyboard") registerKeys(classOf[tileentity.Keyboard], Settings.namespace + "keyboard")
registerKeys(classOf[tileentity.MotionSensor], Settings.namespace + "node") registerKeys(classOf[tileentity.MotionSensor], Settings.namespace + "node")