chore: formatting pass (#640)

* quick formatting pass over codebase

* manually adding 'non-indented brace after case' rule

* formatted 2 files with braces in cases

Author: fernando-cortez

.editorconfig

@@ -91,7 +91,7 @@ public override void OnNetworkSpawn()
             m_NetState.OnStopChargingUpClient += OnStoppedChargingUp;
             m_NetState.IsStealthy.OnValueChanged += OnStealthyChanged;
             m_NetState.MovementStatus.OnValueChanged += OnMovementStatusChanged;
-            OnMovementStatusChanged(MovementStatus.Normal,m_NetState.MovementStatus.Value);
+            OnMovementStatusChanged(MovementStatus.Normal, m_NetState.MovementStatus.Value);
 
             // sync our visualization position & rotation to the most up to date version received from server
             transform.SetPositionAndRotation(m_PhysicsWrapper.Transform.position, m_PhysicsWrapper.Transform.rotation);

Assets/BossRoom/Scripts/Game/Client/Character/ClientCharacterVisualization.cs

@@ -168,8 +168,8 @@ void FixedUpdate()
             }
 
             m_ActionRequestCount = 0;
-            
-            if (EventSystem.current.currentSelectedGameObject != null) 
+
+            if (EventSystem.current.currentSelectedGameObject != null)
             {
                 return;
             }

Assets/BossRoom/Scripts/Game/Client/Character/ClientInputSender.cs

@@ -15,7 +15,7 @@ public class ClientClickFeedback : NetworkBehaviour
         GameObject m_FeedbackObj;
 
         ClientInputSender m_ClientSender;
-        
+
         ClickFeedbackLerper m_ClickFeedbackLerper;
 
 

Assets/BossRoom/Scripts/Game/Client/ClientClickFeedback.cs

@@ -47,7 +47,7 @@ async void InjectDependenciesAndInitialize(AuthenticationServiceFacade authServi
         {
             if (string.IsNullOrEmpty(Application.cloudProjectId))
             {
-                PopupManager.ShowPopupPanel("Unity Gaming Services ProjectID not set up" ,"Click the Readme file in the Assets Folder within the Project window in-editor to follow \"How to set up Unity Gaming Services\"");
+                PopupManager.ShowPopupPanel("Unity Gaming Services ProjectID not set up", "Click the Readme file in the Assets Folder within the Project window in-editor to follow \"How to set up Unity Gaming Services\"");
                 OnSignInFailed();
                 return;
             }

Assets/BossRoom/Scripts/Game/Client/State/ClientMainMenuState.cs

@@ -77,11 +77,11 @@ void OnReconnectMessage(ReconnectMessage message)
             }
             else if (m_CurrentReconnectPopup != null)
             {
-                m_CurrentReconnectPopup.SetupPopupPanel("Connection lost", $"Attempting to reconnect...\nAttempt {message.CurrentAttempt+1}/{message.MaxAttempt}", closeableByUser: false);
+                m_CurrentReconnectPopup.SetupPopupPanel("Connection lost", $"Attempting to reconnect...\nAttempt {message.CurrentAttempt + 1}/{message.MaxAttempt}", closeableByUser: false);
             }
             else
             {
-                m_CurrentReconnectPopup = PopupManager.ShowPopupPanel("Connection lost", $"Attempting to reconnect...\nAttempt {message.CurrentAttempt+1}/{message.MaxAttempt}", closeableByUser: false);
+                m_CurrentReconnectPopup = PopupManager.ShowPopupPanel("Connection lost", $"Attempting to reconnect...\nAttempt {message.CurrentAttempt + 1}/{message.MaxAttempt}", closeableByUser: false);
             }
         }
 

Assets/BossRoom/Scripts/Game/Client/UI/ConnectionStatusMessageUIManager.cs

@@ -63,8 +63,8 @@ void OnTimeElapsed()
                     StartCoroutine(WaitUntilUNETDisconnected(OnTimeElapsed));
                     break;
                 case UnityTransport unityTransport:
