Small fixes

NitroxLauncher/LauncherLogic.cs

@@ -317,7 +317,7 @@ private void OnSubnauticaExited(object sender, EventArgs e)
             }
             catch (Exception ex)
             {
-                DisplayStatusCode(StatusCode.INJECTION_FAIL, "Unhandled exception while trying to inject Nitrox: " + ex.ToString());
+                DisplayStatusCode(StatusCode.INJECTION_FAIL, "Unhandled exception while trying to remove the Nitrox patch: " + ex.ToString());
             }
         }
 

NitroxLauncher/LauncherNotifier.cs

@@ -5,7 +5,7 @@
 using ToastNotifications.Position;
 using ToastNotifications.Messages;
 using ToastNotifications.Core;
-
+using static NitroxModel.DisplayStatusCodes;
 namespace NitroxLauncher
 {
     internal static class LauncherNotifier
@@ -45,7 +45,7 @@ public static void Setup()
             }
             else
             {
-                Log.Error("Notifier is already set up");
+                DisplayStatusCode(StatusCode.INVALID_FUNCTION_CALL, "Notifier is already set up");
             }
         }
 

NitroxLauncher/Models/Patching/NitroxEntryPatch.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -7,7 +7,7 @@
 using dnlib.DotNet.Emit;
 using NitroxModel.Platforms.OS.Shared;
 using FileAttributes = System.IO.FileAttributes;
-
+using static NitroxModel.DisplayStatusCodes;
 namespace NitroxLauncher.Models.Patching
 {
     internal sealed class NitroxEntryPatch
@@ -66,7 +66,7 @@ public void Apply()
             Exception error = RetryWait(() => File.Delete(assemblyCSharp), 100, 5);
             if (error != null)
             {
-                throw error;
+                DisplayStatusCode(StatusCode.MISC_UNHANDLED_EXCEPTION, error.Message);
             }
             FileSystem.Instance.ReplaceFile(modifiedAssemblyCSharp, assemblyCSharp);
         }

NitroxLauncher/Models/Utils/WindowsHelper.cs

@@ -58,7 +58,7 @@ internal static void RestartAsAdmin()
                     }
                     catch (Exception ex)
                     {
-                        DisplayStatusCode(StatusCode.PRIVILEGES_ERR, "Error while trying to instantiate an admin process of the launcher, aborting");
+                        DisplayStatusCode(StatusCode.PRIVILEGES_ERR, "Error while trying to instantiate an admin process of the launcher, aborting. " + ex.Message);
                     }
                 }
             }

NitroxLauncher/ServerLogic.cs

@@ -85,7 +85,7 @@ internal void SendServerCommand(string inputText)
             }
             catch (Exception ex)
             {
-                Log.Error(ex);
+                PrintStatusCode(StatusCode.MISC_UNHANDLED_EXCEPTION, ex.Message);
             }
         }
 

NitroxServer/Communication/NitroxServer.cs

@@ -75,7 +75,7 @@ protected void ProcessIncomingData(INitroxConnection connection, Packet packet)
             }
             catch (Exception ex)
             {
-                PrintStatusCode(StatusCode.MISC_UNHANDLED_EXCEPTION, ex.Message + $"Exception while processing packet: {packet}");
+                //PrintStatusCode(StatusCode.MISC_UNHANDLED_EXCEPTION, ex.Message + $"Exception while processing packet: {packet}");
             }
         }
     }

NitroxServer/Communication/Packets/PacketHandler.cs

@@ -81,7 +81,7 @@ private void ProcessUnauthenticated(Packet packet, INitroxConnection connection)
             }
             catch (Exception ex)
             {
-                PrintStatusCode(StatusCode.MISC_UNHANDLED_EXCEPTION, $"Error in packet processor {processor.GetType()}" + ex.Message);
+                //PrintStatusCode(StatusCode.MISC_UNHANDLED_EXCEPTION, $"Error in packet processor {processor.GetType()}" + ex.Message);
             }
         }
     }

NitroxServer/Communication/Packets/Processors/DefaultServerPacketProcessor.cs

