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

Properly handle arbitrary number types in signals and return values. Closes #1345.

Browse Source
This commit is contained in:
Florian Nücke 2015-08-02 21:16:30 +02:00
parent a05c83e5e5
commit 4be141a903
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/scala/li/cil/oc/server/driver/Registry.scala
View File

@ -122,6 +122,7 @@ private[oc] object Registry extends api.detail.DriverAPI {
case arg: java.lang.Long => arg
case arg: java.lang.Float => arg
case arg: java.lang.Double => arg
case arg: java.lang.Number => Double.box(arg.doubleValue())
case arg: java.lang.String => arg
case arg: Array[Boolean] => arg

10
src/main/scala/li/cil/oc/server/machine/Machine.scala
View File

@ -303,13 +303,9 @@ class Machine(val host: MachineHost) extends prefab.ManagedEnvironment with mach
signals.enqueue(new Machine.Signal(name, args.map {
case null | Unit | None => null
case arg: java.lang.Boolean => arg
case arg: java.lang.Byte => Double.box(arg.doubleValue)
case arg: java.lang.Character => Double.box(arg.toDouble)
case arg: java.lang.Short => Double.box(arg.doubleValue)
case arg: java.lang.Integer => Double.box(arg.doubleValue)
case arg: java.lang.Long => Double.box(arg.doubleValue)
case arg: java.lang.Float => Double.box(arg.doubleValue)
case arg: java.lang.Double => arg
case arg: java.lang.Long => arg
case arg: java.lang.Number => Double.box(arg.doubleValue)
case arg: java.lang.String => arg
case arg: Array[Byte] => arg
case arg: Map[_, _] if arg.isEmpty || arg.head._1.isInstanceOf[String] && arg.head._2.isInstanceOf[String] => arg
@ -697,6 +693,7 @@ class Machine(val host: MachineHost) extends prefab.ManagedEnvironment with mach
(0 until argsLength).map("arg" + _).map(argsNbt.getTag).map {
case tag: NBTTagByte if tag.func_150290_f == -1 => null
case tag: NBTTagByte => Boolean.box(tag.func_150290_f == 1)
case tag: NBTTagLong => Long.box(tag.func_150291_c)
case tag: NBTTagDouble => Double.box(tag.func_150286_g)
case tag: NBTTagString => tag.func_150285_a_
case tag: NBTTagByteArray => tag.func_150292_c
@ -770,6 +767,7 @@ class Machine(val host: MachineHost) extends prefab.ManagedEnvironment with mach
s.args.zipWithIndex.foreach {
case (null, i) => args.setByte("arg" + i, -1)
case (arg: java.lang.Boolean, i) => args.setByte("arg" + i, if (arg) 1 else 0)
case (arg: java.lang.Long, i) => args.setLong("arg" + i, arg)
case (arg: java.lang.Double, i) => args.setDouble("arg" + i, arg)
case (arg: String, i) => args.setString("arg" + i, arg)
case (arg: Array[Byte], i) => args.setByteArray("arg" + i, arg)