-                    var maxConnectAttempts= unityTransport.MaxConnectAttempts;
-                    var connectTimeoutMS= unityTransport.ConnectTimeoutMS;
+                    var maxConnectAttempts = unityTransport.MaxConnectAttempts;
+                    var connectTimeoutMS = unityTransport.ConnectTimeoutMS;
                     StartCoroutine(DisplayUTPConnectionDuration(maxConnectAttempts, connectTimeoutMS, OnTimeElapsed));
                     break;
                 default:

Assets/BossRoom/Scripts/Game/Client/UI/IPConnectionWindow.cs

@@ -118,7 +118,7 @@ void EnsureNumberOfActiveUISlots(int requiredNumber)
 
             for (int i = 0; i < m_LobbyListItems.Count; i++)
             {
-                m_LobbyListItems[i].gameObject.SetActive( i < requiredNumber );
+                m_LobbyListItems[i].gameObject.SetActive(i < requiredNumber);
             }
         }
 

Assets/BossRoom/Scripts/Game/Client/UI/Lobby/LobbyJoiningUI.cs

@@ -217,7 +217,7 @@ private IEnumerator TryToReconnect(string lobbyCode)
                 {
                     ConnectClient();
                 }
-                yield return new WaitForSeconds(1.1f * NetworkManager.Singleton.NetworkConfig.ClientConnectionBufferTimeout + ((UnityTransport)NetworkManager.Singleton.NetworkConfig.NetworkTransport).DisconnectTimeoutMS/1000.0f); // wait a bit longer than the timeout duration to make sure we have enough time to stop this coroutine if successful
+                yield return new WaitForSeconds(1.1f * NetworkManager.Singleton.NetworkConfig.ClientConnectionBufferTimeout + ((UnityTransport)NetworkManager.Singleton.NetworkConfig.NetworkTransport).DisconnectTimeoutMS / 1000.0f); // wait a bit longer than the timeout duration to make sure we have enough time to stop this coroutine if successful
                 nbTries++;
             }
 
@@ -282,7 +282,7 @@ async Task JoinRelayAsync(Action<string> onFailure = null)
                     await UnityRelayUtilities.JoinRelayServerFromJoinCode(m_LocalLobby.RelayJoinCode);
 
                 await m_LobbyServiceFacade.UpdatePlayerRelayInfoAsync(allocationIdBytes.ToString(), m_LocalLobby.RelayJoinCode);
-                var utp = (UnityTransport) NetworkManager.Singleton.NetworkConfig.NetworkTransport;
+                var utp = (UnityTransport)NetworkManager.Singleton.NetworkConfig.NetworkTransport;
                 utp.SetClientRelayData(ipv4Address, port, allocationIdBytes, key, connectionData, hostConnectionData, isSecure: true);
             }
             catch (Exception e)

Assets/BossRoom/Scripts/Game/ConnectionManagement/ClientGameNetPortal.cs

@@ -117,7 +117,7 @@ void OnClientDisconnect(ulong clientId)
                     var sessionData = SessionManager<SessionPlayerData>.Instance.GetPlayerData(playerId);
                     if (sessionData.HasValue)
                     {
-                        m_ConnectionEventPublisher.Publish(new ConnectionEventMessage(){ ConnectStatus = ConnectStatus.GenericDisconnect, PlayerName = sessionData.Value.PlayerName});
+                        m_ConnectionEventPublisher.Publish(new ConnectionEventMessage() { ConnectStatus = ConnectStatus.GenericDisconnect, PlayerName = sessionData.Value.PlayerName });
                     }
                     SessionManager<SessionPlayerData>.Instance.DisconnectClient(clientId);
                 }