@@ -47,7 +47,7 @@ public override void Process(Packet packet, Player player)
 
         if (defaultPacketProcessorBlacklist.Contains(packet.GetType()))
         {
-            PrintStatusCode(StatusCode.INVALID_PACKET, $"Player {player.Name} [{player.Id}] sent a packet which is blacklisted by the server. It's likely that the said player is using a modified version of Nitrox and action could be taken accordingly.");
+            //PrintStatusCode(StatusCode.INVALID_PACKET, $"Player {player.Name} [{player.Id}] sent a packet which is blacklisted by the server. It's likely that the said player is using a modified version of Nitrox and action could be taken accordingly.");
             return;
         }
         playerManager.SendPacketToOtherPlayers(packet, player);

NitroxServer/Communication/Packets/Processors/EntityMetadataUpdateProcessor.cs

@@ -29,7 +29,7 @@ public override void Process(EntityMetadataUpdate packet, Player sendingPlayer)
             }
             else
             {
-                PrintStatusCode(StatusCode.INVALID_PACKET, $"Entity metadata updated on an entity unknown to the server {packet.Id} {packet.NewValue.GetType()} ");
+                //PrintStatusCode(StatusCode.INVALID_PACKET, $"Entity metadata updated on an entity unknown to the server {packet.Id} {packet.NewValue.GetType()} ");
             }
         }
 

NitroxServer/Communication/Packets/Processors/FMODAssetProcessor.cs

