Compiles, and small error fixes

Author: Coding-Hen

Nitrox.Test/Model/Helper/NetHelperTest.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Net;
 using System.Net.Sockets;
 using FluentAssertions;

Nitrox.Test/Patcher/Patches/Dynamic/FootstepSounds_OnStep_PatchTest.cs

@@ -1,3 +1,5 @@
+//TODO: Fix with steps patch
+#if SUBNAUTICA
 using System.Collections.Generic;
 using System.Linq;
 using HarmonyLib;
@@ -18,3 +20,4 @@ public void InjectionSanity()
         Assert.AreEqual(beforeInstructions.Count() + 4, result.Count());
     }
 }
+#endif

NitroxClient/ClientAutoFacRegistrar.cs

@@ -116,7 +116,9 @@ private void RegisterCoreDependencies(ContainerBuilder containerBuilder)
             containerBuilder.RegisterType<NitroxConsole>().InstancePerLifetimeScope();
             containerBuilder.RegisterType<Terrain>().InstancePerLifetimeScope();
             containerBuilder.RegisterType<ExosuitModuleEvent>().InstancePerLifetimeScope();
+#if SUBNAUTICA
             containerBuilder.RegisterType<SeamothModulesEvent>().InstancePerLifetimeScope();
+#endif
             containerBuilder.RegisterType<Fires>().InstancePerLifetimeScope();
             containerBuilder.Register(_ => new FMODWhitelist(GameInfo.Subnautica)).InstancePerLifetimeScope();
             containerBuilder.RegisterType<FMODSystem>().InstancePerLifetimeScope();

NitroxClient/GameLogic/HUD/NitroxPDATabManager.cs

@@ -1,13 +1,18 @@
 using System.Collections.Generic;
+#if BELOWZERO
 using UnityEngine;
+#endif
 
 namespace NitroxClient.GameLogic.HUD;
 
 public class NitroxPDATabManager
 {
     public readonly Dictionary<PDATab, NitroxPDATab> CustomTabs = new();
-    
+#if SUBNAUTICA
+    private readonly Dictionary<string, Atlas.Sprite> tabSpritesByName = new();
+#elif BELOWZERO
     private readonly Dictionary<string, Sprite> tabSpritesByName = new();
+#endif
     private readonly Dictionary<string, TabSpriteLoadedEvent> spriteLoadedCallbackByName = new();
 
     public NitroxPDATabManager()
@@ -19,8 +24,11 @@ void RegisterTab(NitroxPDATab nitroxTab)
 
         RegisterTab(new PlayerListTab());
     }
-
+#if SUBNAUTICA
+    public void AddTabSprite(string spriteName, Atlas.Sprite sprite)
+#elif BELOWZERO
     public void AddTabSprite(string spriteName, Sprite sprite)
+#endif
     {
         tabSpritesByName.Add(spriteName, sprite);
         if (spriteLoadedCallbackByName.TryGetValue(spriteName, out TabSpriteLoadedEvent spriteLoadedEvent))
@@ -29,11 +37,16 @@ public void AddTabSprite(string spriteName, Sprite sprite)
             spriteLoadedCallbackByName.Remove(spriteName);
         }
     }
-    
+#if SUBNAUTICA
+    public bool TryGetTabSprite(string spriteName, out Atlas.Sprite sprite) => tabSpritesByName.TryGetValue(spriteName, out sprite);
+
+    public delegate void TabSpriteLoadedEvent(Atlas.Sprite sprite);
+#elif BELOWZERO
     public bool TryGetTabSprite(string spriteName, out Sprite sprite) => tabSpritesByName.TryGetValue(spriteName, out sprite);
 
     public delegate void TabSpriteLoadedEvent(Sprite sprite);
