205 fixes. (#590)

(cherry picked from commit e41a26dbd2fb966b21757fa0248f6b4a4e716aad)

.dockerignore

@@ -0,0 +1,25 @@
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/.idea
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/azds.yaml
+**/bin
+**/charts
+**/docker-compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
+README.md

Dockerfile

@@ -0,0 +1,38 @@
+FROM mcr.microsoft.com/dotnet/runtime:8.0-windowsservercore-ltsc2022 AS base
+USER $APP_UID
+WORKDIR /app
+
+FROM mcr.microsoft.com/dotnet/sdk:8.0-windowsservercore-ltsc2022 AS build
+ARG BUILD_CONFIGURATION=Release
+WORKDIR /src
+COPY ["NuGet.config", "."]
+COPY ["Directory.Build.props", "."]
+COPY ["Torch.API/Torch.API.csproj", "Torch.API/"]
+COPY ["Torch/Torch.csproj", "Torch/"]
+COPY ["Torch.Server/Torch.Server.csproj", "Torch.Server/"]
+RUN dotnet restore "Torch.Server/Torch.Server.csproj" --locked-mode
+COPY . .
+WORKDIR "/src/Torch.Server"
+RUN dotnet build "Torch.Server.csproj" -c %BUILD_CONFIGURATION% -o /app/build
+
+FROM build AS publish
+ARG BUILD_CONFIGURATION=Release
+RUN dotnet publish "Torch.Server.csproj" -c %BUILD_CONFIGURATION% -o /app/publish --no-self-contained  /p:UseAppHost=false
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2022
+
+ADD ["https://aka.ms/dotnet/8.0/windowsdesktop-runtime-win-x64.exe", "installer.exe"]
+
+RUN installer.exe /install /quiet /norestart && del installer.exe
+
+ADD ["https://github.com/abbodi1406/vcredist/releases/latest/download/VisualCppRedist_AIO_x86_x64.exe", "vc.exe"]
+
+USER ContainerAdministrator
+
+RUN vc.exe /ai39 && del vc.exe
+
+USER ContainerUser
+
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "Torch.Server.dll"]

Torch.API/ITorchBase.cs

@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Configuration;
@@ -140,6 +141,22 @@ namespace Torch.API
         event Action<ITorchServer> Initialized;
         
         TimeSpan ElapsedPlayTime { get; set; }
+
+        #region Backwards compat
+
+        /// <summary>
+        /// Path of the dedicated instance folder.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        new string InstancePath => ((ITorchBase)this).InstancePath;
+        
+        /// <summary>
+        /// Name of the dedicated instance.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        new string InstanceName => ((ITorchBase)this).InstanceName;
+
+        #endregion
     }
 
     /// <summary>

Torch.API/Torch.API.csproj

@@ -12,16 +12,15 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
+    <PackageReference Include="JetBrains.Annotations" Version="2024.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
-    <PackageReference Include="NLog" Version="5.3.2" />
+    <PackageReference Include="NLog" Version="5.3.3" />
-    <PackageReference Include="NuGet.Commands" Version="6.9.1" />
+    <PackageReference Include="NuGet.Commands" Version="6.11.0" />
-    <PackageReference Include="NuGet.DependencyResolver.Core" Version="6.9.1" />
+    <PackageReference Include="NuGet.DependencyResolver.Core" Version="6.11.0" />
     <PackageReference Include="SemanticVersioning" Version="2.0.2" />
-    <PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.204.15">
+    <PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.*">
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
-    <PackageReference Include="System.Text.Json" Version="8.0.3" />
   </ItemGroup>
 </Project>

Torch.API/packages.lock.json

@@ -4,46 +4,46 @@
     "net8.0-windows7.0": {
       "JetBrains.Annotations": {
         "type": "Direct",
-        "requested": "[2023.3.0, )",
+        "requested": "[2024.2.0, )",
-        "resolved": "2023.3.0",
+        "resolved": "2024.2.0",
-        "contentHash": "PHfnvdBUdGaTVG9bR/GEfxgTwWM0Z97Y6X3710wiljELBISipSfF5okn/vz+C2gfO+ihoEyVPjaJwn8ZalVukA=="
+        "contentHash": "GNnqCFW/163p1fOehKx0CnAqjmpPrUSqrgfHM6qca+P+RN39C9rhlfZHQpJhxmQG/dkOYe/b3Z0P8b6Kv5m1qw=="
       },
       "Microsoft.Extensions.Configuration.Binder": {
         "type": "Direct",
-        "requested": "[8.0.1, )",
+        "requested": "[8.0.2, )",
-        "resolved": "8.0.1",
+        "resolved": "8.0.2",
-        "contentHash": "2UKFJnLiBt7Od6nCnTqP9rTIUNhzmn9Hv1l2FchyKbz8xieB9ULwZTbQZMw+M24Qw3F5dzzH1U9PPleN0LNLOQ==",
+        "contentHash": "7IQhGK+wjyGrNsPBjJcZwWAr+Wf6D4+TwOptUt77bWtgNkiV8tDEbhFS+dDamtQFZ2X7kWG9m71iZQRj2x3zgQ==",
         "dependencies": {
           "Microsoft.Extensions.Configuration.Abstractions": "8.0.0"
         }
       },
       "NLog": {
         "type": "Direct",
-        "requested": "[5.3.2, )",
+        "requested": "[5.3.3, )",
-        "resolved": "5.3.2",
+        "resolved": "5.3.3",
-        "contentHash": "cQRQZuDMjSyMe9EQBnI9v55YAMMz8GAfFd6fFJ6tc/kXnG7Hze8p1I8MgvWSBG6E36wA8vSxRrlm8uSIG+SENg=="
+        "contentHash": "cy0+hlrUbYu+6mgUsILqCcqlJ2Csqyt2lm8y9T9kE8nhgwl8SvR+LM21QX4nmzFCPiowbrTFYxNF8+gWpy7/HQ=="
       },
       "NuGet.Commands": {
         "type": "Direct",
-        "requested": "[6.9.1, )",
+        "requested": "[6.11.0, )",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "pI2X+KRQYsVcmjJUIAXT+8fvUCZgNWBQiSizKCOltRqaMjtUHLetfADfz7jfreOBohsDxNzhBnNqPQ8MU/Gjxw==",
+        "contentHash": "8GjJQZVbNJuttVynsRWsgqhTZiBbjxRr2PgZ3E7zPxDBmKUazkQ1s/FqScm83w8Xq5OdEtegkU0dZhibfRkKeg==",
         "dependencies": {
           "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0",
           "Microsoft.Extensions.FileSystemGlobbing": "6.0.0",
-          "NuGet.Credentials": "6.9.1",
+          "NuGet.Credentials": "6.11.0",
-          "NuGet.ProjectModel": "6.9.1"
+          "NuGet.ProjectModel": "6.11.0"
         }
       },
       "NuGet.DependencyResolver.Core": {
         "type": "Direct",
-        "requested": "[6.9.1, )",
+        "requested": "[6.11.0, )",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "gVWIEScv1K40H2Fvs6HGaOzRMpG+r1RUqYpBdh7gqQ18kgsswWUSr90jCNtBb7PUYKkMU1oAhxTslj/gQjO+Vw==",
+        "contentHash": "SoiPKPooA+IF+iCsX1ykwi3M0e+yBL34QnwIP3ujhQEn1dhlP/N1XsYAnKkJPxV15EZCahuuS4HtnBsZx+CHKA==",
         "dependencies": {
-          "NuGet.Configuration": "6.9.1",
+          "NuGet.Configuration": "6.11.0",
-          "NuGet.LibraryModel": "6.9.1",
+          "NuGet.LibraryModel": "6.11.0",
-          "NuGet.Protocol": "6.9.1"
+          "NuGet.Protocol": "6.11.0"
         }
       },
       "SemanticVersioning": {
@@ -54,9 +54,9 @@
       },
       "SpaceEngineersDedicated.ReferenceAssemblies": {
         "type": "Direct",
-        "requested": "[1.204.15, )",
+        "requested": "[1.*, )",
-        "resolved": "1.204.15",
+        "resolved": "1.205.23",
-        "contentHash": "xq1quPCVGi1d4D/iH2iwd8B+1OH5Lqi9H/ld8kaZN8fZ9axz2wtqdq3jYbe9r/FKdSaMhqaERD5W62sHuI9tPA==",
+        "contentHash": "J7mF5hY39PzzCZps6vhIRzKiq8vD6Af9TgumTJR068vjEi+BzyeEFhqX+cl2Dd1ngOmsBtGWc5m+vxgTfs5YuA==",
         "dependencies": {
           "SharpDX": "4.2.0-keen-cringe",
           "protobuf-net": "1.0.0"
@@ -71,15 +71,6 @@
           "Microsoft.Bcl.AsyncInterfaces": "6.0.0"
         }
       },
-      "System.Text.Json": {
-        "type": "Direct",
-        "requested": "[8.0.3, )",
-        "resolved": "8.0.3",
-        "contentHash": "hpagS9joOwv6efWfrMmV9MjQXpiXZH72PgN067Ysfr6AWMSD1/1hEcvh/U5mUpPLezEWsOJSuVrmqDIVD958iA==",
-        "dependencies": {
-          "System.Text.Encodings.Web": "8.0.0"
-        }
-      },
       "Microsoft.Bcl.AsyncInterfaces": {
         "type": "Transitive",
         "resolved": "6.0.0",
@@ -118,74 +109,74 @@
       },
       "NuGet.Common": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "FbuWZBjQ1NJXBDqCwSddN2yvw3Plq3sTCIh0nc66Hu8jrNr+BOaxlKZv78jvJ+pSy8BvurYOdF9sl9KoORjrtg==",
+        "contentHash": "T3bCiKUSx8wdYpcqr6Dbx93zAqFp689ee/oa1tH22XI/xl7EUzQ7No/WlE1FUqvEX1+Mqar3wRNAn2O/yxo94g==",
         "dependencies": {
-          "NuGet.Frameworks": "6.9.1"
+          "NuGet.Frameworks": "6.11.0"
         }
       },
       "NuGet.Configuration": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "GM06pcUzWdNsizeGciqCjAhryfI1F/rQPETLDF+8pDRgzVpA+wKAR01/4aFU+IXzugnQ9LqOb5YyCRuR1OVZiQ==",
+        "contentHash": "73QprQqmumFrv3Ooi4YWpRYeBj8jZy9gNdOaOCp4pPInpt41SJJAz/aP4je+StwIJvi5HsgPPecLKekDIQEwKg==",
         "dependencies": {
-          "NuGet.Common": "6.9.1",
+          "NuGet.Common": "6.11.0",
           "System.Security.Cryptography.ProtectedData": "4.4.0"
         }
       },
       "NuGet.Credentials": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "elTErAznCWoqOLILVDN4FTa3+rpVVdUbHUaOUqJkk9+Z/ZSqyDPbCIhLaqTkPkWqoKa93gqzX9IFwURkMphPnw==",
+        "contentHash": "TeMvEyoqkIxDnYJjPCpD48vV5XoDATmyX2kGYYB2MIzWBT24ZjWauTda72hYBzg0OLLiuafxfnNJKGG6IHHzOQ==",
         "dependencies": {
-          "NuGet.Protocol": "6.9.1"
+          "NuGet.Protocol": "6.11.0"
         }
       },
       "NuGet.Frameworks": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "DaKh3lenPUvzGccPkbI97BIvA27z+/UsL3ankfoZlX/4vBVDK5N1sheFTQ+GuJf+IgSzsJz/A21SPUpQLHwUtA=="
+        "contentHash": "Ew/mrfmLF5phsprysHbph2+tdZ10HMHAURavsr/Kx1WhybDG4vmGuoNLbbZMZOqnPRdpyCTc42OKWLoedxpYtA=="
       },
       "NuGet.LibraryModel": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "xlOpbZTc4862vKHkZHLJ5VgDteo+78ftVkajB8rKgSpevnBqwPKv2Y5OfUxct9HCqWYw0ikVfNf/qfjqnQCV1Q==",
+        "contentHash": "KUV2eeMICMb24OPcICn/wgncNzt6+W+lmFVO5eorTdo1qV4WXxYGyG1NTPiCY+Nrv5H/Ilnv9UaUM2ozqSmnjw==",
         "dependencies": {
-          "NuGet.Common": "6.9.1",
+          "NuGet.Common": "6.11.0",
-          "NuGet.Versioning": "6.9.1"
+          "NuGet.Versioning": "6.11.0"
         }
       },
       "NuGet.Packaging": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "6FyasOxKInCELJ+pGy8f17ub9st6ofFeNcBNTo7CRiPJlxyhJfKGKNpfe3HHYwvnZhc3Vdfr0kSR+f1BVGDuTA==",
+        "contentHash": "VmUv2LedVuPY1tfNybORO2I9IuqOzeV7I5JBD+PwNvJq2bAqovi4FCw2cYI0g+kjOJXBN2lAJfrfnqtUOlVJdQ==",
         "dependencies": {
           "Newtonsoft.Json": "13.0.3",
-          "NuGet.Configuration": "6.9.1",
+          "NuGet.Configuration": "6.11.0",
-          "NuGet.Versioning": "6.9.1",
+          "NuGet.Versioning": "6.11.0",
           "System.Security.Cryptography.Pkcs": "6.0.4"
         }
       },
       "NuGet.ProjectModel": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "x98QkS3oloaJfdSsDFOGTH5oeoHHTDoyTO7oyg/7g60be14AQowLqgPQV52Kuscl4lknx/3259RTxyDcbkdifQ==",
+        "contentHash": "g0KtmDH6fas97WsN73yV2h1F5JT9o6+Y0wlPK+ij9YLKaAXaF6+1HkSaQMMJ+xh9/jCJG9G6nau6InOlb1g48g==",
         "dependencies": {
-          "NuGet.DependencyResolver.Core": "6.9.1"
+          "NuGet.DependencyResolver.Core": "6.11.0"
         }
       },
       "NuGet.Protocol": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "h3bdjqUY4jvwM02D/7QM4FR8x/bbf4Pyjrc1Etw7an2OrWKPUSx0vJPdapKzioxIw7GXl/aVUM/DCeIc3S9brA==",
+        "contentHash": "p5B8oNLLnGhUfMbcS16aRiegj11pD6k+LELyRBqvNFR/pE3yR1XT+g1XS33ME9wvoU+xbCGnl4Grztt1jHPinw==",
         "dependencies": {
-          "NuGet.Packaging": "6.9.1"
+          "NuGet.Packaging": "6.11.0"
         }
       },
       "NuGet.Versioning": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "ypnSvEtpNGo48bAWn95J1oHChycCXcevFSbn53fqzLxlXFSZP7dawu8p/7mHAfGufZQSV2sBpW80XQGIfXO8kQ=="
+        "contentHash": "v/GGlIj2dd7svplFmASWEueu62veKW0MrMtBaZ7QG8aJTSGv2yE+pgUGhXRcQ4nxNOEq/wLBrz1vkth/1SND7A=="
       },
       "protobuf-net": {
         "type": "Transitive",
@@ -214,11 +205,6 @@
         "type": "Transitive",
         "resolved": "4.4.0",
         "contentHash": "cJV7ScGW7EhatRsjehfvvYVBvtiSMKgN8bOVI0bQhnF5bU7vnHVIsH49Kva7i7GWaWYvmEzkYVk1TC+gZYBEog=="
-      },
-      "System.Text.Encodings.Web": {
-        "type": "Transitive",
-        "resolved": "8.0.0",
-        "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ=="
       }
     },
     "net8.0-windows7.0/win-x64": {
@@ -234,11 +220,6 @@
         "type": "Transitive",
         "resolved": "4.4.0",
         "contentHash": "cJV7ScGW7EhatRsjehfvvYVBvtiSMKgN8bOVI0bQhnF5bU7vnHVIsH49Kva7i7GWaWYvmEzkYVk1TC+gZYBEog=="
-      },
-      "System.Text.Encodings.Web": {
-        "type": "Transitive",
-        "resolved": "8.0.0",
-        "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ=="
       }
     }
   }

Torch.Server.Tests/Torch.Server.Tests.csproj

@@ -13,9 +13,9 @@
   </PropertyGroup>
 <!--   <Import Project="$(SolutionDir)\TransformOnBuild.targets" /> -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
-    <PackageReference Include="NLog" Version="5.3.2" />
+    <PackageReference Include="NLog" Version="5.3.3" />
-    <PackageReference Include="xunit" Version="2.8.0" />
+    <PackageReference Include="xunit" Version="2.9.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Torch.API\Torch.API.csproj" />

Torch.Server.Tests/packages.lock.json

