Address request changes and bugs

SubnauticaNitrox · May 10, 2024 · 4a037fe · 4a037fe
1 parent cfbe84c
commit 4a037fe
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 39 deletions.
diff --git a/Nitrox.Assets.Subnautica/LanguageFiles/en.json b/Nitrox.Assets.Subnautica/LanguageFiles/en.json
@@ -1,14 +1,11 @@
 {
     "Nitrox_AddServer": "Add Server",
-    "Nitrox_AddServer_NameDescription": "Name:",
-    "Nitrox_AddServer_AddressDescription": "Host:",
-    "Nitrox_AddServer_PortDescription": "Port:",
-    "Nitrox_AddServer_NamePlaceholder": "Enter a name for the server",
-    "Nitrox_AddServer_AddressPlaceholder": "Enter the IP or address of the server",
-    "Nitrox_AddServer_PortPlaceholder": "Enter the numeric port of the server",
-    "Nitrox_AddServer_Confirm": "Create server",
-    "Nitrox_AddServer_Back": "Back",
-    "Nitrox_AddServer_InvalidInput": "You input is invalid. Please check if all text boxes are filled out.",
+    "Nitrox_AddServerAdd": "Add",
+    "Nitrox_AddServerHost": "Host:",
+    "Nitrox_AddServerName": "Name:",
+    "Nitrox_AddServerPort": "Port:",
+    "Nitrox_BuildingDesyncDetected": "Server detected a desync with the local client's buildings (go to Nitrox settings to request a resync)",
+    "Nitrox_BuildingSettings": "Base building",
     "Nitrox_Cancel": "Cancel",
     "Nitrox_CommandNotAvailable": "This command is not available in Nitrox",
     "Nitrox_ConnectTo": "Connect to",

diff --git a/NitroxClient/GameLogic/Settings/NitroxSettingsManager.cs b/NitroxClient/GameLogic/Settings/NitroxSettingsManager.cs
@@ -48,7 +48,6 @@ private void MakeSettings()
                 BuildingHandler.Main.AskForResync();
             }
         }));
-                MainMenuServerListPanel.Main.RefreshServerEntries();
 
         AddSetting("Nitrox_BuildingSettings", new Setting("Nitrox_SafeBuilding", NitroxPrefs.SafeBuilding, safe => NitroxPrefs.SafeBuilding.Value = safe));
         AddSetting("Nitrox_BuildingSettings", new Setting("Nitrox_SafeBuildingLog", NitroxPrefs.SafeBuildingLog, safeLog => NitroxPrefs.SafeBuildingLog.Value = safeLog));

diff --git a/NitroxClient/MonoBehaviours/Gui/MainMenu/ServerJoin/JoinServerBackend.cs b/NitroxClient/MonoBehaviours/Gui/MainMenu/ServerJoin/JoinServerBackend.cs
@@ -1,6 +1,5 @@
 using System.Collections;
 using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using NitroxClient.Communication.Abstract;
 using NitroxClient.Communication.Exceptions;
@@ -100,7 +99,6 @@ private static void SessionConnectionStateChangedHandler(IMultiplayerSessionConn
         }
     }
 
-    [SuppressMessage("Usage", "DIMA001:Dependency Injection container is used directly")]
     public static async Task StartMultiplayerClientAsync(string ip, int port)
     {
         serverIp = ip;
@@ -147,7 +145,6 @@ public static async Task StartMultiplayerClientAsync(string ip, int port)
         }
     }
 
-    [SuppressMessage("Usage", "DIMA001:Dependency Injection container is used directly")]
     public static void StopMultiplayerClient()
     {
         if (!multiplayerClient || !Multiplayer.Main)

diff --git a/NitroxClient/MonoBehaviours/Gui/MainMenu/ServerJoin/MainMenuJoinServerPanel.cs b/NitroxClient/MonoBehaviours/Gui/MainMenu/ServerJoin/MainMenuJoinServerPanel.cs
@@ -120,7 +120,7 @@ private static void OnCancelClick()
 
     public void UpdatePanelValues(string ip, string playerName, Vector3 hsb)
     {
-        header.text = $"    {Language.main.Get("Nitrox_JoinServer")}{ip}";
+        header.text = $"    {Language.main.Get("Nitrox_JoinServer")} {ip}";
         playerNameInputField.text = playerName;
         colorPicker.SetHSB(hsb);
     }

diff --git a/NitroxClient/MonoBehaviours/Gui/MainMenu/ServersList/MainMenuServerListPanel.cs b/NitroxClient/MonoBehaviours/Gui/MainMenu/ServersList/MainMenuServerListPanel.cs
@@ -43,7 +43,13 @@ public void Setup(GameObject savedGamesRef)
 
         CreateAddServerButton();
         LoadSavedServers();
-        _ = FindLANServersAsync();
+        FindLANServersAsync().ContinueWith(t =>
+        {
+            if (t is { IsFaulted: true, Exception: { } ex })
+            {
+                Log.Warn($"Failed to execute FindLANServersAsync: {ex.GetFirstNonAggregateMessage()}");
+            }
+        });
     }
 
     public bool OnButtonDown(GameInput.Button button)
@@ -272,6 +278,12 @@ public void RefreshServerEntries()
 
         CreateAddServerButton();
         LoadSavedServers();
-        _ = FindLANServersAsync();
+        FindLANServersAsync().ContinueWith(t =>
+        {
+            if (t is { IsFaulted: true, Exception: { } ex })
+            {
+                Log.Warn($"Failed to execute FindLANServersAsync: {ex.GetFirstNonAggregateMessage()}");
+            }
+        });
     }
 }
diff --git a/NitroxModel/Core/NitroxServiceLocator.cs b/NitroxModel/Core/NitroxServiceLocator.cs
@@ -150,7 +150,7 @@ private static T LocateServicePreLifetimeAndRegister()
         /// <summary>
         ///     Invalidates the cache for type <see cref="T" />. The next <see cref="Value" /> access will request from <see cref="NitroxServiceLocator" /> again.
         /// </summary>
-        public static void Invalidate(object _, EventArgs __)
+        private static void Invalidate(object _, EventArgs __)
         {
             value = null;
             LifetimeScopeEnded -= Invalidate;

diff --git a/NitroxPatcher/Patches/Persistent/SystemsSpawner_SetupSingleton_Patch.cs b/NitroxPatcher/Patches/Persistent/SystemsSpawner_SetupSingleton_Patch.cs