-    
+#endif
+
     public void SetSpriteLoadedCallback(string tabName, TabSpriteLoadedEvent callback)
     {
         if (!spriteLoadedCallbackByName.ContainsKey(tabName))

NitroxClient/GameLogic/HUD/PdaTabs/uGUI_PlayerListTab.cs

@@ -75,7 +75,11 @@ public IEnumerator Start()
             {
                 if (asset.name.Equals("player_list_tab@3x"))
                 {
+#if SUBNAUTICA
+                    nitroxPDATabManager.AddTabSprite(asset.name, new Atlas.Sprite(sprite));
+#elif BELOWZERO
                     nitroxPDATabManager.AddTabSprite(asset.name, Sprite.Create(sprite.texture, sprite.rect, sprite.pivot, sprite.pixelsPerUnit));
+#endif
                 }
                 assets.Add(asset.name, sprite);
             }

NitroxClient/GameLogic/InitialSync/PdaInitialSyncProcessor.cs

@@ -66,7 +66,7 @@ private static IEnumerator RestoreEncyclopediaEntries(InitialPlayerSync packet)
             foreach (string entry in entries)
             {
 #if SUBNAUTICA
-                    PDAEncyclopedia.Add(entry, false);
+                PDAEncyclopedia.Add(entry, false);
 #elif BELOWZERO
                 PDAEncyclopedia.Add(entry, false, false);
 #endif

NitroxClient/GameLogic/LocalPlayer.cs

@@ -116,6 +116,7 @@ public void BroadcastSubrootChange(Optional<NitroxId> subrootId)
             packetSender.Send(new SubRootChanged(PlayerId.Value, subrootId));
         }
     }
+
 #if SUBNAUTICA
     public void BroadcastEscapePodChange(Optional<NitroxId> escapePodId)
     {
@@ -141,6 +142,7 @@ public void BroadcastHeldItemChanged(NitroxId itemId, PlayerHeldItemChanged.Chan
     private GameObject CreateBodyPrototype()
     {
         GameObject prototype = Body;
+
         // Cheap fix for showing head, much easier since male_geo contains many different heads
 #if SUBNAUTICA
         prototype.GetComponentInParent<Player>().head.shadowCastingMode = ShadowCastingMode.On;

NitroxClient/GameLogic/PlayerLogic/PlayerModel/ColorSwap/ReinforcedSuitColorSwapManager.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using NitroxClient.GameLogic.PlayerLogic.PlayerModel.Abstract;
 using NitroxClient.GameLogic.PlayerLogic.PlayerModel.ColorSwap.Strategy;

NitroxClient/GameLogic/PlayerLogic/PlayerModel/Equipment/ReinforcedSuitVisibilityHandler.cs

@@ -1,4 +1,4 @@
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
 using NitroxClient.GameLogic.PlayerLogic.PlayerModel.Equipment.Abstract;
 using UnityEngine;
 

NitroxClient/GameLogic/PlayerLogic/PlayerModel/PlayerModelManager.cs

@@ -33,14 +33,14 @@ public void RegisterEquipmentVisibilityHandler(GameObject playerModel)
         {
             new DiveSuitVisibilityHandler(playerModel),
             new FinsVisibilityHandler(playerModel),
-            new StillSuitVisibilityHandler(playerModel),
             new ReinforcedSuitVisibilityHandler(playerModel),
+            new StillSuitVisibilityHandler(playerModel),
 #if SUBNAUTICA
-            new RadiationSuitVisibilityHandler(playerModel),
-            new ScubaSuitVisibilityHandler(playerModel)
+            new ScubaSuitVisibilityHandler(playerModel),
+            new RadiationSuitVisibilityHandler(playerModel)
 #elif BELOWZERO
-            new ColdProtectiveSuitVisibilityHandler(playerModel),
-            new BaseVisibilityHandler(playerModel)
+            new BaseVisibilityHandler(playerModel),
+            new ColdProtectiveSuitVisibilityHandler(playerModel)
 #endif
         };
     }

NitroxClient/GameLogic/RemotePlayer.cs

@@ -1,6 +1,8 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+#if BELOWZERO
 using FMODUnity;
+#endif
 using NitroxClient.GameLogic.HUD;
 using NitroxClient.GameLogic.PlayerLogic;
 using NitroxClient.GameLogic.PlayerLogic.PlayerModel;
@@ -70,7 +72,6 @@ public void InitializeGameObject(GameObject playerBody)
         NitroxEntity.SetNewId(Body, PlayerContext.PlayerNitroxId);
 
         // Get player
-        PlayerModel = Body.RequireGameObject("player_view");
 #if SUBNAUTICA
         PlayerModel = Body.RequireGameObject("player_view");
 #elif BELOWZERO

NitroxClient/GameLogic/SeamothModulesEvent.cs

@@ -1,3 +1,4 @@
+#if SUBNAUTICA
 using NitroxClient.Communication.Abstract;
 using NitroxModel.DataStructures;
 using NitroxModel.Packets;
@@ -58,3 +59,4 @@ public void BroadcastElectricalDefense(TechType techType, int slotID, SeaMoth in
         }
     }
 }
