1.8.0.1

.github/pull_request_template.md

@@ -0,0 +1,5 @@
+<!--
+Before filing a pull request please look at our guidelines: https://github.com/SubnauticaNitrox/Nitrox/blob/master/CONTRIBUTING.md.
+
+We recommend that if you want to do a non trivial feature or a feature without an already open issue, to contact us on Discord https://discord.gg/E8B4X9s before investing your time.
+-->

CONTRIBUTING.md

@@ -1,3 +1,10 @@
 # Contributing
 
-Please have a look at our [documentation site](https://subnauticanitrox.github.io/Documentation/) for contribution guidelines & information on how to get started.
+Please have a look at our [documentation site](https://subnauticanitrox.github.io/Documentation/) for contribution guidelines & information on how to get started.
+
+## Stand on AI and generated issues & PRs
+
+We generally don't want to tell you what tools to use (you undoubting minimalistic vi enjoyer), but we ideally want to have clean and minimal code, issues and pull requests. \
+For this reason we would prefer AI is not used in the creation of issues and PR descriptions. We don't have the resources to read 50 paragraphs on why changing 5 lines of code makes sense. Only explain yourself if the goal of your implementation is not a no-brainer. \
+You are free to use AI to generate your code but we require you to review it before submitting. Nitrox is a special kind of software as it's interacting tightly with Subnautica's code base which makes good code generation difficult. Also keep in mind Subnautica's source code is under copyright and it's prohibited to upload it to an AI. \
+As a last note, only place comments on functions which meaning is not obvious. Follow the principle of "A good comment explains the why not the what". A good example for where comments are needed/expected are the Harmony patches.

Directory.Build.props

@@ -6,7 +6,7 @@
     <!-- Framework properties -->
     <PropertyGroup>
         <LangVersion>13</LangVersion>
-        <Version>1.8.0.0</Version>
+        <Version>1.8.0.1</Version>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <Prefer32Bit>false</Prefer32Bit>
         <DebugType>embedded</DebugType>
@@ -28,6 +28,8 @@
         <TestLibrary>false</TestLibrary>
         <NitroxLibrary>false</NitroxLibrary>
         <UnityModLibrary>false</UnityModLibrary>
+        <GameName>Subnautica</GameName>
+        <GameMinimumVersion>82304</GameMinimumVersion>
     </PropertyGroup>
 
     <PropertyGroup Condition="$([System.Text.RegularExpressions.Regex]::IsMatch($(MSBuildProjectName), '^Nitrox.*$'))">
@@ -36,7 +38,7 @@
     <PropertyGroup Condition="'$(NitroxProject)' == 'true' and '$(MSBuildProjectName)' != 'Nitrox.Test'">
         <NitroxLibrary>true</NitroxLibrary>
     </PropertyGroup>
-    <PropertyGroup Condition="'$(NitroxLibrary)' == 'true' and '$(MSBuildProjectName)' != 'NitroxModel' and '$(MSBuildProjectName)' != 'NitroxServer' and '$(MSBuildProjectName)' != 'Nitrox.Launcher'">
+    <PropertyGroup Condition="'$(NitroxLibrary)' == 'true' and '$(MSBuildProjectName)' != 'Nitrox.Model' and '$(MSBuildProjectName)' != 'Nitrox.Launcher'">
         <UnityModLibrary>true</UnityModLibrary>
     </PropertyGroup>
     <PropertyGroup Condition="'$(MSBuildProjectName)' == 'Nitrox.Test'">
@@ -49,10 +51,10 @@
 
     <!-- Shared dependencies for all Nitrox.* projects -->
     <ItemGroup Condition="'$(NitroxProject)' == 'true'">
-        <PackageReference Include="JetBrains.Annotations" Version="2024.3.0">
+        <PackageReference Include="JetBrains.Annotations">
             <Aliases>JB</Aliases>
         </PackageReference>
-        <PackageReference Include="PolySharp" Version="1.15.0">
+        <PackageReference Include="PolySharp">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>
@@ -62,15 +64,15 @@
     <Choose>
         <When Condition="'$(UnityModLibrary)' == 'true' or '$(TestLibrary)' == 'true'">
             <ItemGroup>
-                <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.2">
+                <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild">
                     <PrivateAssets>all</PrivateAssets>
                     <IncludeAssets>build; native; contentfiles; analyzers</IncludeAssets>
                 </PackageReference>
-                <PackageReference Include="Nitrox.Discovery.MSBuild" Version="0.1.0">
+                <PackageReference Include="Nitrox.Discovery.MSBuild">
                     <PrivateAssets>all</PrivateAssets>
                     <IncludeAssets>build; native; contentfiles; analyzers</IncludeAssets>
                 </PackageReference>
-                <PackageReference Include="Nitrox.Analyzers" Version="*">
+                <PackageReference Include="Nitrox.Analyzers">
                     <PrivateAssets>all</PrivateAssets>
                     <IncludeAssets>build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
                 </PackageReference>

Directory.Build.targets

@@ -33,6 +33,10 @@
                 <_Parameter1>GitShortHash</_Parameter1>
                 <_Parameter2>$(_GitShortHash)</_Parameter2>
             </AssemblyAttribute>
+            <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
+                <_Parameter1>GameMinimumVersion</_Parameter1>
+                <_Parameter2>$(GameMinimumVersion)</_Parameter2>
+            </AssemblyAttribute>
         </ItemGroup>
 
         <ItemGroup>
@@ -71,12 +75,11 @@
         <PropertyGroup>
             <GameManagedDir>$(GameDir)$(GameDataFolder)\Managed\</GameManagedDir>
             <GameVersionFile>$(GameDir)$(GameDataFolder)\StreamingAssets\SNUnmanagedData\plastic_status.ignore</GameVersionFile>
-            <GameLegacyVersion>68598</GameLegacyVersion>
         </PropertyGroup>
         <ReadLinesFromFile File="$(GameVersionFile)">
             <Output TaskParameter="Lines" ItemName="GameVersion" />
         </ReadLinesFromFile>
-        <Error Condition="@(GameVersion) &lt;= $(GameLegacyVersion)" Text="Subnautica must not be on legacy branch. Expected version &gt;$(GameLegacyVersion) but was @(GameVersion)" />
+        <Error Condition="@(GameVersion) &lt; $(GameMinimumVersion)" Text="$(GameName) version is outdated. Expected version &gt;=$(GameMinimumVersion) but was @(GameVersion)" />
         <Message Importance="high" Text="Game found at: '$(GameDir)' with version @(GameVersion)" />
 
         <ItemGroup>

Directory.Packages.props

@@ -0,0 +1,59 @@
+<Project>
+    <PropertyGroup>
+        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+        <CentralPackageFloatingVersionsEnabled>true</CentralPackageFloatingVersionsEnabled>
+    </PropertyGroup>
+    <ItemGroup>
+        <PackageVersion Include="AssetsTools.NET" Version="3.0.0-preview1" />
+        <PackageVersion Include="Autofac" Version="[4.9.4]" />
+        <PackageVersion Include="Avalonia.Desktop" Version="11.3.4" />
+        <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.4" />
+        <PackageVersion Include="Avalonia.Svg.Skia" Version="11.3.0" />
+        <PackageVersion Include="Avalonia.Themes.Fluent" Version="11.3.4" />
+        <PackageVersion Include="Avalonia.Xaml.Interactions" Version="11.3.0.6" />
+        <PackageVersion Include="Avalonia.Xaml.Interactivity" Version="11.3.0.6" />
+        <PackageVersion Include="Avalonia" Version="11.3.4" />
+        <PackageVersion Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.2" />
+        <PackageVersion Include="Bogus" Version="35.6.3" />
+        <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
+        <PackageVersion Include="CompareNETObjects" Version="4.83.0" />
+        <PackageVersion Include="ConsoleAppFramework" Version="5.6.1" />
+        <PackageVersion Include="coverlet.collector" Version="6.0.4" />
+        <PackageVersion Include="DiscordGameSDKWrapper" Version="3.2.1.1" />
+        <PackageVersion Include="dnlib" Version="4.4.0" />
+        <PackageVersion Include="FluentAssertions.Analyzers" Version="[0.34.1]" />
+        <PackageVersion Include="FluentAssertions" Version="[7.2.0]" />
+        <PackageVersion Include="HanumanInstitute.MvvmDialogs.Avalonia" Version="2.1.0" />
+        <PackageVersion Include="HarmonyX" Version="2.10.0" />
+        <PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />
+        <PackageVersion Include="LiteNetLib" Version="1.2.0" />
+        <PackageVersion Include="LitJson" Version="0.19.0" />
+        <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.8" />
+        <PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.8" />
+        <PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
+        <PackageVersion Include="Mono.Nat" Version="3.0.4" />
+        <PackageVersion Include="MSTest" Version="3.8.3" />
+        <PackageVersion Include="Newtonsoft.Json" Version="12.0.3" />
+        <PackageVersion Include="Nitrox.Analyzers" Version="*" />
+        <PackageVersion Include="Nitrox.BinaryPack" Version="2.0.1" />
+        <PackageVersion Include="Nitrox.Discovery.MSBuild" Version="0.1.1" />
+        <PackageVersion Include="NSubstitute" Version="5.3.0" />
+        <PackageVersion Include="PolySharp" Version="1.15.0" />
+        <PackageVersion Include="Serilog.Sinks.Async" Version="2.1.0" />
+        <PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
+        <PackageVersion Include="Serilog.Sinks.Map" Version="2.0.0" />
+        <PackageVersion Include="Serilog" Version="4.2.0" />
+        <PackageVersion Include="ServiceScan.SourceGenerator" Version="2.3.4" />
+        <PackageVersion Include="SixLabors.ImageSharp" Version="[2.1.11]" />
+        <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="3.116.1" />
+        <PackageVersion Include="System.Buffers" Version="4.6.1" />
+        <PackageVersion Include="System.ComponentModel" Version="4.3.0" />
+        <PackageVersion Include="System.IO.Compression" Version="4.3.0" />
+        <PackageVersion Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
+        <PackageVersion Include="System.Memory" Version="4.6.3" />
+        <PackageVersion Include="System.Numerics.Vectors" Version="4.6.1" />
+        <PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
+        <PackageVersion Include="System.Text.Json" Version="9.0.4" />
+        <PackageVersion Include="System.ValueTuple" Version="4.6.1" />
+    </ItemGroup>
+</Project>

Nitrox.Launcher/App.axaml.cs

@@ -17,9 +17,10 @@
 using Nitrox.Launcher.Models.Validators;
 using Nitrox.Launcher.ViewModels;
 using Nitrox.Launcher.Views;
-using NitroxModel.Helper;
-using NitroxModel.Logger;
-using NitroxModel.Platforms.OS.Shared;
+using Nitrox.Model.Core;
+using Nitrox.Model.Helper;
+using Nitrox.Model.Logger;
+using Nitrox.Model.Platforms.OS.Shared;
 
 namespace Nitrox.Launcher;
 

Nitrox.Launcher/GlobalStatic.cs

@@ -1,6 +1,6 @@
 using System;
 using Avalonia.Controls;
-using NitroxModel.Platforms.OS.Shared;
+using Nitrox.Model.Platforms.OS.Shared;
 
 namespace Nitrox.Launcher;
 
@@ -13,10 +13,10 @@ internal static class GlobalStatic
 
     public static string GetServerExeName()
     {
-        string serverExeName = "NitroxServer-Subnautica.exe";
+        string serverExeName = "Nitrox.Server.Subnautica.exe";
         if (!OperatingSystem.IsWindows())
         {
-            serverExeName = "NitroxServer-Subnautica";
+            serverExeName = "Nitrox.Server.Subnautica";
         }
         return serverExeName;
     }

Nitrox.Launcher/GlobalUsings.cs

@@ -1,4 +1,4 @@
-global using NitroxModel;
-global using NitroxModel.Extensions;
+global using Nitrox.Model;
+global using Nitrox.Model.Extensions;
 global using Nitrox.Launcher.Models.Extensions;
 global using static Nitrox.Launcher.GlobalStatic;

Nitrox.Launcher/Models/Behaviors/FocusOnViewShowBehavior.cs

@@ -1,4 +1,5 @@
 using Avalonia.Controls;
+using Avalonia.Threading;
 using Avalonia.Xaml.Interactivity;
 using CommunityToolkit.Mvvm.Messaging;
 
@@ -11,7 +12,11 @@ public class FocusOnViewShowBehavior : Behavior<Control>
 {
     protected override void OnAttached()
     {
-        WeakReferenceMessenger.Default.Register<ShowViewMessage>(this, static (obj, _) => (obj as FocusOnViewShowBehavior)?.Focus());
+        WeakReferenceMessenger.Default.Register<ShowViewMessage>(this, static (obj, _) =>
+        {
+            // Need to queue this work on UI thread as calls via message originate from a different thread.
+            Dispatcher.UIThread.Invoke(() => (obj as FocusOnViewShowBehavior)?.Focus());
+        });
         base.OnAttached();
     }
 

Nitrox.Launcher/Models/Converters/PlatformToIconConverter.cs

@@ -2,7 +2,7 @@
 using System.Globalization;
 using Avalonia.Media.Imaging;
 using Nitrox.Launcher.Models.Utils;
-using NitroxModel.Discovery.Models;
+using Nitrox.Model.Discovery.Models;
 
 namespace Nitrox.Launcher.Models.Converters;
 

Nitrox.Launcher/Models/Converters/ToStringConverter.cs

@@ -2,7 +2,7 @@
 using System.ComponentModel;
 using System.Globalization;
 using Avalonia.Data;
-using NitroxModel.Helper;
+using Nitrox.Model.Helper;
 
 namespace Nitrox.Launcher.Models.Converters;
 

Nitrox.Launcher/Models/Design/EditorField.cs

@@ -1,6 +1,6 @@
 using System.Reflection;
 using Avalonia.Collections;
-using NitroxModel.Serialization;
+using Nitrox.Model.Serialization;
 
 namespace Nitrox.Launcher.Models.Design;
 

Nitrox.Launcher/Models/Design/KnownGame.cs

@@ -1,4 +1,4 @@
-using NitroxModel.Discovery.Models;
+using Nitrox.Model.Discovery.Models;
 
 namespace Nitrox.Launcher.Models.Design;
 

Nitrox.Launcher/Models/Design/ServerEntry.cs

@@ -14,13 +14,15 @@
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
 using Nitrox.Launcher.Models.Exceptions;
-using NitroxModel.DataStructures.GameLogic;
-using NitroxModel.Helper;
-using NitroxModel.Logger;
-using NitroxModel.Serialization;
-using NitroxModel.Server;
-using NitroxServer.Serialization;
-using NitroxServer.Serialization.World;
+using Nitrox.Model.Core;
+using Nitrox.Model.DataStructures.GameLogic;
+using Nitrox.Model.Helper;
+using Nitrox.Model.Logger;
+using Nitrox.Model.Serialization;
+using Nitrox.Model.Server;
+using Nitrox.Model.Subnautica.DataStructures.GameLogic;
+using Nitrox.Server.Subnautica.Models.Serialization;
+using Nitrox.Server.Subnautica.Models.Serialization.World;
 
 namespace Nitrox.Launcher.Models.Design;
 

Nitrox.Launcher/Models/Design/StaticCommands.cs

@@ -9,7 +9,7 @@
 using CommunityToolkit.Mvvm.Input;
 using Nitrox.Launcher.ViewModels;
 using Nitrox.Launcher.Views.Abstract;
-using NitroxModel.Logger;
+using Nitrox.Model.Logger;
 
 namespace Nitrox.Launcher.Models.Design;
 

Nitrox.Launcher/Models/Extensions/DtoExtensions.cs

@@ -17,15 +17,24 @@ public static NitroxChangelog FromDtoToLauncher(this NitroxWebsiteApiService.Cha
         buffer.Clear();
         foreach (string patchNote in changeLog.PatchNotes)
         {
-            if (patchNote.StartsWith('-'))
+            if ((GetAsHeaderOrNull(patchNote, '-') ?? GetAsHeaderOrNull(patchNote, '#')) is {} header)
             {
-                buffer.AppendLine($"\n[b][u]{patchNote.TrimStart('-', ' ')}[/u][/b]");
+                buffer.AppendLine(header);
             }
             else
             {
                 buffer.AppendLine($"• {patchNote}");
             }
         }
-        return new NitroxChangelog(changeLog.Version, changeLog.Released.DateTime, buffer.ToString());
+        return new NitroxChangelog(changeLog.Version, changeLog.Released.DateTime, string.Join(Environment.NewLine, buffer.ToString()));
+
+        static string? GetAsHeaderOrNull(string line, char prefix)
+        {
+            if (line.StartsWith(prefix))
+            {
+                return $"\n[b][u]{line.TrimStart(prefix, ' ')}[/u][/b]";
+            }
+            return null;
+        }
     }
 }

Nitrox.Launcher/Models/Extensions/KeyValueStoreExtensions.cs

@@ -1,4 +1,4 @@
-using NitroxModel.Helper;
+using Nitrox.Model.Helper;
 
 namespace Nitrox.Launcher.Models.Extensions;
 

Nitrox.Launcher/Models/Extensions/ProcessExExtensions.cs

@@ -1,7 +1,7 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
-using NitroxModel.Platforms.OS.Shared;
-using NitroxModel.Platforms.OS.Windows;
+using Nitrox.Model.Platforms.OS.Shared;
+using Nitrox.Model.Platforms.OS.Windows;
 
 namespace Nitrox.Launcher.Models.Extensions;
 

Nitrox.Launcher/Models/Extensions/ServiceCollectionExtensions.cs

@@ -14,7 +14,7 @@
 using Nitrox.Launcher.ViewModels.Abstract;
 using Nitrox.Launcher.Views;
 using Nitrox.Launcher.Views.Abstract;
-using NitroxModel.Helper;
+using Nitrox.Model.Helper;
 using ServiceScan.SourceGenerator;
 
 namespace Nitrox.Launcher.Models.Extensions;

Nitrox.Launcher/Models/Extensions/VisualExtensions.cs

@@ -1,7 +1,7 @@
 using System.Runtime.InteropServices;
 using Avalonia;
 using Avalonia.Controls;
-using NitroxModel.Platforms.OS.Windows;
+using Nitrox.Model.Platforms.OS.Windows;
 
 namespace Nitrox.Launcher.Models.Extensions;
 

Nitrox.Launcher/Models/HttpDelegatingHandlers/FileCacheDelegatingHandler.cs

@@ -5,7 +5,7 @@
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
-using NitroxModel.Helper;
+using Nitrox.Model.Helper;
 using Serilog;
 
 namespace Nitrox.Launcher.Models.HttpDelegatingHandlers;

Nitrox.Launcher/Models/HttpDelegatingHandlers/LogRequestDelegatingHandler.cs

@@ -4,8 +4,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Nitrox.Launcher.Models.Utils;
-using NitroxModel.Helper;
-using NitroxModel.Logger;
+using Nitrox.Model.Helper;
+using Nitrox.Model.Logger;
 
 namespace Nitrox.Launcher.Models.HttpDelegatingHandlers;
 

Nitrox.Launcher/Models/Services/DialogService.cs

@@ -8,7 +8,7 @@
 using Nitrox.Launcher.Models.Utils;
 using Nitrox.Launcher.ViewModels;
 using Nitrox.Launcher.ViewModels.Abstract;
-using NitroxModel.Logger;
+using Nitrox.Model.Logger;
 
 namespace Nitrox.Launcher.Models.Services;