Added support for RPC return values

Author: TwoTenPvP

MLAPI/Data/AttributeMessageMode.cs

@@ -39,7 +39,7 @@ public ReflectionMehtod(MethodInfo methodInfo)
             }
         }
 
-        public void Invoke(object instance, Stream stream)
+        public object Invoke(object instance, Stream stream)
         {
             using (PooledBitReader reader = PooledBitReader.Get(stream))
             {
@@ -48,7 +48,7 @@ public void Invoke(object instance, Stream stream)
                     parameterRefs[i] = reader.ReadObjectPacked(parameterTypes[i]);
                 }
 
-                method.Invoke(instance, parameterRefs);
+                return method.Invoke(instance, parameterRefs);
             }
         }
     }

MLAPI/Data/MLAPIConstants.cs

@@ -26,8 +26,12 @@ public static class MLAPIConstants
         public const byte MLAPI_NETWORKED_VAR_DELTA = 15;
         public const byte MLAPI_NETWORKED_VAR_UPDATE = 16;
         public const byte MLAPI_SERVER_RPC = 17;
-        public const byte MLAPI_CLIENT_RPC = 18;
-        public const byte MLAPI_CUSTOM_MESSAGE = 19;
+        public const byte MLAPI_SERVER_RPC_REQUEST = 18;
+        public const byte MLAPI_SERVER_RPC_RESPONSE = 19;
+        public const byte MLAPI_CLIENT_RPC = 20;
+        public const byte MLAPI_CLIENT_RPC_REQUEST = 21;
+        public const byte MLAPI_CLIENT_RPC_RESPONSE = 22;
+        public const byte MLAPI_CUSTOM_MESSAGE = 23;
         public const byte INVALID = 32;
 
         public static readonly string[] MESSAGE_NAMES = {
@@ -47,9 +51,13 @@ public static class MLAPIConstants
             "MLAPI_ADD_OBJECTS",
             "MLAPI_TIME_SYNC",
             "MLAPI_NETWORKED_VAR_DELTA",
-            "MLAPI_NETWORKED_VAR_UPDATE",
-            "MLAPI_SERVER_RPC", // 16
+            "MLAPI_NETWORKED_VAR_UPDATE", // 16
+            "MLAPI_SERVER_RPC",
+            "MLAPI_SERVER_RPC_REQUEST",
+            "MLAPI_SERVER_RPC_RESPONSE",
             "MLAPI_CLIENT_RPC",
+            "MLAPI_CLIENT_RPC_REQUEST",
+            "MLAPI_CLIENT_RPC_RESPONSE",
             "MLAPI_CUSTOM_MESSAGE",
             "",
             "",
@@ -60,10 +68,6 @@ public static class MLAPIConstants
             "",
             "",
             "",
-            "",
-            "",
-            "",
-            "",
             "INVALID" // 32
         };
 #pragma warning restore CS1591 // Missing XML comment for publicly visible type or member

MLAPI/Data/RpcResponse.cs

@@ -0,0 +1,38 @@
+using System;
+
+namespace MLAPI
+{
+    /// <summary>
+    /// The RpcResponse class exposed by the API. Represents a network Request/Response operation with a result
+    /// </summary>
+    /// <typeparam name="T">The result type</typeparam>
+    public class RpcResponse<T> : RpcResponseBase
+    {
+        /// <summary>
+        /// Gets the value from the operation.
+        /// Note that this is an expensive operation, grab and cache
+        /// </summary>
+        public T Value => Result == null ? default(T) : (T) Result;
+    }
+
+    /// <summary>
+    /// Abstract base class for RpcResponse
+    /// </summary>
+    public abstract class RpcResponseBase
+    {
+        /// <summary>
+        /// Unique ID for the Rpc Request & Response pair
+        /// </summary>
+        public ulong Id { get; internal set; }
+        /// <summary>
+        /// Whether or not a result has been received
+        /// </summary>
+        public bool IsDone { get; internal set; }
+        /// <summary>
+        /// The clientId which the Request/Response was done wit
+        /// </summary>
+        public uint ClientId { get; internal set; }
+        internal object Result { get; set; }
+        internal Type Type { get; set; }
+    }
+}

MLAPI/MLAPI.csproj

@@ -80,6 +80,7 @@
   <ItemGroup>
     <Compile Include="Data\Channel.cs" />
     <Compile Include="Data\AttributeMessageMode.cs" />
+    <Compile Include="Data\RpcResponse.cs" />
     <Compile Include="Data\UnsignedIntegerArrayExtensions.cs" />
     <Compile Include="Data\MLAPIConstants.cs" />
     <Compile Include="Data\NetworkedCollections\NetworkedDictionary.cs" />