+#endif

NitroxClient/GameLogic/Spawning/Metadata/Extractor/ExosuitMetadataExtractor.cs

@@ -1,7 +1,11 @@
+#if BELOWZERO
 using System.Linq;
+#endif
 using NitroxClient.GameLogic.Spawning.Metadata.Extractor.Abstract;
 using NitroxModel.DataStructures.GameLogic.Entities.Metadata;
+#if BELOWZERO
 using NitroxModel_Subnautica.DataStructures;
+#endif
 
 namespace NitroxClient.GameLogic.Spawning.Metadata.Extractor;
 

NitroxClient/GameLogic/Spawning/Metadata/Processor/ExosuitMetadataProcessor.cs

@@ -17,6 +17,7 @@ public override void ProcessMetadata(GameObject gameObject, ExosuitMetadata meta
             Log.ErrorOnce($"[{nameof(ExosuitMetadataProcessor)}] Could not find {nameof(Exosuit)} on {gameObject}");
             return;
         }
+        //TODO: Check login here for subNameInput
 #if SUBNAUTICA
         if (!gameObject.TryGetComponent(out SubName subName))
         {

NitroxClient/GameLogic/Spawning/Metadata/Processor/SubNameInputMetadataProcessor.cs

@@ -7,7 +7,6 @@
 using NitroxModel.Packets;
 using NitroxModel_Subnautica.DataStructures;
 using UnityEngine;
-using static GameInput;
 
 namespace NitroxClient.GameLogic.Spawning.Metadata.Processor;
 
@@ -20,6 +19,7 @@ public override void ProcessMetadata(GameObject gameObject, SubNameInputMetadata
             Log.ErrorOnce($"[{nameof(SubNameInputMetadataProcessor)}] Could not find {nameof(SubNameInput)} on {gameObject}");
             return;
         }
+        //TODO: Check the naming logic here
 #if SUBNAUTICA
         SubName subName = subNameInput.target;
         if (!subName && !subNameInput.TryGetComponent(out subName))

NitroxClient/MonoBehaviours/CinematicController/RemotePlayerCinematicController.cs

@@ -378,6 +378,7 @@ public void ManagedLateUpdate()
         {
             transform = player.Body.GetComponent<Transform>();
         }
+
 #if SUBNAUTICA
         bool isVrAnimationMode = !GameOptions.GetVrAnimationMode();
 #elif BELOWZERO

NitroxClient/MonoBehaviours/FMODEmitterController.cs

@@ -44,6 +44,7 @@ public void LateRegisterEmitter()
             }
         }
     }
+
 #if SUBNAUTICA
     public void AddEmitter(string path, FMOD_CustomEmitter customEmitter, float maxDistance)
     {

NitroxClient/MonoBehaviours/Multiplayer.cs

@@ -193,7 +193,6 @@ private static void SetLoadingComplete()
 #elif BELOWZERO
             WaitScreen.main.Hide();
 #endif
-            
             WaitScreen.main.items.Clear();
 
             PlayerManager remotePlayerManager = NitroxServiceLocator.LocateService<PlayerManager>();

NitroxClient/MonoBehaviours/MultiplayerExosuit.cs

@@ -1,4 +1,4 @@
-using NitroxClient.GameLogic.FMOD;
+using NitroxClient.GameLogic.FMOD;
 using NitroxClient.Unity.Smoothing;
 using NitroxModel.GameLogic.FMOD;
 using UnityEngine;
@@ -20,6 +20,7 @@ protected override void Awake()
         WheelPitchSetter = value => exosuit.steeringWheelPitch = value;
         base.Awake();
         SmoothRotation = new ExosuitSmoothRotation(gameObject.transform.rotation);
+
 #if SUBNAUTICA
         this.Resolve<FMODWhitelist>().TryGetSoundData(exosuit.loopingJetSound.asset.path, out SoundData jetSoundData);
 #elif BELOWZERO

NitroxClient/MonoBehaviours/MultiplayerSeaMoth.cs

@@ -1,4 +1,4 @@
-using FMOD.Studio;
+using FMOD.Studio;
 using NitroxModel.GameLogic.FMOD;
 using UnityEngine;
 

NitroxClient/MonoBehaviours/PlayerStatsBroadcaster.cs

@@ -1,6 +1,5 @@
 using NitroxClient.GameLogic;
 using NitroxClient.Unity.Helper;
-using NitroxModel.Core;
 using UnityEngine;
 
 namespace NitroxClient.MonoBehaviours;

NitroxLauncher/LauncherConfig.cs

@@ -1,4 +1,4 @@
-using System.ComponentModel;
+using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using NitroxLauncher.Properties;
 using NitroxModel.Helper;

NitroxLauncher/LauncherLogic.cs

@@ -248,46 +248,45 @@ internal async Task StartMultiplayerAsync()
 
             gameProcess = await StartSubnauticaAsync();
         }
