From 8131358b719bb87a596ded2f9ed55295688210d9 Mon Sep 17 00:00:00 2001
From: Raul Santos <raulsntos@gmail.com>
Date: Thu, 7 Jul 2022 03:13:41 +0200
Subject: C#: New `RPCAttribute`

Replace old RPC attributes with a new single `RPCAttribute` which works
like the GDScript `@rpc` annotation.
---
 .../GodotSharp/Core/Attributes/RPCAttribute.cs     | 43 ++++++++++++++++++++++
 .../GodotSharp/Core/Attributes/RPCAttributes.cs    | 16 --------
 .../glue/GodotSharp/GodotSharp/GodotSharp.csproj   |  2 +-
 3 files changed, 44 insertions(+), 17 deletions(-)
 create mode 100644 modules/mono/glue/GodotSharp/GodotSharp/Core/Attributes/RPCAttribute.cs
 delete mode 100644 modules/mono/glue/GodotSharp/GodotSharp/Core/Attributes/RPCAttributes.cs

(limited to 'modules/mono/glue')

diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Attributes/RPCAttribute.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Attributes/RPCAttribute.cs
new file mode 100644
index 0000000000..0a1c8322d7
--- /dev/null
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Attributes/RPCAttribute.cs
@@ -0,0 +1,43 @@
+using System;
+
+namespace Godot
+{
+    /// <summary>
+    /// Attribute that changes the RPC mode for the annotated <c>method</c> to the given <see cref="Mode"/>,
+    /// optionally specifying the <see cref="TransferMode"/> and <see cref="TransferChannel"/> (on supported peers).
+    /// See <see cref="RPCMode"/> and <see cref="TransferMode"/>. By default, methods are not exposed to networking
+    /// (and RPCs).
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
+    public class RPCAttribute : Attribute
+    {
+        /// <summary>
+        /// RPC mode for the annotated method.
+        /// </summary>
+        public RPCMode Mode { get; } = RPCMode.Disabled;
+
+        /// <summary>
+        /// If the method will also be called locally; otherwise, it is only called remotely.
+        /// </summary>
+        public bool CallLocal { get; set; } = false;
+
+        /// <summary>
+        /// Transfer mode for the annotated method.
+        /// </summary>
+        public TransferMode TransferMode { get; set; } = TransferMode.Reliable;
+
+        /// <summary>
+        /// Transfer channel for the annotated mode.
+        /// </summary>
+        public int TransferChannel { get; set; } = 0;
+
+        /// <summary>
+        /// Constructs a <see cref="RPCAttribute"/> instance.
+        /// </summary>
+        /// <param name="mode">The RPC mode to use.</param>
+        public RPCAttribute(RPCMode mode = RPCMode.Authority)
+        {
+            Mode = mode;
+        }
+    }
+}
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Attributes/RPCAttributes.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Attributes/RPCAttributes.cs
deleted file mode 100644
index f0d37c344d..0000000000
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Attributes/RPCAttributes.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-
-namespace Godot
-{
-    /// <summary>
-    /// Constructs a new AnyPeerAttribute instance. Members with the AnyPeerAttribute are given authority over their own player.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Method)]
-    public class AnyPeerAttribute : Attribute { }
-
-    /// <summary>
-    /// Constructs a new AuthorityAttribute instance. Members with the AuthorityAttribute are given authority over the game.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Method)]
-    public class AuthorityAttribute : Attribute { }
-}
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj b/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj
index 1fcfe74c86..e59f45bbf6 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj
+++ b/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj
@@ -18,7 +18,7 @@
     <Compile Include="Core\Attributes\DisableGodotGeneratorsAttribute.cs" />
     <Compile Include="Core\Attributes\ExportAttribute.cs" />
     <Compile Include="Core\Attributes\GodotMethodAttribute.cs" />
-    <Compile Include="Core\Attributes\RPCAttributes.cs" />
+    <Compile Include="Core\Attributes\RPCAttribute.cs" />
     <Compile Include="Core\Attributes\ScriptPathAttribute.cs" />
     <Compile Include="Core\Attributes\SignalAttribute.cs" />
     <Compile Include="Core\Attributes\ToolAttribute.cs" />
-- 
cgit v1.2.3