ReSharper support and code cleanup (SubnauticaNitrox#971)

* > Updated solution settings
> Added ReSharper settings file

* Fixed inconsistent naming

* Removed unused using directives

.editorconfig

@@ -102,6 +102,9 @@ dotnet_naming_style.pascal_case_style.capitalization = pascal_case
 
 dotnet_naming_style.camel_case_style.capitalization = camel_case
 
+dotnet_naming_style.parameter_with_underscores_style.capitalization = camel_case
+dotnet_naming_style.parameter_with_underscores_style.required_prefix = __
+
 dotnet_naming_style.all_const_style.capitalization = all_upper
 dotnet_naming_style.all_const_style.word_separator = _
 
@@ -115,7 +118,7 @@ dotnet_naming_rule.private_fields.style = camel_case_style
 dotnet_naming_rule.private_fields.severity = warning
 
 dotnet_naming_rule.parameters.symbols = parameters
-dotnet_naming_rule.parameters.style = camel_case_style
+dotnet_naming_rule.parameters.style = camel_case_style, parameter_with_underscores_style
 dotnet_naming_rule.parameters.severity = warning
 
 dotnet_naming_rule.public_fields.symbols = public_fields

.gitignore

@@ -5,7 +5,6 @@
 
 # Nitrox-specific files
 DevVars.targets
-NitroxReloader/ReloaderSettings.cs
 
 # User-specific files
 *.suo

Nitrox.sln.DotSettings

@@ -20,11 +20,20 @@
 	<s:String x:Key="/Default/CodeStyle/Generate/=Constructor/Options/=CheckForNull/@EntryIndexedValue">False</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/Generate/=Implementations/@KeyIndexDefined">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/Generate/=Implementations/Options/=Mutable/@EntryIndexedValue">False</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HSB/@EntryIndexedValue">HSB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IK/@EntryIndexedValue">IK</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PDA/@EntryIndexedValue">PDA</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpNaming/ApplyAutoDetectedRules/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Constants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Parameters/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb"&gt;&lt;ExtraRule Prefix="__" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Property/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=RB/@EntryIndexedValue">RB</s:String>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
@@ -207,5 +216,7 @@
   &lt;/TypePattern&gt;&#xD;
 &lt;/Patterns&gt;</s:String>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Mathf/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Nitrox/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Startable/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
 

NitroxClient/Communication/MultiplayerSession/ConnectionState/AwaitingReservationCredentials.cs

@@ -8,7 +8,7 @@ namespace NitroxClient.Communication.MultiplayerSession.ConnectionState
 {
     public class AwaitingReservationCredentials : ConnectionNegotiatingState
     {
-        public override MultiplayerSessionConnectionStage CurrentStage => MultiplayerSessionConnectionStage.AwaitingReservationCredentials;
+        public override MultiplayerSessionConnectionStage CurrentStage => MultiplayerSessionConnectionStage.AWAITING_RESERVATION_CREDENTIALS;
 
         public override void NegotiateReservation(IMultiplayerSessionConnectionContext sessionConnectionContext)
         {

NitroxClient/Communication/MultiplayerSession/ConnectionState/AwaitingSessionReservation.cs

@@ -15,7 +15,7 @@ public AwaitingSessionReservation(string reservationCorrelationId)
             this.reservationCorrelationId = reservationCorrelationId;
         }
 
-        public override MultiplayerSessionConnectionStage CurrentStage => MultiplayerSessionConnectionStage.AwaitingSessionReservation;
+        public override MultiplayerSessionConnectionStage CurrentStage => MultiplayerSessionConnectionStage.AWAITING_SESSION_RESERVATION;
 
         public override void NegotiateReservation(IMultiplayerSessionConnectionContext sessionConnectionContext)
         {
@@ -33,7 +33,7 @@ public override void NegotiateReservation(IMultiplayerSessionConnectionContext s
 
         private static void HandleReservation(IMultiplayerSessionConnectionContext sessionConnectionContext)
         {
-            IMultiplayerSessionConnectionState nextState = sessionConnectionContext.Reservation.ReservationState == MultiplayerSessionReservationState.Reserved
+            IMultiplayerSessionConnectionState nextState = sessionConnectionContext.Reservation.ReservationState == MultiplayerSessionReservationState.RESERVED
                 ? new SessionReserved()
                 : new SessionReservationRejected() as IMultiplayerSessionConnectionState;
 

NitroxClient/Communication/MultiplayerSession/ConnectionState/Disconnected.cs

@@ -9,7 +9,7 @@ namespace NitroxClient.Communication.MultiplayerSession.ConnectionState
     public class Disconnected : IMultiplayerSessionConnectionState
     {
         private object stateLock = new object();
-        public MultiplayerSessionConnectionStage CurrentStage => MultiplayerSessionConnectionStage.Disconnected;
+        public MultiplayerSessionConnectionStage CurrentStage => MultiplayerSessionConnectionStage.DISCONNECTED;
 
         public void NegotiateReservation(IMultiplayerSessionConnectionContext sessionConnectionContext)
         {

NitroxClient/Communication/MultiplayerSession/ConnectionState/EstablishingSessionPolicy.cs

@@ -14,7 +14,7 @@ public EstablishingSessionPolicy(string policyRequestCorrelationId)
             this.policyRequestCorrelationId = policyRequestCorrelationId;
         }
 
-        public override MultiplayerSessionConnectionStage CurrentStage => MultiplayerSessionConnectionStage.EstablishingServerPolicy;
+        public override MultiplayerSessionConnectionStage CurrentStage => MultiplayerSessionConnectionStage.ESTABLISHING_SERVER_POLICY;
 
         public override void NegotiateReservation(IMultiplayerSessionConnectionContext sessionConnectionContext)
         {

NitroxClient/Communication/MultiplayerSession/ConnectionState/SessionJoined.cs

@@ -5,7 +5,7 @@ namespace NitroxClient.Communication.MultiplayerSession.ConnectionState
 {
     public class SessionJoined : ConnectionNegotiatedState
     {
-        public override MultiplayerSessionConnectionStage CurrentStage => MultiplayerSessionConnectionStage.SessionJoined;
+        public override MultiplayerSessionConnectionStage CurrentStage => MultiplayerSessionConnectionStage.SESSION_JOINED;
 
         public override void JoinSession(IMultiplayerSessionConnectionContext sessionConnectionContext)
         {

NitroxClient/Communication/MultiplayerSession/ConnectionState/SessionReservationRejected.cs

@@ -5,7 +5,7 @@ namespace NitroxClient.Communication.MultiplayerSession.ConnectionState
 {
     public class SessionReservationRejected : ConnectionNegotiatedState
     {
-        public override MultiplayerSessionConnectionStage CurrentStage => MultiplayerSessionConnectionStage.SessionReservationRejected;
+        public override MultiplayerSessionConnectionStage CurrentStage => MultiplayerSessionConnectionStage.SESSION_RESERVATION_REJECTED;
 
         public override void JoinSession(IMultiplayerSessionConnectionContext sessionConnectionContext)
         {

NitroxClient/Communication/MultiplayerSession/ConnectionState/SessionReserved.cs

@@ -6,7 +6,7 @@ namespace NitroxClient.Communication.MultiplayerSession.ConnectionState
 {
     public class SessionReserved : ConnectionNegotiatedState
     {
-        public override MultiplayerSessionConnectionStage CurrentStage => MultiplayerSessionConnectionStage.SessionReserved;
+        public override MultiplayerSessionConnectionStage CurrentStage => MultiplayerSessionConnectionStage.SESSION_RESERVED;
 
         public override void JoinSession(IMultiplayerSessionConnectionContext sessionConnectionContext)
         {

NitroxClient/Communication/MultiplayerSession/MultiplayerSessionConnectionStage.cs

@@ -2,12 +2,12 @@
 {
     public enum MultiplayerSessionConnectionStage
     {
-        Disconnected,
-        EstablishingServerPolicy,
-        AwaitingReservationCredentials,
-        AwaitingSessionReservation,
-        SessionReserved,
-        SessionReservationRejected,
-        SessionJoined
+        DISCONNECTED,
+        ESTABLISHING_SERVER_POLICY,
+        AWAITING_RESERVATION_CREDENTIALS,
+        AWAITING_SESSION_RESERVATION,
+        SESSION_RESERVED,
+        SESSION_RESERVATION_REJECTED,
+        SESSION_JOINED
     }
 }

NitroxClient/Communication/MultiplayerSession/MultiplayerSessionManager.cs

@@ -4,7 +4,6 @@
 using NitroxClient.Communication.MultiplayerSession.ConnectionState;
 using NitroxClient.GameLogic;
 using NitroxModel;
-using NitroxModel.Core;
 using NitroxModel.Helper;
 using NitroxModel.Logger;
 using NitroxModel.MultiplayerSession;
@@ -89,7 +88,7 @@ public void JoinSession()
 
         public void Disconnect()
         {
-            if (CurrentState.CurrentStage != MultiplayerSessionConnectionStage.Disconnected)
+            if (CurrentState.CurrentStage != MultiplayerSessionConnectionStage.DISCONNECTED)
             {
                 CurrentState.Disconnect(this);
             }

NitroxClient/Communication/PacketReceiver.cs

@@ -1,10 +1,5 @@
 using System.Collections.Generic;
-using NitroxClient.Map;
-using NitroxModel;
-using NitroxModel.DataStructures.GameLogic;
-using NitroxModel.Logger;
 using NitroxModel.Packets;
-using NitroxModel.DataStructures.Util;
 
 namespace NitroxClient.Communication
 {

NitroxClient/Communication/Packets/Processors/BedEnterProcessor.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using NitroxClient.Communication.Packets.Processors.Abstract;
+using NitroxClient.Communication.Packets.Processors.Abstract;
 using NitroxModel.Packets;
 
 namespace NitroxClient.Communication.Packets.Processors

NitroxClient/Communication/Packets/Processors/CyclopsChangeEngineModeProcessor.cs

@@ -1,10 +1,7 @@
 using NitroxClient.Communication.Abstract;
 using NitroxClient.Communication.Packets.Processors.Abstract;
 using NitroxClient.GameLogic;
-using NitroxClient.GameLogic.Helper;
-using NitroxClient.Unity.Helper;
 using NitroxModel_Subnautica.Packets;
-using UnityEngine;
 
 namespace NitroxClient.Communication.Packets.Processors
 {

NitroxClient/Communication/Packets/Processors/CyclopsChangeShieldModeProcessor.cs

@@ -1,11 +1,7 @@
 using NitroxClient.Communication.Abstract;
 using NitroxClient.Communication.Packets.Processors.Abstract;
 using NitroxClient.GameLogic;
-using NitroxClient.GameLogic.Helper;
-using NitroxClient.Unity.Helper;
-using NitroxModel.Helper;
 using NitroxModel_Subnautica.Packets;
-using UnityEngine;
 
 namespace NitroxClient.Communication.Packets.Processors
 {

NitroxClient/Communication/Packets/Processors/CyclopsChangeSilentRunningProcessor.cs

@@ -1,11 +1,6 @@
 using NitroxClient.Communication.Abstract;
 using NitroxClient.Communication.Packets.Processors.Abstract;
-using NitroxClient.GameLogic.Helper;
-using NitroxClient.Unity.Helper;
-using NitroxModel.Helper;
 using NitroxModel_Subnautica.Packets;
-using UnityEngine;
-using System.Reflection;
 using NitroxClient.GameLogic;
 
 namespace NitroxClient.Communication.Packets.Processors

NitroxClient/Communication/Packets/Processors/CyclopsChangeSonarModeProcessor.cs

@@ -1,11 +1,6 @@
 using NitroxClient.Communication.Abstract;
 using NitroxClient.Communication.Packets.Processors.Abstract;
-using NitroxClient.GameLogic.Helper;
-using NitroxClient.Unity.Helper;
-using System.Reflection;
-using NitroxModel.Helper;
 using NitroxModel_Subnautica.Packets;
-using UnityEngine;
 using NitroxClient.GameLogic;
 
 namespace NitroxClient.Communication.Packets.Processors

NitroxClient/Communication/Packets/Processors/CyclopsDecoyLaunchProcessor.cs

@@ -1,11 +1,7 @@
 using NitroxClient.Communication.Abstract;
 using NitroxClient.Communication.Packets.Processors.Abstract;
 using NitroxClient.GameLogic;
-using NitroxClient.GameLogic.Helper;
-using NitroxClient.Unity.Helper;
-using NitroxModel.Helper;
 using NitroxModel_Subnautica.Packets;
-using UnityEngine;
 
 namespace NitroxClient.Communication.Packets.Processors
 {

NitroxClient/Communication/Packets/Processors/CyclopsFireSuppressionProcessor.cs

@@ -1,13 +1,6 @@
 using NitroxClient.Communication.Abstract;
 using NitroxClient.Communication.Packets.Processors.Abstract;
-using NitroxClient.GameLogic.Helper;
-using NitroxClient.Unity.Helper;
-using System.Reflection;
-using System.Collections;
-using System.Collections.Generic;
-using NitroxModel.Helper;
 using NitroxModel_Subnautica.Packets;
-using UnityEngine;
 using NitroxClient.GameLogic;
 
 namespace NitroxClient.Communication.Packets.Processors

NitroxClient/Communication/Packets/Processors/CyclopsSonarPingProcessor.cs

@@ -1,12 +1,7 @@
 using NitroxClient.Communication.Abstract;
 using NitroxClient.Communication.Packets.Processors.Abstract;
 using NitroxClient.GameLogic;
-using NitroxClient.GameLogic.Helper;
-using NitroxClient.Unity.Helper;
-using NitroxModel.Helper;
 using NitroxModel_Subnautica.Packets;
-using UnityEngine;
-
 
 namespace NitroxClient.Communication.Packets.Processors
 {

NitroxClient/Communication/Packets/Processors/CyclopsToggleEngineStateProcessor.cs

@@ -1,11 +1,7 @@
 using NitroxClient.Communication.Abstract;
 using NitroxClient.Communication.Packets.Processors.Abstract;
 using NitroxClient.GameLogic;
-using NitroxClient.GameLogic.Helper;
-using NitroxClient.Unity.Helper;
-using NitroxModel.Helper;
 using NitroxModel_Subnautica.Packets;
-using UnityEngine;
 
 namespace NitroxClient.Communication.Packets.Processors
 {

NitroxClient/Communication/Packets/Processors/CyclopsToggleFloodlightsProcessor.cs

@@ -1,12 +1,7 @@
 using NitroxClient.Communication.Abstract;
 using NitroxClient.Communication.Packets.Processors.Abstract;
 using NitroxClient.GameLogic;
-using NitroxClient.GameLogic.Helper;
-using NitroxClient.Unity.Helper;
-using NitroxModel.Core;
-using NitroxModel.Packets;
 using NitroxModel_Subnautica.Packets;
-using UnityEngine;
 
 namespace NitroxClient.Communication.Packets.Processors
 {

NitroxClient/Communication/Packets/Processors/CyclopsToggleInternalLightingProcessor.cs

@@ -1,11 +1,7 @@
 using NitroxClient.Communication.Abstract;
 using NitroxClient.Communication.Packets.Processors.Abstract;
 using NitroxClient.GameLogic;
-using NitroxClient.GameLogic.Helper;
-using NitroxClient.Unity.Helper;
-using NitroxModel.Core;
 using NitroxModel_Subnautica.Packets;
-using UnityEngine;
 
 namespace NitroxClient.Communication.Packets.Processors
 {

NitroxClient/Communication/Packets/Processors/DeconstructionBeginProcessor.cs

@@ -2,7 +2,6 @@
 using NitroxClient.Communication.Packets.Processors.Abstract;
 using NitroxClient.GameLogic.Helper;
 using NitroxClient.MonoBehaviours;
-using NitroxClient.Unity.Helper;
 using NitroxModel.Logger;
 using NitroxModel.Packets;
 using UnityEngine;

NitroxClient/Communication/Packets/Processors/EscapePodRadioRepairProcessor.cs

@@ -1,9 +1,5 @@
 using NitroxClient.Communication.Packets.Processors.Abstract;
-using NitroxClient.GameLogic.Helper;
-using NitroxClient.Unity.Helper;
-using NitroxModel.Helper;
 using NitroxModel.Packets;
-using UnityEngine;
 using NitroxClient.GameLogic;
 
 namespace NitroxClient.Communication.Packets.Processors

NitroxClient/Communication/Packets/Processors/EscapePodRepairProcessor.cs

@@ -1,9 +1,5 @@
 using NitroxClient.Communication.Packets.Processors.Abstract;
-using NitroxClient.GameLogic.Helper;
-using NitroxClient.Unity.Helper;
-using NitroxModel.Helper;
 using NitroxModel.Packets;
-using UnityEngine;
 using NitroxClient.GameLogic;
 
 namespace NitroxClient.Communication.Packets.Processors

NitroxClient/Communication/Packets/Processors/PDAEncyclopediaEntryAddProcessor.cs

@@ -1,14 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using NitroxClient.Communication.Abstract;
+using NitroxClient.Communication.Abstract;
 using NitroxClient.Communication.Packets.Processors.Abstract;
-using NitroxClient.GameLogic.Helper;
-using NitroxModel.DataStructures.Util;
-using NitroxModel.Logger;
 using NitroxModel.Packets;
-using Story;
-using UnityEngine;
 
 namespace NitroxClient.Communication.Packets.Processors
 {

NitroxClient/Communication/Packets/Processors/PlayerStatsProcessor.cs

@@ -2,7 +2,6 @@
 using NitroxClient.GameLogic.HUD;
 using NitroxClient.MonoBehaviours.Gui.HUD;
 using NitroxModel.Packets;
-using NitroxClient.GameLogic;
 
 namespace NitroxClient.Communication.Packets.Processors
 {

NitroxClient/Communication/Packets/Processors/RemotePlayerEquipmentAddedProcessor.cs

@@ -1,6 +1,5 @@
 using NitroxClient.Communication.Packets.Processors.Abstract;
 using NitroxClient.GameLogic;
-using NitroxModel.DataStructures.Util;
 using NitroxModel.Packets;
 using NitroxModel_Subnautica.Helper;
 

NitroxClient/Communication/Packets/Processors/StoryEventHandler.cs

@@ -21,15 +21,15 @@ public override void Process(StoryEventSend packet)
             switch (packet.StoryEventType)
             {
                 case StoryEventType.PDA:
-                case StoryEventType.Radio:
-                case StoryEventType.Encyclopedia:
-                case StoryEventType.Story:
+                case StoryEventType.RADIO:
+                case StoryEventType.ENCYCLOPEDIA:
+                case StoryEventType.STORY:
                     using (NitroxServiceLocator.LocateService<IPacketSender>().Suppress<StoryEventSend>())
                     {
                         StoryGoal.Execute(packet.Key, (Story.GoalType)packet.StoryEventType);
                     }
                     break;
-                case StoryEventType.Extra:
+                case StoryEventType.EXTRA:
                     ExecuteExtraEvent(packet.Key);
                     break;
             }

NitroxClient/Communication/Packets/Processors/ToggleLightsProcessor.cs

@@ -1,6 +1,5 @@
 using NitroxClient.Communication.Abstract;
 using NitroxClient.Communication.Packets.Processors.Abstract;
-using NitroxClient.GameLogic.Helper;
 using NitroxClient.MonoBehaviours;
 using NitroxClient.Unity.Helper;
 using UnityEngine;