@@ -4,29 +4,29 @@
     "net8.0-windows7.0": {
       "Microsoft.NET.Test.Sdk": {
         "type": "Direct",
-        "requested": "[17.9.0, )",
+        "requested": "[17.11.0, )",
-        "resolved": "17.9.0",
+        "resolved": "17.11.0",
-        "contentHash": "7GUNAUbJYn644jzwLm5BD3a2p9C1dmP8Hr6fDPDxgItQk9hBs1Svdxzz07KQ/UphMSmgza9AbijBJGmw5D658A==",
+        "contentHash": "fH7P0LihMXgnlNLtrXGetHd30aQcD+YrSbWXbCPBnrypdRApPgNqd/TgncTlSVY1bbLYdnvpBgts2dcnK37GzA==",
         "dependencies": {
-          "Microsoft.CodeCoverage": "17.9.0",
+          "Microsoft.CodeCoverage": "17.11.0",
-          "Microsoft.TestPlatform.TestHost": "17.9.0"
+          "Microsoft.TestPlatform.TestHost": "17.11.0"
         }
       },
       "NLog": {
         "type": "Direct",
-        "requested": "[5.3.2, )",
+        "requested": "[5.3.3, )",
-        "resolved": "5.3.2",
+        "resolved": "5.3.3",
-        "contentHash": "cQRQZuDMjSyMe9EQBnI9v55YAMMz8GAfFd6fFJ6tc/kXnG7Hze8p1I8MgvWSBG6E36wA8vSxRrlm8uSIG+SENg=="
+        "contentHash": "cy0+hlrUbYu+6mgUsILqCcqlJ2Csqyt2lm8y9T9kE8nhgwl8SvR+LM21QX4nmzFCPiowbrTFYxNF8+gWpy7/HQ=="
       },
       "xunit": {
         "type": "Direct",
-        "requested": "[2.8.0, )",
+        "requested": "[2.9.0, )",
-        "resolved": "2.8.0",
+        "resolved": "2.9.0",
-        "contentHash": "US3a3twJziAif1kFPGdk9fALwILHxV0n1roX5j67bN/d3o4DGNLHnV3tr5ZX+uinVrzfkf0avH3zGX8JPBC0qA==",
+        "contentHash": "PtU3rZ0ThdmdJqTbK7GkgFf6iBaCR6Q0uvJHznID+XEYk2v6O/b7sRxqnbi3B2gRDXxjTqMkVNayzwsqsFUxRw==",
         "dependencies": {
-          "xunit.analyzers": "1.13.0",
+          "xunit.analyzers": "1.15.0",
-          "xunit.assert": "2.8.0",
+          "xunit.assert": "2.9.0",
-          "xunit.core": "[2.8.0]"
+          "xunit.core": "[2.9.0]"
         }
       },
       "AutoCompleteTextBox": {
@@ -56,18 +56,19 @@
           "System.Text.Json": "5.0.1"
         }
       },
-      "HarmonyX": {
-        "type": "Transitive",
-        "resolved": "2.10.2-prerelease.7",
-        "contentHash": "15kgPt5Cqeu7w1CHp4YqlVXuq6FKZj9iZwA/oNd7SaRVwvq2kZ9EODmJ2+U61ZLFasQY7nr2w/latSAv/Pjn/g==",
-        "dependencies": {
-          "MonoMod.RuntimeDetour": "25.1.0-prerelease.1"
-        }
-      },
       "JetBrains.Annotations": {
         "type": "Transitive",
-        "resolved": "2023.3.0",
+        "resolved": "2024.2.0",
-        "contentHash": "PHfnvdBUdGaTVG9bR/GEfxgTwWM0Z97Y6X3710wiljELBISipSfF5okn/vz+C2gfO+ihoEyVPjaJwn8ZalVukA=="
+        "contentHash": "GNnqCFW/163p1fOehKx0CnAqjmpPrUSqrgfHM6qca+P+RN39C9rhlfZHQpJhxmQG/dkOYe/b3Z0P8b6Kv5m1qw=="
+      },
+      "Lib.Harmony.Thin": {
+        "type": "Transitive",
+        "resolved": "2.3.3-torch",
+        "contentHash": "djQtMUpURRgP+Ytf1EgQwu4XnJL3J3bz5kyTVcRDNb632N62/A4CbduG96CUsKhL944yGNAJnLX3zfWldPYOTw==",
+        "dependencies": {
+          "MonoMod.Core": "1.1.0",
+          "System.Text.Json": "8.0.1"
+        }
       },
       "MahApps.Metro": {
         "type": "Transitive",
@@ -103,27 +104,29 @@
       },
       "Microsoft.CodeAnalysis.Common": {
         "type": "Transitive",
-        "resolved": "4.9.2",
+        "resolved": "4.11.0",
-        "contentHash": "M5PThug7b2AdxL7xKmQs50KzAQTl9jENw5jMT3iUt16k+DAFlw1S87juU3UuPs3gvBm8trMBSOEvSFDr31c9Vw==",
+        "contentHash": "djf8ujmqYImFgB04UGtcsEhHrzVqzHowS+EEl/Yunc5LdrYrZhGBWUTXoCF0NzYXJxtfuD+UVQarWpvrNc94Qg==",
         "dependencies": {
           "Microsoft.CodeAnalysis.Analyzers": "3.3.4",
           "System.Collections.Immutable": "8.0.0",
-          "System.Reflection.Metadata": "8.0.0",
+          "System.Reflection.Metadata": "8.0.0"
-          "System.Runtime.CompilerServices.Unsafe": "6.0.0"
         }
       },
       "Microsoft.CodeAnalysis.CSharp": {
         "type": "Transitive",
-        "resolved": "4.9.2",
+        "resolved": "4.11.0",
-        "contentHash": "HGIo7E9Mf3exAJbUdYpDFfLoYkSVaHDJXPyusWTYUTBaOPCowGw+Gap5McE1w+K+ryIXre72oiqL88sQHmHBmg==",
+        "contentHash": "6XYi2EusI8JT4y2l/F3VVVS+ISoIX9nqHsZRaG6W5aFeJ5BEuBosHfT/ABb73FN0RZ1Z3cj2j7cL28SToJPXOw==",
         "dependencies": {
-          "Microsoft.CodeAnalysis.Common": "[4.9.2]"
+          "Microsoft.CodeAnalysis.Analyzers": "3.3.4",
+          "Microsoft.CodeAnalysis.Common": "[4.11.0]",
+          "System.Collections.Immutable": "8.0.0",
+          "System.Reflection.Metadata": "8.0.0"
         }
       },
       "Microsoft.CodeCoverage": {
         "type": "Transitive",
-        "resolved": "17.9.0",
+        "resolved": "17.11.0",
-        "contentHash": "RGD37ZSrratfScYXm7M0HjvxMxZyWZL4jm+XgMZbkIY1UPgjUpbNA/t+WTGj/rC/0Hm9A3IrH3ywbKZkOCnoZA=="
+        "contentHash": "QKcOSuw7MZG4XiQ+pCj+Ib6amOwoRDEO7e3DbxqXeOPXSnfyGXYoZQI8I140s1mKQVn1Vh+c5WlKvCvlgMovpg=="
       },
       "Microsoft.Diagnostics.NETCore.Client": {
         "type": "Transitive",
@@ -161,8 +164,8 @@
       },
       "Microsoft.Extensions.Configuration.Binder": {
         "type": "Transitive",
-        "resolved": "8.0.1",
+        "resolved": "8.0.2",
-        "contentHash": "2UKFJnLiBt7Od6nCnTqP9rTIUNhzmn9Hv1l2FchyKbz8xieB9ULwZTbQZMw+M24Qw3F5dzzH1U9PPleN0LNLOQ==",
+        "contentHash": "7IQhGK+wjyGrNsPBjJcZwWAr+Wf6D4+TwOptUt77bWtgNkiV8tDEbhFS+dDamtQFZ2X7kWG9m71iZQRj2x3zgQ==",
         "dependencies": {
           "Microsoft.Extensions.Configuration.Abstractions": "8.0.0"
         }
@@ -279,18 +282,18 @@
       },
       "Microsoft.TestPlatform.ObjectModel": {
         "type": "Transitive",
-        "resolved": "17.9.0",
+        "resolved": "17.11.0",
-        "contentHash": "1ilw/8vgmjLyKU+2SKXKXaOqpYFJCQfGqGz+x0cosl981VzjrY74Sv6qAJv+neZMZ9ZMxF3ArN6kotaQ4uvEBw==",
+        "contentHash": "PU+CC1yRzbR0IllrtdILaeep7WP5OIrvmWrvCMqG3jB1h4F6Ur7CYHl6ENbDVXPzEvygXh0GWbTyrbjfvgTpAg==",
         "dependencies": {
           "System.Reflection.Metadata": "1.6.0"
         }
       },
       "Microsoft.TestPlatform.TestHost": {
         "type": "Transitive",
-        "resolved": "17.9.0",
+        "resolved": "17.11.0",
-        "contentHash": "Spmg7Wx49Ya3SxBjyeAR+nQpjMTKZwTwpZ7KyeOTIqI/WHNPnBU4HUvl5kuHPQAwGWqMy4FGZja1HvEwvoaDiA==",
+        "contentHash": "KMzJO3dm3+9W8JRQ3IDviu0v7uXP5Lgii6TuxMc5m8ynaqcGnn7Y18cMb5AsP2xp59uUHO474WZrssxBdb8ZxQ==",
         "dependencies": {
-          "Microsoft.TestPlatform.ObjectModel": "17.9.0",
+          "Microsoft.TestPlatform.ObjectModel": "17.11.0",
           "Newtonsoft.Json": "13.0.1"
         }
       },
@@ -306,21 +309,21 @@
       },
       "MonoMod.Backports": {
         "type": "Transitive",
-        "resolved": "1.1.1",
+        "resolved": "1.1.0",
-        "contentHash": "lExtjdkld5iWrhYEspoT1bvy0pJ4oBOBkKu+tWKabK1rHvjuS+gjbAd2bG62UGKc0JRBG3myaWtvgIIwYDw1bQ==",
+        "contentHash": "GUAjCrCZEddqHKHFA7Lh61PgTzoKY7gfBShFe0hQe0p8iynHhBK3TWGyRi+QIw/PGfaRPwx6c33CPGFURBVM6g==",
         "dependencies": {
           "MonoMod.ILHelpers": "1.0.1"
         }
       },
       "MonoMod.Core": {
         "type": "Transitive",
-        "resolved": "1.1.1",
+        "resolved": "1.1.0",
-        "contentHash": "7m7RqlxiWHilriKwzbK+F1FZiJG1vvVzfzRktVnoRb4OKYfdRalost/78LYTNOp9htwLgPKojZydRsNlI1/qHw==",
+        "contentHash": "Ks8RntZGVcktr2QF/AovTEbuOkrgXz6omjrvT5LRveOIQJuy+IFuEQPBVWu+cSKVIoZD5XkpRFvlVrItgPIrXw==",
         "dependencies": {
           "Mono.Cecil": "0.11.5",
-          "MonoMod.Backports": "1.1.1",
+          "MonoMod.Backports": "1.1.0",
           "MonoMod.ILHelpers": "1.0.1",
-          "MonoMod.Utils": "25.0.5"
+          "MonoMod.Utils": "25.0.4"
         }
       },
       "MonoMod.ILHelpers": {
@@ -328,25 +331,13 @@
         "resolved": "1.0.1",
         "contentHash": "6djj/Hz+/eTomo1H/sJEJNxBz2ZdhXjvH0MOmyU2xRtbjaIfBQuyVV0zNUbJhMY/8qoWrz7WXfskfFhdaY0afA=="
       },
-      "MonoMod.RuntimeDetour": {
-        "type": "Transitive",
-        "resolved": "25.1.1",
-        "contentHash": "05oD6LyB3N4eqssBbDHfywNBalBRleX3/HHOQxLhjAyl59tWfZFah2WN0nZ/mrwQ5We3tFIUEHAfbyUxlAbeFw==",
-        "dependencies": {
-          "Mono.Cecil": "0.11.5",
-          "MonoMod.Backports": "1.1.1",
-          "MonoMod.Core": "1.1.1",
-          "MonoMod.ILHelpers": "1.0.1",
-          "MonoMod.Utils": "25.0.5"
-        }
-      },
       "MonoMod.Utils": {
         "type": "Transitive",
-        "resolved": "25.0.5",
+        "resolved": "25.0.4",
-        "contentHash": "1lcpjEOiK1dfOxG9DsKkHNcP4G0DZSwtBEOhTGDfszjCvmLzCZqqFQvSzLRpzp3wfTKak+R0K2K5O5TbO0kwvg==",
+        "contentHash": "cB94MaZtFD9u4clYEFTwM4jGXnJnzXsxYF3yBpMZKHhXOas66tMF2frbdYte023i0MH4C5iRJbDjxHmA4x5VgA==",
         "dependencies": {
           "Mono.Cecil": "0.11.5",
-          "MonoMod.Backports": "1.1.1",
+          "MonoMod.Backports": "1.1.0",
           "MonoMod.ILHelpers": "1.0.1"
         }
       },
@@ -357,116 +348,105 @@
       },
       "NuGet.Commands": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "pI2X+KRQYsVcmjJUIAXT+8fvUCZgNWBQiSizKCOltRqaMjtUHLetfADfz7jfreOBohsDxNzhBnNqPQ8MU/Gjxw==",
+        "contentHash": "8GjJQZVbNJuttVynsRWsgqhTZiBbjxRr2PgZ3E7zPxDBmKUazkQ1s/FqScm83w8Xq5OdEtegkU0dZhibfRkKeg==",
         "dependencies": {
           "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0",
           "Microsoft.Extensions.FileSystemGlobbing": "6.0.0",
-          "NuGet.Credentials": "6.9.1",
+          "NuGet.Credentials": "6.11.0",
-          "NuGet.ProjectModel": "6.9.1"
+          "NuGet.ProjectModel": "6.11.0"
         }
       },
       "NuGet.Common": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "FbuWZBjQ1NJXBDqCwSddN2yvw3Plq3sTCIh0nc66Hu8jrNr+BOaxlKZv78jvJ+pSy8BvurYOdF9sl9KoORjrtg==",
+        "contentHash": "T3bCiKUSx8wdYpcqr6Dbx93zAqFp689ee/oa1tH22XI/xl7EUzQ7No/WlE1FUqvEX1+Mqar3wRNAn2O/yxo94g==",
         "dependencies": {
-          "NuGet.Frameworks": "6.9.1"
+          "NuGet.Frameworks": "6.11.0"
         }
       },
       "NuGet.Configuration": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "GM06pcUzWdNsizeGciqCjAhryfI1F/rQPETLDF+8pDRgzVpA+wKAR01/4aFU+IXzugnQ9LqOb5YyCRuR1OVZiQ==",
+        "contentHash": "73QprQqmumFrv3Ooi4YWpRYeBj8jZy9gNdOaOCp4pPInpt41SJJAz/aP4je+StwIJvi5HsgPPecLKekDIQEwKg==",
         "dependencies": {
-          "NuGet.Common": "6.9.1",
+          "NuGet.Common": "6.11.0",
           "System.Security.Cryptography.ProtectedData": "4.4.0"
         }
       },
       "NuGet.Credentials": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "elTErAznCWoqOLILVDN4FTa3+rpVVdUbHUaOUqJkk9+Z/ZSqyDPbCIhLaqTkPkWqoKa93gqzX9IFwURkMphPnw==",
+        "contentHash": "TeMvEyoqkIxDnYJjPCpD48vV5XoDATmyX2kGYYB2MIzWBT24ZjWauTda72hYBzg0OLLiuafxfnNJKGG6IHHzOQ==",
         "dependencies": {
-          "NuGet.Protocol": "6.9.1"
+          "NuGet.Protocol": "6.11.0"
         }
       },
       "NuGet.DependencyResolver.Core": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "gVWIEScv1K40H2Fvs6HGaOzRMpG+r1RUqYpBdh7gqQ18kgsswWUSr90jCNtBb7PUYKkMU1oAhxTslj/gQjO+Vw==",
+        "contentHash": "SoiPKPooA+IF+iCsX1ykwi3M0e+yBL34QnwIP3ujhQEn1dhlP/N1XsYAnKkJPxV15EZCahuuS4HtnBsZx+CHKA==",
         "dependencies": {
-          "NuGet.Configuration": "6.9.1",
+          "NuGet.Configuration": "6.11.0",
-          "NuGet.LibraryModel": "6.9.1",
+          "NuGet.LibraryModel": "6.11.0",
-          "NuGet.Protocol": "6.9.1"
+          "NuGet.Protocol": "6.11.0"
         }
       },
       "NuGet.Frameworks": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "DaKh3lenPUvzGccPkbI97BIvA27z+/UsL3ankfoZlX/4vBVDK5N1sheFTQ+GuJf+IgSzsJz/A21SPUpQLHwUtA=="
+        "contentHash": "Ew/mrfmLF5phsprysHbph2+tdZ10HMHAURavsr/Kx1WhybDG4vmGuoNLbbZMZOqnPRdpyCTc42OKWLoedxpYtA=="
       },
       "NuGet.LibraryModel": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "xlOpbZTc4862vKHkZHLJ5VgDteo+78ftVkajB8rKgSpevnBqwPKv2Y5OfUxct9HCqWYw0ikVfNf/qfjqnQCV1Q==",
+        "contentHash": "KUV2eeMICMb24OPcICn/wgncNzt6+W+lmFVO5eorTdo1qV4WXxYGyG1NTPiCY+Nrv5H/Ilnv9UaUM2ozqSmnjw==",
         "dependencies": {
-          "NuGet.Common": "6.9.1",
+          "NuGet.Common": "6.11.0",
-          "NuGet.Versioning": "6.9.1"
+          "NuGet.Versioning": "6.11.0"
         }
       },
       "NuGet.Packaging": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "6FyasOxKInCELJ+pGy8f17ub9st6ofFeNcBNTo7CRiPJlxyhJfKGKNpfe3HHYwvnZhc3Vdfr0kSR+f1BVGDuTA==",
