From eb93c34b330189c79727b0332bb66f3675cfd641 Mon Sep 17 00:00:00 2001
From: Paul Pacheco <paulpach@gmail.com>
Date: Sun, 12 Jul 2020 16:50:01 -0500
Subject: [PATCH] feat: ClientRpc no longer need Rpc prefix (#2086)

Instead of doing
```cs
[ClientRpc]
public void RpcPepe() {}
```

You can now do
```cs
[ClientRpc]
public void Pepe() {}
```

We actually tried to remove them a while ago. The way the weaver worked
back then caused an infinite recursion.

Since the Command rewrite that allows virtuals, this is no longer
a problem.  So we can drop this requirement.

Co-authored-by: Paul Pacheco <paul.pacheco@aa.com>
---
 Assets/Mirror/Editor/Weaver/Processors/RpcProcessor.cs |  6 ------
 Assets/Mirror/Tests/Editor/ClientRpcTest.cs            |  4 ++--
 .../Mirror/Tests/Editor/Weaver/WeaverClientRpcTests.cs |  6 ------
 .../WeaverClientRpcTests~/ClientRpcStartsWithRpc.cs    | 10 ----------
 4 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 Assets/Mirror/Tests/Editor/Weaver/WeaverClientRpcTests~/ClientRpcStartsWithRpc.cs

diff --git a/Assets/Mirror/Editor/Weaver/Processors/RpcProcessor.cs b/Assets/Mirror/Editor/Weaver/Processors/RpcProcessor.cs
index e8a2642ab61..aee473d2ac7 100644
--- a/Assets/Mirror/Editor/Weaver/Processors/RpcProcessor.cs
+++ b/Assets/Mirror/Editor/Weaver/Processors/RpcProcessor.cs
@@ -112,12 +112,6 @@ public static MethodDefinition ProcessRpcCall(TypeDefinition td, MethodDefinitio
 
         public static bool ProcessMethodsValidateRpc(MethodDefinition md)
         {
-            if (!md.Name.StartsWith("Rpc"))
-            {
-                Weaver.Error($"{md.Name} must start with Rpc.  Consider renaming it to Rpc{md.Name}", md);
-                return false;
-            }
-
             if (md.IsStatic)
             {
                 Weaver.Error($"{md.Name} must not be static", md);
diff --git a/Assets/Mirror/Tests/Editor/ClientRpcTest.cs b/Assets/Mirror/Tests/Editor/ClientRpcTest.cs
index aad930c21ca..feac81c1580 100644
--- a/Assets/Mirror/Tests/Editor/ClientRpcTest.cs
+++ b/Assets/Mirror/Tests/Editor/ClientRpcTest.cs
@@ -8,7 +8,7 @@ class ClientRpcBehaviour : NetworkBehaviour
         public event Action<int> onSendInt;
 
         [ClientRpc]
-        public void RpcSendInt(int someInt)
+        public void SendInt(int someInt)
         {
             onSendInt?.Invoke(someInt);
         }
@@ -40,7 +40,7 @@ public void RpcIsCalled()
                 callCount++;
                 Assert.That(incomingInt, Is.EqualTo(someInt));
             };
-            hostBehaviour.RpcSendInt(someInt);
+            hostBehaviour.SendInt(someInt);
             ProcessMessages();
             Assert.That(callCount, Is.EqualTo(1));
         }
diff --git a/Assets/Mirror/Tests/Editor/Weaver/WeaverClientRpcTests.cs b/Assets/Mirror/Tests/Editor/Weaver/WeaverClientRpcTests.cs
index e0dc1742382..b6d9a8bff65 100644
--- a/Assets/Mirror/Tests/Editor/Weaver/WeaverClientRpcTests.cs
+++ b/Assets/Mirror/Tests/Editor/Weaver/WeaverClientRpcTests.cs
@@ -10,12 +10,6 @@ public void ClientRpcValid()
             Assert.That(weaverErrors, Is.Empty);
         }
 
-        [Test]
-        public void ClientRpcStartsWithRpc()
-        {
-            Assert.That(weaverErrors, Contains.Item("DoesntStartWithRpc must start with Rpc.  Consider renaming it to RpcDoesntStartWithRpc (at System.Void WeaverClientRpcTests.ClientRpcStartsWithRpc.ClientRpcStartsWithRpc::DoesntStartWithRpc())"));
-        }
-
         [Test]
         public void ClientRpcCantBeStatic()
         {
diff --git a/Assets/Mirror/Tests/Editor/Weaver/WeaverClientRpcTests~/ClientRpcStartsWithRpc.cs b/Assets/Mirror/Tests/Editor/Weaver/WeaverClientRpcTests~/ClientRpcStartsWithRpc.cs
deleted file mode 100644
index 3eb9064e3a5..00000000000
--- a/Assets/Mirror/Tests/Editor/Weaver/WeaverClientRpcTests~/ClientRpcStartsWithRpc.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Mirror;
-
-namespace WeaverClientRpcTests.ClientRpcStartsWithRpc
-{
-    class ClientRpcStartsWithRpc : NetworkBehaviour
-    {
-        [ClientRpc]
-        void DoesntStartWithRpc() { }
-    }
-}