@@ -21,7 +21,7 @@ public override void Process(FMODAssetPacket packet, Player sendingPlayer)
     {
         if (!fmodWhitelist.TryGetSoundData(packet.AssetPath, out SoundData soundData))
         {
-            PrintStatusCode(StatusCode.INVALID_PACKET, $"[{nameof(FMODAssetProcessor)}] Whitelist has no item for {packet.AssetPath}.");
+            //PrintStatusCode(StatusCode.INVALID_PACKET, $"[{nameof(FMODAssetProcessor)}] Whitelist has no item for {packet.AssetPath}.");
             return;
         }
 

NitroxServer/Communication/Packets/Processors/VehicleDockingProcessor.cs

@@ -21,13 +21,13 @@ public override void Process(VehicleDocking packet, Player player)
     {
         if (!entityRegistry.TryGetEntityById(packet.VehicleId, out Entity vehicleEntity))
         {
-            PrintStatusCode(StatusCode.INVALID_PACKET, $"Unable to find vehicle to dock {packet.VehicleId}");
+            //PrintStatusCode(StatusCode.INVALID_PACKET, $"Unable to find vehicle to dock {packet.VehicleId}");
             return;
         }
 
         if (!entityRegistry.TryGetEntityById(packet.DockId, out Entity dockEntity))
         {
-            PrintStatusCode(StatusCode.INVALID_PACKET, $"Unable to find dock {packet.DockId} for docking vehicle {packet.VehicleId}");
+            //PrintStatusCode(StatusCode.INVALID_PACKET, $"Unable to find dock {packet.DockId} for docking vehicle {packet.VehicleId}");
             return;
         }
 

NitroxServer/Communication/Packets/Processors/VehicleUndockingProcessor.cs

@@ -23,13 +23,13 @@ public override void Process(VehicleUndocking packet, Player player)
         {
             if (!entityRegistry.TryGetEntityById(packet.VehicleId, out Entity vehicleEntity))
             {
-                PrintStatusCode(StatusCode.INVALID_PACKET, $"Unable to find vehicle to undock {packet.VehicleId}");
+                //PrintStatusCode(StatusCode.INVALID_PACKET, $"Unable to find vehicle to undock {packet.VehicleId}");
                 return;
             }
 
             if (!entityRegistry.GetEntityById(vehicleEntity.ParentId).HasValue)
             {
-                PrintStatusCode(StatusCode.INVALID_PACKET, $"Unable to find docked vehicles parent {vehicleEntity.ParentId} to undock from");
+                //PrintStatusCode(StatusCode.INVALID_PACKET, $"Unable to find docked vehicles parent {vehicleEntity.ParentId} to undock from");
                 return;
             }
 

NitroxServer/ConsoleCommands/ConfigCommand.cs

@@ -54,7 +54,7 @@ protected override void Execute(CallArgs args)
 #if DEBUG
                     if (t.Exception != null)
                     {
-                        PrintStatusCode(StatusCode.FILE_SYSTEM_ERR, t.Exception.ToString());
+                        //PrintStatusCode(StatusCode.FILE_SYSTEM_ERR, t.Exception.ToString());
                     }
 #endif
                 });

NitroxServer/ConsoleCommands/Processor/ConsoleCommandProcessor.cs

@@ -18,7 +18,7 @@ public ConsoleCommandProcessor(IEnumerable<Command> cmds)
             {
                 if (commands.ContainsKey(cmd.Name))
                 {
-                    PrintStatusCode(StatusCode.INVALID_FUNCTION_CALL, $"Command {cmd.Name} is registered multiple times.");
+                    //PrintStatusCode(StatusCode.INVALID_FUNCTION_CALL, $"Command {cmd.Name} is registered multiple times.");
                 }
 
                 commands[cmd.Name] = cmd;
@@ -27,7 +27,7 @@ public ConsoleCommandProcessor(IEnumerable<Command> cmds)
                 {
                     if (commands.ContainsKey(alias))
                     {
-                        PrintStatusCode(StatusCode.INVALID_FUNCTION_CALL, $"Command {alias} is registered multiple times.");
+                        //PrintStatusCode(StatusCode.INVALID_FUNCTION_CALL, $"Command {alias} is registered multiple times.");
                     }
                     commands[alias] = cmd;
                 }

NitroxServer/ConsoleCommands/RestartCommand.cs

@@ -17,14 +17,14 @@ protected override void Execute(CallArgs args)
         {
             if (Debugger.IsAttached)
             {
-                PrintStatusCode(StatusCode.INVALID_FUNCTION_CALL, "Cannot restart server while debugger is attached.");
+                //PrintStatusCode(StatusCode.INVALID_FUNCTION_CALL, "Cannot restart server while debugger is attached.");
                 return;
             }
 
             string program = Process.GetCurrentProcess().MainModule?.FileName;
             if (program == null)
             {
-                PrintStatusCode(StatusCode.FILE_SYSTEM_ERR, "Failed to get location of server.");
+                //PrintStatusCode(StatusCode.FILE_SYSTEM_ERR, "Failed to get location of server.");
                 return;
             }
 

NitroxServer/GameLogic/Bases/BuildingManager.cs

@@ -32,7 +32,7 @@ public bool AddGhost(PlaceGhost placeGhost)
         {
             if (entityRegistry.GetEntityById(ghostEntity.Id).HasValue)
             {
-                PrintStatusCode(StatusCode.SUBNAUTICA_ERROR, $"Trying to add a ghost to Global Root but another entity with the same id already exists (GhostId: {ghostEntity.Id})");
+                //PrintStatusCode(StatusCode.SUBNAUTICA_ERROR, $"Trying to add a ghost to Global Root but another entity with the same id already exists (GhostId: {ghostEntity.Id})");
                 return false;
             }
 
@@ -42,17 +42,17 @@ public bool AddGhost(PlaceGhost placeGhost)
 
         if (!entityRegistry.TryGetEntityById(ghostEntity.ParentId, out Entity parentEntity))
         {
-            PrintStatusCode(StatusCode.INVALID_PACKET, $"Trying to add a ghost to a build that isn't registered (ParentId: {ghostEntity.ParentId})");
+            //PrintStatusCode(StatusCode.INVALID_PACKET, $"Trying to add a ghost to a build that isn't registered (ParentId: {ghostEntity.ParentId})");
             return false;
         }
         if (parentEntity is not BuildEntity)
         {
-            PrintStatusCode(StatusCode.SUBNAUTICA_ERROR, $"Trying to add a ghost to an entity that is not a building (ParentId: {ghostEntity.ParentId})");
+            //PrintStatusCode(StatusCode.SUBNAUTICA_ERROR, $"Trying to add a ghost to an entity that is not a building (ParentId: {ghostEntity.ParentId})");
             return false;
         }
         if (parentEntity.ChildEntities.Any(childEntity => childEntity.Id.Equals(ghostEntity.Id)))
         {
-            PrintStatusCode(StatusCode.INVALID_PACKET, $"Trying to add a ghost to a building but another child with the same id already exists (GhostId: {ghostEntity.Id})");
+            //PrintStatusCode(StatusCode.INVALID_PACKET, $"Trying to add a ghost to a building but another child with the same id already exists (GhostId: {ghostEntity.Id})");
             return false;
         }
 
@@ -67,7 +67,7 @@ public bool AddModule(PlaceModule placeModule)
         {
             if (entityRegistry.GetEntityById(moduleEntity.Id).HasValue)
             {
-                PrintStatusCode(StatusCode.INVALID_PACKET, $"Trying to add a module to Global Root but another entity with the same id already exists ({moduleEntity.Id})");
+                //PrintStatusCode(StatusCode.INVALID_PACKET, $"Trying to add a module to Global Root but another entity with the same id already exists ({moduleEntity.Id})");
                 return false;
             }
 
@@ -77,17 +77,17 @@ public bool AddModule(PlaceModule placeModule)
 
         if (!entityRegistry.TryGetEntityById(moduleEntity.ParentId, out Entity parentEntity))
         {
-            PrintStatusCode(StatusCode.INVALID_PACKET, $"Trying to add a module to a build that isn't registered (ParentId: {moduleEntity.ParentId})");
+            //PrintStatusCode(StatusCode.INVALID_PACKET, $"Trying to add a module to a build that isn't registered (ParentId: {moduleEntity.ParentId})");
             return false;
         }
         if (parentEntity is not BuildEntity && parentEntity is not VehicleWorldEntity)
         {
-            PrintStatusCode(StatusCode.INVALID_PACKET, $"Trying to add a module to an entity that is not a building/vehicle (ParentId: {moduleEntity.ParentId})");
+            //PrintStatusCode(StatusCode.INVALID_PACKET, $"Trying to add a module to an entity that is not a building/vehicle (ParentId: {moduleEntity.ParentId})");
             return false;
         }
         if (parentEntity.ChildEntities.Any(childEntity => childEntity.Id.Equals(moduleEntity.Id)))
         {
-            PrintStatusCode(StatusCode.INVALID_PACKET, $"Trying to add a module to a building but another child with the same id already exists (ModuleId: {moduleEntity.Id})");
+            //PrintStatusCode(StatusCode.INVALID_PACKET, $"Trying to add a module to a building but another child with the same id already exists (ModuleId: {moduleEntity.Id})");
             return false;
         }
 
@@ -99,12 +99,12 @@ public bool ModifyConstructedAmount(ModifyConstructedAmount modifyConstructedAmo
     {
         if (!entityRegistry.TryGetEntityById(modifyConstructedAmount.GhostId, out Entity entity))
         {
-            PrintStatusCode(StatusCode.INVALID_PACKET, $"Trying to modify the constructed amount of a non-registered object (GhostId: {modifyConstructedAmount.GhostId})");
+            //PrintStatusCode(StatusCode.INVALID_PACKET, $"Trying to modify the constructed amount of a non-registered object (GhostId: {modifyConstructedAmount.GhostId})");
             return false;
         }
         if (entity is not GhostEntity && entity is not ModuleEntity)
         {
-            PrintStatusCode(StatusCode.INVALID_PACKET, $"Trying to modify the constructed amount of an entity that is not a ghost (Id: {modifyConstructedAmount.GhostId})");
+            //PrintStatusCode(StatusCode.INVALID_PACKET, $"Trying to modify the constructed amount of an entity that is not a ghost (Id: {modifyConstructedAmount.GhostId})");
             return false;
         }
         if (modifyConstructedAmount.ConstructedAmount == 0f)
@@ -129,12 +129,12 @@ public bool CreateBase(PlaceBase placeBase)
     {
         if (!entityRegistry.TryGetEntityById(placeBase.FormerGhostId, out Entity entity))
         {
-            PrintStatusCode(StatusCode.INVALID_PACKET, $"Trying to place a base from a non-registered ghost (Id: {placeBase.FormerGhostId})");
+            //PrintStatusCode(StatusCode.INVALID_PACKET, $"Trying to place a base from a non-registered ghost (Id: {placeBase.FormerGhostId})");
             return false;
         }
         if (entity is not GhostEntity)
         {
-            PrintStatusCode(StatusCode.INVALID_PACKET, $"Trying to add a new build to Global Root but another build with the same id already exists (GhostId: {placeBase.FormerGhostId})");
+            //PrintStatusCode(StatusCode.INVALID_PACKET, $"Trying to add a new build to Global Root but another build with the same id already exists (GhostId: {placeBase.FormerGhostId})");
             return false;
         }
 
@@ -147,13 +147,13 @@ public bool UpdateBase(Player player, UpdateBase updateBase, out int operationId
     {
         if (!entityRegistry.TryGetEntityById<GhostEntity>(updateBase.FormerGhostId, out _))
         {
-            PrintStatusCode(StatusCode.INVALID_PACKET, $"Trying to place a base from a non-registered ghost (GhostId: {updateBase.FormerGhostId})");
+            //PrintStatusCode(StatusCode.INVALID_PACKET, $"Trying to place a base from a non-registered ghost (GhostId: {updateBase.FormerGhostId})");
             operationId = -1;
             return false;
         }
         if (!entityRegistry.TryGetEntityById(updateBase.BaseId, out BuildEntity buildEntity))
         {
-            PrintStatusCode(StatusCode.INVALID_PACKET, $"Trying to update a non-registered build (BaseId: {updateBase.BaseId})");
+            //PrintStatusCode(StatusCode.INVALID_PACKET, $"Trying to update a non-registered build (BaseId: {updateBase.BaseId})");
             operationId = -1;
             return false;
         }
@@ -223,7 +223,7 @@ public bool ReplaceBaseByGhost(BaseDeconstructed baseDeconstructed)
     {
         if (!entityRegistry.TryGetEntityById(baseDeconstructed.FormerBaseId, out BuildEntity _))
         {
-            PrintStatusCode(StatusCode.INVALID_PACKET, $"Trying to replace a non-registered build (BaseId: {baseDeconstructed.FormerBaseId})");
+            //PrintStatusCode(StatusCode.INVALID_PACKET, $"Trying to replace a non-registered build (BaseId: {baseDeconstructed.FormerBaseId})");
             return false;
         }
 
@@ -236,14 +236,14 @@ public bool ReplacePieceByGhost(Player player, PieceDeconstructed pieceDeconstru
     {
         if (!entityRegistry.TryGetEntityById(pieceDeconstructed.BaseId, out BuildEntity buildEntity))
         {
-            PrintStatusCode(StatusCode.INVALID_PACKET, $"Trying to replace a non-registered build (BaseId: {pieceDeconstructed.BaseId})");
+            //PrintStatusCode(StatusCode.INVALID_PACKET, $"Trying to replace a non-registered build (BaseId: {pieceDeconstructed.BaseId})");
             removedEntity = null;
             operationId = -1;
             return false;
         }
         if (entityRegistry.TryGetEntityById(pieceDeconstructed.PieceId, out GhostEntity _))
         {
-            PrintStatusCode(StatusCode.INVALID_PACKET, $"Trying to add a ghost to a building but another ghost child with the same id already exists (GhostId: {pieceDeconstructed.PieceId})");
+            //PrintStatusCode(StatusCode.INVALID_PACKET, $"Trying to add a ghost to a building but another ghost child with the same id already exists (GhostId: {pieceDeconstructed.PieceId})");
             removedEntity = null;
             operationId = -1;
             return false;
@@ -273,12 +273,12 @@ public bool CreateWaterParkPiece(WaterParkDeconstructed waterParkDeconstructed,
     {
         if (!entityRegistry.TryGetEntityById(waterParkDeconstructed.BaseId, out Entity entity) || entity is not BuildEntity buildEntity)
         {
-            PrintStatusCode(StatusCode.INVALID_PACKET, $"Trying to create a WaterPark piece in a non-registered build ({waterParkDeconstructed.BaseId})");
+            //PrintStatusCode(StatusCode.INVALID_PACKET, $"Trying to create a WaterPark piece in a non-registered build ({waterParkDeconstructed.BaseId})");
             return false;
         }
         if (buildEntity.ChildEntities.Any(childEntity => childEntity.Id.Equals(waterParkDeconstructed.NewWaterPark.Id)))
         {
-            PrintStatusCode(StatusCode.SUBNAUTICA_ERROR, $"Trying to create a WaterPark piece with an already registered id ({waterParkDeconstructed.NewWaterPark.Id})");
+            //PrintStatusCode(StatusCode.SUBNAUTICA_ERROR, $"Trying to create a WaterPark piece with an already registered id ({waterParkDeconstructed.NewWaterPark.Id})");
             return false;
         }
         InteriorPieceEntity newPiece = waterParkDeconstructed.NewWaterPark;