+        "contentHash": "VmUv2LedVuPY1tfNybORO2I9IuqOzeV7I5JBD+PwNvJq2bAqovi4FCw2cYI0g+kjOJXBN2lAJfrfnqtUOlVJdQ==",
         "dependencies": {
           "Newtonsoft.Json": "13.0.3",
-          "NuGet.Configuration": "6.9.1",
+          "NuGet.Configuration": "6.11.0",
-          "NuGet.Versioning": "6.9.1",
+          "NuGet.Versioning": "6.11.0",
           "System.Security.Cryptography.Pkcs": "6.0.4"
         }
       },
       "NuGet.ProjectModel": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "x98QkS3oloaJfdSsDFOGTH5oeoHHTDoyTO7oyg/7g60be14AQowLqgPQV52Kuscl4lknx/3259RTxyDcbkdifQ==",
+        "contentHash": "g0KtmDH6fas97WsN73yV2h1F5JT9o6+Y0wlPK+ij9YLKaAXaF6+1HkSaQMMJ+xh9/jCJG9G6nau6InOlb1g48g==",
         "dependencies": {
-          "NuGet.DependencyResolver.Core": "6.9.1"
+          "NuGet.DependencyResolver.Core": "6.11.0"
         }
       },
       "NuGet.Protocol": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "h3bdjqUY4jvwM02D/7QM4FR8x/bbf4Pyjrc1Etw7an2OrWKPUSx0vJPdapKzioxIw7GXl/aVUM/DCeIc3S9brA==",
+        "contentHash": "p5B8oNLLnGhUfMbcS16aRiegj11pD6k+LELyRBqvNFR/pE3yR1XT+g1XS33ME9wvoU+xbCGnl4Grztt1jHPinw==",
         "dependencies": {
-          "NuGet.Packaging": "6.9.1"
+          "NuGet.Packaging": "6.11.0"
         }
       },
       "NuGet.Versioning": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "ypnSvEtpNGo48bAWn95J1oHChycCXcevFSbn53fqzLxlXFSZP7dawu8p/7mHAfGufZQSV2sBpW80XQGIfXO8kQ=="
+        "contentHash": "v/GGlIj2dd7svplFmASWEueu62veKW0MrMtBaZ7QG8aJTSGv2yE+pgUGhXRcQ4nxNOEq/wLBrz1vkth/1SND7A=="
       },
       "nulastudio.NetBeauty": {
         "type": "Transitive",
-        "resolved": "2.1.4.4",
+        "resolved": "2.1.4.5",
-        "contentHash": "Q+4H1o9tNVVHEm4VHQq1kglc+eNAwVdEKKnNKez0kDZHBPRE+ufXIgN6ucdvi1A462nFDstChLafMt36L3kXAw=="
+        "contentHash": "hOluHDEPDlS/lmDrRAlv5Xaza+n7kBPOtkuS6nYm0k6npJLi/vlYhZwR/IhpV+lCRTiu4so4D61pSrtHdTiagw=="
       },
       "protobuf-net": {
         "type": "Transitive",
-        "resolved": "3.2.30",
+        "resolved": "1.0.0",
-        "contentHash": "C/UTlmxEJHAHpqm8xQK1UyJKaIynVCSNG4mVrbLgnZ7ccH28nN49O8iMJvKEodTgVbnimvy+3mIiAdW6mATwnw==",
+        "contentHash": "kTGOK0E87473sOImOjgZOnz3kTC2aMLffoRWQLYNuBLJnwNNmjanF9IkevZ9Q7yYLeABQfcF3BpeepuMntMVNw=="
-        "dependencies": {
-          "protobuf-net.Core": "3.2.30"
-        }
-      },
-      "protobuf-net.Core": {
-        "type": "Transitive",
-        "resolved": "3.2.30",
-        "contentHash": "v2ZxxYrz+X212ukSx+uqkLuPu414bvmSAnTyf+PBUKR9ENJxO4P/csorA/27456MCp1JNoMssDj/f91RDiwBfQ==",
-        "dependencies": {
-          "System.Collections.Immutable": "7.0.0"
-        }
       },
       "SemanticVersioning": {
         "type": "Transitive",
@@ -488,8 +468,8 @@
       },
       "SpaceEngineersDedicated.ReferenceAssemblies": {
         "type": "Transitive",
-        "resolved": "1.204.15",
+        "resolved": "1.205.23",
-        "contentHash": "xq1quPCVGi1d4D/iH2iwd8B+1OH5Lqi9H/ld8kaZN8fZ9axz2wtqdq3jYbe9r/FKdSaMhqaERD5W62sHuI9tPA==",
+        "contentHash": "J7mF5hY39PzzCZps6vhIRzKiq8vD6Af9TgumTJR068vjEi+BzyeEFhqX+cl2Dd1ngOmsBtGWc5m+vxgTfs5YuA==",
         "dependencies": {
           "SharpDX": "4.2.0-keen-cringe",
           "protobuf-net": "1.0.0"
@@ -541,8 +521,8 @@
       },
       "System.Runtime.CompilerServices.Unsafe": {
         "type": "Transitive",
-        "resolved": "6.0.0",
+        "resolved": "4.5.1",
-        "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
+        "contentHash": "Zh8t8oqolRaFa9vmOZfdQm/qKejdqz0J9kr7o2Fu0vPeoH3BL1EOXipKWwkWtLT1JPzjByrF19fGuFlNbmPpiw=="
       },
       "System.Security.Cryptography.Pkcs": {
         "type": "Transitive",
@@ -572,8 +552,8 @@
       },
       "System.Text.Json": {
         "type": "Transitive",
-        "resolved": "8.0.3",
+        "resolved": "8.0.1",
-        "contentHash": "hpagS9joOwv6efWfrMmV9MjQXpiXZH72PgN067Ysfr6AWMSD1/1hEcvh/U5mUpPLezEWsOJSuVrmqDIVD958iA==",
+        "contentHash": "7AWk2za1hSEJBppe/Lg+uDcam2TrDqwIKa9XcPssSwyjC2xa39EKEGul3CO5RWNF+hMuZG4zlBDrvhBdDTg4lg==",
         "dependencies": {
           "System.Text.Encodings.Web": "8.0.0"
         }
@@ -594,67 +574,64 @@
       },
       "xunit.analyzers": {
         "type": "Transitive",
-        "resolved": "1.13.0",
+        "resolved": "1.15.0",
-        "contentHash": "Pai9YnDV71/Ox14nBHB6/f62iyPyLbmUG/YYMiA4dfdFZvr0gIYE9yGxSr0i5Tr3INK75wgL2MCUNEKpeiZ2Fw=="
+        "contentHash": "s+M8K/Rtlgr6CmD7AYQKrNTvT5sh0l0ZKDoZ3Z/ExhlIwfV9mGAMR4f7KqIB7SSK7ZOhqDTgTUMYPmKfmvWUWQ=="
       },
       "xunit.assert": {
         "type": "Transitive",
-        "resolved": "2.8.0",
+        "resolved": "2.9.0",
-        "contentHash": "lwf7Dy5/5HbDkaPx1YrGXCByytCEEcIn+KPI74jh2BD/RU/7RhO8c+S3k0Ph+Mr7+cLf338fl+o6UcgPCLa6PA=="
+        "contentHash": "Z/1pyia//860wEYTKn6Q5dmgikJdRjgE4t5AoxJkK8oTmidzPLEPG574kmm7LFkMLbH6Frwmgb750kcyR+hwoA=="
       },
       "xunit.core": {
         "type": "Transitive",
-        "resolved": "2.8.0",
+        "resolved": "2.9.0",
-        "contentHash": "McSTFGTETCxLpmJKE9TWi9FtFthrRbpRrjz2V2g8sK2wRt1+JHs15vwi+B+nfftFkV9aFWIXZfzZM95TIGZNIA==",
+        "contentHash": "uRaop9tZsZMCaUS4AfbSPGYHtvywWnm8XXFNUqII7ShWyDBgdchY6gyDNgO4AK1Lv/1NNW61Zq63CsDV6oH6Jg==",
         "dependencies": {
-          "xunit.extensibility.core": "[2.8.0]",
+          "xunit.extensibility.core": "[2.9.0]",
-          "xunit.extensibility.execution": "[2.8.0]"
+          "xunit.extensibility.execution": "[2.9.0]"
         }
       },
       "xunit.extensibility.core": {
         "type": "Transitive",
-        "resolved": "2.8.0",
+        "resolved": "2.9.0",
-        "contentHash": "eBJv9xQeY0p5z+C/L1tFjUFYqtl5pQqIEYCGTMl+MbRzA7sOlgYKwJE//vEePBp+mgBh7NjD0Qhz0liZBYM27w==",
+        "contentHash": "zjDEUSxsr6UNij4gIwCgMqQox+oLDPRZ+mubwWLci+SssPBFQD1xeRR4SvgBuXqbE0QXCJ/STVTp+lxiB5NLVA==",
         "dependencies": {
           "xunit.abstractions": "2.0.3"
         }
       },
       "xunit.extensibility.execution": {
         "type": "Transitive",
-        "resolved": "2.8.0",
+        "resolved": "2.9.0",
-        "contentHash": "TyyrZesHB9ODZMS9c73OqiBz4x0vL944JCkSPBWW5w6PF2LlUfdfXRjjOhoIOuY6lTmEgl07rS4/Jot9mCYnpg==",
+        "contentHash": "5ZTQZvmPLlBw6QzCOwM0KnMsZw6eGjbmC176QHZlcbQoMhGIeGcYzYwn5w9yXxf+4phtplMuVqTpTbFDQh2bqQ==",
         "dependencies": {
-          "xunit.extensibility.core": "[2.8.0]"
+          "xunit.extensibility.core": "[2.9.0]"
         }
       },
       "torch": {
         "type": "Project",
         "dependencies": {
           "ControlzEx": "[5.0.2, )",
-          "HarmonyX": "[2.10.2-prerelease.7, )",
+          "Lib.Harmony.Thin": "[2.3.3-torch, )",
           "MahApps.Metro": "[2.4.10, )",
-          "Microsoft.CodeAnalysis.CSharp": "[4.9.2, )",
+          "Microsoft.CodeAnalysis.CSharp": "[4.11.0, )",
-          "Microsoft.CodeAnalysis.Common": "[4.9.2, )",
+          "Microsoft.CodeAnalysis.Common": "[4.11.0, )",
-          "MonoMod.RuntimeDetour": "[25.1.1, )",
+          "NLog": "[5.3.3, )",
-          "NLog": "[5.3.2, )",
           "System.ComponentModel.Annotations": "[5.0.0, )",
           "Torch.API": "[1.0.0, )",
-          "Torch.SixLabors.ImageSharp": "[1.0.0-beta6, )",
+          "Torch.SixLabors.ImageSharp": "[1.0.0-beta6, )"
-          "protobuf-net": "[3.2.30, )"
         }
       },
       "torch.api": {
         "type": "Project",
         "dependencies": {
-          "JetBrains.Annotations": "[2023.3.0, )",
+          "JetBrains.Annotations": "[2024.2.0, )",
-          "Microsoft.Extensions.Configuration.Binder": "[8.0.1, )",
+          "Microsoft.Extensions.Configuration.Binder": "[8.0.2, )",
-          "NLog": "[5.3.2, )",
+          "NLog": "[5.3.3, )",
-          "NuGet.Commands": "[6.9.1, )",
+          "NuGet.Commands": "[6.11.0, )",
-          "NuGet.DependencyResolver.Core": "[6.9.1, )",
+          "NuGet.DependencyResolver.Core": "[6.11.0, )",
           "SemanticVersioning": "[2.0.2, )",
-          "SpaceEngineersDedicated.ReferenceAssemblies": "[1.204.15, )",
+          "SpaceEngineersDedicated.ReferenceAssemblies": "[1.*, )",
-          "System.Linq.Async": "[6.0.1, )",
+          "System.Linq.Async": "[6.0.1, )"
-          "System.Text.Json": "[8.0.3, )"
         }
       },
       "torch.server": {
@@ -671,22 +648,22 @@
           "Microsoft.Extensions.Configuration.EnvironmentVariables": "[8.0.0, )",
           "Microsoft.Extensions.Configuration.Xml": "[8.0.0, )",
           "Microsoft.Extensions.Logging": "[8.0.0, )",
-          "NLog": "[5.3.2, )",
+          "NLog": "[5.3.3, )",
           "System.ComponentModel.Annotations": "[5.0.0, )",
           "System.Management": "[8.0.0, )",
           "Torch": "[1.0.0, )",
           "Torch.API": "[1.0.0, )",
-          "nulastudio.NetBeauty": "[2.1.4.4, )"
+          "nulastudio.NetBeauty": "[2.1.4.5, )"
         }
       },
       "torch.tests": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.NET.Test.Sdk": "[17.9.0, )",
+          "Microsoft.NET.Test.Sdk": "[17.11.0, )",
-          "NLog": "[5.3.2, )",
+          "NLog": "[5.3.3, )",
           "Torch": "[1.0.0, )",
           "Torch.API": "[1.0.0, )",
-          "xunit": "[2.8.0, )"
+          "xunit": "[2.9.0, )"
         }
       }
     },

Torch.Server/Managers/InstanceManager.cs

@@ -128,7 +128,15 @@ namespace Torch.Server.Managers
                 return;
             }
 
-            SelectWorld(DedicatedConfig.LoadWorld ?? DedicatedConfig.Worlds.First().WorldPath, false);
+            var worldPath = DedicatedConfig.LoadWorld;
+
+            if (worldPath == null)
+                worldPath = DedicatedConfig.Worlds.First().WorldPath;
+            else
+                // make sure we won't end up with a file path when we expect it to be a directory
+                worldPath = worldPath.EndsWith(".sbc") ? Path.GetDirectoryName(worldPath) : worldPath;
+
+            SelectWorld(worldPath, false);
 
             _instanceLoaded?.Invoke(DedicatedConfig);
         }
