First concept of nanomachine commands.

Vexatos · Vexatos · commit 10e2db7e5f93 · 2016-09-15T10:20:57.000+02:00
diff --git a/src/main/java/li/cil/oc/api/nanomachines/Behavior.java b/src/main/java/li/cil/oc/api/nanomachines/Behavior.java
@@ -1,5 +1,7 @@
 package li.cil.oc.api.nanomachines;
 
+import li.cil.oc.api.machine.Arguments;
+
 /**
  * Implemented by single behaviors.
  * <p/>
@@ -49,4 +51,10 @@ public interface Behavior {
      * Called each tick while this behavior is active.
      */
     void update();
+
+    /**
+     * Calls the nanomachine behavior using the <tt>call</tt> command.
+     * The returned values will be passed as the response message.
+     */
+    Object[] call(Arguments args);
 }
diff --git a/src/main/java/li/cil/oc/api/prefab/AbstractBehavior.java b/src/main/java/li/cil/oc/api/prefab/AbstractBehavior.java
@@ -1,5 +1,6 @@
 package li.cil.oc.api.prefab;
 
+import li.cil.oc.api.machine.Arguments;
 import li.cil.oc.api.nanomachines.Behavior;
 import li.cil.oc.api.nanomachines.DisableReason;
 import net.minecraft.entity.player.EntityPlayer;
@@ -49,4 +50,9 @@ public void onDisable(DisableReason reason) {
     @Override
     public void update() {
     }
+
+    @Override
+    public Object[] call(Arguments args) {
+        return new Object[0];
+    }
 }
diff --git a/src/main/scala/li/cil/oc/common/nanomachines/ControllerImpl.scala b/src/main/scala/li/cil/oc/common/nanomachines/ControllerImpl.scala
@@ -16,6 +16,7 @@ import li.cil.oc.api.network.WirelessEndpoint
 import li.cil.oc.common.item.data.NanomachineData
 import li.cil.oc.integration.util.DamageSourceWithRandomCause
 import li.cil.oc.server.PacketSender
+import li.cil.oc.server.machine.ArgumentsImpl
 import li.cil.oc.util.BlockPosition
 import li.cil.oc.util.ExtendedNBT._
 import li.cil.oc.util.InventoryUtils
@@ -139,6 +140,20 @@ class ControllerImpl(val player: EntityPlayer) extends Controller with WirelessE
                 val joined = "{" + names.map(_.replace(',', '_').replace('"', '_')).mkString(",") + "}"
                 respond(sender, "effects", joined)
               }
+            case Array("call", index: java.lang.Number, data @ _*) =>
+              try {
+                var response: Array[AnyRef] = null
+                configuration.synchronized(
+                  response = configuration.behaviors(index.intValue - 1).behavior.call(new ArgumentsImpl(data))
+                )
+                respond(sender, Array(Array("call", new Integer(index.intValue)), response).flatten)
+              }
+              catch {
+                case e: Exception =>
+                  respond(sender, "call", "error", e.getMessage)
+                case _: Throwable =>
+                  respond(sender, "call", "error")
+              }
             case _ => // Ignore.
           }
         case _ => // Not for us.
