Updates standards and errors

Author: michalChrobot

.yamato/project-standards.yml

@@ -45,9 +45,10 @@ standards_{{ platform.name }}_{{ project.name }}_{{ editor }}:
     - dotnet format --version
 
     - unity-downloader-cli --fast --wait -u {{ editor }} -c editor {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models. Downloads basic editor
-
     - .Editor/Unity -batchmode -nographics -logFile - -executeMethod Packages.Rider.Editor.RiderScriptEditor.SyncSolution -projectPath {{ project.path }} -quit # This command is used to invoke Unity in a "headless" mode. It's used to sync the project
-    - dotnet run --project=dotnet-tools/netcode.standards -- --project={{ project.path }} --check # Runs standards check
+    - dotnet run --project=dotnet-tools/netcode.standards -- --project={{ project.path }} --fix # Auto-fix formatting issues
+    - git checkout -- {{ project.path }}/Packages/manifest.json {{ project.path }}/Packages/packages-lock.json {{ project.path }}/ProjectSettings/ProjectVersion.txt 2>/dev/null || true # Restore files that Unity may have modified (we only want to check code formatting)
+    - 'git diff --exit-code || (echo "ERROR: Code formatting issues found. Run dotnet run --project=dotnet-tools/netcode.standards -- --project={{ project.path }} --fix locally and commit the changes." && exit 1)' # Fail if formatter made any changes
 {% endfor -%}
 {% endfor -%}
 {% endfor -%}

com.unity.netcode.gameobjects/Components/NetworkAnimator.cs

@@ -533,11 +533,8 @@ static AnimationParamEnumWrapper()
         /// </summary>
         private void SpawnCleanup()
         {
-            if (m_NetworkAnimatorStateChangeHandler != null)
-            {
-                m_NetworkAnimatorStateChangeHandler.DeregisterUpdate();
-                m_NetworkAnimatorStateChangeHandler = null;
-            }
+            m_NetworkAnimatorStateChangeHandler?.DeregisterUpdate();
+            m_NetworkAnimatorStateChangeHandler = null;
         }
 
         public override void OnDestroy()

com.unity.netcode.gameobjects/Components/NetworkTransform.cs

@@ -3385,6 +3385,6 @@ private static void DeregisterForTickUpdate(NetworkTransform networkTransform)
 
     internal interface INetworkTransformLogStateEntry
     {
-        void AddLogEntry(NetworkTransform.NetworkTransformState networkTransformState, ulong targetClient, bool preUpdate = false);
+        public void AddLogEntry(NetworkTransform.NetworkTransformState networkTransformState, ulong targetClient, bool preUpdate = false);
     }
 }

com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs

@@ -608,8 +608,8 @@ internal T Value
         /// </summary>
         internal interface INetworkManagerHelper
         {
-            bool NotifyUserOfNestedNetworkManager(NetworkManager networkManager, bool ignoreNetworkManagerCache = false, bool editorTest = false);
-            void CheckAndNotifyUserNetworkObjectRemoved(NetworkManager networkManager, bool editorTest = false);
+            public bool NotifyUserOfNestedNetworkManager(NetworkManager networkManager, bool ignoreNetworkManagerCache = false, bool editorTest = false);
+            public void CheckAndNotifyUserNetworkObjectRemoved(NetworkManager networkManager, bool editorTest = false);
         }
 
         internal delegate void ResetNetworkManagerDelegate(NetworkManager manager);
@@ -1255,11 +1255,8 @@ internal void ShutdownInternal()
 
             CustomMessagingManager = null;
 
-            if (MessageManager != null)
-            {
-                MessageManager.Dispose();
-                MessageManager = null;
-            }
+            MessageManager?.Dispose();
+            MessageManager = null;
 
             // We need to clean up NetworkObjects before we reset the IsServer
             // and IsClient properties. This provides consistency of these two

com.unity.netcode.gameobjects/Runtime/Core/NetworkUpdateLoop.cs

@@ -15,7 +15,7 @@ public interface INetworkUpdateSystem
         /// The update method that is being executed in the context of related <see cref="NetworkUpdateStage"/>.
         /// </summary>
         /// <param name="updateStage">The <see cref="NetworkUpdateStage"/> that is being executed.</param>
-        void NetworkUpdate(NetworkUpdateStage updateStage);
+        public void NetworkUpdate(NetworkUpdateStage updateStage);
     }
 
     /// <summary>

com.unity.netcode.gameobjects/Runtime/Messaging/IDeferredNetworkMessageManager.cs