@@ -227,7 +235,7 @@ namespace Torch.Server.Managers
 
             try
             {
-                MyObjectBuilderSerializer.DeserializeXML(sandboxPath, out MyObjectBuilder_Checkpoint checkpoint, out ulong sizeInBytes);
+                MyObjectBuilderSerializerKeen.DeserializeXML(sandboxPath, out MyObjectBuilder_Checkpoint checkpoint, out ulong sizeInBytes);
                 if (checkpoint == null)
                 {
                     Log.Error($"Failed to load {DedicatedConfig.LoadWorld}, checkpoint null ({sizeInBytes} bytes, instance {Torch.Config.InstancePath})");
@@ -360,14 +368,14 @@ namespace Torch.Server.Managers
 
         public void LoadSandbox()
         {
-            if (!MyObjectBuilderSerializer.DeserializeXML(_checkpointPath, out MyObjectBuilder_Checkpoint checkpoint))
+            if (!MyObjectBuilderSerializerKeen.DeserializeXML(_checkpointPath, out MyObjectBuilder_Checkpoint checkpoint))
                 throw new SerializationException("Error reading checkpoint, see keen log for details");
             Checkpoint = new CheckpointViewModel(checkpoint);
             
             // migrate old saves
             if (File.Exists(_worldConfigPath))
             {
-                if (!MyObjectBuilderSerializer.DeserializeXML(_worldConfigPath, out MyObjectBuilder_WorldConfiguration worldConfig))
+                if (!MyObjectBuilderSerializerKeen.DeserializeXML(_worldConfigPath, out MyObjectBuilder_WorldConfiguration worldConfig))
                     throw new SerializationException("Error reading settings, see keen log for details");
                 WorldConfiguration = new WorldConfigurationViewModel(worldConfig);
             }

Torch.Server/Managers/MultiplayerManagerDedicatedPatchShim.cs

@@ -10,7 +10,7 @@ namespace Torch.Server.Managers
         public static void Patch(PatchContext ctx)
         {
             ctx.GetPattern(typeof(MyDedicatedServerBase).GetMethod(nameof(MyDedicatedServerBase.BanClient))).Prefixes.Add(typeof(MultiplayerManagerDedicatedPatchShim).GetMethod(nameof(BanPrefix)));
-            ctx.GetPattern(typeof(MyDedicatedServerBase).GetMethod(nameof(MyDedicatedServerBase.KickClient))).Prefixes.Add(typeof(MultiplayerManagerDedicatedPatchShim).GetMethod(nameof(KickPrefix)));
+            ctx.GetPattern(typeof(MyMultiplayerServerBase).GetMethod(nameof(MyMultiplayerServerBase.KickClient))).Prefixes.Add(typeof(MultiplayerManagerDedicatedPatchShim).GetMethod(nameof(KickPrefix)));
         }
 
         public static void BanPrefix(ulong userId, bool banned)

Torch.Server/Patches/ServerResponsePatch.cs

@@ -26,10 +26,18 @@ namespace Torch.Patches
             // Reduce response timeout from 100 seconds to 5 seconds.
             foreach (var instruction in instructions)
             {
-                if (instruction.OpCode == OpCodes.Ldc_I4 && instruction.Operand is MsilOperandInline.MsilOperandInt32 inlineI32 && inlineI32.Value == 1000)
+                if (instruction.OpCode == OpCodes.Ldc_I4 && instruction.Operand is 
+                        MsilOperandInline.MsilOperandInt32 { Value: 1000 } operandResponseTimeout)
                 {
                     _log.Info("Patching Steam response timeout to 5 seconds");
-                    inlineI32.Value = 50;
+                    operandResponseTimeout.Value = 50;
+                }
+                
+                if (instruction.OpCode == OpCodes.Ldc_I4 && instruction.Operand is 
+                        MsilOperandInline.MsilOperandInt32 { Value: 10000 } inlineI32)
+                {
+                    _log.Info("Patching Steam connect timeout to 60 seconds");
+                    inlineI32.Value = 60000;
                 }
 
                 yield return instruction;

Torch.Server/Torch.Server.csproj

@@ -37,7 +37,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="NLog" Version="5.3.2" />
+    <PackageReference Include="NLog" Version="5.3.3" />
     <PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="all" />
     <PackageReference Include="Steamworks.NET" Version="20.2.0">
       <PrivateAssets>all</PrivateAssets>
@@ -45,7 +45,7 @@
     </PackageReference>
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageReference Include="System.Management" Version="8.0.0" />
-    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.4" />
+    <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.5" />
   </ItemGroup>
   
   <ItemGroup>

Torch.Server/packages.lock.json

@@ -107,15 +107,15 @@
       },
       "NLog": {
         "type": "Direct",
-        "requested": "[5.3.2, )",
+        "requested": "[5.3.3, )",
-        "resolved": "5.3.2",
+        "resolved": "5.3.3",
-        "contentHash": "cQRQZuDMjSyMe9EQBnI9v55YAMMz8GAfFd6fFJ6tc/kXnG7Hze8p1I8MgvWSBG6E36wA8vSxRrlm8uSIG+SENg=="
+        "contentHash": "cy0+hlrUbYu+6mgUsILqCcqlJ2Csqyt2lm8y9T9kE8nhgwl8SvR+LM21QX4nmzFCPiowbrTFYxNF8+gWpy7/HQ=="
       },
       "nulastudio.NetBeauty": {
         "type": "Direct",
-        "requested": "[2.1.4.4, )",
+        "requested": "[2.1.4.5, )",
-        "resolved": "2.1.4.4",
+        "resolved": "2.1.4.5",
-        "contentHash": "Q+4H1o9tNVVHEm4VHQq1kglc+eNAwVdEKKnNKez0kDZHBPRE+ufXIgN6ucdvi1A462nFDstChLafMt36L3kXAw=="
+        "contentHash": "hOluHDEPDlS/lmDrRAlv5Xaza+n7kBPOtkuS6nYm0k6npJLi/vlYhZwR/IhpV+lCRTiu4so4D61pSrtHdTiagw=="
       },
       "PropertyChanged.Fody": {
         "type": "Direct",
@@ -157,18 +157,19 @@
         "resolved": "6.6.4",
         "contentHash": "vLZS+oa+ndUHYPlx/8n9bBTT3dHkCF0riml4paKq4D663+cZd47x1uagQo32D/gKFZ/sfmV1oqKaLmH0elxq4A=="
       },
-      "HarmonyX": {
-        "type": "Transitive",
-        "resolved": "2.10.2-prerelease.7",
-        "contentHash": "15kgPt5Cqeu7w1CHp4YqlVXuq6FKZj9iZwA/oNd7SaRVwvq2kZ9EODmJ2+U61ZLFasQY7nr2w/latSAv/Pjn/g==",
-        "dependencies": {
-          "MonoMod.RuntimeDetour": "25.1.0-prerelease.1"
-        }
-      },
       "JetBrains.Annotations": {
         "type": "Transitive",
-        "resolved": "2023.3.0",
+        "resolved": "2024.2.0",
-        "contentHash": "PHfnvdBUdGaTVG9bR/GEfxgTwWM0Z97Y6X3710wiljELBISipSfF5okn/vz+C2gfO+ihoEyVPjaJwn8ZalVukA=="
+        "contentHash": "GNnqCFW/163p1fOehKx0CnAqjmpPrUSqrgfHM6qca+P+RN39C9rhlfZHQpJhxmQG/dkOYe/b3Z0P8b6Kv5m1qw=="
+      },
+      "Lib.Harmony.Thin": {
+        "type": "Transitive",
+        "resolved": "2.3.3-torch",
+        "contentHash": "djQtMUpURRgP+Ytf1EgQwu4XnJL3J3bz5kyTVcRDNb632N62/A4CbduG96CUsKhL944yGNAJnLX3zfWldPYOTw==",
+        "dependencies": {
+          "MonoMod.Core": "1.1.0",
+          "System.Text.Json": "8.0.1"
+        }
       },
       "MdXaml.Plugins": {
         "type": "Transitive",
@@ -182,21 +183,23 @@
       },
       "Microsoft.CodeAnalysis.Common": {
         "type": "Transitive",
-        "resolved": "4.9.2",
+        "resolved": "4.11.0",
-        "contentHash": "M5PThug7b2AdxL7xKmQs50KzAQTl9jENw5jMT3iUt16k+DAFlw1S87juU3UuPs3gvBm8trMBSOEvSFDr31c9Vw==",
+        "contentHash": "djf8ujmqYImFgB04UGtcsEhHrzVqzHowS+EEl/Yunc5LdrYrZhGBWUTXoCF0NzYXJxtfuD+UVQarWpvrNc94Qg==",
         "dependencies": {
           "Microsoft.CodeAnalysis.Analyzers": "3.3.4",
           "System.Collections.Immutable": "8.0.0",
-          "System.Reflection.Metadata": "8.0.0",
+          "System.Reflection.Metadata": "8.0.0"
-          "System.Runtime.CompilerServices.Unsafe": "6.0.0"
         }
       },
       "Microsoft.CodeAnalysis.CSharp": {
         "type": "Transitive",
-        "resolved": "4.9.2",
+        "resolved": "4.11.0",
-        "contentHash": "HGIo7E9Mf3exAJbUdYpDFfLoYkSVaHDJXPyusWTYUTBaOPCowGw+Gap5McE1w+K+ryIXre72oiqL88sQHmHBmg==",
+        "contentHash": "6XYi2EusI8JT4y2l/F3VVVS+ISoIX9nqHsZRaG6W5aFeJ5BEuBosHfT/ABb73FN0RZ1Z3cj2j7cL28SToJPXOw==",
         "dependencies": {
-          "Microsoft.CodeAnalysis.Common": "[4.9.2]"
+          "Microsoft.CodeAnalysis.Analyzers": "3.3.4",
+          "Microsoft.CodeAnalysis.Common": "[4.11.0]",
+          "System.Collections.Immutable": "8.0.0",
+          "System.Reflection.Metadata": "8.0.0"
         }
       },
       "Microsoft.Diagnostics.NETCore.Client": {
@@ -227,8 +230,8 @@
       },
       "Microsoft.Extensions.Configuration.Binder": {
         "type": "Transitive",
-        "resolved": "8.0.1",
+        "resolved": "8.0.2",
-        "contentHash": "2UKFJnLiBt7Od6nCnTqP9rTIUNhzmn9Hv1l2FchyKbz8xieB9ULwZTbQZMw+M24Qw3F5dzzH1U9PPleN0LNLOQ==",
+        "contentHash": "7IQhGK+wjyGrNsPBjJcZwWAr+Wf6D4+TwOptUt77bWtgNkiV8tDEbhFS+dDamtQFZ2X7kWG9m71iZQRj2x3zgQ==",
         "dependencies": {
           "Microsoft.Extensions.Configuration.Abstractions": "8.0.0"
         }
@@ -315,21 +318,21 @@
       },
       "MonoMod.Backports": {
         "type": "Transitive",
-        "resolved": "1.1.1",
+        "resolved": "1.1.0",
-        "contentHash": "lExtjdkld5iWrhYEspoT1bvy0pJ4oBOBkKu+tWKabK1rHvjuS+gjbAd2bG62UGKc0JRBG3myaWtvgIIwYDw1bQ==",
+        "contentHash": "GUAjCrCZEddqHKHFA7Lh61PgTzoKY7gfBShFe0hQe0p8iynHhBK3TWGyRi+QIw/PGfaRPwx6c33CPGFURBVM6g==",
         "dependencies": {
           "MonoMod.ILHelpers": "1.0.1"
         }
       },
       "MonoMod.Core": {
         "type": "Transitive",
-        "resolved": "1.1.1",
+        "resolved": "1.1.0",
-        "contentHash": "7m7RqlxiWHilriKwzbK+F1FZiJG1vvVzfzRktVnoRb4OKYfdRalost/78LYTNOp9htwLgPKojZydRsNlI1/qHw==",
+        "contentHash": "Ks8RntZGVcktr2QF/AovTEbuOkrgXz6omjrvT5LRveOIQJuy+IFuEQPBVWu+cSKVIoZD5XkpRFvlVrItgPIrXw==",
         "dependencies": {
           "Mono.Cecil": "0.11.5",
-          "MonoMod.Backports": "1.1.1",
+          "MonoMod.Backports": "1.1.0",
           "MonoMod.ILHelpers": "1.0.1",
-          "MonoMod.Utils": "25.0.5"
+          "MonoMod.Utils": "25.0.4"
         }
       },
       "MonoMod.ILHelpers": {
@@ -337,25 +340,13 @@
         "resolved": "1.0.1",
         "contentHash": "6djj/Hz+/eTomo1H/sJEJNxBz2ZdhXjvH0MOmyU2xRtbjaIfBQuyVV0zNUbJhMY/8qoWrz7WXfskfFhdaY0afA=="
       },
-      "MonoMod.RuntimeDetour": {
-        "type": "Transitive",
-        "resolved": "25.1.1",
-        "contentHash": "05oD6LyB3N4eqssBbDHfywNBalBRleX3/HHOQxLhjAyl59tWfZFah2WN0nZ/mrwQ5We3tFIUEHAfbyUxlAbeFw==",
-        "dependencies": {
-          "Mono.Cecil": "0.11.5",
-          "MonoMod.Backports": "1.1.1",
-          "MonoMod.Core": "1.1.1",
-          "MonoMod.ILHelpers": "1.0.1",
-          "MonoMod.Utils": "25.0.5"
-        }
-      },
       "MonoMod.Utils": {
         "type": "Transitive",
-        "resolved": "25.0.5",
+        "resolved": "25.0.4",
-        "contentHash": "1lcpjEOiK1dfOxG9DsKkHNcP4G0DZSwtBEOhTGDfszjCvmLzCZqqFQvSzLRpzp3wfTKak+R0K2K5O5TbO0kwvg==",
+        "contentHash": "cB94MaZtFD9u4clYEFTwM4jGXnJnzXsxYF3yBpMZKHhXOas66tMF2frbdYte023i0MH4C5iRJbDjxHmA4x5VgA==",
         "dependencies": {
           "Mono.Cecil": "0.11.5",
-          "MonoMod.Backports": "1.1.1",
+          "MonoMod.Backports": "1.1.0",
           "MonoMod.ILHelpers": "1.0.1"
         }
       },
@@ -366,111 +357,100 @@
       },
       "NuGet.Commands": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "pI2X+KRQYsVcmjJUIAXT+8fvUCZgNWBQiSizKCOltRqaMjtUHLetfADfz7jfreOBohsDxNzhBnNqPQ8MU/Gjxw==",
+        "contentHash": "8GjJQZVbNJuttVynsRWsgqhTZiBbjxRr2PgZ3E7zPxDBmKUazkQ1s/FqScm83w8Xq5OdEtegkU0dZhibfRkKeg==",
         "dependencies": {
           "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0",
           "Microsoft.Extensions.FileSystemGlobbing": "6.0.0",
-          "NuGet.Credentials": "6.9.1",
+          "NuGet.Credentials": "6.11.0",
-          "NuGet.ProjectModel": "6.9.1"
+          "NuGet.ProjectModel": "6.11.0"
         }
       },
       "NuGet.Common": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "FbuWZBjQ1NJXBDqCwSddN2yvw3Plq3sTCIh0nc66Hu8jrNr+BOaxlKZv78jvJ+pSy8BvurYOdF9sl9KoORjrtg==",
+        "contentHash": "T3bCiKUSx8wdYpcqr6Dbx93zAqFp689ee/oa1tH22XI/xl7EUzQ7No/WlE1FUqvEX1+Mqar3wRNAn2O/yxo94g==",
         "dependencies": {
-          "NuGet.Frameworks": "6.9.1"
+          "NuGet.Frameworks": "6.11.0"
         }
       },
       "NuGet.Configuration": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "GM06pcUzWdNsizeGciqCjAhryfI1F/rQPETLDF+8pDRgzVpA+wKAR01/4aFU+IXzugnQ9LqOb5YyCRuR1OVZiQ==",
+        "contentHash": "73QprQqmumFrv3Ooi4YWpRYeBj8jZy9gNdOaOCp4pPInpt41SJJAz/aP4je+StwIJvi5HsgPPecLKekDIQEwKg==",
         "dependencies": {
-          "NuGet.Common": "6.9.1",
+          "NuGet.Common": "6.11.0",
           "System.Security.Cryptography.ProtectedData": "4.4.0"
         }
       },
       "NuGet.Credentials": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "elTErAznCWoqOLILVDN4FTa3+rpVVdUbHUaOUqJkk9+Z/ZSqyDPbCIhLaqTkPkWqoKa93gqzX9IFwURkMphPnw==",
+        "contentHash": "TeMvEyoqkIxDnYJjPCpD48vV5XoDATmyX2kGYYB2MIzWBT24ZjWauTda72hYBzg0OLLiuafxfnNJKGG6IHHzOQ==",
         "dependencies": {
-          "NuGet.Protocol": "6.9.1"
+          "NuGet.Protocol": "6.11.0"
         }
       },
       "NuGet.DependencyResolver.Core": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "gVWIEScv1K40H2Fvs6HGaOzRMpG+r1RUqYpBdh7gqQ18kgsswWUSr90jCNtBb7PUYKkMU1oAhxTslj/gQjO+Vw==",
+        "contentHash": "SoiPKPooA+IF+iCsX1ykwi3M0e+yBL34QnwIP3ujhQEn1dhlP/N1XsYAnKkJPxV15EZCahuuS4HtnBsZx+CHKA==",
         "dependencies": {
-          "NuGet.Configuration": "6.9.1",
+          "NuGet.Configuration": "6.11.0",
-          "NuGet.LibraryModel": "6.9.1",
+          "NuGet.LibraryModel": "6.11.0",
-          "NuGet.Protocol": "6.9.1"
+          "NuGet.Protocol": "6.11.0"
         }
       },
       "NuGet.Frameworks": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "DaKh3lenPUvzGccPkbI97BIvA27z+/UsL3ankfoZlX/4vBVDK5N1sheFTQ+GuJf+IgSzsJz/A21SPUpQLHwUtA=="
+        "contentHash": "Ew/mrfmLF5phsprysHbph2+tdZ10HMHAURavsr/Kx1WhybDG4vmGuoNLbbZMZOqnPRdpyCTc42OKWLoedxpYtA=="
       },
       "NuGet.LibraryModel": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "xlOpbZTc4862vKHkZHLJ5VgDteo+78ftVkajB8rKgSpevnBqwPKv2Y5OfUxct9HCqWYw0ikVfNf/qfjqnQCV1Q==",
+        "contentHash": "KUV2eeMICMb24OPcICn/wgncNzt6+W+lmFVO5eorTdo1qV4WXxYGyG1NTPiCY+Nrv5H/Ilnv9UaUM2ozqSmnjw==",
         "dependencies": {
-          "NuGet.Common": "6.9.1",
+          "NuGet.Common": "6.11.0",
-          "NuGet.Versioning": "6.9.1"
+          "NuGet.Versioning": "6.11.0"
         }
       },
       "NuGet.Packaging": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "6FyasOxKInCELJ+pGy8f17ub9st6ofFeNcBNTo7CRiPJlxyhJfKGKNpfe3HHYwvnZhc3Vdfr0kSR+f1BVGDuTA==",
+        "contentHash": "VmUv2LedVuPY1tfNybORO2I9IuqOzeV7I5JBD+PwNvJq2bAqovi4FCw2cYI0g+kjOJXBN2lAJfrfnqtUOlVJdQ==",
         "dependencies": {
           "Newtonsoft.Json": "13.0.3",
-          "NuGet.Configuration": "6.9.1",
+          "NuGet.Configuration": "6.11.0",
-          "NuGet.Versioning": "6.9.1",
+          "NuGet.Versioning": "6.11.0",
           "System.Security.Cryptography.Pkcs": "6.0.4"
         }
       },
       "NuGet.ProjectModel": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "x98QkS3oloaJfdSsDFOGTH5oeoHHTDoyTO7oyg/7g60be14AQowLqgPQV52Kuscl4lknx/3259RTxyDcbkdifQ==",
+        "contentHash": "g0KtmDH6fas97WsN73yV2h1F5JT9o6+Y0wlPK+ij9YLKaAXaF6+1HkSaQMMJ+xh9/jCJG9G6nau6InOlb1g48g==",
         "dependencies": {
-          "NuGet.DependencyResolver.Core": "6.9.1"
+          "NuGet.DependencyResolver.Core": "6.11.0"
         }
       },
       "NuGet.Protocol": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "h3bdjqUY4jvwM02D/7QM4FR8x/bbf4Pyjrc1Etw7an2OrWKPUSx0vJPdapKzioxIw7GXl/aVUM/DCeIc3S9brA==",