@@ -210,7 +210,7 @@ void ApprovalCheck(byte[] connectionData, ulong clientId, NetworkManager.Connect
                 // connection approval will create a player object for you
                 connectionApprovedCallback(true, null, true, Vector3.zero, Quaternion.identity);
 
-                m_ConnectionEventPublisher.Publish(new ConnectionEventMessage(){ ConnectStatus = ConnectStatus.Success, PlayerName = SessionManager<SessionPlayerData>.Instance.GetPlayerData(clientId)?.PlayerName});
+                m_ConnectionEventPublisher.Publish(new ConnectionEventMessage() { ConnectStatus = ConnectStatus.Success, PlayerName = SessionManager<SessionPlayerData>.Instance.GetPlayerData(clientId)?.PlayerName });
             }
             else
             {

Assets/BossRoom/Scripts/Game/ConnectionManagement/ServerGameNetPortal.cs

@@ -113,7 +113,7 @@ void InitializeHitPoints()
             if (!IsNpc)
             {
                 SessionPlayerData? sessionPlayerData = SessionManager<SessionPlayerData>.Instance.GetPlayerData(OwnerClientId);
-                if (sessionPlayerData is {HasCharacterSpawned: true})
+                if (sessionPlayerData is { HasCharacterSpawned: true })
                 {
                     NetState.HitPoints = sessionPlayerData.Value.CurrentHitPoints;
                     if (NetState.HitPoints <= 0)

Assets/BossRoom/Scripts/Game/Server/Character/ServerCharacter.cs

@@ -48,7 +48,7 @@ void OnLifeStateChanged(LifeState previousState, LifeState newState)
         {
             m_Publisher.Publish(new LifeStateChangedEventMessage()
             {
-                CharacterName = m_NameState != null ? m_NameState.Name.Value : (FixedPlayerName) m_CharacterName,
+                CharacterName = m_NameState != null ? m_NameState.Name.Value : (FixedPlayerName)m_CharacterName,
                 CharacterType = m_CharacterClass.CharacterClass.CharacterType,
                 NewLifeState = newState
             });

Assets/BossRoom/Scripts/Game/Server/Entity/PublishMessageOnLifeChange.cs

@@ -108,7 +108,7 @@ public T Resolve<T>() where T : class
             //if we have this type as lazy-bound instance - we are going to instantiate it now
             if (m_LazyBindDescriptors.TryGetValue(type, out var lazyBindDescriptor))
             {
-                var instance = (T) InstantiateLazyBoundObject(lazyBindDescriptor);
+                var instance = (T)InstantiateLazyBoundObject(lazyBindDescriptor);
                 m_LazyBindDescriptors.Remove(type);
                 foreach (var interfaceType in lazyBindDescriptor.InterfaceTypes)
                 {
@@ -127,7 +127,7 @@ public T Resolve<T>() where T : class
                 throw new NoInstanceToInjectException($"Injection of type {type} failed.");
             }
 
-            return (T) value;
+            return (T)value;
         }
 
         public void InjectIn(object obj)
@@ -159,7 +159,7 @@ public void InjectIn(object obj)
 
         public void InjectIn(GameObject go)
         {
-            var components = go.GetComponentsInChildren<Component>(includeInactive:true);
+            var components = go.GetComponentsInChildren<Component>(includeInactive: true);
 
             foreach (var component in components)
             {

Assets/BossRoom/Scripts/Infrastructure/DIScope.cs

@@ -42,7 +42,7 @@ public virtual void Publish(T message)
         public virtual IDisposable Subscribe(Action<T> handler)
         {
             Assert.IsTrue(!m_MessageHandlers.Contains(handler), "Attempting to subscribe with the same handler more than once");
-           // so we don't modify the handler list while iterating on it (which could happen if the handler unsubscribes). With this, we'd unsubscribe on next publish.
+            // so we don't modify the handler list while iterating on it (which could happen if the handler unsubscribes). With this, we'd unsubscribe on next publish.
             m_PendingHandlers.Enqueue(() => { DoSubscribe(handler); });
 
             var subscription = new DisposableSubscription<T>(this, handler);

Assets/BossRoom/Scripts/Infrastructure/PubSub/MessageChannel.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using UnityEngine;
 
@@ -56,7 +56,7 @@ public void Subscribe(Action<float> onUpdate, float updatePeriod)
                 {
                     if (m_Subscribers.Add(onUpdate))
                     {
-                        m_SubscriberData.Add(onUpdate, new SubscriberData() {Period = updatePeriod, NextCallTime = 0});
+                        m_SubscriberData.Add(onUpdate, new SubscriberData() { Period = updatePeriod, NextCallTime = 0 });
                     }
                 });
             }
@@ -71,7 +71,7 @@ public void Unsubscribe(Action<float> onUpdate)
             {
                 m_Subscribers.Remove(onUpdate);
                 m_SubscriberData.Remove(onUpdate);
-            } );
+            });
         }
 
         /// <summary>

Assets/BossRoom/Scripts/Infrastructure/UpdateRunner.cs

@@ -1,4 +1,4 @@
-using Unity.Multiplayer.Samples.BossRoom.Shared.Infrastructure;
+using Unity.Multiplayer.Samples.BossRoom.Shared.Infrastructure;
 
 namespace Unity.Multiplayer.Samples.BossRoom.Shared.Net.UnityServices.Lobbies
 {

Assets/BossRoom/Scripts/UnityServices/Lobbies/JoinedLobbyContentHeartbeat.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Unity.Multiplayer.Samples.BossRoom.Shared.Infrastructure;
@@ -120,7 +120,7 @@ public async Task RemovePlayerFromLobby(string requesterUasId, string lobbyId)
                 await ExceptionHandling(Lobbies.Instance.RemovePlayerAsync(lobbyId, requesterUasId));
             }
             catch (LobbyServiceException e)
-                when (e is {Reason: LobbyExceptionReason.PlayerNotFound})
+                when (e is { Reason: LobbyExceptionReason.PlayerNotFound })
             {
                 // If Player is not found, they have already left the lobby or have been kicked out. No need to throw here
             }
@@ -145,7 +145,7 @@ public async Task<Lobby> GetLobby(string lobbyId)
 
         public async Task<Lobby> UpdateLobby(string lobbyId, Dictionary<string, DataObject> data, bool shouldLock)
         {
-            UpdateLobbyOptions updateOptions = new UpdateLobbyOptions { Data = data , IsLocked = shouldLock};
+            UpdateLobbyOptions updateOptions = new UpdateLobbyOptions { Data = data, IsLocked = shouldLock };
             return await ExceptionHandling(Lobbies.Instance.UpdateLobbyAsync(lobbyId, updateOptions));
         }
 

Assets/BossRoom/Scripts/UnityServices/Lobbies/LobbyAPIInterface.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Net.Http;
 using System.Runtime.CompilerServices;
@@ -83,7 +83,7 @@ public void SetRemoteLobby(Lobby lobby)
 
         public void BeginTracking()
         {
-            if(!m_IsTracking)
+            if (!m_IsTracking)
             {
                 m_IsTracking = true;
                 // 2s update cadence is arbitrary and is here to demonstrate the fact that this update can be rather infrequent
@@ -144,7 +144,7 @@ async void UpdateLobby(float unused)
                             return;
                         }
                     }
-                    m_UnityServiceErrorMessagePub.Publish(new UnityServiceErrorMessage("Host left the lobby","Disconnecting.", UnityServiceErrorMessage.Service.Lobby));
+                    m_UnityServiceErrorMessagePub.Publish(new UnityServiceErrorMessage("Host left the lobby", "Disconnecting.", UnityServiceErrorMessage.Service.Lobby));
                     await EndTracking();
                     // no need to disconnect Netcode, it should already be handled by Netcode's callback to disconnect
                 }