-#if BELOWZERO
+#if SUBNAUTICA
         private async Task<ProcessEx> StartSubnauticaAsync()
         {
             string subnauticaPath = Config.SubnauticaPath;
             string subnauticaLaunchArguments = Config.SubnauticaLaunchArguments;
-            string subnauticaExe = Path.Combine(subnauticaPath, GameInfo.SubnauticaBelowZero.ExeName);
+            string subnauticaExe = Path.Combine(subnauticaPath, GameInfo.Subnautica.ExeName);
             IGamePlatform platform = GamePlatforms.GetPlatformByGameDir(subnauticaPath);
 
             // Start game & gaming platform if needed.
             using ProcessEx game = platform switch
             {
-                Steam s => await s.StartGameAsync(subnauticaExe, GameInfo.SubnauticaBelowZero.SteamAppId, subnauticaLaunchArguments),
+                Steam s => await s.StartGameAsync(subnauticaExe, GameInfo.Subnautica.SteamAppId, subnauticaLaunchArguments),
                 EpicGames e => await e.StartGameAsync(subnauticaExe, subnauticaLaunchArguments),
                 MSStore m => await m.StartGameAsync(subnauticaExe),
                 DiscordStore d => await d.StartGameAsync(subnauticaExe, subnauticaLaunchArguments),
-                _ => throw new Exception($"Directory '{subnauticaPath}' is not a valid {GameInfo.SubnauticaBelowZero.Name} game installation or the game's platform is unsupported by Nitrox.")
+                _ => throw new Exception($"Directory '{subnauticaPath}' is not a valid {GameInfo.Subnautica.Name} game installation or the game's platform is unsupported by Nitrox.")
             };
 
-            return game ?? throw new Exception($"Unable to start game through {platform.Name}");
+            return game ?? throw new Exception($"Game failed to start through {platform.Name}");
         }
-#endif
-#if SUBNAUTICA
+#elif BELOWZERO
         private async Task<ProcessEx> StartSubnauticaAsync()
         {
-            string subnauticaPath = Config.SubnauticaPath;
-            string subnauticaLaunchArguments = Config.SubnauticaLaunchArguments;
-            string subnauticaExe = Path.Combine(subnauticaPath, GameInfo.Subnautica.ExeName);
-            IGamePlatform platform = GamePlatforms.GetPlatformByGameDir(subnauticaPath);
-            
+            string subnauticaBelowZeroPath = Config.SubnauticaPath;
+            string subnauticaBelowZeroLaunchArguments = Config.SubnauticaLaunchArguments;
+            string subnauticaBelowZeroExe = Path.Combine(subnauticaBelowZeroPath, GameInfo.SubnauticaBelowZero.ExeName);
+            IGamePlatform platform = GamePlatforms.GetPlatformByGameDir(subnauticaBelowZeroPath);
+
             // Start game & gaming platform if needed.
             using ProcessEx game = platform switch
             {
-                Steam s => await s.StartGameAsync(subnauticaExe, GameInfo.Subnautica.SteamAppId, subnauticaLaunchArguments),
-                EpicGames e => await e.StartGameAsync(subnauticaExe, subnauticaLaunchArguments),
-                MSStore m => await m.StartGameAsync(subnauticaExe),
-                DiscordStore d => await d.StartGameAsync(subnauticaExe, subnauticaLaunchArguments),
-                _ => throw new Exception($"Directory '{subnauticaPath}' is not a valid {GameInfo.Subnautica.Name} game installation or the game's platform is unsupported by Nitrox.")
+                Steam s => await s.StartGameAsync(subnauticaBelowZeroExe, GameInfo.SubnauticaBelowZero.SteamAppId, subnauticaBelowZeroLaunchArguments),
+                EpicGames e => await e.StartGameAsync(subnauticaBelowZeroExe, subnauticaBelowZeroLaunchArguments),
+                MSStore m => await m.StartGameAsync(subnauticaBelowZeroExe),
+                DiscordStore d => await d.StartGameAsync(subnauticaBelowZeroExe, subnauticaBelowZeroLaunchArguments),
+                _ => throw new Exception($"Directory '{subnauticaBelowZeroPath}' is not a valid {GameInfo.SubnauticaBelowZero.Name} game installation or the game's platform is unsupported by Nitrox.")
             };
 
-            return game ?? throw new Exception($"Game failed to start through {platform.Name}");
+            return game ?? throw new Exception($"Unable to start game through {platform.Name}");
         }
 #endif
 