+        "contentHash": "p5B8oNLLnGhUfMbcS16aRiegj11pD6k+LELyRBqvNFR/pE3yR1XT+g1XS33ME9wvoU+xbCGnl4Grztt1jHPinw==",
         "dependencies": {
-          "NuGet.Packaging": "6.9.1"
+          "NuGet.Packaging": "6.11.0"
         }
       },
       "NuGet.Versioning": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "ypnSvEtpNGo48bAWn95J1oHChycCXcevFSbn53fqzLxlXFSZP7dawu8p/7mHAfGufZQSV2sBpW80XQGIfXO8kQ=="
+        "contentHash": "v/GGlIj2dd7svplFmASWEueu62veKW0MrMtBaZ7QG8aJTSGv2yE+pgUGhXRcQ4nxNOEq/wLBrz1vkth/1SND7A=="
       },
       "protobuf-net": {
         "type": "Transitive",
-        "resolved": "3.2.30",
+        "resolved": "1.0.0",
-        "contentHash": "C/UTlmxEJHAHpqm8xQK1UyJKaIynVCSNG4mVrbLgnZ7ccH28nN49O8iMJvKEodTgVbnimvy+3mIiAdW6mATwnw==",
+        "contentHash": "kTGOK0E87473sOImOjgZOnz3kTC2aMLffoRWQLYNuBLJnwNNmjanF9IkevZ9Q7yYLeABQfcF3BpeepuMntMVNw=="
-        "dependencies": {
-          "protobuf-net.Core": "3.2.30"
-        }
-      },
-      "protobuf-net.Core": {
-        "type": "Transitive",
-        "resolved": "3.2.30",
-        "contentHash": "v2ZxxYrz+X212ukSx+uqkLuPu414bvmSAnTyf+PBUKR9ENJxO4P/csorA/27456MCp1JNoMssDj/f91RDiwBfQ==",
-        "dependencies": {
-          "System.Collections.Immutable": "7.0.0"
-        }
       },
       "SemanticVersioning": {
         "type": "Transitive",
@@ -492,8 +472,8 @@
       },
       "SpaceEngineersDedicated.ReferenceAssemblies": {
         "type": "Transitive",
-        "resolved": "1.204.15",
+        "resolved": "1.205.23",
-        "contentHash": "xq1quPCVGi1d4D/iH2iwd8B+1OH5Lqi9H/ld8kaZN8fZ9axz2wtqdq3jYbe9r/FKdSaMhqaERD5W62sHuI9tPA==",
+        "contentHash": "J7mF5hY39PzzCZps6vhIRzKiq8vD6Af9TgumTJR068vjEi+BzyeEFhqX+cl2Dd1ngOmsBtGWc5m+vxgTfs5YuA==",
         "dependencies": {
           "SharpDX": "4.2.0-keen-cringe",
           "protobuf-net": "1.0.0"
@@ -532,8 +512,8 @@
       },
       "System.Runtime.CompilerServices.Unsafe": {
         "type": "Transitive",
-        "resolved": "6.0.0",
+        "resolved": "4.5.1",
-        "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
+        "contentHash": "Zh8t8oqolRaFa9vmOZfdQm/qKejdqz0J9kr7o2Fu0vPeoH3BL1EOXipKWwkWtLT1JPzjByrF19fGuFlNbmPpiw=="
       },
       "System.Security.Cryptography.Pkcs": {
         "type": "Transitive",
@@ -563,8 +543,8 @@
       },
       "System.Text.Json": {
         "type": "Transitive",
-        "resolved": "8.0.3",
+        "resolved": "8.0.1",
-        "contentHash": "hpagS9joOwv6efWfrMmV9MjQXpiXZH72PgN067Ysfr6AWMSD1/1hEcvh/U5mUpPLezEWsOJSuVrmqDIVD958iA==",
+        "contentHash": "7AWk2za1hSEJBppe/Lg+uDcam2TrDqwIKa9XcPssSwyjC2xa39EKEGul3CO5RWNF+hMuZG4zlBDrvhBdDTg4lg==",
         "dependencies": {
           "System.Text.Encodings.Web": "8.0.0"
         }
@@ -582,30 +562,27 @@
         "type": "Project",
         "dependencies": {
           "ControlzEx": "[5.0.2, )",
-          "HarmonyX": "[2.10.2-prerelease.7, )",
+          "Lib.Harmony.Thin": "[2.3.3-torch, )",
           "MahApps.Metro": "[2.4.10, )",
-          "Microsoft.CodeAnalysis.CSharp": "[4.9.2, )",
+          "Microsoft.CodeAnalysis.CSharp": "[4.11.0, )",
-          "Microsoft.CodeAnalysis.Common": "[4.9.2, )",
+          "Microsoft.CodeAnalysis.Common": "[4.11.0, )",
-          "MonoMod.RuntimeDetour": "[25.1.1, )",
+          "NLog": "[5.3.3, )",
-          "NLog": "[5.3.2, )",
           "System.ComponentModel.Annotations": "[5.0.0, )",
           "Torch.API": "[1.0.0, )",
-          "Torch.SixLabors.ImageSharp": "[1.0.0-beta6, )",
+          "Torch.SixLabors.ImageSharp": "[1.0.0-beta6, )"
-          "protobuf-net": "[3.2.30, )"
         }
       },
       "torch.api": {
         "type": "Project",
         "dependencies": {
-          "JetBrains.Annotations": "[2023.3.0, )",
+          "JetBrains.Annotations": "[2024.2.0, )",
-          "Microsoft.Extensions.Configuration.Binder": "[8.0.1, )",
+          "Microsoft.Extensions.Configuration.Binder": "[8.0.2, )",
-          "NLog": "[5.3.2, )",
+          "NLog": "[5.3.3, )",
-          "NuGet.Commands": "[6.9.1, )",
+          "NuGet.Commands": "[6.11.0, )",
-          "NuGet.DependencyResolver.Core": "[6.9.1, )",
+          "NuGet.DependencyResolver.Core": "[6.11.0, )",
           "SemanticVersioning": "[2.0.2, )",
-          "SpaceEngineersDedicated.ReferenceAssemblies": "[1.204.15, )",
+          "SpaceEngineersDedicated.ReferenceAssemblies": "[1.*, )",
-          "System.Linq.Async": "[6.0.1, )",
+          "System.Linq.Async": "[6.0.1, )"
-          "System.Text.Json": "[8.0.3, )"
         }
       }
     },

Torch.Tests/Torch.Tests.csproj

@@ -13,9 +13,9 @@
   </PropertyGroup>
 <!--   <Import Project="$(SolutionDir)\TransformOnBuild.targets" /> -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
-    <PackageReference Include="NLog" Version="5.3.2" />
+    <PackageReference Include="NLog" Version="5.3.3" />
-    <PackageReference Include="xunit" Version="2.8.0" />
+    <PackageReference Include="xunit" Version="2.9.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Torch.API\Torch.API.csproj" />

Torch.Tests/packages.lock.json

@@ -4,29 +4,29 @@
     "net8.0-windows7.0": {
       "Microsoft.NET.Test.Sdk": {
         "type": "Direct",
-        "requested": "[17.9.0, )",
+        "requested": "[17.11.0, )",
-        "resolved": "17.9.0",
+        "resolved": "17.11.0",
-        "contentHash": "7GUNAUbJYn644jzwLm5BD3a2p9C1dmP8Hr6fDPDxgItQk9hBs1Svdxzz07KQ/UphMSmgza9AbijBJGmw5D658A==",
+        "contentHash": "fH7P0LihMXgnlNLtrXGetHd30aQcD+YrSbWXbCPBnrypdRApPgNqd/TgncTlSVY1bbLYdnvpBgts2dcnK37GzA==",
         "dependencies": {
-          "Microsoft.CodeCoverage": "17.9.0",
+          "Microsoft.CodeCoverage": "17.11.0",
-          "Microsoft.TestPlatform.TestHost": "17.9.0"
+          "Microsoft.TestPlatform.TestHost": "17.11.0"
         }
       },
       "NLog": {
         "type": "Direct",
-        "requested": "[5.3.2, )",
+        "requested": "[5.3.3, )",
-        "resolved": "5.3.2",
+        "resolved": "5.3.3",
-        "contentHash": "cQRQZuDMjSyMe9EQBnI9v55YAMMz8GAfFd6fFJ6tc/kXnG7Hze8p1I8MgvWSBG6E36wA8vSxRrlm8uSIG+SENg=="
+        "contentHash": "cy0+hlrUbYu+6mgUsILqCcqlJ2Csqyt2lm8y9T9kE8nhgwl8SvR+LM21QX4nmzFCPiowbrTFYxNF8+gWpy7/HQ=="
       },
       "xunit": {
         "type": "Direct",
-        "requested": "[2.8.0, )",
+        "requested": "[2.9.0, )",
-        "resolved": "2.8.0",
+        "resolved": "2.9.0",
-        "contentHash": "US3a3twJziAif1kFPGdk9fALwILHxV0n1roX5j67bN/d3o4DGNLHnV3tr5ZX+uinVrzfkf0avH3zGX8JPBC0qA==",
+        "contentHash": "PtU3rZ0ThdmdJqTbK7GkgFf6iBaCR6Q0uvJHznID+XEYk2v6O/b7sRxqnbi3B2gRDXxjTqMkVNayzwsqsFUxRw==",
         "dependencies": {
-          "xunit.analyzers": "1.13.0",
+          "xunit.analyzers": "1.15.0",
-          "xunit.assert": "2.8.0",
+          "xunit.assert": "2.9.0",
-          "xunit.core": "[2.8.0]"
+          "xunit.core": "[2.9.0]"
         }
       },
       "ControlzEx": {
@@ -38,18 +38,19 @@
           "System.Text.Json": "5.0.1"
         }
       },
-      "HarmonyX": {
-        "type": "Transitive",
-        "resolved": "2.10.2-prerelease.7",
-        "contentHash": "15kgPt5Cqeu7w1CHp4YqlVXuq6FKZj9iZwA/oNd7SaRVwvq2kZ9EODmJ2+U61ZLFasQY7nr2w/latSAv/Pjn/g==",
-        "dependencies": {
-          "MonoMod.RuntimeDetour": "25.1.0-prerelease.1"
-        }
-      },
       "JetBrains.Annotations": {
         "type": "Transitive",
-        "resolved": "2023.3.0",
+        "resolved": "2024.2.0",
-        "contentHash": "PHfnvdBUdGaTVG9bR/GEfxgTwWM0Z97Y6X3710wiljELBISipSfF5okn/vz+C2gfO+ihoEyVPjaJwn8ZalVukA=="
+        "contentHash": "GNnqCFW/163p1fOehKx0CnAqjmpPrUSqrgfHM6qca+P+RN39C9rhlfZHQpJhxmQG/dkOYe/b3Z0P8b6Kv5m1qw=="
+      },
+      "Lib.Harmony.Thin": {
+        "type": "Transitive",
+        "resolved": "2.3.3-torch",
+        "contentHash": "djQtMUpURRgP+Ytf1EgQwu4XnJL3J3bz5kyTVcRDNb632N62/A4CbduG96CUsKhL944yGNAJnLX3zfWldPYOTw==",
+        "dependencies": {
+          "MonoMod.Core": "1.1.0",
+          "System.Text.Json": "8.0.1"
+        }
       },
       "MahApps.Metro": {
         "type": "Transitive",
@@ -71,27 +72,29 @@
       },
       "Microsoft.CodeAnalysis.Common": {
         "type": "Transitive",
-        "resolved": "4.9.2",
+        "resolved": "4.11.0",
-        "contentHash": "M5PThug7b2AdxL7xKmQs50KzAQTl9jENw5jMT3iUt16k+DAFlw1S87juU3UuPs3gvBm8trMBSOEvSFDr31c9Vw==",
+        "contentHash": "djf8ujmqYImFgB04UGtcsEhHrzVqzHowS+EEl/Yunc5LdrYrZhGBWUTXoCF0NzYXJxtfuD+UVQarWpvrNc94Qg==",
         "dependencies": {
           "Microsoft.CodeAnalysis.Analyzers": "3.3.4",
           "System.Collections.Immutable": "8.0.0",
-          "System.Reflection.Metadata": "8.0.0",
+          "System.Reflection.Metadata": "8.0.0"
-          "System.Runtime.CompilerServices.Unsafe": "6.0.0"
         }
       },
       "Microsoft.CodeAnalysis.CSharp": {
         "type": "Transitive",
-        "resolved": "4.9.2",
+        "resolved": "4.11.0",
-        "contentHash": "HGIo7E9Mf3exAJbUdYpDFfLoYkSVaHDJXPyusWTYUTBaOPCowGw+Gap5McE1w+K+ryIXre72oiqL88sQHmHBmg==",
+        "contentHash": "6XYi2EusI8JT4y2l/F3VVVS+ISoIX9nqHsZRaG6W5aFeJ5BEuBosHfT/ABb73FN0RZ1Z3cj2j7cL28SToJPXOw==",
         "dependencies": {
-          "Microsoft.CodeAnalysis.Common": "[4.9.2]"
+          "Microsoft.CodeAnalysis.Analyzers": "3.3.4",
+          "Microsoft.CodeAnalysis.Common": "[4.11.0]",
+          "System.Collections.Immutable": "8.0.0",
+          "System.Reflection.Metadata": "8.0.0"
         }
       },
       "Microsoft.CodeCoverage": {
         "type": "Transitive",
-        "resolved": "17.9.0",
+        "resolved": "17.11.0",
-        "contentHash": "RGD37ZSrratfScYXm7M0HjvxMxZyWZL4jm+XgMZbkIY1UPgjUpbNA/t+WTGj/rC/0Hm9A3IrH3ywbKZkOCnoZA=="
+        "contentHash": "QKcOSuw7MZG4XiQ+pCj+Ib6amOwoRDEO7e3DbxqXeOPXSnfyGXYoZQI8I140s1mKQVn1Vh+c5WlKvCvlgMovpg=="
       },
       "Microsoft.Extensions.Configuration.Abstractions": {
         "type": "Transitive",
@@ -103,8 +106,8 @@
       },
       "Microsoft.Extensions.Configuration.Binder": {
         "type": "Transitive",
-        "resolved": "8.0.1",
+        "resolved": "8.0.2",
-        "contentHash": "2UKFJnLiBt7Od6nCnTqP9rTIUNhzmn9Hv1l2FchyKbz8xieB9ULwZTbQZMw+M24Qw3F5dzzH1U9PPleN0LNLOQ==",
+        "contentHash": "7IQhGK+wjyGrNsPBjJcZwWAr+Wf6D4+TwOptUt77bWtgNkiV8tDEbhFS+dDamtQFZ2X7kWG9m71iZQRj2x3zgQ==",
         "dependencies": {
           "Microsoft.Extensions.Configuration.Abstractions": "8.0.0"
         }
@@ -129,18 +132,18 @@
       },
       "Microsoft.TestPlatform.ObjectModel": {
         "type": "Transitive",
-        "resolved": "17.9.0",
+        "resolved": "17.11.0",
-        "contentHash": "1ilw/8vgmjLyKU+2SKXKXaOqpYFJCQfGqGz+x0cosl981VzjrY74Sv6qAJv+neZMZ9ZMxF3ArN6kotaQ4uvEBw==",
+        "contentHash": "PU+CC1yRzbR0IllrtdILaeep7WP5OIrvmWrvCMqG3jB1h4F6Ur7CYHl6ENbDVXPzEvygXh0GWbTyrbjfvgTpAg==",
         "dependencies": {
           "System.Reflection.Metadata": "1.6.0"
         }
       },
       "Microsoft.TestPlatform.TestHost": {
         "type": "Transitive",
-        "resolved": "17.9.0",
+        "resolved": "17.11.0",
-        "contentHash": "Spmg7Wx49Ya3SxBjyeAR+nQpjMTKZwTwpZ7KyeOTIqI/WHNPnBU4HUvl5kuHPQAwGWqMy4FGZja1HvEwvoaDiA==",
+        "contentHash": "KMzJO3dm3+9W8JRQ3IDviu0v7uXP5Lgii6TuxMc5m8ynaqcGnn7Y18cMb5AsP2xp59uUHO474WZrssxBdb8ZxQ==",
         "dependencies": {
-          "Microsoft.TestPlatform.ObjectModel": "17.9.0",
+          "Microsoft.TestPlatform.ObjectModel": "17.11.0",
           "Newtonsoft.Json": "13.0.1"
         }
       },