@@ -201,8 +201,8 @@ async void UpdateLobby(float unused)
             {
                 if (!string.IsNullOrEmpty(lobbyCode))
                 {
-                   var lobby = await  m_LobbyApiInterface.JoinLobbyByCode(AuthenticationService.Instance.PlayerId, lobbyCode, m_LocalUser.GetDataForUnityServices());
-                   return (true, lobby);
+                    var lobby = await m_LobbyApiInterface.JoinLobbyByCode(AuthenticationService.Instance.PlayerId, lobbyCode, m_LocalUser.GetDataForUnityServices());
+                    return (true, lobby);
                 }
                 else
                 {
@@ -320,7 +320,8 @@ public async Task UpdatePlayerDataAsync(Dictionary<string, PlayerDataObject> dat
             {
                 var result = await m_LobbyApiInterface.UpdatePlayer(CurrentUnityLobby.Id, AuthenticationService.Instance.PlayerId, data, null, null);
 
-                if (result != null) {
+                if (result != null)
+                {
                     CurrentUnityLobby = result; // Store the most up-to-date lobby now since we have it, instead of waiting for the next heartbeat.
                 }
             }

Assets/BossRoom/Scripts/UnityServices/Lobbies/LobbyServiceFacade.cs

@@ -98,9 +98,9 @@ public void CopyDataFrom(LocalLobbyUser lobby)
         {
             var data = lobby.m_UserData;
             int lastChanged = // Set flags just for the members that will be changed.
-                (m_UserData.IsHost == data.IsHost ? 0 : (int) UserMembers.IsHost) |
-                (m_UserData.DisplayName == data.DisplayName ? 0 : (int) UserMembers.DisplayName) |
-                (m_UserData.ID == data.ID ? 0 : (int) UserMembers.ID);
+                (m_UserData.IsHost == data.IsHost ? 0 : (int)UserMembers.IsHost) |
+                (m_UserData.DisplayName == data.DisplayName ? 0 : (int)UserMembers.DisplayName) |
+                (m_UserData.ID == data.ID ? 0 : (int)UserMembers.ID);
 
             if (lastChanged == 0) // Ensure something actually changed.
             {

Assets/BossRoom/Scripts/UnityServices/Lobbies/LocalLobbyUser.cs

@@ -5,7 +5,7 @@ namespace Unity.Multiplayer.Samples.BossRoom.Shared.Net.UnityServices.Lobbies
     public struct LobbyListFetchedMessage
     {
         public readonly IReadOnlyList<LocalLobby> LocalLobbies;
-        
+
         public LobbyListFetchedMessage(List<LocalLobby> localLobbies)
         {
             LocalLobbies = localLobbies;

Assets/BossRoom/Scripts/UnityServices/Lobbies/Messages/LobbyListFetchedMessage.cs

@@ -242,7 +242,7 @@ void ClearDisconnectedPlayersData()
             foreach (var id in m_ClientIDToPlayerId.Keys)
             {
                 var data = GetPlayerData(id);
-                if (data is {IsConnected: false})
+                if (data is { IsConnected: false })
                 {
                     idsToClear.Add(id);
                 }

Packages/com.unity.multiplayer.samples.coop/Utilities/Net/SessionManager.cs

@@ -166,7 +166,7 @@ IEnumerator FadeOutCoroutine()
             float currentTime = 0;
             while (currentTime < m_FadeOutDuration)
             {
-                m_CanvasGroup.alpha = Mathf.Lerp(1, 0, currentTime/ m_FadeOutDuration);
+                m_CanvasGroup.alpha = Mathf.Lerp(1, 0, currentTime / m_FadeOutDuration);
                 yield return null;
                 currentTime += Time.deltaTime;
             }

Packages/com.unity.multiplayer.samples.coop/Utilities/SceneManagement/ClientLoadingScreen.cs

@@ -5,7 +5,7 @@ namespace Unity.Multiplayer.Samples.Utilities
     /// <summary>
     /// Simple object that keeps track of the scene loading progress of a specific instance.
     /// </summary>
-    public class NetworkedLoadingProgressTracker: NetworkBehaviour
+    public class NetworkedLoadingProgressTracker : NetworkBehaviour
     {
         /// <summary>
         /// The current loading progress associated with the owner of this NetworkBehavior

Packages/com.unity.multiplayer.samples.coop/Utilities/SceneManagement/NetworkedLoadingProgressTracker.cs

@@ -155,7 +155,7 @@ void OnSceneEvent(SceneEvent sceneEvent)
                     if (NetworkManager.IsServer)
                     {
                         // Send client RPC to make sure the client stops the loading screen after the server handles what it needs to after the client finished synchronizing, for example character spawning done server side should still be hidden by loading screen.
-                        StopLoadingScreenClientRpc(new ClientRpcParams {Send = new ClientRpcSendParams {TargetClientIds = new[] {sceneEvent.ClientId}}});
+                        StopLoadingScreenClientRpc(new ClientRpcParams { Send = new ClientRpcSendParams { TargetClientIds = new[] { sceneEvent.ClientId } } });
                     }
                     break;
             }