@@ -17,20 +17,20 @@ internal enum TriggerType
         /// There is a one second maximum lifetime of triggers to avoid memory leaks. After one second has passed
         /// without the requested object ID being spawned, the triggers for it are automatically deleted.
         /// </summary>
-        void DeferMessage(TriggerType trigger, ulong key, FastBufferReader reader, ref NetworkContext context);
+        public void DeferMessage(TriggerType trigger, ulong key, FastBufferReader reader, ref NetworkContext context);
 
         /// <summary>
         /// Cleans up any trigger that's existed for more than a second.
         /// These triggers were probably for situations where a request was received after a despawn rather than before a spawn.
         /// </summary>
-        void CleanupStaleTriggers();
+        public void CleanupStaleTriggers();
 
-        void ProcessTriggers(TriggerType trigger, ulong key);
+        public void ProcessTriggers(TriggerType trigger, ulong key);
 
         /// <summary>
         /// Cleans up any trigger that's existed for more than a second.
         /// These triggers were probably for situations where a request was received after a despawn rather than before a spawn.
         /// </summary>
-        void CleanupAllTriggers();
+        public void CleanupAllTriggers();
     }
 }

com.unity.netcode.gameobjects/Runtime/Messaging/INetworkHooks.cs

@@ -15,7 +15,7 @@ internal interface INetworkHooks
         /// <param name="clientId">The destination clientId</param>
         /// <param name="message">The message being sent</param>
         /// <param name="delivery"></param>
-        void OnBeforeSendMessage<T>(ulong clientId, ref T message, NetworkDelivery delivery) where T : INetworkMessage;
+        public void OnBeforeSendMessage<T>(ulong clientId, ref T message, NetworkDelivery delivery) where T : INetworkMessage;
 
         /// <summary>
         /// Called after an individual message is sent.
@@ -24,23 +24,23 @@ internal interface INetworkHooks
         /// <param name="message">The message being sent</param>
         /// <param name="delivery"></param>
         /// <param name="messageSizeBytes">Number of bytes in the message, not including the message header</param>
-        void OnAfterSendMessage<T>(ulong clientId, ref T message, NetworkDelivery delivery, int messageSizeBytes) where T : INetworkMessage;
+        public void OnAfterSendMessage<T>(ulong clientId, ref T message, NetworkDelivery delivery, int messageSizeBytes) where T : INetworkMessage;
 
         /// <summary>
         /// Called before an individual message is received.
         /// </summary>
         /// <param name="senderId">The source clientId</param>
         /// <param name="messageType">The type of the message being sent</param>
         /// <param name="messageSizeBytes">Number of bytes in the message, not including the message header</param>
-        void OnBeforeReceiveMessage(ulong senderId, Type messageType, int messageSizeBytes);
+        public void OnBeforeReceiveMessage(ulong senderId, Type messageType, int messageSizeBytes);
 
         /// <summary>
         /// Called after an individual message is received.
         /// </summary>
         /// <param name="senderId">The source clientId</param>
         /// <param name="messageType">The type of the message being sent</param>
         /// <param name="messageSizeBytes">Number of bytes in the message, not including the message header</param>
-        void OnAfterReceiveMessage(ulong senderId, Type messageType, int messageSizeBytes);
+        public void OnAfterReceiveMessage(ulong senderId, Type messageType, int messageSizeBytes);
 
         /// <summary>
         /// Called before a batch of messages is sent
@@ -49,7 +49,7 @@ internal interface INetworkHooks
         /// <param name="messageCount">Number of messages in the batch</param>
         /// <param name="batchSizeInBytes">Number of bytes in the batch, including the batch header</param>
         /// <param name="delivery"></param>
-        void OnBeforeSendBatch(ulong clientId, int messageCount, int batchSizeInBytes, NetworkDelivery delivery);
+        public void OnBeforeSendBatch(ulong clientId, int messageCount, int batchSizeInBytes, NetworkDelivery delivery);
 
         /// <summary>
         /// Called after a batch of messages is sent
@@ -58,23 +58,23 @@ internal interface INetworkHooks
         /// <param name="messageCount">Number of messages in the batch</param>
         /// <param name="batchSizeInBytes">Number of bytes in the batch, including the batch header</param>
         /// <param name="delivery"></param>
-        void OnAfterSendBatch(ulong clientId, int messageCount, int batchSizeInBytes, NetworkDelivery delivery);
+        public void OnAfterSendBatch(ulong clientId, int messageCount, int batchSizeInBytes, NetworkDelivery delivery);
 
         /// <summary>
         /// Called before a batch of messages is received
         /// </summary>
         /// <param name="senderId">The source clientId</param>
         /// <param name="messageCount">Number of messages in the batch</param>
         /// <param name="batchSizeInBytes">Number of bytes in the batch, including the batch header</param>