@@ -156,21 +159,21 @@
       },
       "MonoMod.Backports": {
         "type": "Transitive",
-        "resolved": "1.1.1",
+        "resolved": "1.1.0",
-        "contentHash": "lExtjdkld5iWrhYEspoT1bvy0pJ4oBOBkKu+tWKabK1rHvjuS+gjbAd2bG62UGKc0JRBG3myaWtvgIIwYDw1bQ==",
+        "contentHash": "GUAjCrCZEddqHKHFA7Lh61PgTzoKY7gfBShFe0hQe0p8iynHhBK3TWGyRi+QIw/PGfaRPwx6c33CPGFURBVM6g==",
         "dependencies": {
           "MonoMod.ILHelpers": "1.0.1"
         }
       },
       "MonoMod.Core": {
         "type": "Transitive",
-        "resolved": "1.1.1",
+        "resolved": "1.1.0",
-        "contentHash": "7m7RqlxiWHilriKwzbK+F1FZiJG1vvVzfzRktVnoRb4OKYfdRalost/78LYTNOp9htwLgPKojZydRsNlI1/qHw==",
+        "contentHash": "Ks8RntZGVcktr2QF/AovTEbuOkrgXz6omjrvT5LRveOIQJuy+IFuEQPBVWu+cSKVIoZD5XkpRFvlVrItgPIrXw==",
         "dependencies": {
           "Mono.Cecil": "0.11.5",
-          "MonoMod.Backports": "1.1.1",
+          "MonoMod.Backports": "1.1.0",
           "MonoMod.ILHelpers": "1.0.1",
-          "MonoMod.Utils": "25.0.5"
+          "MonoMod.Utils": "25.0.4"
         }
       },
       "MonoMod.ILHelpers": {
@@ -178,25 +181,13 @@
         "resolved": "1.0.1",
         "contentHash": "6djj/Hz+/eTomo1H/sJEJNxBz2ZdhXjvH0MOmyU2xRtbjaIfBQuyVV0zNUbJhMY/8qoWrz7WXfskfFhdaY0afA=="
       },
-      "MonoMod.RuntimeDetour": {
-        "type": "Transitive",
-        "resolved": "25.1.1",
-        "contentHash": "05oD6LyB3N4eqssBbDHfywNBalBRleX3/HHOQxLhjAyl59tWfZFah2WN0nZ/mrwQ5We3tFIUEHAfbyUxlAbeFw==",
-        "dependencies": {
-          "Mono.Cecil": "0.11.5",
-          "MonoMod.Backports": "1.1.1",
-          "MonoMod.Core": "1.1.1",
-          "MonoMod.ILHelpers": "1.0.1",
-          "MonoMod.Utils": "25.0.5"
-        }
-      },
       "MonoMod.Utils": {
         "type": "Transitive",
-        "resolved": "25.0.5",
+        "resolved": "25.0.4",
-        "contentHash": "1lcpjEOiK1dfOxG9DsKkHNcP4G0DZSwtBEOhTGDfszjCvmLzCZqqFQvSzLRpzp3wfTKak+R0K2K5O5TbO0kwvg==",
+        "contentHash": "cB94MaZtFD9u4clYEFTwM4jGXnJnzXsxYF3yBpMZKHhXOas66tMF2frbdYte023i0MH4C5iRJbDjxHmA4x5VgA==",
         "dependencies": {
           "Mono.Cecil": "0.11.5",
-          "MonoMod.Backports": "1.1.1",
+          "MonoMod.Backports": "1.1.0",
           "MonoMod.ILHelpers": "1.0.1"
         }
       },
@@ -207,111 +198,100 @@
       },
       "NuGet.Commands": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "pI2X+KRQYsVcmjJUIAXT+8fvUCZgNWBQiSizKCOltRqaMjtUHLetfADfz7jfreOBohsDxNzhBnNqPQ8MU/Gjxw==",
+        "contentHash": "8GjJQZVbNJuttVynsRWsgqhTZiBbjxRr2PgZ3E7zPxDBmKUazkQ1s/FqScm83w8Xq5OdEtegkU0dZhibfRkKeg==",
         "dependencies": {
           "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0",
           "Microsoft.Extensions.FileSystemGlobbing": "6.0.0",
-          "NuGet.Credentials": "6.9.1",
+          "NuGet.Credentials": "6.11.0",
-          "NuGet.ProjectModel": "6.9.1"
+          "NuGet.ProjectModel": "6.11.0"
         }
       },
       "NuGet.Common": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "FbuWZBjQ1NJXBDqCwSddN2yvw3Plq3sTCIh0nc66Hu8jrNr+BOaxlKZv78jvJ+pSy8BvurYOdF9sl9KoORjrtg==",
+        "contentHash": "T3bCiKUSx8wdYpcqr6Dbx93zAqFp689ee/oa1tH22XI/xl7EUzQ7No/WlE1FUqvEX1+Mqar3wRNAn2O/yxo94g==",
         "dependencies": {
-          "NuGet.Frameworks": "6.9.1"
+          "NuGet.Frameworks": "6.11.0"
         }
       },
       "NuGet.Configuration": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "GM06pcUzWdNsizeGciqCjAhryfI1F/rQPETLDF+8pDRgzVpA+wKAR01/4aFU+IXzugnQ9LqOb5YyCRuR1OVZiQ==",
+        "contentHash": "73QprQqmumFrv3Ooi4YWpRYeBj8jZy9gNdOaOCp4pPInpt41SJJAz/aP4je+StwIJvi5HsgPPecLKekDIQEwKg==",
         "dependencies": {
-          "NuGet.Common": "6.9.1",
+          "NuGet.Common": "6.11.0",
           "System.Security.Cryptography.ProtectedData": "4.4.0"
         }
       },
       "NuGet.Credentials": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "elTErAznCWoqOLILVDN4FTa3+rpVVdUbHUaOUqJkk9+Z/ZSqyDPbCIhLaqTkPkWqoKa93gqzX9IFwURkMphPnw==",
+        "contentHash": "TeMvEyoqkIxDnYJjPCpD48vV5XoDATmyX2kGYYB2MIzWBT24ZjWauTda72hYBzg0OLLiuafxfnNJKGG6IHHzOQ==",
         "dependencies": {
-          "NuGet.Protocol": "6.9.1"
+          "NuGet.Protocol": "6.11.0"
         }
       },
       "NuGet.DependencyResolver.Core": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "gVWIEScv1K40H2Fvs6HGaOzRMpG+r1RUqYpBdh7gqQ18kgsswWUSr90jCNtBb7PUYKkMU1oAhxTslj/gQjO+Vw==",
+        "contentHash": "SoiPKPooA+IF+iCsX1ykwi3M0e+yBL34QnwIP3ujhQEn1dhlP/N1XsYAnKkJPxV15EZCahuuS4HtnBsZx+CHKA==",
         "dependencies": {
-          "NuGet.Configuration": "6.9.1",
+          "NuGet.Configuration": "6.11.0",
-          "NuGet.LibraryModel": "6.9.1",
+          "NuGet.LibraryModel": "6.11.0",
-          "NuGet.Protocol": "6.9.1"
+          "NuGet.Protocol": "6.11.0"
         }
       },
       "NuGet.Frameworks": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "DaKh3lenPUvzGccPkbI97BIvA27z+/UsL3ankfoZlX/4vBVDK5N1sheFTQ+GuJf+IgSzsJz/A21SPUpQLHwUtA=="
+        "contentHash": "Ew/mrfmLF5phsprysHbph2+tdZ10HMHAURavsr/Kx1WhybDG4vmGuoNLbbZMZOqnPRdpyCTc42OKWLoedxpYtA=="
       },
       "NuGet.LibraryModel": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "xlOpbZTc4862vKHkZHLJ5VgDteo+78ftVkajB8rKgSpevnBqwPKv2Y5OfUxct9HCqWYw0ikVfNf/qfjqnQCV1Q==",
+        "contentHash": "KUV2eeMICMb24OPcICn/wgncNzt6+W+lmFVO5eorTdo1qV4WXxYGyG1NTPiCY+Nrv5H/Ilnv9UaUM2ozqSmnjw==",
         "dependencies": {
-          "NuGet.Common": "6.9.1",
+          "NuGet.Common": "6.11.0",
-          "NuGet.Versioning": "6.9.1"
+          "NuGet.Versioning": "6.11.0"
         }
       },
       "NuGet.Packaging": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "6FyasOxKInCELJ+pGy8f17ub9st6ofFeNcBNTo7CRiPJlxyhJfKGKNpfe3HHYwvnZhc3Vdfr0kSR+f1BVGDuTA==",
+        "contentHash": "VmUv2LedVuPY1tfNybORO2I9IuqOzeV7I5JBD+PwNvJq2bAqovi4FCw2cYI0g+kjOJXBN2lAJfrfnqtUOlVJdQ==",
         "dependencies": {
           "Newtonsoft.Json": "13.0.3",
-          "NuGet.Configuration": "6.9.1",
+          "NuGet.Configuration": "6.11.0",
-          "NuGet.Versioning": "6.9.1",
+          "NuGet.Versioning": "6.11.0",
           "System.Security.Cryptography.Pkcs": "6.0.4"
         }
       },
       "NuGet.ProjectModel": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "x98QkS3oloaJfdSsDFOGTH5oeoHHTDoyTO7oyg/7g60be14AQowLqgPQV52Kuscl4lknx/3259RTxyDcbkdifQ==",
+        "contentHash": "g0KtmDH6fas97WsN73yV2h1F5JT9o6+Y0wlPK+ij9YLKaAXaF6+1HkSaQMMJ+xh9/jCJG9G6nau6InOlb1g48g==",
         "dependencies": {
-          "NuGet.DependencyResolver.Core": "6.9.1"
+          "NuGet.DependencyResolver.Core": "6.11.0"
         }
       },
       "NuGet.Protocol": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "h3bdjqUY4jvwM02D/7QM4FR8x/bbf4Pyjrc1Etw7an2OrWKPUSx0vJPdapKzioxIw7GXl/aVUM/DCeIc3S9brA==",
+        "contentHash": "p5B8oNLLnGhUfMbcS16aRiegj11pD6k+LELyRBqvNFR/pE3yR1XT+g1XS33ME9wvoU+xbCGnl4Grztt1jHPinw==",
         "dependencies": {
-          "NuGet.Packaging": "6.9.1"
+          "NuGet.Packaging": "6.11.0"
         }
       },
       "NuGet.Versioning": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "ypnSvEtpNGo48bAWn95J1oHChycCXcevFSbn53fqzLxlXFSZP7dawu8p/7mHAfGufZQSV2sBpW80XQGIfXO8kQ=="
+        "contentHash": "v/GGlIj2dd7svplFmASWEueu62veKW0MrMtBaZ7QG8aJTSGv2yE+pgUGhXRcQ4nxNOEq/wLBrz1vkth/1SND7A=="
       },
       "protobuf-net": {
         "type": "Transitive",
-        "resolved": "3.2.30",
+        "resolved": "1.0.0",
-        "contentHash": "C/UTlmxEJHAHpqm8xQK1UyJKaIynVCSNG4mVrbLgnZ7ccH28nN49O8iMJvKEodTgVbnimvy+3mIiAdW6mATwnw==",
+        "contentHash": "kTGOK0E87473sOImOjgZOnz3kTC2aMLffoRWQLYNuBLJnwNNmjanF9IkevZ9Q7yYLeABQfcF3BpeepuMntMVNw=="
-        "dependencies": {
-          "protobuf-net.Core": "3.2.30"
-        }
-      },
-      "protobuf-net.Core": {
-        "type": "Transitive",
-        "resolved": "3.2.30",
-        "contentHash": "v2ZxxYrz+X212ukSx+uqkLuPu414bvmSAnTyf+PBUKR9ENJxO4P/csorA/27456MCp1JNoMssDj/f91RDiwBfQ==",
-        "dependencies": {
-          "System.Collections.Immutable": "7.0.0"
-        }
       },
       "SemanticVersioning": {
         "type": "Transitive",
@@ -333,8 +313,8 @@
       },
       "SpaceEngineersDedicated.ReferenceAssemblies": {
         "type": "Transitive",
-        "resolved": "1.204.15",
+        "resolved": "1.205.23",
-        "contentHash": "xq1quPCVGi1d4D/iH2iwd8B+1OH5Lqi9H/ld8kaZN8fZ9axz2wtqdq3jYbe9r/FKdSaMhqaERD5W62sHuI9tPA==",
+        "contentHash": "J7mF5hY39PzzCZps6vhIRzKiq8vD6Af9TgumTJR068vjEi+BzyeEFhqX+cl2Dd1ngOmsBtGWc5m+vxgTfs5YuA==",
         "dependencies": {
           "SharpDX": "4.2.0-keen-cringe",
           "protobuf-net": "1.0.0"
@@ -373,8 +353,8 @@
       },
       "System.Runtime.CompilerServices.Unsafe": {
         "type": "Transitive",
-        "resolved": "6.0.0",
+        "resolved": "4.5.1",
-        "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
+        "contentHash": "Zh8t8oqolRaFa9vmOZfdQm/qKejdqz0J9kr7o2Fu0vPeoH3BL1EOXipKWwkWtLT1JPzjByrF19fGuFlNbmPpiw=="
       },
       "System.Security.Cryptography.Pkcs": {
         "type": "Transitive",
@@ -396,8 +376,8 @@
       },
       "System.Text.Json": {
         "type": "Transitive",
-        "resolved": "8.0.3",
+        "resolved": "8.0.1",
-        "contentHash": "hpagS9joOwv6efWfrMmV9MjQXpiXZH72PgN067Ysfr6AWMSD1/1hEcvh/U5mUpPLezEWsOJSuVrmqDIVD958iA==",
+        "contentHash": "7AWk2za1hSEJBppe/Lg+uDcam2TrDqwIKa9XcPssSwyjC2xa39EKEGul3CO5RWNF+hMuZG4zlBDrvhBdDTg4lg==",
         "dependencies": {
           "System.Text.Encodings.Web": "8.0.0"
         }
@@ -418,67 +398,64 @@
       },
       "xunit.analyzers": {
         "type": "Transitive",
-        "resolved": "1.13.0",
+        "resolved": "1.15.0",
-        "contentHash": "Pai9YnDV71/Ox14nBHB6/f62iyPyLbmUG/YYMiA4dfdFZvr0gIYE9yGxSr0i5Tr3INK75wgL2MCUNEKpeiZ2Fw=="
+        "contentHash": "s+M8K/Rtlgr6CmD7AYQKrNTvT5sh0l0ZKDoZ3Z/ExhlIwfV9mGAMR4f7KqIB7SSK7ZOhqDTgTUMYPmKfmvWUWQ=="
       },
       "xunit.assert": {
         "type": "Transitive",
-        "resolved": "2.8.0",
+        "resolved": "2.9.0",
-        "contentHash": "lwf7Dy5/5HbDkaPx1YrGXCByytCEEcIn+KPI74jh2BD/RU/7RhO8c+S3k0Ph+Mr7+cLf338fl+o6UcgPCLa6PA=="
+        "contentHash": "Z/1pyia//860wEYTKn6Q5dmgikJdRjgE4t5AoxJkK8oTmidzPLEPG574kmm7LFkMLbH6Frwmgb750kcyR+hwoA=="
       },
       "xunit.core": {
         "type": "Transitive",
-        "resolved": "2.8.0",
+        "resolved": "2.9.0",
-        "contentHash": "McSTFGTETCxLpmJKE9TWi9FtFthrRbpRrjz2V2g8sK2wRt1+JHs15vwi+B+nfftFkV9aFWIXZfzZM95TIGZNIA==",
+        "contentHash": "uRaop9tZsZMCaUS4AfbSPGYHtvywWnm8XXFNUqII7ShWyDBgdchY6gyDNgO4AK1Lv/1NNW61Zq63CsDV6oH6Jg==",
         "dependencies": {
-          "xunit.extensibility.core": "[2.8.0]",
+          "xunit.extensibility.core": "[2.9.0]",
-          "xunit.extensibility.execution": "[2.8.0]"
+          "xunit.extensibility.execution": "[2.9.0]"
         }
       },
       "xunit.extensibility.core": {
         "type": "Transitive",
-        "resolved": "2.8.0",
+        "resolved": "2.9.0",
-        "contentHash": "eBJv9xQeY0p5z+C/L1tFjUFYqtl5pQqIEYCGTMl+MbRzA7sOlgYKwJE//vEePBp+mgBh7NjD0Qhz0liZBYM27w==",
+        "contentHash": "zjDEUSxsr6UNij4gIwCgMqQox+oLDPRZ+mubwWLci+SssPBFQD1xeRR4SvgBuXqbE0QXCJ/STVTp+lxiB5NLVA==",
         "dependencies": {
           "xunit.abstractions": "2.0.3"
         }
       },
       "xunit.extensibility.execution": {
         "type": "Transitive",
-        "resolved": "2.8.0",
+        "resolved": "2.9.0",
-        "contentHash": "TyyrZesHB9ODZMS9c73OqiBz4x0vL944JCkSPBWW5w6PF2LlUfdfXRjjOhoIOuY6lTmEgl07rS4/Jot9mCYnpg==",
+        "contentHash": "5ZTQZvmPLlBw6QzCOwM0KnMsZw6eGjbmC176QHZlcbQoMhGIeGcYzYwn5w9yXxf+4phtplMuVqTpTbFDQh2bqQ==",
         "dependencies": {
-          "xunit.extensibility.core": "[2.8.0]"
+          "xunit.extensibility.core": "[2.9.0]"
         }
       },
       "torch": {
         "type": "Project",
         "dependencies": {
           "ControlzEx": "[5.0.2, )",
-          "HarmonyX": "[2.10.2-prerelease.7, )",
+          "Lib.Harmony.Thin": "[2.3.3-torch, )",
           "MahApps.Metro": "[2.4.10, )",
-          "Microsoft.CodeAnalysis.CSharp": "[4.9.2, )",
+          "Microsoft.CodeAnalysis.CSharp": "[4.11.0, )",
-          "Microsoft.CodeAnalysis.Common": "[4.9.2, )",
+          "Microsoft.CodeAnalysis.Common": "[4.11.0, )",
-          "MonoMod.RuntimeDetour": "[25.1.1, )",
+          "NLog": "[5.3.3, )",
-          "NLog": "[5.3.2, )",
           "System.ComponentModel.Annotations": "[5.0.0, )",
           "Torch.API": "[1.0.0, )",
-          "Torch.SixLabors.ImageSharp": "[1.0.0-beta6, )",
+          "Torch.SixLabors.ImageSharp": "[1.0.0-beta6, )"
-          "protobuf-net": "[3.2.30, )"
         }
       },
       "torch.api": {
         "type": "Project",
         "dependencies": {
-          "JetBrains.Annotations": "[2023.3.0, )",
+          "JetBrains.Annotations": "[2024.2.0, )",
-          "Microsoft.Extensions.Configuration.Binder": "[8.0.1, )",
+          "Microsoft.Extensions.Configuration.Binder": "[8.0.2, )",
-          "NLog": "[5.3.2, )",
+          "NLog": "[5.3.3, )",
-          "NuGet.Commands": "[6.9.1, )",
+          "NuGet.Commands": "[6.11.0, )",
-          "NuGet.DependencyResolver.Core": "[6.9.1, )",
+          "NuGet.DependencyResolver.Core": "[6.11.0, )",
           "SemanticVersioning": "[2.0.2, )",
-          "SpaceEngineersDedicated.ReferenceAssemblies": "[1.204.15, )",
+          "SpaceEngineersDedicated.ReferenceAssemblies": "[1.*, )",
-          "System.Linq.Async": "[6.0.1, )",
+          "System.Linq.Async": "[6.0.1, )"
-          "System.Text.Json": "[8.0.3, )"
         }
       }
     },

