regression: fix prefab cache version check (SubnauticaNitrox#2674)

Author: Measurity

Nitrox.Model/Helper/Reflect.cs

@@ -77,7 +77,7 @@ public static PropertyInfo Property<T>(Expression<Func<T, object>> expression)
         return (PropertyInfo)GetMemberInfo(expression);
     }
 
-    private static MemberInfo GetMemberInfo(LambdaExpression expression, Type implementingType = null)
+    private static MemberInfo GetMemberInfo(LambdaExpression expression, Type? implementingType = null)
     {
         Expression currentExpression = expression.Body;
         while (true)

Nitrox.Server.Subnautica/Models/Commands/Core/HostToServerCommandContext.cs

@@ -12,7 +12,7 @@ internal sealed record HostToServerCommandContext : ICommandContext
     public ILogger Logger { get; set; } = NullLogger.Instance;
     public CommandOrigin Origin { get; init; } = CommandOrigin.SERVER;
     public string OriginName => "SERVER";
-    public SessionId OriginId { get; init; } = 0;
+    public SessionId OriginId { get; init; } = SessionId.SERVER_ID;
     public Perms Permissions { get; init; } = Perms.HOST;
 
     public HostToServerCommandContext(IPacketSender packetSender)

Nitrox.Server.Subnautica/Models/Communication/LiteNetLibServer.cs

@@ -12,6 +12,7 @@
 using Nitrox.Model.Packets.Core;
 using Nitrox.Server.Subnautica.Models.Administration;
 using Nitrox.Server.Subnautica.Models.AppEvents;
+using Nitrox.Server.Subnautica.Models.AppEvents.Core;
 using Nitrox.Server.Subnautica.Models.GameLogic;
 using Nitrox.Server.Subnautica.Models.Helper;
 using Nitrox.Server.Subnautica.Models.Packets.Core;
@@ -45,8 +46,10 @@ public LiteNetLibServer(PlayerManager playerManager, SessionManager sessionManag
         this.options = options;
         this.logger = logger;
         listener = new EventBasedNetListener();
-        server = new NetManager(listener, NitroxEnvironment.IsReleaseMode ? new Crc32cLayer() : null) {
-            UseNativeSockets = true, IPv6Enabled = true };
+        server = new NetManager(listener, NitroxEnvironment.IsReleaseMode ? new Crc32cLayer() : null)
+        {
+            UseNativeSockets = true, IPv6Enabled = true
+        };
     }
 
     public Task StartAsync(CancellationToken cancellationToken)
@@ -181,7 +184,7 @@ public async Task<bool> KickPlayer(SessionId sessionId, string reason = "")
         return true;
     }
 