NitroxModel-Subnautica/DataStructures/DataExtensions.cs

@@ -140,7 +140,10 @@ public static StoryGoalExecuted.EventType ToDto(this Story.GoalType goalType)
             Story.GoalType.Radio => StoryGoalExecuted.EventType.RADIO,
             Story.GoalType.Encyclopedia => StoryGoalExecuted.EventType.ENCYCLOPEDIA,
             Story.GoalType.Story => StoryGoalExecuted.EventType.STORY,
-            _ => throw new ArgumentException("The provided Story.GoalType doesn't correspond to a StoryEventSend.EventType"),
+#if BELOWZERO
+            Story.GoalType.Call => StoryGoalExecuted.EventType.CALL,
+#endif
+            _ => throw new ArgumentException($"The provided Story.GoalType ({goalType}) doesn't correspond to a StoryEventSend.EventType"),
         };
     }
 
@@ -152,7 +155,10 @@ public static Story.GoalType ToUnity(this StoryGoalExecuted.EventType eventType)
             StoryGoalExecuted.EventType.RADIO => Story.GoalType.Radio,
             StoryGoalExecuted.EventType.ENCYCLOPEDIA => Story.GoalType.Encyclopedia,
             StoryGoalExecuted.EventType.STORY => Story.GoalType.Story,
-            _ => throw new ArgumentException("The provided StoryEventSend.EventType doesn't correspond to a Story.GoalType")
+#if BELOWZERO
+            StoryGoalExecuted.EventType.CALL => Story.GoalType.Call,
+#endif
+            _ => throw new ArgumentException($"The provided StoryEventSend.EventType ({eventType}) doesn't correspond to a Story.GoalType")
         };
     }
 

NitroxModel-Subnautica/Helper/SubnauticaMap.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using NitroxModel.DataStructures;
 using NitroxModel.DataStructures.GameLogic;
 using NitroxModel.Helper;
@@ -24,7 +24,9 @@ public class SubnauticaMap : IMap
             new NitroxTechType(nameof(TechType.Gravsphere)),
             new NitroxTechType(nameof(TechType.PipeSurfaceFloater)),
             new NitroxTechType(nameof(TechType.SmallStorage)),
+#if SUBNAUTICA
             new NitroxTechType(nameof(TechType.CyclopsDecoy)),
+#endif
             new NitroxTechType(nameof(TechType.LEDLight)),
             new NitroxTechType(nameof(TechType.Beacon))
         };

NitroxModel/DataStructures/GameLogic/PlayerStatsData.cs

@@ -32,6 +32,7 @@ protected PlayerStatsData()
         {
             // Constructor for serialization. Has to be "protected" for json serialization.
         }
+
 #if SUBNAUTICA
         public PlayerStatsData(float oxygen, float maxOxygen, float health, float food, float water, float infectionAmount)
 #elif BELOWZERO

NitroxModel/Helper/NetHelper.cs

@@ -37,8 +37,8 @@ public static class NetHelper
         public static IEnumerable<NetworkInterface> GetInternetInterfaces()
         {
             return NetworkInterface.GetAllNetworkInterfaces()
-                                   .Where(n => n.Name is "Ethernet" or "Wi-Fi" && n.OperationalStatus is OperationalStatus.Up && n.NetworkInterfaceType is NetworkInterfaceType.Wireless80211 or NetworkInterfaceType.Ethernet)
-                                   .OrderBy(n => n.Name == "Ethernet" ? 1 : 0)
+                                   .Where(n => n.Name.Contains("Ethernet") || n.Name.Contains("Wi-Fi") && n.OperationalStatus is OperationalStatus.Up && n.NetworkInterfaceType is NetworkInterfaceType.Wireless80211 or NetworkInterfaceType.Ethernet)
+                                   .OrderBy(n => n.Name.Contains("Ethernet") ? 1 : 0)
                                    .ThenBy(n => n.Name);
         }