Torch/Managers/ChatManager/ChatManagerClient.cs

@@ -10,6 +10,7 @@ using Torch.API;
 using Torch.API.Managers;
 using Torch.Utils;
 using VRage.Game;
+using VRage.GameServices;
 using Color = VRageMath.Color;
 
 namespace Torch.Managers.ChatManager
@@ -76,7 +77,7 @@ namespace Torch.Managers.ChatManager
                 _chatMessageRecievedReplacer = _chatMessageReceivedFactory.Invoke();
                 _scriptedChatMessageRecievedReplacer = _scriptedChatMessageReceivedFactory.Invoke();
                 _chatMessageRecievedReplacer.Replace(
-                    new Action<ulong, string, ChatChannel, long, string, ulong?>(Multiplayer_ChatMessageReceived),
+                    new Action<ulong, string, ChatChannel, long, ChatMessageCustomData?>(Multiplayer_ChatMessageReceived),
                     MyMultiplayer.Static);
                 _scriptedChatMessageRecievedReplacer.Replace(
                     new Action<string, string, string, Color>(Multiplayer_ScriptedChatMessageReceived),
@@ -133,14 +134,14 @@ namespace Torch.Managers.ChatManager
         }
 
 
-        private void Multiplayer_ChatMessageReceived(ulong steamUserId, string messageText, ChatChannel channel, long targetId, string customAuthorName, ulong? customSenderId = null)
+        private void Multiplayer_ChatMessageReceived(ulong steamUserId, string messageText, ChatChannel channel, long targetId, ChatMessageCustomData? customData )
         {
 #pragma warning disable CS0612
             var torchMsg = new TorchChatMessage(steamUserId, messageText, channel, targetId,
 #pragma warning restore CS0612
                 (steamUserId == MyGameService.UserId) ? MyFontEnum.DarkBlue : MyFontEnum.Blue);
             if (!RaiseMessageRecieved(torchMsg) && HasHud)
-                _hudChatMessageReceived.Invoke(MyHud.Chat, steamUserId, messageText, channel, targetId, customAuthorName, customSenderId);
+                _hudChatMessageReceived.Invoke(MyHud.Chat, steamUserId, messageText, channel, targetId, customData);
         }
 
         private void Multiplayer_ScriptedChatMessageReceived(string message, string author, string font, Color color)
@@ -165,7 +166,7 @@ namespace Torch.Managers.ChatManager
         protected static bool HasHud => !Sandbox.Engine.Platform.Game.IsDedicated;
 
         [ReflectedMethod(Name = _hudChatMessageReceivedName)]
-        private static Action<MyHudChat, ulong, string, ChatChannel, long, string, ulong?> _hudChatMessageReceived = null!;
+        private static Action<MyHudChat, ulong, string, ChatChannel, long, ChatMessageCustomData?> _hudChatMessageReceived = null!;
         [ReflectedMethod(Name = _hudChatScriptedMessageReceivedName)]
         private static Action<MyHudChat, string, string, string, Color> _hudChatScriptedMessageReceived = null!;
 

Torch/Patches/ScriptCompilerPatch.cs

@@ -45,6 +45,12 @@ namespace Torch.Patches
         private static void WhitelistCtorPrefix(MyScriptCompiler scriptCompiler)
         {
             var baseDir = new FileInfo(typeof(Type).Assembly.Location).DirectoryName!;
+            var binDir =
+#if DEBUG
+                baseDir;
+#else
+                Path.Join(AppContext.BaseDirectory, "torch64");
+#endif
             
             scriptCompiler.AddReferencedAssemblies(
                 typeof(Type).Assembly.Location,
@@ -57,22 +63,22 @@ namespace Torch.Patches
                 typeof(TypeConverter).Assembly.Location,
                 typeof(System.Diagnostics.TraceSource).Assembly.Location,
                 typeof(System.Security.Policy.Evidence).Assembly.Location,
-                Path.Combine(baseDir, "System.Xml.ReaderWriter.dll"),
+                Path.Join(binDir, "System.Xml.ReaderWriter.dll"),
-                Path.Combine(MyFileSystem.ExePath, "ProtoBuf.Net.dll"),
+                Path.Join(MyFileSystem.ExePath, "ProtoBuf.Net.dll"),
-                Path.Combine(MyFileSystem.ExePath, "ProtoBuf.Net.Core.dll"),
+                Path.Join(MyFileSystem.ExePath, "ProtoBuf.Net.Core.dll"),
-                Path.Combine(baseDir, "netstandard.dll"),
+                Path.Join(binDir, "netstandard.dll"),
-                Path.Combine(baseDir, "System.Runtime.dll"),
+                Path.Join(baseDir, "System.Runtime.dll"),
-                Path.Combine(MyFileSystem.ExePath, "Sandbox.Game.dll"),
+                Path.Join(MyFileSystem.ExePath, "Sandbox.Game.dll"),
-                Path.Combine(MyFileSystem.ExePath, "Sandbox.Common.dll"),
+                Path.Join(MyFileSystem.ExePath, "Sandbox.Common.dll"),
-                Path.Combine(MyFileSystem.ExePath, "Sandbox.Graphics.dll"),
+                Path.Join(MyFileSystem.ExePath, "Sandbox.Graphics.dll"),
-                Path.Combine(MyFileSystem.ExePath, "VRage.dll"),
+                Path.Join(MyFileSystem.ExePath, "VRage.dll"),
-                Path.Combine(MyFileSystem.ExePath, "VRage.Library.dll"),
+                Path.Join(MyFileSystem.ExePath, "VRage.Library.dll"),
-                Path.Combine(MyFileSystem.ExePath, "VRage.Math.dll"),
+                Path.Join(MyFileSystem.ExePath, "VRage.Math.dll"),
-                Path.Combine(MyFileSystem.ExePath, "VRage.Game.dll"),
+                Path.Join(MyFileSystem.ExePath, "VRage.Game.dll"),
-                Path.Combine(MyFileSystem.ExePath, "VRage.Render.dll"),
+                Path.Join(MyFileSystem.ExePath, "VRage.Render.dll"),
-                Path.Combine(MyFileSystem.ExePath, "VRage.Input.dll"),
+                Path.Join(MyFileSystem.ExePath, "VRage.Input.dll"),
-                Path.Combine(MyFileSystem.ExePath, "SpaceEngineers.ObjectBuilders.dll"),
+                Path.Join(MyFileSystem.ExePath, "SpaceEngineers.ObjectBuilders.dll"),
-                Path.Combine(MyFileSystem.ExePath, "SpaceEngineers.Game.dll"));
+                Path.Join(MyFileSystem.ExePath, "SpaceEngineers.Game.dll"));
         }
         
         private static bool InitializePrefix(Thread updateThread, Type[] referencedTypes, string[] symbols)

Torch/Plugins/AssemblyRewriter.cs

@@ -19,8 +19,11 @@ internal static class AssemblyRewriter
     {
         _defaultResolver = new();
         _zipResolver = new(_defaultResolver);
-        _defaultResolver.AddSearchDirectory(Directory.GetCurrentDirectory());
+        _defaultResolver.AddSearchDirectory(AppContext.BaseDirectory);
         _defaultResolver.AddSearchDirectory(Path.Combine(Directory.GetCurrentDirectory(), "DedicatedServer64"));
+#if !DEBUG
+        _defaultResolver.AddSearchDirectory(Path.Join(AppContext.BaseDirectory, "torch64"));
+#endif
     }
 
     public static Assembly ProcessWeavers(this Stream stream, ZipArchive archive)
@@ -60,17 +63,17 @@ internal static class AssemblyRewriter
 
     private static Assembly ProcessInternal(Stream inputStream, IAssemblyResolver resolver)
     {
-        using var module = ModuleDefinition.ReadModule(inputStream, new()
+        using var assembly = AssemblyDefinition.ReadAssembly(inputStream, new()
         {
             AssemblyResolver = resolver
         });
-        foreach (var fieldDefinition in FindAllToRewrite(module))
+        foreach (var fieldDefinition in FindAllToRewrite(assembly.MainModule))
         {
             fieldDefinition.IsInitOnly = false;
         }
 
         using var memStream = new MemoryStream();
-        module.Assembly.Write(memStream);
+        assembly.Write(memStream);
         return Assembly.Load(memStream.ToArray());
     }
 

Torch/Torch.csproj

@@ -14,17 +14,15 @@
   <Import Project="..\Torch.Mod\Torch.Mod.projitems" Label="Shared" />
   
   <ItemGroup>
-    <PackageReference Include="MonoMod.RuntimeDetour" Version="25.1.1" />
+    <PackageReference Include="Lib.Harmony.Thin" Version="2.3.3-torch" />
-    <PackageReference Include="HarmonyX" Version="2.10.2-prerelease.7" />
     
     <PackageReference Include="ControlzEx" Version="5.0.2" />
     <PackageReference Include="InfoOf.Fody" Version="2.2.0" PrivateAssets="all" />
     <PackageReference Include="MahApps.Metro" Version="2.4.10" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.9.2" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.11.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
-    <PackageReference Include="NLog" Version="5.3.2" />
+    <PackageReference Include="NLog" Version="5.3.3" />
     <PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="all" />
-    <PackageReference Include="protobuf-net" Version="3.2.30" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageReference Include="Torch.SixLabors.ImageSharp" Version="1.0.0-beta6" />
   </ItemGroup>

Torch/TorchBase.cs

@@ -140,20 +140,6 @@ namespace Torch
                 if (state == TorchGameState.Created) 
                     PatchManager.CommitInternal();
             };
-
-            var harmonyLog = LogManager.GetLogger("HarmonyX");
-            HarmonyLib.Tools.Logger.ChannelFilter = HarmonyLib.Tools.Logger.LogChannel.Debug;
-            HarmonyLib.Tools.Logger.MessageReceived += (_, args) => harmonyLog.Log(args.LogChannel switch
-            {
-                HarmonyLib.Tools.Logger.LogChannel.None => LogLevel.Off,
-                HarmonyLib.Tools.Logger.LogChannel.Info => LogLevel.Info,
-                HarmonyLib.Tools.Logger.LogChannel.IL => LogLevel.Trace,
-                HarmonyLib.Tools.Logger.LogChannel.Warn => LogLevel.Warn,
-                HarmonyLib.Tools.Logger.LogChannel.Error => LogLevel.Error,
-                HarmonyLib.Tools.Logger.LogChannel.Debug => LogLevel.Debug,
-                HarmonyLib.Tools.Logger.LogChannel.All => LogLevel.Debug,
-                _ => throw new ArgumentOutOfRangeException()
-            }, args.Message);
         }
 
         [Obsolete("Prefer using Managers.GetManager for global managers")]
@@ -409,5 +395,15 @@ namespace Torch
 
         /// <inheritdoc/>
         public event TorchGameStateChangedDel GameStateChanged;
+
+        #region Backwards compat
+
+        [Obsolete("Dont use that", true)]
+        internal static void RegisterAuxAssembly(Assembly assembly)
+        {
+            TorchLauncher.RegisterAssembly(assembly);
+        }
+
+        #endregion
     }
 }

Torch/VRageGame.cs

@@ -312,7 +312,7 @@ namespace Torch
 
         private void Destroy()
         {
-            _game.Dispose();
+            _game?.Dispose();
             _game = null;
 
             MyGameService.ShutDown();
@@ -462,6 +462,7 @@ namespace Torch
         public void SignalDestroy()
         {
             _destroyGame = true;
+            if (_game is not null)
                 SignalStop();
             _commandChanged.Set();
         }

Torch/packages.lock.json

@@ -12,15 +12,6 @@
           "System.Text.Json": "5.0.1"
         }
       },
-      "HarmonyX": {
-        "type": "Direct",
-        "requested": "[2.10.2-prerelease.7, )",
-        "resolved": "2.10.2-prerelease.7",
-        "contentHash": "15kgPt5Cqeu7w1CHp4YqlVXuq6FKZj9iZwA/oNd7SaRVwvq2kZ9EODmJ2+U61ZLFasQY7nr2w/latSAv/Pjn/g==",
-        "dependencies": {
-          "MonoMod.RuntimeDetour": "25.1.0-prerelease.1"
-        }
-      },
       "InfoOf.Fody": {
         "type": "Direct",
         "requested": "[2.2.0, )",
@@ -30,6 +21,16 @@
           "Fody": "6.8.0"
         }
       },
+      "Lib.Harmony.Thin": {
+        "type": "Direct",
+        "requested": "[2.3.3-torch, )",
+        "resolved": "2.3.3-torch",
+        "contentHash": "djQtMUpURRgP+Ytf1EgQwu4XnJL3J3bz5kyTVcRDNb632N62/A4CbduG96CUsKhL944yGNAJnLX3zfWldPYOTw==",
+        "dependencies": {
+          "MonoMod.Core": "1.1.0",
+          "System.Text.Json": "8.0.1"
+        }
+      },
       "MahApps.Metro": {
         "type": "Direct",
         "requested": "[2.4.10, )",
@@ -41,43 +42,32 @@
       },
       "Microsoft.CodeAnalysis.Common": {
         "type": "Direct",
-        "requested": "[4.9.2, )",
+        "requested": "[4.11.0, )",
-        "resolved": "4.9.2",
+        "resolved": "4.11.0",
-        "contentHash": "M5PThug7b2AdxL7xKmQs50KzAQTl9jENw5jMT3iUt16k+DAFlw1S87juU3UuPs3gvBm8trMBSOEvSFDr31c9Vw==",
+        "contentHash": "djf8ujmqYImFgB04UGtcsEhHrzVqzHowS+EEl/Yunc5LdrYrZhGBWUTXoCF0NzYXJxtfuD+UVQarWpvrNc94Qg==",
         "dependencies": {
           "Microsoft.CodeAnalysis.Analyzers": "3.3.4",
           "System.Collections.Immutable": "8.0.0",
-          "System.Reflection.Metadata": "8.0.0",
+          "System.Reflection.Metadata": "8.0.0"
-          "System.Runtime.CompilerServices.Unsafe": "6.0.0"
         }
       },
       "Microsoft.CodeAnalysis.CSharp": {
         "type": "Direct",
-        "requested": "[4.9.2, )",
+        "requested": "[4.11.0, )",
-        "resolved": "4.9.2",
+        "resolved": "4.11.0",
-        "contentHash": "HGIo7E9Mf3exAJbUdYpDFfLoYkSVaHDJXPyusWTYUTBaOPCowGw+Gap5McE1w+K+ryIXre72oiqL88sQHmHBmg==",
+        "contentHash": "6XYi2EusI8JT4y2l/F3VVVS+ISoIX9nqHsZRaG6W5aFeJ5BEuBosHfT/ABb73FN0RZ1Z3cj2j7cL28SToJPXOw==",
         "dependencies": {
-          "Microsoft.CodeAnalysis.Common": "[4.9.2]"
+          "Microsoft.CodeAnalysis.Analyzers": "3.3.4",
-        }
+          "Microsoft.CodeAnalysis.Common": "[4.11.0]",
-      },
+          "System.Collections.Immutable": "8.0.0",
-      "MonoMod.RuntimeDetour": {
+          "System.Reflection.Metadata": "8.0.0"
-        "type": "Direct",
-        "requested": "[25.1.1, )",
-        "resolved": "25.1.1",
-        "contentHash": "05oD6LyB3N4eqssBbDHfywNBalBRleX3/HHOQxLhjAyl59tWfZFah2WN0nZ/mrwQ5We3tFIUEHAfbyUxlAbeFw==",
-        "dependencies": {
-          "Mono.Cecil": "0.11.5",
-          "MonoMod.Backports": "1.1.1",
-          "MonoMod.Core": "1.1.1",
-          "MonoMod.ILHelpers": "1.0.1",
-          "MonoMod.Utils": "25.0.5"
         }
       },
       "NLog": {
         "type": "Direct",
-        "requested": "[5.3.2, )",
+        "requested": "[5.3.3, )",
-        "resolved": "5.3.2",
+        "resolved": "5.3.3",
-        "contentHash": "cQRQZuDMjSyMe9EQBnI9v55YAMMz8GAfFd6fFJ6tc/kXnG7Hze8p1I8MgvWSBG6E36wA8vSxRrlm8uSIG+SENg=="
+        "contentHash": "cy0+hlrUbYu+6mgUsILqCcqlJ2Csqyt2lm8y9T9kE8nhgwl8SvR+LM21QX4nmzFCPiowbrTFYxNF8+gWpy7/HQ=="
       },
       "PropertyChanged.Fody": {
         "type": "Direct",
@@ -88,15 +78,6 @@
           "Fody": "6.6.4"
         }
       },