-        void OnBeforeReceiveBatch(ulong senderId, int messageCount, int batchSizeInBytes);
+        public void OnBeforeReceiveBatch(ulong senderId, int messageCount, int batchSizeInBytes);
 
         /// <summary>
         /// Called after a batch of messages is received
         /// </summary>
         /// <param name="senderId">The source clientId</param>
         /// <param name="messageCount">Number of messages in the batch</param>
         /// <param name="batchSizeInBytes">Number of bytes in the batch, including the batch header</param>
-        void OnAfterReceiveBatch(ulong senderId, int messageCount, int batchSizeInBytes);
+        public void OnAfterReceiveBatch(ulong senderId, int messageCount, int batchSizeInBytes);
 
 
         /// <summary>
@@ -84,7 +84,7 @@ internal interface INetworkHooks
         /// <param name="messageType">The type of the message</param>
         /// <param name="delivery"></param>
         /// <returns></returns>
-        bool OnVerifyCanSend(ulong destinationId, Type messageType, NetworkDelivery delivery);
+        public bool OnVerifyCanSend(ulong destinationId, Type messageType, NetworkDelivery delivery);
 
         /// <summary>
         /// Called before a message is received. If this returns false, the message will be discarded.
@@ -94,7 +94,7 @@ internal interface INetworkHooks
         /// <param name="messageContent">The FastBufferReader containing the message</param>
         /// <param name="context">The NetworkContext the message is being processed in</param>
         /// <returns></returns>
-        bool OnVerifyCanReceive(ulong senderId, Type messageType, FastBufferReader messageContent, ref NetworkContext context);
+        public bool OnVerifyCanReceive(ulong senderId, Type messageType, FastBufferReader messageContent, ref NetworkContext context);
 
         /// <summary>
         /// Called after a message is serialized, but before it's handled.
@@ -103,7 +103,7 @@ internal interface INetworkHooks
         /// <param name="message">The message object</param>
         /// <param name="context">The network context the message is being ahandled in</param>
         /// <typeparam name="T"></typeparam>
-        void OnBeforeHandleMessage<T>(ref T message, ref NetworkContext context) where T : INetworkMessage;
+        public void OnBeforeHandleMessage<T>(ref T message, ref NetworkContext context) where T : INetworkMessage;
 
         /// <summary>
         /// Called after a message is serialized and handled.
@@ -112,6 +112,6 @@ internal interface INetworkHooks
         /// <param name="message">The message object</param>
         /// <param name="context">The network context the message is being ahandled in</param>
         /// <typeparam name="T"></typeparam>
-        void OnAfterHandleMessage<T>(ref T message, ref NetworkContext context) where T : INetworkMessage;
+        public void OnAfterHandleMessage<T>(ref T message, ref NetworkContext context) where T : INetworkMessage;
     }
 }

com.unity.netcode.gameobjects/Runtime/Messaging/INetworkMessage.cs

@@ -39,9 +39,9 @@ namespace Unity.Netcode
     /// </summary>
     internal interface INetworkMessage
     {
-        void Serialize(FastBufferWriter writer, int targetVersion);
-        bool Deserialize(FastBufferReader reader, ref NetworkContext context, int receivedMessageVersion);
-        void Handle(ref NetworkContext context);
-        int Version { get; }
+        public void Serialize(FastBufferWriter writer, int targetVersion);
+        public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int receivedMessageVersion);
+        public void Handle(ref NetworkContext context);
+        public int Version { get; }
     }
 }

com.unity.netcode.gameobjects/Runtime/Messaging/INetworkMessageProvider.cs

@@ -4,6 +4,6 @@ namespace Unity.Netcode
 {
     internal interface INetworkMessageProvider
     {
-        List<NetworkMessageManager.MessageWithHandler> GetMessages();
+        public List<NetworkMessageManager.MessageWithHandler> GetMessages();
     }
 }

com.unity.netcode.gameobjects/Runtime/Messaging/INetworkMessageSender.cs

@@ -2,6 +2,6 @@ namespace Unity.Netcode
 {
     internal interface INetworkMessageSender
     {
-        void Send(ulong clientId, NetworkDelivery delivery, FastBufferWriter batchData);
+        public void Send(ulong clientId, NetworkDelivery delivery, FastBufferWriter batchData);
     }
 }