-    public async Task OnEventAsync(ISessionCleaner.Args args)
+    async Task IEvent<ISessionCleaner.Args>.OnEventAsync(ISessionCleaner.Args args)
     {
         Disconnect disconnect = new(args.Session.Id);
         await SendPacketToAllAsync(disconnect);

Nitrox.Server.Subnautica/Models/Resources/Parsers/PrefabPlaceholderGroupsResource.cs

@@ -149,12 +149,8 @@ private async Task CreateOrLoadPrefabCacheAsync(string nitroxCachePath)
         {
             logger.ZLogWarning($"An error occurred while deserializing the prefab cache. Re-creating it: {ex.Message:@Error}");
         }
-        if (cache.HasValue)
+        if (cache is { Version: CACHE_VERSION })
         {
-            if (cache.Value.Version != CACHE_VERSION)
-            {
-                logger.ZLogInformation($"Found outdated cache ({cache.Value.Version}, expected {CACHE_VERSION})");
-            }
             prefabPlaceholdersGroupPaths = cache.Value.PrefabPlaceholdersGroupPaths;
             randomPossibilitiesByClassId = cache.Value.RandomPossibilitiesByClassId;
             groupsByClassId = cache.Value.GroupsByClassId;
@@ -164,6 +160,10 @@ private async Task CreateOrLoadPrefabCacheAsync(string nitroxCachePath)
         // Fallback solution
         else
         {
+            if (cache.HasValue)
+            {
+                logger.ZLogInformation($"Found outdated cache (is v{cache.Value.Version}, expected v{CACHE_VERSION})");
+            }
             logger.ZLogInformation($"Building cache, this may take a while...");
             // Get all prefab-classIds linked to the (partial) bundle path
             string prefabDatabasePath = Path.Combine(options.Value.GetSubnauticaResourcesPath(), "StreamingAssets", "SNUnmanagedData", "prefabs.db");

Nitrox.Server.Subnautica/Services/PortForwardService.cs

@@ -6,7 +6,7 @@
 namespace Nitrox.Server.Subnautica.Services;
 
 /// <summary>
-///     Opens ports on network attached routers via <a href="https://en.wikipedia.org/wiki/Universal_Plug_and_Play">UPnP</a>.
+///     Uses <see cref="SubnauticaServerOptions"/> to automatically open server listening port on network router via <a href="https://en.wikipedia.org/wiki/Universal_Plug_and_Play">UPnP</a>.
 /// </summary>
 /// <remarks>
 ///     By port forwarding, incoming connections will be forwarded to the host machine running the game server.<br /><br />

Nitrox.Test/Model/Platforms/OS/Windows/RegistryTest.cs

@@ -8,7 +8,7 @@ namespace Nitrox.Model.Platforms.OS.Windows;
 [SupportedOSPlatform("windows")]
 public class RegistryTest
 {
-    [OSTestMethod("windows")]
+    [OSTestMethod(OperatingSystems.Windows)]
     public async Task WaitsForRegistryKeyToExist()
     {
         const string PATH_TO_KEY = @"SOFTWARE\Nitrox\test";

Nitrox.Test/Model/Platforms/OSTestMethodAttribute.cs

@@ -1,32 +1,38 @@
 namespace Nitrox.Test.Model.Platforms;
 
+/// <summary>
+///     Test method attribute, that will only run the test on the specified platform.
+/// </summary>
+/// <param name="platform">case-insensitive platform, i.e: linux, windows, osx</param>
 [AttributeUsage(AttributeTargets.Method)]
-public class OSTestMethodAttribute : TestMethodAttribute
+internal sealed class OSTestMethodAttribute(OperatingSystems platform) : TestMethodAttribute
 {
-    public string Platform { get;}
-
-    /// <summary>
-    /// Test method attribute, that will only run the test on the specified platform.
-    /// </summary>
-    /// <param name="platform">case insensitive platform, i.e: linux, windows, osx</param>
-    public OSTestMethodAttribute(string platform)
-    {
-        Platform = platform;
-    }
+    private readonly OperatingSystems platform = platform;
 
     public override TestResult[] Execute(ITestMethod testMethod)
     {
-        if (!OperatingSystem.IsOSPlatform(Platform))
+        if (!OperatingSystem.IsOSPlatform(GetPlatformString()))
         {
-            return [
-                new TestResult()
+            return
+            [
+                new TestResult
                 {
                     Outcome = UnitTestOutcome.Inconclusive,
-                    TestContextMessages = $"This test can only be run on {Platform}"
+                    TestContextMessages = $"This test can only be run on {GetPlatformString()}"
                 }
             ];
         }
 
         return base.Execute(testMethod);
     }
+
+    private string GetPlatformString() =>
+        platform switch
+        {
+            OperatingSystems.Windows => "Windows",
+            OperatingSystems.Linux => "Linux",
+            OperatingSystems.OSX => "OSX",
+            OperatingSystems.FreeBSD => "FreeBSD",
+            _ => throw new InvalidOperationException($"Unknown platform {(int)platform}")
+        };
 }

NitroxClient/GameLogic/Spawning/WorldEntities/PlaceholderGroupWorldEntitySpawner.cs

@@ -12,7 +12,7 @@ namespace NitroxClient.GameLogic.Spawning.WorldEntities;
 /// This spawner can't hold a SpawnSync function because it is also responsible for spawning its children
 /// so the <see cref="SpawnAsync"/> function will still use sync spawning when possible and fall back to async when required.
 /// </remarks>
-public class PlaceholderGroupWorldEntitySpawner : IWorldEntitySpawner
+internal sealed class PlaceholderGroupWorldEntitySpawner : IWorldEntitySpawner
 {
     private readonly Entities entities;
     private readonly WorldEntitySpawnerResolver spawnerResolver;

NitroxClient/GameLogic/Spawning/WorldEntities/WorldEntitySpawnerResolver.cs

@@ -4,7 +4,7 @@
 
 namespace NitroxClient.GameLogic.Spawning.WorldEntities;
 
-public class WorldEntitySpawnerResolver
+internal sealed class WorldEntitySpawnerResolver
 {
     private readonly DefaultWorldEntitySpawner defaultEntitySpawner = new();
 
@@ -32,33 +32,16 @@ public WorldEntitySpawnerResolver(EntityMetadataManager entityMetadataManager, E
         creatureRespawnEntitySpawner = new CreatureRespawnEntitySpawner(simulationOwnership);
     }
 
-    public IWorldEntitySpawner ResolveEntitySpawner(WorldEntity entity)
-    {
-        switch (entity)
-        {
-            case PrefabPlaceholderEntity:
-                return prefabPlaceholderEntitySpawner;
-            case PlaceholderGroupWorldEntity:
-                return placeholderGroupWorldEntitySpawner;
-            case SerializedWorldEntity:
-                return serializedWorldEntitySpawner;
-            case GeyserWorldEntity:
-                return geyserWorldEntitySpawner;
-            case ReefbackEntity:
-                return reefbackEntitySpawner;
-            case ReefbackChildEntity:
-                return reefbackChildEntitySpawner;
-            case CreatureRespawnEntity:
-                return creatureRespawnEntitySpawner;
-        }
-
-        TechType techType = entity.TechType.ToUnity();
-
-        if (customSpawnersByTechType.TryGetValue(techType, out IWorldEntitySpawner value))
+    public IWorldEntitySpawner ResolveEntitySpawner(WorldEntity entity) =>
+        entity switch
         {
-            return value;
-        }
-
-        return defaultEntitySpawner;
-    }
+            PrefabPlaceholderEntity => prefabPlaceholderEntitySpawner,
+            PlaceholderGroupWorldEntity => placeholderGroupWorldEntitySpawner,
+            SerializedWorldEntity => serializedWorldEntitySpawner,
+            GeyserWorldEntity => geyserWorldEntitySpawner,
+            ReefbackEntity => reefbackEntitySpawner,
+            ReefbackChildEntity => reefbackChildEntitySpawner,
+            CreatureRespawnEntity => creatureRespawnEntitySpawner,
+            _ => customSpawnersByTechType.GetValueOrDefault(entity.TechType.ToUnity(), defaultEntitySpawner)
+        };
 }