-      "protobuf-net": {
-        "type": "Direct",
-        "requested": "[3.2.30, )",
-        "resolved": "3.2.30",
-        "contentHash": "C/UTlmxEJHAHpqm8xQK1UyJKaIynVCSNG4mVrbLgnZ7ccH28nN49O8iMJvKEodTgVbnimvy+3mIiAdW6mATwnw==",
-        "dependencies": {
-          "protobuf-net.Core": "3.2.30"
-        }
-      },
       "System.ComponentModel.Annotations": {
         "type": "Direct",
         "requested": "[5.0.0, )",
@@ -120,8 +101,8 @@
       },
       "JetBrains.Annotations": {
         "type": "Transitive",
-        "resolved": "2023.3.0",
+        "resolved": "2024.2.0",
-        "contentHash": "PHfnvdBUdGaTVG9bR/GEfxgTwWM0Z97Y6X3710wiljELBISipSfF5okn/vz+C2gfO+ihoEyVPjaJwn8ZalVukA=="
+        "contentHash": "GNnqCFW/163p1fOehKx0CnAqjmpPrUSqrgfHM6qca+P+RN39C9rhlfZHQpJhxmQG/dkOYe/b3Z0P8b6Kv5m1qw=="
       },
       "Microsoft.Bcl.AsyncInterfaces": {
         "type": "Transitive",
@@ -143,8 +124,8 @@
       },
       "Microsoft.Extensions.Configuration.Binder": {
         "type": "Transitive",
-        "resolved": "8.0.1",
+        "resolved": "8.0.2",
-        "contentHash": "2UKFJnLiBt7Od6nCnTqP9rTIUNhzmn9Hv1l2FchyKbz8xieB9ULwZTbQZMw+M24Qw3F5dzzH1U9PPleN0LNLOQ==",
+        "contentHash": "7IQhGK+wjyGrNsPBjJcZwWAr+Wf6D4+TwOptUt77bWtgNkiV8tDEbhFS+dDamtQFZ2X7kWG9m71iZQRj2x3zgQ==",
         "dependencies": {
           "Microsoft.Extensions.Configuration.Abstractions": "8.0.0"
         }
@@ -179,21 +160,21 @@
       },
       "MonoMod.Backports": {
         "type": "Transitive",
-        "resolved": "1.1.1",
+        "resolved": "1.1.0",
-        "contentHash": "lExtjdkld5iWrhYEspoT1bvy0pJ4oBOBkKu+tWKabK1rHvjuS+gjbAd2bG62UGKc0JRBG3myaWtvgIIwYDw1bQ==",
+        "contentHash": "GUAjCrCZEddqHKHFA7Lh61PgTzoKY7gfBShFe0hQe0p8iynHhBK3TWGyRi+QIw/PGfaRPwx6c33CPGFURBVM6g==",
         "dependencies": {
           "MonoMod.ILHelpers": "1.0.1"
         }
       },
       "MonoMod.Core": {
         "type": "Transitive",
-        "resolved": "1.1.1",
+        "resolved": "1.1.0",
-        "contentHash": "7m7RqlxiWHilriKwzbK+F1FZiJG1vvVzfzRktVnoRb4OKYfdRalost/78LYTNOp9htwLgPKojZydRsNlI1/qHw==",
+        "contentHash": "Ks8RntZGVcktr2QF/AovTEbuOkrgXz6omjrvT5LRveOIQJuy+IFuEQPBVWu+cSKVIoZD5XkpRFvlVrItgPIrXw==",
         "dependencies": {
           "Mono.Cecil": "0.11.5",
-          "MonoMod.Backports": "1.1.1",
+          "MonoMod.Backports": "1.1.0",
           "MonoMod.ILHelpers": "1.0.1",
-          "MonoMod.Utils": "25.0.5"
+          "MonoMod.Utils": "25.0.4"
         }
       },
       "MonoMod.ILHelpers": {
@@ -203,11 +184,11 @@
       },
       "MonoMod.Utils": {
         "type": "Transitive",
-        "resolved": "25.0.5",
+        "resolved": "25.0.4",
-        "contentHash": "1lcpjEOiK1dfOxG9DsKkHNcP4G0DZSwtBEOhTGDfszjCvmLzCZqqFQvSzLRpzp3wfTKak+R0K2K5O5TbO0kwvg==",
+        "contentHash": "cB94MaZtFD9u4clYEFTwM4jGXnJnzXsxYF3yBpMZKHhXOas66tMF2frbdYte023i0MH4C5iRJbDjxHmA4x5VgA==",
         "dependencies": {
           "Mono.Cecil": "0.11.5",
-          "MonoMod.Backports": "1.1.1",
+          "MonoMod.Backports": "1.1.0",
           "MonoMod.ILHelpers": "1.0.1"
         }
       },
@@ -218,103 +199,100 @@
       },
       "NuGet.Commands": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "pI2X+KRQYsVcmjJUIAXT+8fvUCZgNWBQiSizKCOltRqaMjtUHLetfADfz7jfreOBohsDxNzhBnNqPQ8MU/Gjxw==",
+        "contentHash": "8GjJQZVbNJuttVynsRWsgqhTZiBbjxRr2PgZ3E7zPxDBmKUazkQ1s/FqScm83w8Xq5OdEtegkU0dZhibfRkKeg==",
         "dependencies": {
           "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0",
           "Microsoft.Extensions.FileSystemGlobbing": "6.0.0",
-          "NuGet.Credentials": "6.9.1",
+          "NuGet.Credentials": "6.11.0",
-          "NuGet.ProjectModel": "6.9.1"
+          "NuGet.ProjectModel": "6.11.0"
         }
       },
       "NuGet.Common": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "FbuWZBjQ1NJXBDqCwSddN2yvw3Plq3sTCIh0nc66Hu8jrNr+BOaxlKZv78jvJ+pSy8BvurYOdF9sl9KoORjrtg==",
+        "contentHash": "T3bCiKUSx8wdYpcqr6Dbx93zAqFp689ee/oa1tH22XI/xl7EUzQ7No/WlE1FUqvEX1+Mqar3wRNAn2O/yxo94g==",
         "dependencies": {
-          "NuGet.Frameworks": "6.9.1"
+          "NuGet.Frameworks": "6.11.0"
         }
       },
       "NuGet.Configuration": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "GM06pcUzWdNsizeGciqCjAhryfI1F/rQPETLDF+8pDRgzVpA+wKAR01/4aFU+IXzugnQ9LqOb5YyCRuR1OVZiQ==",
+        "contentHash": "73QprQqmumFrv3Ooi4YWpRYeBj8jZy9gNdOaOCp4pPInpt41SJJAz/aP4je+StwIJvi5HsgPPecLKekDIQEwKg==",
         "dependencies": {
-          "NuGet.Common": "6.9.1",
+          "NuGet.Common": "6.11.0",
           "System.Security.Cryptography.ProtectedData": "4.4.0"
         }
       },
       "NuGet.Credentials": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "elTErAznCWoqOLILVDN4FTa3+rpVVdUbHUaOUqJkk9+Z/ZSqyDPbCIhLaqTkPkWqoKa93gqzX9IFwURkMphPnw==",
+        "contentHash": "TeMvEyoqkIxDnYJjPCpD48vV5XoDATmyX2kGYYB2MIzWBT24ZjWauTda72hYBzg0OLLiuafxfnNJKGG6IHHzOQ==",
         "dependencies": {
-          "NuGet.Protocol": "6.9.1"
+          "NuGet.Protocol": "6.11.0"
         }
       },
       "NuGet.DependencyResolver.Core": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "gVWIEScv1K40H2Fvs6HGaOzRMpG+r1RUqYpBdh7gqQ18kgsswWUSr90jCNtBb7PUYKkMU1oAhxTslj/gQjO+Vw==",
+        "contentHash": "SoiPKPooA+IF+iCsX1ykwi3M0e+yBL34QnwIP3ujhQEn1dhlP/N1XsYAnKkJPxV15EZCahuuS4HtnBsZx+CHKA==",
         "dependencies": {
-          "NuGet.Configuration": "6.9.1",
+          "NuGet.Configuration": "6.11.0",
-          "NuGet.LibraryModel": "6.9.1",
+          "NuGet.LibraryModel": "6.11.0",
-          "NuGet.Protocol": "6.9.1"
+          "NuGet.Protocol": "6.11.0"
         }
       },
       "NuGet.Frameworks": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "DaKh3lenPUvzGccPkbI97BIvA27z+/UsL3ankfoZlX/4vBVDK5N1sheFTQ+GuJf+IgSzsJz/A21SPUpQLHwUtA=="
+        "contentHash": "Ew/mrfmLF5phsprysHbph2+tdZ10HMHAURavsr/Kx1WhybDG4vmGuoNLbbZMZOqnPRdpyCTc42OKWLoedxpYtA=="
       },
       "NuGet.LibraryModel": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "xlOpbZTc4862vKHkZHLJ5VgDteo+78ftVkajB8rKgSpevnBqwPKv2Y5OfUxct9HCqWYw0ikVfNf/qfjqnQCV1Q==",
+        "contentHash": "KUV2eeMICMb24OPcICn/wgncNzt6+W+lmFVO5eorTdo1qV4WXxYGyG1NTPiCY+Nrv5H/Ilnv9UaUM2ozqSmnjw==",
         "dependencies": {
-          "NuGet.Common": "6.9.1",
+          "NuGet.Common": "6.11.0",
-          "NuGet.Versioning": "6.9.1"
+          "NuGet.Versioning": "6.11.0"
         }
       },
       "NuGet.Packaging": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "6FyasOxKInCELJ+pGy8f17ub9st6ofFeNcBNTo7CRiPJlxyhJfKGKNpfe3HHYwvnZhc3Vdfr0kSR+f1BVGDuTA==",
+        "contentHash": "VmUv2LedVuPY1tfNybORO2I9IuqOzeV7I5JBD+PwNvJq2bAqovi4FCw2cYI0g+kjOJXBN2lAJfrfnqtUOlVJdQ==",
         "dependencies": {
           "Newtonsoft.Json": "13.0.3",
-          "NuGet.Configuration": "6.9.1",
+          "NuGet.Configuration": "6.11.0",
-          "NuGet.Versioning": "6.9.1",
+          "NuGet.Versioning": "6.11.0",
           "System.Security.Cryptography.Pkcs": "6.0.4"
         }
       },
       "NuGet.ProjectModel": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "x98QkS3oloaJfdSsDFOGTH5oeoHHTDoyTO7oyg/7g60be14AQowLqgPQV52Kuscl4lknx/3259RTxyDcbkdifQ==",
+        "contentHash": "g0KtmDH6fas97WsN73yV2h1F5JT9o6+Y0wlPK+ij9YLKaAXaF6+1HkSaQMMJ+xh9/jCJG9G6nau6InOlb1g48g==",
         "dependencies": {
-          "NuGet.DependencyResolver.Core": "6.9.1"
+          "NuGet.DependencyResolver.Core": "6.11.0"
         }
       },
       "NuGet.Protocol": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "h3bdjqUY4jvwM02D/7QM4FR8x/bbf4Pyjrc1Etw7an2OrWKPUSx0vJPdapKzioxIw7GXl/aVUM/DCeIc3S9brA==",
+        "contentHash": "p5B8oNLLnGhUfMbcS16aRiegj11pD6k+LELyRBqvNFR/pE3yR1XT+g1XS33ME9wvoU+xbCGnl4Grztt1jHPinw==",
         "dependencies": {
-          "NuGet.Packaging": "6.9.1"
+          "NuGet.Packaging": "6.11.0"
         }
       },
       "NuGet.Versioning": {
         "type": "Transitive",
-        "resolved": "6.9.1",
+        "resolved": "6.11.0",
-        "contentHash": "ypnSvEtpNGo48bAWn95J1oHChycCXcevFSbn53fqzLxlXFSZP7dawu8p/7mHAfGufZQSV2sBpW80XQGIfXO8kQ=="
+        "contentHash": "v/GGlIj2dd7svplFmASWEueu62veKW0MrMtBaZ7QG8aJTSGv2yE+pgUGhXRcQ4nxNOEq/wLBrz1vkth/1SND7A=="
       },
-      "protobuf-net.Core": {
+      "protobuf-net": {
         "type": "Transitive",
-        "resolved": "3.2.30",
+        "resolved": "1.0.0",
-        "contentHash": "v2ZxxYrz+X212ukSx+uqkLuPu414bvmSAnTyf+PBUKR9ENJxO4P/csorA/27456MCp1JNoMssDj/f91RDiwBfQ==",
+        "contentHash": "kTGOK0E87473sOImOjgZOnz3kTC2aMLffoRWQLYNuBLJnwNNmjanF9IkevZ9Q7yYLeABQfcF3BpeepuMntMVNw=="
-        "dependencies": {
-          "System.Collections.Immutable": "7.0.0"
-        }
       },
       "SemanticVersioning": {
         "type": "Transitive",
@@ -336,8 +314,8 @@
       },
       "SpaceEngineersDedicated.ReferenceAssemblies": {
         "type": "Transitive",
-        "resolved": "1.204.15",
+        "resolved": "1.205.23",
-        "contentHash": "xq1quPCVGi1d4D/iH2iwd8B+1OH5Lqi9H/ld8kaZN8fZ9axz2wtqdq3jYbe9r/FKdSaMhqaERD5W62sHuI9tPA==",
+        "contentHash": "J7mF5hY39PzzCZps6vhIRzKiq8vD6Af9TgumTJR068vjEi+BzyeEFhqX+cl2Dd1ngOmsBtGWc5m+vxgTfs5YuA==",
         "dependencies": {
           "SharpDX": "4.2.0-keen-cringe",
           "protobuf-net": "1.0.0"
@@ -371,8 +349,8 @@
       },
       "System.Runtime.CompilerServices.Unsafe": {
         "type": "Transitive",
-        "resolved": "6.0.0",
+        "resolved": "4.5.1",
-        "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
+        "contentHash": "Zh8t8oqolRaFa9vmOZfdQm/qKejdqz0J9kr7o2Fu0vPeoH3BL1EOXipKWwkWtLT1JPzjByrF19fGuFlNbmPpiw=="
       },
       "System.Security.Cryptography.Pkcs": {
         "type": "Transitive",
@@ -394,8 +372,8 @@
       },
       "System.Text.Json": {
         "type": "Transitive",
-        "resolved": "8.0.3",
+        "resolved": "8.0.1",
-        "contentHash": "hpagS9joOwv6efWfrMmV9MjQXpiXZH72PgN067Ysfr6AWMSD1/1hEcvh/U5mUpPLezEWsOJSuVrmqDIVD958iA==",
+        "contentHash": "7AWk2za1hSEJBppe/Lg+uDcam2TrDqwIKa9XcPssSwyjC2xa39EKEGul3CO5RWNF+hMuZG4zlBDrvhBdDTg4lg==",
         "dependencies": {
           "System.Text.Encodings.Web": "8.0.0"
         }
@@ -403,15 +381,14 @@
       "torch.api": {
         "type": "Project",
         "dependencies": {
-          "JetBrains.Annotations": "[2023.3.0, )",
+          "JetBrains.Annotations": "[2024.2.0, )",
-          "Microsoft.Extensions.Configuration.Binder": "[8.0.1, )",
+          "Microsoft.Extensions.Configuration.Binder": "[8.0.2, )",
-          "NLog": "[5.3.2, )",
+          "NLog": "[5.3.3, )",
-          "NuGet.Commands": "[6.9.1, )",
+          "NuGet.Commands": "[6.11.0, )",
-          "NuGet.DependencyResolver.Core": "[6.9.1, )",
+          "NuGet.DependencyResolver.Core": "[6.11.0, )",
           "SemanticVersioning": "[2.0.2, )",
-          "SpaceEngineersDedicated.ReferenceAssemblies": "[1.204.15, )",
+          "SpaceEngineersDedicated.ReferenceAssemblies": "[1.*, )",
-          "System.Linq.Async": "[6.0.1, )",
+          "System.Linq.Async": "[6.0.1, )"
-          "System.Text.Json": "[8.0.3, )"
         }
       }
     },