add version string normalization

(cherry picked from commit c81f139fe6b5de0c9f7a005dc2cbe576f4ca8f67)

.github/workflows/release.yaml

@@ -0,0 +1,80 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    env:
+      TORCH_VERSION: ${{ github.ref_name }}
+      BUILD_CONFIGURATION: Release
+      DOTNET_NOLOGO: true
+      DOTNET_CLI_TELEMETRY_OPTOUT: true
+    steps:
+      - uses: actions/checkout@master
+        name: Checkout
+      - uses: actions/setup-dotnet@v3
+        name: Setup dotnet
+        with:
+          dotnet-version: '6.0.x'
+      - uses: actions/cache@v1
+        with:
+          path: ~/.nuget/packages
+          key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-nuget-
+      - name: Add Gh Packages Nuget Source
+        run: dotnet nuget add source "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json" --username ${{ github.actor }} --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github
+      - name: Restore dependencies
+        run: dotnet restore Torch.Server/Torch.Server.csproj --use-lock-file
+      - uses: bhowell2/github-substring-action
+        id: normalize_version
+        with:
+          value: ${{ env.TORCH_VERSION }}
+          index_of_str: "v"
+      - name: Build
+        run: dotnet build Torch.Server/Torch.Server.csproj --no-restore -c ${{ env.BUILD_CONFIGURATION }} /p:AssemblyVersion=${{ env.TORCH_VERSION }} /p:Version=${{ steps.normalize_version.outputs.substring }}
+      - name: Publish
+        run: dotnet publish Torch.Server/Torch.Server.csproj --no-build -r win-x64 --sc -c ${{ env.BUILD_CONFIGURATION }} -o ./publish
+      - uses: vimtor/action-zip@v1
+        name: Zip Release
+        with:
+          files: publish/
+          dest: release.zip
+      - name: Build Changelog
+        id: build_changelog
+        uses: mikepenz/release-changelog-builder-action@v3
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          commitMode: true
+      - name: Create release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ env.TORCH_VERSION }}
+          release_name: Release v${{ env.TORCH_VERSION }}
+          body: ${{ steps.github_release.outputs.changelog }}
+          draft: true
+          prerelease: false
+      - name: Upload release asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: release.zip
+          asset_name: torch-server.zip
+          asset_content_type: application/zip
+      - name: Publish release
+        uses: StuYarrow/publish-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          id: ${{ steps.create_release.outputs.id }}

CHANGELOG.md

@@ -1,33 +0,0 @@
-# Torch 1.1.229.265
-* Features
-    - Added more lenient version parsing for plugins (v#.# should work)
-    - Added countdown option to restart command (!restart [seconds])
-* Fixes
-    - General fixes to work with the latest SE version
-    - Fixed config changes not saving
-    - (hopefully) Fixed issue causing crashes on servers using the Windows Classic theme
-
-# Torch 1.1.207.7
-* Notes
-    - This release makes significant changes to TorchConfig.xml. It has been renamed to Torch.cfg and has different options.
-* Features
-    - Plugins, Torch, and the DS can now all update automatically
-    - Changed command prefix to !
-    - Added manual save command (thanks to Maldark)
-    - Added restart command
-    - Improved instance creation: now creates an entire skeleton instance with blank config
-    - Added instance name to console title
-* Fixes
-    - Optimized UI so it's snappier and freezes less often
-    - Fixed NetworkManager.RaiseEvent overload that had an off-by-one bug
-    - Fixed chat window so it automatically scrolls down
-
-# Torch 1.0.182.329
-    * Improved logging, logs now to go the Logs folder and aren't deleted on start
-    * Fixed chat tab not enabling with -autostart
-    * Fixed player list
-    * Watchdog time-out is now configurable in TorchConfig.xml
-    * Fixed infinario log spam
-    * Fixed crash when sending empty message from chat tab
-    * Fixed permissions on Torch commands
-    * Changed plugin StoragePath to the current instance path (per-instance configs)

Jenkins/jenkins-grab-se.ps1

@@ -1,22 +0,0 @@
-pushd
-
-$steamData = "C:/Steam/Data/"
-$steamCMDPath = "C:/Steam/steamcmd/"
-$steamCMDZip = "C:/Steam/steamcmd.zip"
-
-Add-Type -AssemblyName System.IO.Compression.FileSystem
-
-if (!(Test-Path $steamData)) {
-	mkdir "$steamData"
-}
-if (!(Test-Path $steamCMDPath)) {
-	if (!(Test-Path $steamCMDZip)) {
-		(New-Object System.Net.WebClient).DownloadFile("https://steamcdn-a.akamaihd.net/client/installer/steamcmd.zip", "$steamCMDZip");
-	}
-	[System.IO.Compression.ZipFile]::ExtractToDirectory($steamCMDZip, $steamCMDPath)
-}
-
-cd "$steamData"
-& "$steamCMDPath/steamcmd.exe" "+login anonymous" "+force_install_dir $steamData" "+app_update 298740" "+quit"
-
-popd

Jenkins/release.ps1

@@ -1,52 +0,0 @@
-param([string] $ApiBase, [string]$tagName, [string]$authinfo, [string[]] $assetPaths)
-Add-Type -AssemblyName "System.Web"
-
-$headers = @{
-    Authorization = "Basic " + [System.Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes($authinfo))
-    Accept = "application/vnd.github.v3+json"
-}
-try
-{
-	Write-Output("Checking if release with tag " + $tagName + " already exists...")
-	$release = Invoke-RestMethod -Uri ($ApiBase+"releases/tags/$tagName") -Method "GET" -Headers $headers
-	Write-Output("    Using existing release " + $release.id + " at " + $release.html_url)
-} catch {
-	Write-Output("    Doesn't exist")
-	$rel_arg = @{
-	    tag_name=$tagName
-	    name="Generated $tagName"
-	    body=""
-	    draft=$TRUE
-		prerelease=$tagName.Contains("alpha") -or $tagName.Contains("beta")
-	}
-	Write-Output("Creating new release " + $tagName + "...")
-	$release = Invoke-RestMethod -Uri ($ApiBase+"releases") -Method "POST" -Headers $headers -Body (ConvertTo-Json($rel_arg))
-	Write-Output("    Created new release " + $tagName + " at " + $release.html_url)
-}
-
-$assetsApiBase = $release.assets_url
-Write-Output("Checking for existing assets...")
-$existingAssets = Invoke-RestMethod -Uri ($assetsApiBase) -Method "GET" -Headers $headers
-$assetLabels = ($assetPaths | ForEach-Object {[System.IO.Path]::GetFileName($_)})
-foreach ($asset in $existingAssets) {
-	if ($assetLabels -contains $asset.name) {
-		$uri = $asset.url
-		Write-Output("    Deleting old asset " + $asset.name + " (id " + $asset.id + "); URI=" + $uri)
-		$result = Invoke-RestMethod -Uri $uri -Method "DELETE" -Headers $headers
-	}
-}
-Write-Output("Uploading assets...")
-$uploadUrl = $release.upload_url.Substring(0, $release.upload_url.LastIndexOf('{'))
-foreach ($asset in $assetPaths) {
-	$assetName = [System.IO.Path]::GetFileName($asset)
-	$assetType = [System.Web.MimeMapping]::GetMimeMapping($asset)
-	$assetData = [System.IO.File]::ReadAllBytes($asset)
-	$headerExtra = $headers + @{
-		"Content-Type" = $assetType
-		Name = $assetName
-	}
-	$uri = $uploadUrl + "?name=" + $assetName
-	Write-Output("    Uploading " + $asset + " as " + $assetType + "; URI=" + $uri)
-	$result = Invoke-RestMethod -Uri $uri -Method "POST" -Headers $headerExtra -Body $assetData
-	Write-Output("        ID=" + $result.id + ", found at=" + $result.browser_download_url)
-}

Jenkinsfile

@@ -1,73 +0,0 @@
-def packageAndArchive(buildMode, packageName, exclude) {
-	zipFile = "bin\\${packageName}.zip"
-	packageDir = "bin\\${packageName}\\"
-
-	bat "IF EXIST ${zipFile} DEL ${zipFile}"
-	bat "IF EXIST ${packageDir} RMDIR /S /Q ${packageDir}"
-
-	bat "xcopy bin\\x64\\${buildMode} ${packageDir}"
-	if (exclude.length() > 0) {
-		bat "del ${packageDir}${exclude}"
-	}
-	powershell "Add-Type -Assembly System.IO.Compression.FileSystem; [System.IO.Compression.ZipFile]::CreateFromDirectory(\"\$PWD\\${packageDir}\", \"\$PWD\\${zipFile}\")"
-	archiveArtifacts artifacts: zipFile, caseSensitive: false, onlyIfSuccessful: true
-}
-
-node {
-	stage('Checkout') {
-		checkout scm
-		bat 'git pull --tags'
-	}
-
-	stage('Acquire SE') {
-		bat 'powershell -File Jenkins/jenkins-grab-se.ps1'
-		bat 'IF EXIST GameBinaries RMDIR GameBinaries'
-		bat 'mklink /J GameBinaries "C:/Steam/Data/DedicatedServer64/"'		
-	}
-
-	stage('Acquire NuGet Packages') {
-		bat 'nuget restore Torch.sln'
-	}
-
-	stage('Build') {
-		currentBuild.description = bat(returnStdout: true, script: '@powershell -File Versioning/version.ps1').trim()
-		if (env.BRANCH_NAME == "master") {
-			buildMode = "Release"
-		} else {
-			buildMode = "Debug"
-		}
-		bat "IF EXIST \"bin\" rmdir /Q /S \"bin\""
-		bat "IF EXIST \"bin-test\" rmdir /Q /S \"bin-test\""
-		bat "\"${tool 'MSBuild'}msbuild\" Torch.sln /p:Configuration=${buildMode} /p:Platform=x64 /t:Clean"
-		bat "\"${tool 'MSBuild'}msbuild\" Torch.sln /p:Configuration=${buildMode} /p:Platform=x64"
-	}
-
-	stage('Archive') {
-		archiveArtifacts artifacts: "bin/x64/${buildMode}/Torch*", caseSensitive: false, fingerprint: true, onlyIfSuccessful: true
-
-		packageAndArchive(buildMode, "torch-server", "Torch.Client*")
-
-		/*packageAndArchive(buildMode, "torch-client", "Torch.Server*")*/
-	}
-
-	/* Disabled because they fail builds more often than they detect actual problems
-	stage('Test') {
-		bat 'IF NOT EXIST reports MKDIR reports'
-		bat "\"packages/xunit.runner.console.2.2.0/tools/xunit.console.exe\" \"bin-test/x64/${buildMode}/Torch.Tests.dll\" \"bin-test/x64/${buildMode}/Torch.Server.Tests.dll\" \"bin-test/x64/${buildMode}/Torch.Client.Tests.dll\" -parallel none -xml \"reports/Torch.Tests.xml\""
-
-	    step([
-	        $class: 'XUnitBuilder',
-	        thresholdMode: 1,
-	        thresholds: [[$class: 'FailedThreshold', failureThreshold: '1']],
-	        tools: [[
-	            $class: 'XUnitDotNetTestType',
-	            deleteOutputFiles: true,
-	            failIfNotNew: true,
-	            pattern: 'reports/*.xml',
-	            skipNoTestFiles: false,
-	            stopProcessingIfError: true
-	        ]]
-	    ])
-	}
-	*/
-}

NLog.config

@@ -3,18 +3,22 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <variable name="logStamp" value="${time} ${pad:padding=-8:inner=[${level:uppercase=true}]}" />
   <variable name="logContent" value="${message:withException=true}"/>
-
-  <targets async="true">
+  
+  <targets>
+    <default-wrapper xsi:type="AsyncWrapper" overflowAction="Block" optimizeBufferReuse="true" />
     <target xsi:type="Null" name="null" formatMessage="false"  />
-    <target xsi:type="File" name="keen" layout="${var:logStamp} ${logger}: ${var:logContent}" fileName="Logs\Keen-${shortdate}.log" />
-    <target xsi:type="File" name="main" layout="${var:logStamp} ${logger}: ${var:logContent}" fileName="Logs\Torch-${shortdate}.log" />
+    <target xsi:type="File" keepFileOpen="true" concurrentWrites="false" name="keen" layout="${var:logStamp} ${logger}: ${var:logContent}" 
+            fileName="Logs\Keen-${shortdate}.log" />
+    <target xsi:type="File" keepFileOpen="true" concurrentWrites="false" name="main" layout="${var:logStamp} ${logger}: ${var:logContent}" 
+            fileName="Logs\Torch-${shortdate}.log" />
     <target xsi:type="File" name="chat" layout="${longdate} ${message}" fileName="Logs\Chat.log" />
     <target xsi:type="ColoredConsole" name="console" layout="${var:logStamp} ${logger:shortName=true}: ${var:logContent}" />
     <target xsi:type="File" name="patch" layout="${var:logContent}" fileName="Logs\patch.log"/>
-    <target xsi:type="FlowDocument" name="wpf" layout="${var:logStamp} ${logger:shortName=true}: ${var:logContent}" />
+    <target xsi:type="LogViewerTarget" name="wpf" layout="[${level:uppercase=true}] ${logger:shortName=true}: ${var:logContent}" />
   </targets>
 
   <rules>
+    <!-- Do not define custom rules here. Use NLog-user.config -->
     <logger name="Keen" minlevel="Warn" writeTo="main"/>
     <logger name="Keen" minlevel="Info" writeTo="console, wpf"/>
     <logger name="Keen" minlevel="Debug" writeTo="keen" final="true" />

README.md

@@ -1,5 +1,3 @@
-[![Discord](https://discordapp.com/api/guilds/230191591640268800/widget.png)](https://discord.gg/8uHZykr) [![Build Status](http://build.torchapi.net/job/Torch/job/Torch/job/master/badge/icon)](http://build.torchapi.net/job/Torch/job/Torch/job/master/)
-
 # What is Torch?
 Torch is the successor to SE Server Extender and gives server admins the tools they need to keep their Space Engineers servers running smoothly. It features a user interface with live management tools and a plugin system so you can run your server exactly how you'd like. Torch is still in early development so there may be bugs and incomplete features.
 
@@ -12,16 +10,27 @@ Torch is the successor to SE Server Extender and gives server admins the tools t
 * Organized, easy to use configuration editor
 * Extensible using the Torch plugin system
 
+### Fork Difference
+* .NET 6.0 runtime
+* Optimized in-game scripts (also newer compiler & language versions)
+* Better configuration via cli arguments, environment variables or xml config
+* Designed to run multiple instance from same install directory without having you to waste disk space 
+* Mostly compatible with original torch's plugins
+
+### Discord
+
+If you have any questions or issues please join our [discord](https://discord.gg/UyYFSe3TyQ)
+
 ### Installation
 
-* Get the latest Torch release here: https://torchapi.net/download
 * Unzip the Torch release into its own directory and run the executable. It will automatically download the SE DS and generate the other necessary files.
-  - If you already have a DS installed you can unzip the Torch files into the folder that contains the DedicatedServer64 folder.
+  - If you already have a DS installed you can:
+    * Unzip the Torch files into the folder that contains the DedicatedServer64 folder.
+    * Pass path to game files using config parameter `gamePath`
 
 # Building
-To build Torch you must first have a complete SE Dedicated installation somewhere. Before you open the solution, run the Setup batch file and enter the path of that installation's DedicatedServer64 folder. The script will make a symlink to that folder so the Torch solution can find the DLL references it needs.
 
-In both cases you will need to set the InstancePath in TorchConfig.xml to an existing dedicated server instance as Torch can't fully generate it on its own yet.
+As a regular dotnet project with cli by running `dotnet build Torch.Server/Torch.Server.csproj`, with VS 2022 or higher, with JB Rider or Fleet.
+
+If you have a more enjoyable server experience because of Torch, please consider supporting us on Patreon. (https://www.patreon.com/TorchSE)
 
-If you have a more enjoyable server experience because of Torch, please consider supporting us on Patreon.
-[![Patreon](http://i.imgur.com/VzzIMgn.png)](https://www.patreon.com/bePatron?u=847269)!

Setup (run before opening solution).bat

@@ -1,13 +0,0 @@
-:: This script creates a symlink to the game binaries to account for different installation directories on different systems.
-
-@echo off
-set /p path="Please enter the folder location of your SpaceEngineersDedicated.exe: "
-cd %~dp0
-mklink /J GameBinaries "%path%"
-if errorlevel 1 goto Error
-echo Done! You can now open the Torch solution without issue.
-goto End
-:Error
-echo An error occured creating the symlink.
-:End
-pause

Torch.API/IApplicationContext.cs

@@ -0,0 +1,30 @@
+using System.IO;
+namespace Torch.API;
+
+public interface IApplicationContext
+{
+    /// <summary>
+    /// Directory contains torch binaries.
+    /// </summary>
+    public DirectoryInfo TorchDirectory { get; }
+    /// <summary>
+    /// Root directory for all game files.
+    /// </summary>
+    public DirectoryInfo GameFilesDirectory { get; }
+    /// <summary>
+    /// Directory contains game binaries.
+    /// </summary>
+    public DirectoryInfo GameBinariesDirectory { get; }
+    /// <summary>
+    /// Current instance directory.
+    /// </summary>
+    public DirectoryInfo InstanceDirectory { get; }
+    /// <summary>
+    /// Current instance name.
+    /// </summary>
+    public string InstanceName { get; }
+    /// <summary>
+    /// Application running in service mode.
+    /// </summary>
+    public bool IsService { get; }
+}

Torch.API/ITorchBase.cs

@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using Torch.API.Managers;
 using Torch.API.Session;
 using VRage.Game.ModAPI;
+using Version = SemanticVersioning.Version;
 
 namespace Torch.API
 {
@@ -15,30 +16,6 @@ namespace Torch.API
     /// </summary>
     public interface ITorchBase
     {
-        /// <summary>
-        /// Fired when the session begins loading.
-        /// </summary>
-        [Obsolete("Prefer using the TorchSessionManager.SessionStateChanged event")]
-        event Action SessionLoading;
-
-        /// <summary>
-        /// Fired when the session finishes loading.
-        /// </summary>
-        [Obsolete("Prefer using the TorchSessionManager.SessionStateChanged event")]
-        event Action SessionLoaded;
-
-        /// <summary>
-        /// Fires when the session begins unloading.
-        /// </summary>
-        [Obsolete("Prefer using the TorchSessionManager.SessionStateChanged event")]
-        event Action SessionUnloading;
-
-        /// <summary>
-        /// Fired when the session finishes unloading.
-        /// </summary>
-        [Obsolete("Prefer using the TorchSessionManager.SessionStateChanged event")]
-        event Action SessionUnloaded;
-
         /// <summary>
         /// Gets the currently running session instance, or null if none exists.
         /// </summary>
@@ -65,7 +42,17 @@ namespace Torch.API
         /// <summary>
         /// The binary version of the current instance.
         /// </summary>
-        InformationalVersion TorchVersion { get; }
+        Version TorchVersion { get; }
+        
+        /// <summary>
+        /// Path of the dedicated instance folder.
+        /// </summary>
+        string InstancePath { get; }
+        
+        /// <summary>
+        /// Name of the dedicated instance.
+        /// </summary>
+        string InstanceName { get; }
 
         /// <summary>
         /// Invoke an action on the game thread.
@@ -104,7 +91,7 @@ namespace Torch.API
         /// <summary>
         /// Restart the Torch instance, blocking until the restart has been performed.
         /// </summary>
-        void Restart();
+        void Restart(bool save = true);
 
         /// <summary>
         /// Initializes a save of the game.
@@ -145,15 +132,12 @@ namespace Torch.API
         /// </summary>
         ServerState State { get; }
 
-        /// <summary>
-        /// Path of the dedicated instance folder.
-        /// </summary>
-        string InstancePath { get; }
-
         /// <summary>
         /// Raised when the server's Init() method has completed.
         /// </summary>
         event Action<ITorchServer> Initialized;
+        
+        TimeSpan ElapsedPlayTime { get; set; }
     }
 
     /// <summary>

Torch.API/ITorchConfig.cs

@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using Torch.API;
 
 namespace Torch
 {
@@ -8,17 +10,44 @@ namespace Torch
         bool ForceUpdate { get; set; }
         bool GetPluginUpdates { get; set; }
         bool GetTorchUpdates { get; set; }
+        [Obsolete("Use Torch.InstanceName instead")]
         string InstanceName { get; set; }
+        [Obsolete("Use Torch.InstancePath instead")]
         string InstancePath { get; set; }
         bool NoGui { get; set; }
         bool NoUpdate { get; set; }
-        List<string> Plugins { get; set; }
+        List<Guid> Plugins { get; set; }
+        bool LocalPlugins { get; set; }
         bool RestartOnCrash { get; set; }
         bool ShouldUpdatePlugins { get; }
         bool ShouldUpdateTorch { get; }
         int TickTimeout { get; set; }
-        string WaitForPID { get; set; }
+        string ChatName { get; set; }
+        string ChatColor { get; set; }
+        string TestPlugin { get; set; }
+        bool DisconnectOnRestart { get; set; }
+        int WindowWidth { get; set; }
+        int WindowHeight { get; set; }
+        int FontSize { get; set; }
+        UGCServiceType UgcServiceType { get; set; }
+        bool EntityManagerEnabled { get; set; }
+        string LoginToken { get; set; }
+        UpdateSource UpdateSource { get; set; }
+        
+        void Save(string path = null);
+    }
 
-        bool Save(string path = null);
+    public class UpdateSource
+    {
+        public UpdateSourceType SourceType { get; set; }
+        public string Url { get; set; }
+        public string Repository { get; set; }
+        public string Branch { get; set; }
+    }
+
+    public enum UpdateSourceType
+    {
+        Github,
+        Jenkins
     }
 }

Torch.API/InformationalVersion.cs

@@ -1,52 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Torch.API
-{
-    /// <summary>
-    /// Version in the form v#.#.#.#-info
-    /// </summary>
-    public class InformationalVersion
-    {
-        public Version Version { get; set; }
-        public string[] Information { get; set; }
-
-        public static bool TryParse(string input, out InformationalVersion version)
-        {
-            version = default(InformationalVersion);
-            var trim = input.TrimStart('v');
-            var info = trim.Split('-');
-            if (!Version.TryParse(info[0], out Version result))
-                return false;
-
-            version = new InformationalVersion { Version = result };
-
-            if (info.Length > 1)
-                version.Information = info.Skip(1).ToArray();
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public override string ToString()
-        {
-            if (Information == null || Information.Length == 0)
-                return $"v{Version}";
-
-            return $"v{Version}-{string.Join("-", Information)}";
-        }
-
-        public static explicit operator InformationalVersion(Version v)
-        {
-            return new InformationalVersion { Version = v };
-        }
-
-        public static implicit operator Version(InformationalVersion v)
-        {
-            return v.Version;
-        }
-    }
-}

Torch.API/Managers/IChatManagerClient.cs

@@ -4,31 +4,56 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Sandbox.Engine.Multiplayer;
+using Sandbox.Game.Gui;
 using Sandbox.Game.Multiplayer;
+using Torch.Utils;
 using VRage.Game;
 using VRage.Network;
 using VRage.Replication;
+using VRageMath;
+using VRageRender;
 
 namespace Torch.API.Managers
 {
     /// <summary>
     /// Represents a scripted or user chat message.
     /// </summary>
-    public struct TorchChatMessage
+    public readonly struct TorchChatMessage
     {
+        private const string DEFAULT_FONT = MyFontEnum.Blue;
+
+        #region Backwards compatibility
+
+        [Obsolete]
+        public TorchChatMessage(string author, string message, string font = DEFAULT_FONT) 
+            : this(author, message, default, font) { }
+
+        [Obsolete]
+        public TorchChatMessage(string author, ulong authorSteamId, string message, ChatChannel channel, long target, string font = DEFAULT_FONT)
+            : this(author, authorSteamId, message, channel, target, default, font) { }
+
+        [Obsolete]
+        public TorchChatMessage(ulong authorSteamId, string message, ChatChannel channel, long target, string font = DEFAULT_FONT)
+            : this(authorSteamId, message, channel, target, default, font) { }
+
+        #endregion
+        
         /// <summary>
         /// Creates a new torch chat message with the given author and message.
         /// </summary>
         /// <param name="author">Author's name</param>
         /// <param name="message">Message</param>
         /// <param name="font">Font</param>
-        public TorchChatMessage(string author, string message, string font = MyFontEnum.Blue)
+        public TorchChatMessage(string author, string message, Color color, string font = DEFAULT_FONT)
         {
             Timestamp = DateTime.Now;
             AuthorSteamId = null;
             Author = author;
             Message = message;
+            Channel = ChatChannel.Global;
+            Target = 0;
             Font = font;
+            Color = color == default ? ColorUtils.TranslateColor(font) : color;
         }
 
         /// <summary>
@@ -38,13 +63,16 @@ namespace Torch.API.Managers
         /// <param name="authorSteamId">Author's steam ID</param>
         /// <param name="message">Message</param>
         /// <param name="font">Font</param>
-        public TorchChatMessage(string author, ulong authorSteamId, string message, string font = MyFontEnum.Blue)
+        public TorchChatMessage(string author, ulong authorSteamId, string message, ChatChannel channel, long target, Color color, string font = DEFAULT_FONT)
         {
             Timestamp = DateTime.Now;
             AuthorSteamId = authorSteamId;
             Author = author;
             Message = message;
+            Channel = channel;
+            Target = target;
             Font = font;
+            Color = color == default ? ColorUtils.TranslateColor(font) : color;
         }
 
         /// <summary>
@@ -53,13 +81,16 @@ namespace Torch.API.Managers
         /// <param name="authorSteamId">Author's steam ID</param>
         /// <param name="message">Message</param>
         /// <param name="font">Font</param>
-        public TorchChatMessage(ulong authorSteamId, string message, string font = MyFontEnum.Blue)
+        public TorchChatMessage(ulong authorSteamId, string message, ChatChannel channel, long target, Color color, string font = DEFAULT_FONT)
         {
             Timestamp = DateTime.Now;
             AuthorSteamId = authorSteamId;
             Author = MyMultiplayer.Static?.GetMemberName(authorSteamId) ?? "Player";
             Message = message;
+            Channel = channel;
+            Target = target;
             Font = font;
+            Color = color == default ? ColorUtils.TranslateColor(font) : color;
         }
 
         /// <summary>
@@ -79,9 +110,21 @@ namespace Torch.API.Managers
         /// </summary>
         public readonly string Message;
         /// <summary>
+        /// The chat channel the message is part of.
+        /// </summary>
+        public readonly ChatChannel Channel;
+        /// <summary>
+        /// The intended recipient of the message.
+        /// </summary>
+        public readonly long Target;
+        /// <summary>
         /// The font, or null if default.
         /// </summary>
         public readonly string Font;
+        /// <summary>
+        /// The chat message color.
+        /// </summary>
+        public readonly Color Color;
     }
 
     /// <summary>

Torch.API/Managers/IChatManagerServer.cs

@@ -3,7 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using VRage.Collections;
+using VRage.Game;
 using VRage.Network;
+using VRageMath;
 
 namespace Torch.API.Managers
 {
@@ -33,13 +36,36 @@ namespace Torch.API.Managers
         void SendMessageAsOther(ulong authorId, string message, ulong targetSteamId = 0);
 
 
+        [Obsolete("Use the other overload with a Color parameter.")]
+        void SendMessageAsOther(string author, string message, string font, ulong targetSteamId = 0);
+        
         /// <summary>
         /// Sends a scripted message with the given author and message to the given player, or all players by default.
         /// </summary>
         /// <param name="author">Author name</param>
         /// <param name="message">The message to send</param>
+        /// <param name="color">Name color</param>
         /// <param name="font">Font to use</param>
         /// <param name="targetSteamId">Player to send the message to, or everyone by default</param>
-        void SendMessageAsOther(string author, string message, string font, ulong targetSteamId = 0);
+        void SendMessageAsOther(string author, string message, Color color = default, ulong targetSteamId = 0, string font = MyFontEnum.White);
+
+        /// <summary>
+        /// Mute user from global chat.
+        /// </summary>
+        /// <param name="steamId"></param>
+        /// <returns></returns>
+        bool MuteUser(ulong steamId);
+
+        /// <summary>
+        /// Unmute user from global chat.
+        /// </summary>
+        /// <param name="steamId"></param>
+        /// <returns></returns>
+        bool UnmuteUser(ulong steamId);
+
+        /// <summary>
+        /// Users which are not allowed to chat.
+        /// </summary>
+        HashSetReader<ulong> MutedUsers { get; }
     }
 }

Torch.API/Managers/IInstanceManager.cs

@@ -0,0 +1,20 @@
+using VRage.Game;
+
+namespace Torch.API.Managers;
+
+public interface IInstanceManager : IManager
+{
+    IWorld SelectedWorld { get; } 
+    void LoadInstance(string path, bool validate = true);
+    void SelectCreatedWorld(string worldPath);
+    void SelectWorld(string worldPath, bool modsOnly = true);
+    void ImportSelectedWorldConfig();
+    void SaveConfig();
+}
+
+public interface IWorld
+{
+    string WorldPath { get; }
+    MyObjectBuilder_SessionSettings KeenSessionSettings { get; }
+    MyObjectBuilder_Checkpoint KeenCheckpoint { get; }
+}

Torch.API/Managers/IMultiplayerManagerServer.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using VRage.Game.ModAPI;
 
 namespace Torch.API.Managers
 {
@@ -21,6 +22,25 @@ namespace Torch.API.Managers
         /// </summary>
         void BanPlayer(ulong steamId, bool banned = true);
 
+        /// <summary>
+        /// Promotes user if possible.
+        /// </summary>
+        /// <param name="steamId"></param>
+        void PromoteUser(ulong steamId);
+
+        /// <summary>
+        /// Demotes user if possible.
+        /// </summary>
+        /// <param name="steamId"></param>
+        void DemoteUser(ulong steamId);
+
+        /// <summary>
+        /// Gets a user's promote level.
+        /// </summary>
+        /// <param name="steamId"></param>
+        /// <returns></returns>
+        MyPromoteLevel GetUserPromoteLevel(ulong steamId);
+
         /// <summary>
         /// List of the banned SteamID's
         /// </summary>        
@@ -42,5 +62,10 @@ namespace Torch.API.Managers
         /// Raised when a player is banned or unbanned. Passes SteamID of player, and true if banned, false if unbanned.
         /// </summary>
         event Action<ulong, bool> PlayerBanned;
+
+        /// <summary>
+        /// Raised when a player is promoted or demoted. Passes SteamID of player, and new promote level.
+        /// </summary>
+        event Action<ulong, MyPromoteLevel> PlayerPromoted;
     }
 }

Torch.API/ModAPI/TorchAPI.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices.WindowsRuntime;
 using System.Text;
 using System.Threading.Tasks;
 

Torch.API/Plugins/ITorchPlugin.cs

@@ -34,5 +34,22 @@ namespace Torch.API.Plugins
         /// This is called on the game thread after each tick.
         /// </summary>
         void Update();
+
+        /// <summary>
+        /// Plugin's enabled state. Mainly for UI niceness
+        /// </summary>
+        PluginState State { get; }
+    }
+
+    public enum PluginState
+    {
+         NotInitialized,
+         DisabledError,
+         DisabledUser,
+         UpdateRequired,
+         UninstallRequested,
+         NotInstalled,
+         MissingDependency,
+         Enabled
     }
 }

Torch.API/Properties/AssemblyInfo.cs

@@ -1,17 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("Torch API")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Torch")]
-[assembly: AssemblyCopyright("Copyright © Torch API 2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
-
-#if DEBUG
-[assembly: AssemblyConfiguration("Debug")]
-#else
-[assembly: AssemblyConfiguration("Release")]
-#endif

Torch.API/Session/ITorchSession.cs

@@ -22,6 +22,11 @@ namespace Torch.API.Session
         /// The Space Engineers game session this session is bound to.
         /// </summary>
         MySession KeenSession { get; }
+        
+        /// <summary>
+        /// Currently running world
+        /// </summary>
+        IWorld World { get; }
 
         /// <inheritdoc cref="IDependencyManager"/>
         IDependencyManager Managers { get; }

Torch.API/Session/ITorchSessionManager.cs

@@ -1,9 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Torch.API.Managers;
+using VRage.Game;
 
 namespace Torch.API.Session
 {
@@ -47,5 +49,29 @@ namespace Torch.API.Session
         /// <returns>true if removed, false if not present</returns>
         /// <exception cref="ArgumentNullException">If the factory is null</exception>
         bool RemoveFactory(SessionManagerFactoryDel factory);
+
+        /// <summary>
+        /// Add a mod to be injected into client's world download.
+        /// </summary>
+        /// <param name="modId"></param>
+        /// <returns></returns>
+        bool AddOverrideMod(ulong modId);
+        
+        /// <summary>
+        /// Removes a mod from the injected mod list.
+        /// </summary>
+        /// <param name="modId"></param>
+        /// <returns></returns>
+        bool RemoveOverrideMod(ulong modId);
+        
+        /// <summary>
+        /// List over mods that will be injected into client world downloads.
+        /// </summary>
+        IReadOnlyCollection<MyObjectBuilder_Checkpoint.ModItem> OverrideMods { get; }
+
+        /// <summary>
+        /// Event raised when injected mod list changes.
+        /// </summary>
+        event Action<CollectionChangeEventArgs> OverrideModsChanged;
     }
 }

Torch.API/Torch.API.csproj

@@ -1,201 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <ProjectGuid>{FBA5D932-6254-4A1E-BAF4-E229FA94E3C2}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Torch.API</RootNamespace>
-    <AssemblyName>Torch.API</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <TargetFramework>net6-windows</TargetFramework>
+    <LangVersion>10</LangVersion>
+    <AssemblyTitle>Torch API</AssemblyTitle>
+    <Product>Torch</Product>
+    <Copyright>Copyright © Torch API 2017</Copyright>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <OutputPath>..\bin\$(Platform)\$(Configuration)\</OutputPath>
+    <UseWpf>True</UseWpf>
+    <EnableWindowsTargeting>true</EnableWindowsTargeting>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(SolutionDir)\bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>$(SolutionDir)\bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>$(SolutionDir)\bin\x64\Release\Torch.API.xml</DocumentationFile>
+  
+  <PropertyGroup Condition="$(Configuration) == 'Release'">
+    <NoWarn>1591</NoWarn>
   </PropertyGroup>
+  
   <ItemGroup>
-    <Reference Include="HavokWrapper, Version=1.0.6278.22649, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\HavokWrapper.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.12\lib\net45\NLog.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="Sandbox.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\Sandbox.Common.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Sandbox.Game, Version=0.1.6305.30774, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\Sandbox.Game.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Sandbox.Graphics, Version=0.1.6305.30761, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\Sandbox.Graphics.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="SpaceEngineers.Game, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\SpaceEngineers.Game.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="SpaceEngineers.ObjectBuilders, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\SpaceEngineers.ObjectBuilders.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="SpaceEngineers.ObjectBuilders.XmlSerializers, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\SpaceEngineers.ObjectBuilders.XmlSerializers.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Transactions" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-    <Reference Include="VRage">
-      <HintPath>..\GameBinaries\VRage.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.Audio, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\VRage.Audio.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.Dedicated">
-      <HintPath>..\GameBinaries\VRage.Dedicated.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.Game, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\VRage.Game.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.Game.XmlSerializers, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\VRage.Game.XmlSerializers.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.Input, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\VRage.Input.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.Library">
-      <HintPath>..\GameBinaries\VRage.Library.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.Math, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\VRage.Math.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.Native, Version=0.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\VRage.Native.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.OpenVRWrapper, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\VRage.OpenVRWrapper.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.Render, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\VRage.Render.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.Render11, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\VRage.Render11.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.Scripting, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\VRage.Scripting.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
+    <PackageReference Include="JorgeSerrano.Json.JsonSnakeCaseNamingPolicy" Version="0.9.0" />
+    <PackageReference Include="NLog" Version="5.0.4" />
+    <PackageReference Include="SemanticVersioning" Version="2.0.2" />
+    <PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.201.13">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>compile</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Versioning\AssemblyVersion.cs">
-      <Link>Properties\AssemblyVersion.cs</Link>
-    </Compile>
-    <Compile Include="ConnectionState.cs" />
-    <Compile Include="InformationalVersion.cs" />
-    <Compile Include="ITorchConfig.cs" />
-    <Compile Include="Managers\DependencyManagerExtensions.cs" />
-    <Compile Include="Managers\DependencyProviderExtensions.cs" />
-    <Compile Include="Event\EventHandlerAttribute.cs" />
-    <Compile Include="Event\IEvent.cs" />
-    <Compile Include="Event\IEventHandler.cs" />
-    <Compile Include="Managers\IChatManagerClient.cs" />
-    <Compile Include="Managers\IChatManagerServer.cs" />
-    <Compile Include="Managers\IDependencyManager.cs" />
-    <Compile Include="Managers\IDependencyProvider.cs" />
-    <Compile Include="Event\IEventManager.cs" />
-    <Compile Include="Managers\IManager.cs" />
-    <Compile Include="Managers\IMultiplayerManagerClient.cs" />
-    <Compile Include="Managers\IMultiplayerManagerBase.cs" />
-    <Compile Include="IPlayer.cs" />
-    <Compile Include="Managers\IMultiplayerManagerServer.cs" />
-    <Compile Include="Managers\INetworkManager.cs" />
-    <Compile Include="Managers\IPluginManager.cs" />
-    <Compile Include="Plugins\ITorchPlugin.cs" />
-    <Compile Include="IServerControls.cs" />
-    <Compile Include="ITorchBase.cs" />
-    <Compile Include="Plugins\IWpfPlugin.cs" />
-    <Compile Include="ModAPI\Ingame\GridExtensions.cs" />
-    <Compile Include="Plugins\PluginAttribute.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ServerState.cs" />
-    <Compile Include="ModAPI\TorchAPI.cs" />
-    <Compile Include="Session\GameSaveResult.cs" />
-    <Compile Include="Session\ITorchSession.cs" />
-    <Compile Include="Session\ITorchSessionManager.cs" />
-    <Compile Include="Session\TorchSessionState.cs" />
-    <Compile Include="TorchGameState.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\TransformOnBuild.targets" />
 </Project>

Torch.API/UGCServiceType.cs

@@ -0,0 +1,8 @@
+namespace Torch.API
+{
+    public enum UGCServiceType
+    {
+        Steam,
+        EOS
+    }
+}

Torch.API/Utils/ColorUtils.cs

@@ -0,0 +1,40 @@
+using System.Windows.Media;
+using VRage.Game;
+using Color = VRageMath.Color;
+
+namespace Torch.Utils
+{
+    public static class ColorUtils
+    {
+        /// <summary>
+        /// Convert the old "font" or a RGB hex code to a Color.
+        /// </summary>
+        public static Color TranslateColor(string font)
+        {
+            if (StringUtils.IsFontEnum(font))
+            {
+                // RGB values copied from Fonts.sbc
+                switch (font)
+                {
+                    case MyFontEnum.Blue:
+                        return new Color(220, 244, 252);
+                    case MyFontEnum.Red:
+                        return new Color(227, 65, 65);
+                    case MyFontEnum.Green:
+                        return new Color(101, 182, 193);
+                    case MyFontEnum.DarkBlue:
+                        return new Color(94, 115, 127);
+                    default:
+                        return Color.White;
+                }
+            }
+            else
+            {
+                // VRage color doesn't have its own hex code parser and I don't want to write one
+                var conv = (System.Windows.Media.Color)(ColorConverter.ConvertFromString(font) ?? 
+                                                        System.Windows.Media.Color.FromRgb(255, 255, 255));
+                return new Color(conv.R, conv.G, conv.B);
+            }
+        }
+    }
+}

Torch.API/Utils/SemanticVersionConverter.cs

@@ -0,0 +1,21 @@
+#nullable enable
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Version = SemanticVersioning.Version;
+
+namespace Torch.API.Utils;
+
+public class SemanticVersionConverter : JsonConverter<Version>
+{
+    public override Version? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        Version.TryParse(reader.GetString(), out var ver);
+        return ver;
+    }
+
+    public override void Write(Utf8JsonWriter writer, Version value, JsonSerializerOptions options)
+    {
+        writer.WriteStringValue(value.ToString());
+    }
+}

Torch.API/Utils/StringUtils.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -60,5 +61,13 @@ namespace Torch.Utils
             }
             return builder?.ToString() ?? "";
         }
+
+        private static string[] FontEnumValues => _fontEnumValues ?? (_fontEnumValues = typeof(VRage.Game.MyFontEnum).GetFields(BindingFlags.Public | BindingFlags.Static).Where(x => x.IsLiteral && !x.IsInitOnly).Select(x => (string)x.GetValue(null)).ToArray());
+
+        private static string[] _fontEnumValues;
+        public static bool IsFontEnum(string str)
+        {
+            return FontEnumValues.Contains(str);
+        }
     }
 }

Torch.API/WebAPI/GithubQuery.cs

@@ -0,0 +1,128 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Net.Http.Json;
+using System.Text.Json;
+using System.Threading.Tasks;
+using JorgeSerrano.Json;
+using Version = SemanticVersioning.Version;
+
+namespace Torch.API.WebAPI;
+
+public class GithubQuery : IUpdateQuery
+{
+    private readonly HttpClient _client;
+
+    public GithubQuery(string url)
+    {
+        if (url == null) throw new ArgumentNullException(nameof(url));
+        
+        _client = new()
+        {
+            BaseAddress = new(url),
+            DefaultVersionPolicy = HttpVersionPolicy.RequestVersionOrHigher,
+            DefaultRequestHeaders =
+            {
+                {"User-Agent", "TorchAPI"}
+            }
+        };
+    }
+
+    public void Dispose()
+    {
+        _client?.Dispose();
+    }
+
+    public async Task<UpdateRelease> GetLatestReleaseAsync(string repository, string branch = null)
+    {
+        var response = await _client.GetFromJsonAsync<Release>($"/repos/{repository}/releases/latest", new JsonSerializerOptions(JsonSerializerDefaults.Web)
+        {
+            PropertyNamingPolicy = new JsonSnakeCaseNamingPolicy()
+        });
+
+        if (response is null)
+            throw new($"Unable to get latest release for {repository}");
+
+        return new(Version.Parse(response.TagName), response.Assets.First(b => b.Name == "torch-server.zip").BrowserDownloadUrl);
+    }
+    
+    private record Asset(
+        string Url,
+        int Id,
+        string NodeId,
+        string Name,
+        string Label,
+        Uploader Uploader,
+        string ContentType,
+        string State,
+        int Size,
+        int DownloadCount,
+        DateTime CreatedAt,
+        DateTime UpdatedAt,
+        string BrowserDownloadUrl
+    );
+    
+    private record Author(
+        string Login,
+        int Id,
+        string NodeId,
+        string AvatarUrl,
+        string GravatarId,
+        string Url,
+        string HtmlUrl,
+        string FollowersUrl,
+        string FollowingUrl,
+        string GistsUrl,
+        string StarredUrl,
+        string SubscriptionsUrl,
+        string OrganizationsUrl,
+        string ReposUrl,
+        string EventsUrl,
+        string ReceivedEventsUrl,
+        string Type,
+        bool SiteAdmin
+    );
+    
+    private record Release(
+        string Url,
+        string AssetsUrl,
+        string UploadUrl,
+        string HtmlUrl,
+        int Id,
+        Author Author,
+        string NodeId,
+        string TagName,
+        string TargetCommitish,
+        string Name,
+        bool Draft,
+        bool Prerelease,
+        DateTime CreatedAt,
+        DateTime PublishedAt,
+        IReadOnlyList<Asset> Assets,
+        string TarballUrl,
+        string ZipballUrl,
+        string Body
+    );
+    
+    private record Uploader(
+        string Login,
+        int Id,
+        string NodeId,
+        string AvatarUrl,
+        string GravatarId,
+        string Url,
+        string HtmlUrl,
+        string FollowersUrl,
+        string FollowingUrl,
+        string GistsUrl,
+        string StarredUrl,
+        string SubscriptionsUrl,
+        string OrganizationsUrl,
+        string ReposUrl,
+        string EventsUrl,
+        string ReceivedEventsUrl,
+        string Type,
+        bool SiteAdmin
+    );
+}

Torch.API/WebAPI/IUpdateQuery.cs

@@ -0,0 +1,9 @@
+using System;
+using System.Threading.Tasks;
+
+namespace Torch.API.WebAPI;
+
+public interface IUpdateQuery : IDisposable
+{
+    Task<UpdateRelease> GetLatestReleaseAsync(string repository, string branch = null);
+}

Torch.API/WebAPI/JenkinsQuery.cs

@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Net.Http.Json;
+using System.Text.Json.Serialization;
+using System.Threading.Tasks;
+using Torch.API.Utils;
+using Version = SemanticVersioning.Version;
+
+namespace Torch.API.WebAPI
+{
+    public class JenkinsQuery : IUpdateQuery
+    {
+        private const string ApiPath = "api/json";
+        private readonly HttpClient _client;
+        
+        public JenkinsQuery(string url)
+        {
+            if (url == null) throw new ArgumentNullException(nameof(url));
+            
+            _client = new()
+            {
+                BaseAddress = new(url)
+            };
+        }
+
+        public async Task<UpdateRelease> GetLatestReleaseAsync(string repository, string branch = null)
+        {
+            branch ??= "master";
+
+            var response = await _client.GetFromJsonAsync<BranchResponse>($"/job/{repository}/job/{branch}/{ApiPath}");
+
+            if (response is null)
+                throw new($"Unable to get latest release for {repository}");
+
+            var job = await _client.GetFromJsonAsync<Job>(
+                $"/job/{repository}/job/{branch}/{response.LastBuild.Number}/{ApiPath}");
+            
+            if (job is null)
+                throw new($"Unable to get latest release for job {repository}/{response.LastBuild.Number}");
+
+            return new(job.Version, job.Url + job.Artifacts.First(b => b.FileName == "torch-server.zip").RelativePath);
+        }
+
+        public void Dispose()
+        {
+            _client?.Dispose();
+        }
+    }
+
+    public record BranchResponse(string Name, string Url, Build LastBuild, Build LastStableBuild);
+
+    public record Build(int Number, string Url);
+
+    public record Job(int Number, bool Building, string Description, string Result, string Url,
+        [property: JsonConverter(typeof(SemanticVersionConverter))] Version Version,
+                      IReadOnlyList<Artifact> Artifacts);
+    
+    public record Artifact(
+        string DisplayPath,
+        string FileName,
+        string RelativePath
+    );
+}

Torch.API/WebAPI/PluginQuery.cs

@@ -0,0 +1,104 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Net.Http.Json;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.Threading;
+using System.Threading.Tasks;
+using NLog;
+
+namespace Torch.API.WebAPI
+{
+    public class PluginQuery
+    {
+        private const string ALL_QUERY = "https://torchapi.com/api/plugins/";
+        private const string PLUGIN_QUERY = "https://torchapi.com/api/plugins/search/{0}";
+        private readonly HttpClient _client;
+        private static readonly Logger Log = LogManager.GetCurrentClassLogger();
+
+        private static PluginQuery _instance;
+        public static PluginQuery Instance => _instance ??= new();
+
+        private PluginQuery()
+        {
+            _client = new();
+        }
+
+        public async Task<PluginsResponse> QueryAll()
+        {
+            return (PluginsResponse) await _client.GetFromJsonAsync(ALL_QUERY, typeof(PluginsResponse), CancellationToken.None);
+        }
+
+        public Task<PluginItem> QueryOne(Guid guid)
+        {
+            return QueryOne(guid.ToString());
+        }
+
+        public async Task<PluginItem> QueryOne(string guid)
+        {
+            using var res = await _client.GetAsync(string.Format(PLUGIN_QUERY, guid));
+            if (!res.IsSuccessStatusCode)
+                return null;
+            return await res.Content.ReadFromJsonAsync<PluginItem>();
+        }
+
+        public Task<bool> DownloadPlugin(Guid guid, string path = null)
+        {
+            return DownloadPlugin(guid.ToString(), path);
+        }
+
+        public async Task<bool> DownloadPlugin(string guid, string path = null)
+        {
+            var item = await QueryOne(guid);
+            if (item is null) return false;
+            return await DownloadPlugin(item, path);
+        }
+
+        public async Task<bool> DownloadPlugin(PluginItem item, string path = null)
+        {
+            try
+            {
+                path ??= Path.Combine(AppContext.BaseDirectory, "Plugins", $"{item.Name}.zip");
+                
+                if (item.Versions.Length == 0)
+                {
+                    Log.Error($"Selected plugin {item.Name} does not have any versions to download!");
+                    return false;
+                }
+                var version = item.Versions.FirstOrDefault(v => v.Version == item.LatestVersion);
+                if (version is null)
+                {
+                    Log.Error($"Could not find latest version for selected plugin {item.Name}");
+                    return false;
+                }
+                var s = await _client.GetStreamAsync(version.Url);
+
+                if(File.Exists(path))
+                    File.Delete(path);
+
+                await using var f = File.Create(path);
+                await s.CopyToAsync(f);
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex, "Failed to download plugin!");
+            }
+
+            return true;
+        }
+    }
+
+    public record PluginsResponse(PluginItem[] Plugins);
+
+    public record PluginItem(Guid Id, string Name, string Author, string Description, string LatestVersion,
+        VersionItem[] Versions)
+    {
+        [JsonIgnore]
+        public bool Installed { get; set; }
+    }
+
+    public record VersionItem(string Version, string Note, [property: JsonPropertyName("is_beta")] bool IsBeta,
+        string Url);
+}

Torch.API/WebAPI/UpdateRelease.cs

@@ -0,0 +1,5 @@
+using SemanticVersioning;
+
+namespace Torch.API.WebAPI;
+
+public record UpdateRelease(Version Version, string ArtifactUrl);

Torch.API/packages.config

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Mono.TextTransform" version="1.0.0" targetFramework="net461" />
-  <package id="NLog" version="4.4.12" targetFramework="net461" />
-</packages>

Torch.Client.Tests/Properties/AssemblyInfo.cs

@@ -1,17 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("Torch Client Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Torch")]
-[assembly: AssemblyCopyright("Copyright © Torch API 2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
-
-#if DEBUG
-[assembly: AssemblyConfiguration("Debug")]
-#else
-[assembly: AssemblyConfiguration("Release")]
-#endif

Torch.Client.Tests/Torch.Client.Tests.csproj

@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <ProjectGuid>{632E78C0-0DAC-4B71-B411-2F1B333CC310}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Torch.Client.Tests</RootNamespace>
-    <AssemblyName>Torch.Client.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <NoWarn>1591,0649</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(SolutionDir)\bin-test\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>$(SolutionDir)\bin-test\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>$(SolutionDir)\bin-test\x64\Release\Torch.Client.Tests.xml</DocumentationFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.12\lib\net45\NLog.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.assert, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.core, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.core.2.2.0\lib\netstandard1.1\xunit.core.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.execution.2.2.0\lib\net452\xunit.execution.desktop.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Versioning\AssemblyVersion.cs">
-      <Link>Properties\AssemblyVersion.cs</Link>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TorchClientReflectionTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Torch.API\Torch.API.csproj">
-      <Project>{fba5d932-6254-4a1e-baf4-e229fa94e3c2}</Project>
-      <Name>Torch.API</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Torch.Client\Torch.Client.csproj">
-      <Project>{e36df745-260b-4956-a2e8-09f08b2e7161}</Project>
-      <Name>Torch.Client</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Torch.Tests\Torch.Tests.csproj">
-      <Project>{c3c8b671-6ad1-44aa-a8da-e0c0dc0fedf5}</Project>
-      <Name>Torch.Tests</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Torch\Torch.csproj">
-      <Project>{7e01635c-3b67-472e-bcd6-c5539564f214}</Project>
-      <Name>Torch</Name>
-      <Private>True</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\TransformOnBuild.targets" />
-</Project>

Torch.Client.Tests/TorchClientReflectionTest.cs

@@ -1,94 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Torch.Client;
-using Torch.Tests;
-using Torch.Utils;
-using Xunit;
-
-namespace Torch.Client.Tests
-{
-    public class TorchClientReflectionTest
-    {
-        static TorchClientReflectionTest()
-        {
-            TestUtils.Init();
-        }
-
-        private static ReflectionTestManager _manager;
-
-        private static ReflectionTestManager Manager()
-        {
-            if (_manager != null)
-                return _manager;
-
-            return _manager = new ReflectionTestManager().Init(typeof(TorchClient).Assembly);
-        }
-
-        public static IEnumerable<object[]> Getters => Manager().Getters;
-
-        public static IEnumerable<object[]> Setters => Manager().Setters;
-
-        public static IEnumerable<object[]> Invokers => Manager().Invokers;
-
-        public static IEnumerable<object[]> MemberInfo => Manager().MemberInfo;
-
-        public static IEnumerable<object[]> Events => Manager().Events;
-
-        #region Binding
-        [Theory]
-        [MemberData(nameof(Getters))]
-        public void TestBindingGetter(ReflectionTestManager.FieldRef field)
-        {
-            if (field.Field == null)
-                return;
-            Assert.True(ReflectedManager.Process(field.Field));
-            if (field.Field.IsStatic)
-                Assert.NotNull(field.Field.GetValue(null));
-        }
-
-        [Theory]
-        [MemberData(nameof(Setters))]
-        public void TestBindingSetter(ReflectionTestManager.FieldRef field)
-        {
-            if (field.Field == null)
-                return;
-            Assert.True(ReflectedManager.Process(field.Field));
-            if (field.Field.IsStatic)
-                Assert.NotNull(field.Field.GetValue(null));
-        }
-
-        [Theory]
-        [MemberData(nameof(Invokers))]
-        public void TestBindingInvoker(ReflectionTestManager.FieldRef field)
-        {
-            if (field.Field == null)
-                return;
-            Assert.True(ReflectedManager.Process(field.Field));
-            if (field.Field.IsStatic)
-                Assert.NotNull(field.Field.GetValue(null));
-        }
-
-        [Theory]
-        [MemberData(nameof(MemberInfo))]
-        public void TestBindingMemberInfo(ReflectionTestManager.FieldRef field)
-        {
-            if (field.Field == null)
-                return;
-            Assert.True(ReflectedManager.Process(field.Field));
-            if (field.Field.IsStatic)
-                Assert.NotNull(field.Field.GetValue(null));
-        }
-
-        [Theory]
-        [MemberData(nameof(Events))]
-        public void TestBindingEvents(ReflectionTestManager.FieldRef field)
-        {
-            if (field.Field == null)
-                return;
-            Assert.True(ReflectedManager.Process(field.Field));
-            if (field.Field.IsStatic)
-                ((Func<ReflectedEventReplacer>)field.Field.GetValue(null)).Invoke();
-        }
-        #endregion
-    }
-}

Torch.Client.Tests/packages.config

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Mono.TextTransform" version="1.0.0" targetFramework="net461" />
-  <package id="NLog" version="4.4.12" targetFramework="net461" />
-  <package id="xunit" version="2.2.0" targetFramework="net461" />
-  <package id="xunit.abstractions" version="2.0.1" targetFramework="net461" />
-  <package id="xunit.assert" version="2.2.0" targetFramework="net461" />
-  <package id="xunit.core" version="2.2.0" targetFramework="net461" />
-  <package id="xunit.extensibility.core" version="2.2.0" targetFramework="net461" />
-  <package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net461" />
-  <package id="xunit.runner.console" version="2.2.0" targetFramework="net461" developmentDependency="true" />
-</packages>

Torch.Client/Manager/MultiplayerManagerClient.cs

@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Sandbox.Engine.Multiplayer;
-using Torch.API;
-using Torch.API.Managers;
-using Torch.Managers;
-
-namespace Torch.Client.Manager
-{
-    public class MultiplayerManagerClient : MultiplayerManagerBase, IMultiplayerManagerClient
-    {
-        /// <inheritdoc />
-        public MultiplayerManagerClient(ITorchBase torch) : base(torch) { }
-
-        /// <inheritdoc />
-        public override void Attach()
-        {
-            base.Attach();
-            MyMultiplayer.Static.ClientJoined += RaiseClientJoined;
-        }
-
-        /// <inheritdoc />
-        public override void Detach()
-        {
-            MyMultiplayer.Static.ClientJoined -= RaiseClientJoined;
-            base.Detach();
-        }
-    }
-}

Torch.Client/Manager/MultiplayerManagerLobby.cs

@@ -1,58 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Sandbox.Engine.Multiplayer;
-using Torch.API;
-using Torch.API.Managers;
-using Torch.Managers;
-
-namespace Torch.Client.Manager
-{
-    public class MultiplayerManagerLobby : MultiplayerManagerBase, IMultiplayerManagerServer
-    {
-        /// <inheritdoc />
-        public IReadOnlyList<ulong> BannedPlayers => new List<ulong>();
-
-        /// <inheritdoc />
-        public MultiplayerManagerLobby(ITorchBase torch) : base(torch) { }
-
-        /// <inheritdoc />
-        public void KickPlayer(ulong steamId) => Torch.Invoke(() => MyMultiplayer.Static.KickClient(steamId));
-
-        /// <inheritdoc />
-        public void BanPlayer(ulong steamId, bool banned = true) => Torch.Invoke(() => MyMultiplayer.Static.BanClient(steamId, banned));
-
-        /// <inheritdoc />
-        public bool IsBanned(ulong steamId) => false;
-
-        /// <inheritdoc />
-        public event Action<ulong> PlayerKicked
-        {
-            add => throw new NotImplementedException();
-            remove => throw new NotImplementedException();
-        }
-
-        /// <inheritdoc />
-        public event Action<ulong, bool> PlayerBanned
-        {
-            add => throw new NotImplementedException();
-            remove => throw new NotImplementedException();
-        }
-
-        /// <inheritdoc/>
-        public override void Attach()
-        {
-            base.Attach();
-            MyMultiplayer.Static.ClientJoined += RaiseClientJoined;
-        }
-
-        /// <inheritdoc/>
-        public override void Detach()
-        {
-            MyMultiplayer.Static.ClientJoined -= RaiseClientJoined;
-            base.Detach();
-        }
-    }
-}

Torch.Client/Program.cs

@@ -1,194 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading;
-using System.Windows;
-using System.Windows.Forms;
-using NLog;
-using Torch.Utils;
-using MessageBox = System.Windows.MessageBox;
-
-namespace Torch.Client
-{
-    public static class Program
-    {
-        public const string SpaceEngineersBinaries = "Bin64";
-        private static string _spaceEngInstallAlias = null;
-
-        public static string SpaceEngineersInstallAlias
-        {
-            get
-            {
-                // ReSharper disable once ConvertIfStatementToNullCoalescingExpression
-                if (_spaceEngInstallAlias == null)
-                {
-                    // ReSharper disable once AssignNullToNotNullAttribute
-                    _spaceEngInstallAlias = Path.Combine(Path.GetDirectoryName(typeof(Program).Assembly.Location),
-                        "SpaceEngineersAlias");
-                }
-                return _spaceEngInstallAlias;
-            }
-        }
-
-        private const string _steamSpaceEngineersDirectory = @"steamapps\common\SpaceEngineers\";
-        private const string _spaceEngineersVerifyFile = SpaceEngineersBinaries + @"\SpaceEngineers.exe";
-
-        public const string ConfigName = "Torch.cfg";
-
-        private static Logger _log = LogManager.GetLogger("Torch");
-
-#if DEBUG
-        [DllImport("kernel32.dll")]
-        private static extern void AllocConsole();
-        [DllImport("kernel32.dll")]
-        private static extern void FreeConsole();
-#endif
-        public static void Main(string[] args)
-        {
-#if DEBUG
-            try
-            {
-                AllocConsole();
-#endif
-                if (!TorchLauncher.IsTorchWrapped())
-                {
-                    AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
-
-                    // Early config: Resolve SE install directory.
-                    if (!File.Exists(Path.Combine(SpaceEngineersInstallAlias, _spaceEngineersVerifyFile)))
-                        SetupSpaceEngInstallAlias();
-
-                    TorchLauncher.Launch(Assembly.GetEntryAssembly().FullName, args,
-                        Path.Combine(SpaceEngineersInstallAlias, SpaceEngineersBinaries));
-                    return;
-                }
-
-                RunClient();
-#if DEBUG
-            }
-            finally
-            {
-                FreeConsole();
-            }
-#endif
-        }
-
-        private static void SetupSpaceEngInstallAlias()
-        {
-            string spaceEngineersDirectory = null;
-
-            // TODO look at Steam/config/Config.VDF?  Has alternate directories.
-            var steamDir =
-                Microsoft.Win32.Registry.GetValue("HKEY_CURRENT_USER\\SOFTWARE\\Valve\\Steam", "SteamPath",
-                    null) as string;
-            if (steamDir != null)
-            {
-                spaceEngineersDirectory = Path.Combine(steamDir, _steamSpaceEngineersDirectory);
-                // ReSharper disable once ConvertIfStatementToConditionalTernaryExpression
-                if (File.Exists(Path.Combine(spaceEngineersDirectory, _spaceEngineersVerifyFile)))
-                    _log.Debug("Found Space Engineers in {0}", spaceEngineersDirectory);
-                else
-                {
-                    _log.Debug("Couldn't find Space Engineers in {0}", spaceEngineersDirectory);
-                    spaceEngineersDirectory = null;
-                }
-            }
-            if (spaceEngineersDirectory == null)
-            {
-                var dialog = new System.Windows.Forms.FolderBrowserDialog
-                {
-                    Description = "Please select the SpaceEngineers installation folder"
-                };
-                do
-                {
-                    if (dialog.ShowDialog() != DialogResult.OK)
-                    {
-                        var ex = new FileNotFoundException(
-                            "Unable to find the Space Engineers install directory, aborting");
-                        _log.Fatal(ex);
-                        LogManager.Flush();
-                        throw ex;
-                    }
-                    spaceEngineersDirectory = dialog.SelectedPath;
-                    if (File.Exists(Path.Combine(spaceEngineersDirectory, _spaceEngineersVerifyFile)))
-                        break;
-                    if (MessageBox.Show(
-                            $"Unable to find {0} in {1}.  Are you sure it's the Space Engineers install directory?",
-                            "Invalid Space Engineers Directory", MessageBoxButton.YesNo) == MessageBoxResult.Yes)
-                        break;
-                } while (true); // Repeat until they confirm.
-            }
-            if (!JunctionLink(SpaceEngineersInstallAlias, spaceEngineersDirectory))
-            {
-                var ex = new IOException(
-                    $"Failed to create junction link {SpaceEngineersInstallAlias} => {spaceEngineersDirectory}. Aborting.");
-                _log.Fatal(ex);
-                LogManager.Flush();
-                throw ex;
-            }
-            string junctionVerify = Path.Combine(SpaceEngineersInstallAlias, _spaceEngineersVerifyFile);
-            if (!File.Exists(junctionVerify))
-            {
-                var ex = new FileNotFoundException(
-                    $"Junction link is not working.  File {junctionVerify} does not exist");
-                _log.Fatal(ex);
-                LogManager.Flush();
-                throw ex;
-            }
-        }
-
-        private static bool JunctionLink(string linkName, string targetDir)
-        {
-            var junctionLinkProc = new ProcessStartInfo("cmd.exe", $"/c mklink /J \"{linkName}\" \"{targetDir}\"")
-            {
-                WorkingDirectory = Directory.GetCurrentDirectory(),
-                UseShellExecute = false,
-                RedirectStandardOutput = true,
-                StandardOutputEncoding = Encoding.ASCII
-            };
-            Process cmd = Process.Start(junctionLinkProc);
-            // ReSharper disable once PossibleNullReferenceException
-            while (!cmd.HasExited)
-            {
-                string line = cmd.StandardOutput.ReadLine();
-                if (!string.IsNullOrWhiteSpace(line))
-                    _log.Info(line);
-                Thread.Sleep(100);
-            }
-            if (cmd.ExitCode != 0)
-                _log.Error("Unable to create junction link {0} => {1}", linkName, targetDir);
-            return cmd.ExitCode == 0;
-        }
-
-        private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
-        {
-            var ex = (Exception) e.ExceptionObject;
-            _log.Error(ex);
-            LogManager.Flush();
-            MessageBox.Show(ex.StackTrace, ex.Message);
-        }
-
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        private static void RunClient()
-        {
-            var client = new TorchClient();
-
-            try
-            {
-                client.Init();
-            }
-            catch (Exception e)
-            {
-                _log.Fatal("Torch encountered an error trying to initialize the game.");
-                _log.Fatal(e);
-                return;
-            }
-
-            client.Start();
-        }
-    }
-}

Torch.Client/Properties/AssemblyInfo.cs

@@ -1,17 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("Torch Client")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Torch")]
-[assembly: AssemblyCopyright("Copyright © Torch API 2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
-
-#if DEBUG
-[assembly: AssemblyConfiguration("Debug")]
-#else
-[assembly: AssemblyConfiguration("Release")]
-#endif

Torch.Client/Properties/Resources.Designer.cs

@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Torch.Client.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Torch.Client.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-    }
-}

Torch.Client/Properties/Resources.resx

@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

Torch.Client/Properties/Settings.Designer.cs

@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Torch.Client.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
-                return defaultInstance;
-            }
-        }
-    }
-}

Torch.Client/Properties/Settings.settings

@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>

Torch.Client/Torch.Client.csproj

@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <ProjectGuid>{E36DF745-260B-4956-A2E8-09F08B2E7161}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Torch.Client</RootNamespace>
-    <AssemblyName>Torch.Client</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(SolutionDir)\bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>$(SolutionDir)\bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-    <DocumentationFile>$(SolutionDir)\bin\x64\Release\Torch.Client.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationIcon>torchicon.ico</ApplicationIcon>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.12\lib\net45\NLog.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Sandbox.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\Sandbox.Common.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Sandbox.Game">
-      <HintPath>..\GameBinaries\Sandbox.Game.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Sandbox.Graphics, Version=0.1.6108.20417, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\Sandbox.Graphics.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="SpaceEngineers.Game">
-      <HintPath>..\GameBinaries\SpaceEngineers.Game.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="VRage">
-      <HintPath>..\GameBinaries\VRage.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.Game">
-      <HintPath>..\GameBinaries\VRage.Game.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.Game.XmlSerializers">
-      <HintPath>..\GameBinaries\VRage.Game.XmlSerializers.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.Input, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\VRage.Input.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.Library">
-      <HintPath>..\GameBinaries\VRage.Library.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.Math, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\VRage.Math.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.Render">
-      <HintPath>..\GameBinaries\VRage.Render.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.Render11">
-      <HintPath>..\GameBinaries\VRage.Render11.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.Steam">
-      <HintPath>..\GameBinaries\VRage.Steam.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Versioning\AssemblyVersion.cs">
-      <Link>Properties\AssemblyVersion.cs</Link>
-    </Compile>
-    <Compile Include="Manager\MultiplayerManagerClient.cs" />
-    <Compile Include="Manager\MultiplayerManagerLobby.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TorchClient.cs" />
-    <Compile Include="TorchClientConfig.cs" />
-    <Compile Include="TorchConsoleScreen.cs" />
-    <Compile Include="TorchSettingsScreen.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <Compile Include="UI\TorchMainMenuScreen.cs" />
-    <Compile Include="UI\TorchNavScreen.cs" />
-    <Compile Include="UI\TorchSettingsScreen.cs" />
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <None Include="packages.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Torch.API\Torch.API.csproj">
-      <Project>{fba5d932-6254-4a1e-baf4-e229fa94e3c2}</Project>
-      <Name>Torch.API</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\Torch\Torch.csproj">
-      <Project>{7E01635C-3B67-472E-BCD6-C5539564F214}</Project>
-      <Name>Torch</Name>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="torchicon.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\TransformOnBuild.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>copy "$(SolutionDir)NLog.config" "$(TargetDir)"
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>

Torch.Client/TorchClient.cs

@@ -1,92 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-using System.Windows;
-using Sandbox;
-using Sandbox.Engine.Multiplayer;
-using Sandbox.Engine.Networking;
-using Sandbox.Engine.Platform;
-using Sandbox.Game;
-using SpaceEngineers.Game;
-using VRage.Steam;
-using Torch.API;
-using Torch.API.Managers;
-using Torch.API.Session;
-using Torch.Client.Manager;
-using Torch.Client.UI;
-using Torch.Session;
-using VRage;
-using VRage.FileSystem;
-using VRage.GameServices;
-using VRageRender;
-using VRageRender.ExternalApp;
-
-namespace Torch.Client
-{
-    public class TorchClient : TorchBase, ITorchClient
-    {
-        protected override uint SteamAppId => 244850;
-        protected override string SteamAppName => "SpaceEngineers";
-
-        public TorchClient()
-        {
-            Config = new TorchClientConfig();
-            var sessionManager = Managers.GetManager<ITorchSessionManager>();
-            sessionManager.AddFactory((x) => MyMultiplayer.Static is MyMultiplayerLobby
-                ? new MultiplayerManagerLobby(this)
-                : null);
-            sessionManager.AddFactory((x) => MyMultiplayer.Static is MyMultiplayerClientBase
-                ? new MultiplayerManagerClient(this)
-                : null);
-        }
-
-        public override void Init()
-        {
-            Directory.SetCurrentDirectory(Program.SpaceEngineersInstallAlias);
-            MyFileSystem.ExePath = Path.Combine(Program.SpaceEngineersInstallAlias, Program.SpaceEngineersBinaries);
-            Log.Info("Initializing Torch Client");
-            Config.InstancePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
-                SteamAppName);
-            base.Init();
-            OverrideMenus();
-            SetRenderWindowTitle($"Space Engineers v{GameVersion} with Torch v{TorchVersion}");
-        }
-
-        private void OverrideMenus()
-        {
-            var credits = new MyCreditsDepartment("Torch Developed By")
-            {
-                Persons = new List<MyCreditsPerson>
-                {
-                    new MyCreditsPerson("THE TORCH TEAM"),
-                    new MyCreditsPerson("http://github.com/TorchSE"),
-                }
-            };
-            MyPerGameSettings.Credits.Departments.Insert(0, credits);
-
-            MyPerGameSettings.GUI.MainMenu = typeof(TorchMainMenuScreen);
-        }
-
-        private void SetRenderWindowTitle(string title)
-        {
-            MyRenderThread renderThread = MySandboxGame.Static?.GameRenderComponent?.RenderThread;
-            if (renderThread == null)
-                return;
-            FieldInfo renderWindowField = typeof(MyRenderThread).GetField("m_renderWindow",
-                BindingFlags.Instance | BindingFlags.NonPublic);
-            if (renderWindowField == null)
-                return;
-            var window =
-                renderWindowField.GetValue(MySandboxGame.Static.GameRenderComponent.RenderThread) as
-                    System.Windows.Forms.Form;
-            if (window != null)
-                renderThread.Invoke(() => { window.Text = title; });
-        }
-
-        public override void Restart()
-        {
-            throw new NotImplementedException();
-        }
-    }
-}

Torch.Client/TorchClientConfig.cs

@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Torch.Client
-{
-    public class TorchClientConfig : ITorchConfig
-    {
-        // How do we want to handle client side config?  It's radically different than the server.
-        public bool GetPluginUpdates { get; set; } = false;
-        public bool GetTorchUpdates { get; set; } = false;
-        public string InstanceName { get; set; } = "TorchClient";
-        public string InstancePath { get; set; }
-        public bool NoUpdate { get; set; } = true;
-        public List<string> Plugins { get; set; }
-        public bool ShouldUpdatePlugins { get; } = false;
-        public bool ShouldUpdateTorch { get; } = false;
-        public int TickTimeout { get; set; }
-        public bool Autostart { get; set; } = false;
-        public bool ForceUpdate { get; set; } = false;
-        public bool NoGui { get; set; } = false;
-        public bool RestartOnCrash { get; set; } = false;
-        public string WaitForPID { get; set; } = null;
-
-        public bool Save(string path = null)
-        {
-            return true;
-        }
-    }
-}

Torch.Client/TorchConsoleScreen.cs

@@ -1,63 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using Sandbox.Graphics;
-using Sandbox.Graphics.GUI;
-using Sandbox.Gui;
-using VRage.Utils;
-using VRageMath;
-
-namespace Torch.Client
-{
-    public class TorchConsoleScreen : MyGuiScreenBase
-    {
-        private MyGuiControlTextbox _textBox;
-
-        public override string GetFriendlyName()
-        {
-            return "Torch Console";
-        }
-
-        public TorchConsoleScreen() : base(isTopMostScreen: true)
-        {
-            BackgroundColor = new Vector4(0, 0, 0, 0.5f);
-            Size = new Vector2(0.5f);
-            RecreateControls(true);
-        }
-
-        public sealed override void RecreateControls(bool constructor)
-        {
-            Elements.Clear();
-            Elements.Add(new MyGuiControlLabel
-            {
-                Text = "Torch Console",
-                OriginAlign = MyGuiDrawAlignEnum.HORISONTAL_RIGHT_AND_VERTICAL_TOP,
-                Position = MyGuiManager.ComputeFullscreenGuiCoordinate(MyGuiDrawAlignEnum.HORISONTAL_RIGHT_AND_VERTICAL_TOP)
-            });
-
-            Controls.Clear();
-            _textBox = new MyGuiControlTextbox
-            {
-                BorderEnabled = false,
-                Enabled = true,
-                OriginAlign = MyGuiDrawAlignEnum.HORISONTAL_LEFT_AND_VERTICAL_TOP,
-                Position = new Vector2(-0.5f)
-            };
-            Controls.Add(_textBox);
-
-            var pistonBtn = new MyGuiControlImageButton
-            {
-                Name = "TorchButton",
-                Text = "Torch",
-                HighlightType = MyGuiControlHighlightType.WHEN_CURSOR_OVER,
-                Visible = true,
-                OriginAlign = MyGuiDrawAlignEnum.HORISONTAL_LEFT_AND_VERTICAL_TOP
-            };
-
-            Controls.Add(pistonBtn);
-        }
-    }
-}

Torch.Client/TorchSettingsScreen.cs

@@ -1,38 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Sandbox.Graphics;
-using Sandbox.Graphics.GUI;
-using VRage.Utils;
-using VRageMath;
-
-namespace Torch.Client
-{
-    public class TorchSettingsScreen : MyGuiScreenBase
-    {
-        public override string GetFriendlyName() => "Torch Settings";
-
-        public TorchSettingsScreen() : base(new Vector2(0.5f), null, Vector2.One, true)
-        {
-            RecreateControls(true);
-        }
-
-        public sealed override void RecreateControls(bool constructor)
-        {
-            base.RecreateControls(constructor);
-            AddCaption(MyStringId.GetOrCompute("Torch Settings"), null, new Vector2(0, 0), 1.2f);
-            var pluginList = new MyGuiControlListbox
-            {
-                VisibleRowsCount = 10,
-            };
-
-            foreach (var plugin in TorchBase.Instance.Plugins)
-            {
-                pluginList.Items.Add(new MyGuiControlListbox.Item(new StringBuilder(plugin.Name)));
-            }
-            Controls.Add(pluginList);
-        }
-    }
-}

Torch.Client/UI/TorchMainMenuScreen.cs

@@ -1,56 +0,0 @@
-#pragma warning disable 618
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Sandbox.Engine.Networking;
-using Sandbox.Engine.Utils;
-using Sandbox.Game;
-using Sandbox.Game.Gui;
-using Sandbox.Graphics;
-using Sandbox.Graphics.GUI;
-using Sandbox.Gui;
-using SpaceEngineers.Game.GUI;
-using Torch.Utils;
-using VRage.Game;
-using VRage.Utils;
-using VRageMath;
-
-namespace Torch.Client.UI
-{
-    public class TorchMainMenuScreen : MyGuiScreenMainMenu
-    {
-#pragma warning disable 169
-        [ReflectedGetter(Name = "m_elementGroup")]
-        private static Func<MyGuiScreenMainMenu, MyGuiControlElementGroup> _elementsGroup;
-#pragma warning restore 169
-
-        public TorchMainMenuScreen() : this(false)
-        {
-        }
-
-        public TorchMainMenuScreen(bool pauseGame)
-      : base(pauseGame)
-        {
-        }
-        /// <inheritdoc />
-        public override void RecreateControls(bool constructor)
-        {
-            base.RecreateControls(constructor);
-
-            Vector2 minSizeGui = MyGuiControlButton.GetVisualStyle(MyGuiControlButtonStyleEnum.Default).NormalTexture.MinSizeGui;
-            Vector2 value = MyGuiManager.ComputeFullscreenGuiCoordinate(MyGuiDrawAlignEnum.HORISONTAL_LEFT_AND_VERTICAL_BOTTOM, 54, 54) + new Vector2(minSizeGui.X / 2f, 0f) + new Vector2(15f, 0f) / MyGuiConstants.GUI_OPTIMAL_SIZE;
-            
-            MyGuiControlButton myGuiControlButton = MakeButton(value - 9 * MyGuiConstants.MENU_BUTTONS_POSITION_DELTA,
-                MyStringId.GetOrCompute("Torch"), TorchButtonClicked, MyCommonTexts.ToolTipExitToWindows);
-            Controls.Add(myGuiControlButton);
-            _elementsGroup.Invoke(this).Add(myGuiControlButton);
-        }
-
-        private void TorchButtonClicked(MyGuiControlButton obj)
-        {
-            MyGuiSandbox.AddScreen(MyGuiSandbox.CreateScreen<TorchNavScreen>());
-        }
-    }
-}

Torch.Client/UI/TorchNavScreen.cs

@@ -1,49 +0,0 @@
-using Sandbox;
-using Sandbox.Game.Gui;
-using Sandbox.Graphics.GUI;
-using VRage;
-using VRage.Game;
-using VRage.Utils;
-using VRageMath;
-
-namespace Torch.Client.UI
-{
-    public class TorchNavScreen : MyGuiScreenBase
-    {
-		private MyGuiControlElementGroup _elementGroup;
-
-        public TorchNavScreen() : base(new Vector2(0.5f, 0.5f), MyGuiConstants.SCREEN_BACKGROUND_COLOR, new Vector2(0.35875f, 0.558333337f))
-		{
-			EnabledBackgroundFade = true;
-			RecreateControls(true);
-		}
-
-		public override void RecreateControls(bool constructor)
-		{
-			base.RecreateControls(constructor);
-			_elementGroup = new MyGuiControlElementGroup();
-			_elementGroup.HighlightChanged += ElementGroupHighlightChanged;
-			AddCaption(MyCommonTexts.ScreenCaptionOptions, null, null);
-			var value = new Vector2(0f, -m_size.Value.Y / 2f + 0.146f);
-			var num = 0;
-			var myGuiControlButton = new MyGuiControlButton(value + num++ * MyGuiConstants.MENU_BUTTONS_POSITION_DELTA, MyGuiControlButtonStyleEnum.Default, null, null, MyGuiDrawAlignEnum.HORISONTAL_CENTER_AND_VERTICAL_CENTER, null, MyTexts.Get(MyCommonTexts.ScreenOptionsButtonGame), 0.8f, MyGuiDrawAlignEnum.HORISONTAL_CENTER_AND_VERTICAL_CENTER, MyGuiControlHighlightType.WHEN_ACTIVE, delegate(MyGuiControlButton sender)
-			{
-				MyGuiSandbox.AddScreen(MyGuiSandbox.CreateScreen<TorchSettingsScreen>());
-			}, GuiSounds.MouseClick, 1f, null);
-			Controls.Add(myGuiControlButton);
-			_elementGroup.Add(myGuiControlButton);
-			CloseButtonEnabled = true;
-		}
-
-		private void ElementGroupHighlightChanged(MyGuiControlElementGroup obj)
-		{
-			foreach (MyGuiControlBase current in _elementGroup)
-				if (current.HasFocus && obj.SelectedElement != current)
-					FocusedControl = obj.SelectedElement;
-		}
-
-        public override string GetFriendlyName() => "Torch";
-
-        public void OnBackClick(MyGuiControlButton sender) => CloseScreen();
-    }
-}

Torch.Client/UI/TorchSettingsScreen.cs

@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Sandbox.Graphics.GUI;
-using VRageMath;
-
-namespace Torch.Client.UI
-{
-    public class TorchSettingsScreen : MyGuiScreenBase
-    {
-        public TorchSettingsScreen() : base(new Vector2(0.5f, 0.5f), MyGuiConstants.SCREEN_BACKGROUND_COLOR,
-            new Vector2(0.35875f, 0.558333337f))
-		{
-            EnabledBackgroundFade = true;
-            RecreateControls(true);
-        }
-
-        /// <inheritdoc />
-        public override string GetFriendlyName() => "Torch Settings";
-
-        public void OnBackClick(MyGuiControlButton sender) => CloseScreen();
-    }
-}

Torch.Client/packages.config

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Mono.TextTransform" version="1.0.0" targetFramework="net461" />
-  <package id="NLog" version="4.4.12" targetFramework="net461" />
-</packages>

Torch.Mod/Messages/JoinServerMessage.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using ProtoBuf;
+using Sandbox.ModAPI;
+
+namespace Torch.Mod.Messages
+{
+    [ProtoContract]
+    public class JoinServerMessage : MessageBase
+    {
+        [ProtoMember(201)]
+        public int Delay;
+        [ProtoMember(202)]
+        public string Address;
+
+        private JoinServerMessage()
+        {
+
+        }
+
+        public JoinServerMessage(string address)
+        {
+            Address = address;
+        }
+
+        public JoinServerMessage(string address, int delay)
+        {
+            Address = address;
+            Delay = delay;
+        }
+
+        public override void ProcessClient()
+        {
+            if (TorchModCore.Debug)
+            {
+                MyAPIGateway.Utilities.ShowMessage("Torch", $"Joining server {Address} with delay {Delay}");
+            }
+
+            if (Delay <= 0)
+            {
+                MyAPIGateway.Multiplayer.JoinServer(Address);
+                return;
+            }
+
+            MyAPIGateway.Parallel.StartBackground(() =>
+                                                  {
+                                                      MyAPIGateway.Parallel.Sleep(Delay);
+                                                      MyAPIGateway.Multiplayer.JoinServer(Address);
+                                                  });
+        }
+
+        public override void ProcessServer()
+        {
+        }
+    }
+}

Torch.Mod/Messages/MessageBase.cs

@@ -11,6 +11,7 @@ namespace Torch.Mod.Messages
     [ProtoInclude(1, typeof(DialogMessage))]
     [ProtoInclude(2, typeof(NotificationMessage))]
     [ProtoInclude(3, typeof(VoxelResetMessage))]
+    [ProtoInclude(4, typeof(JoinServerMessage))]
     #endregion
 
     [ProtoContract]
@@ -28,7 +29,7 @@ namespace Torch.Mod.Messages
         internal ulong[] Ignore;
         internal byte[] CompressedData;
     }
-
+    
     public enum MessageTarget
     {
         /// <summary>

Torch.Mod/ModCommunication.cs

@@ -10,6 +10,7 @@ using Torch.Mod.Messages;
 using VRage;
 using VRage.Collections;
 using VRage.Game.ModAPI;
+using VRage.Network;
 using VRage.Utils;
 using Task = ParallelTasks.Task;
 
@@ -50,6 +51,10 @@ namespace Torch.Mod
         {
             var m = _messagePool.Get();
             m.CompressedData = bytes;
+#if TORCH
+            m.SenderId = MyEventContext.Current.Sender.Value;
+#endif
+
             _processing.Add(m);
         }
 
@@ -59,10 +64,19 @@ namespace Torch.Mod
             {
                 try
                 {
-                    var m = _processing.Take();
+                    MessageBase m;
+                    try
+                    {
+                        m = _processing.Take();
+                    }
+                    catch
+                    {
+                        continue;
+                    }
+
                     MyLog.Default.WriteLineAndConsole($"Processing message: {m.GetType().Name}");
 
-                    if (m is IncomingMessage)
+                    if (m is IncomingMessage) //process incoming messages
                     {
                         MessageBase i;
                         try
@@ -78,50 +92,55 @@ namespace Torch.Mod
                             continue;
                         }
 
+                        if (TorchModCore.Debug)
+                            MyAPIGateway.Utilities.ShowMessage("Torch", $"Received message of type {i.GetType().Name}");
+
                         if (MyAPIGateway.Multiplayer.IsServer)
                             i.ProcessServer();
                         else
                             i.ProcessClient();
                     }
-                    else
+                    else //process outgoing messages
                     {
+                        if (TorchModCore.Debug)
+                            MyAPIGateway.Utilities.ShowMessage("Torch", $"Sending message of type {m.GetType().Name}");
+
                         var b = MyAPIGateway.Utilities.SerializeToBinary(m);
                         m.CompressedData = MyCompression.Compress(b);
 
-                        MyAPIGateway.Utilities.InvokeOnGameThread(() =>
+                        switch (m.TargetType)
                         {
+                            case MessageTarget.Single:
+                                MyAPIGateway.Multiplayer.SendMessageTo(NET_ID, m.CompressedData, m.Target);
+                                break;
+                            case MessageTarget.Server:
+                                MyAPIGateway.Multiplayer.SendMessageToServer(NET_ID, m.CompressedData);
+                                break;
+                            case MessageTarget.AllClients:
+                                MyAPIGateway.Players.GetPlayers(_playerCache);
+                                foreach (var p in _playerCache)
+                                {
+                                    if (p.SteamUserId == MyAPIGateway.Multiplayer.MyId)
+                                        continue;
+                                    MyAPIGateway.Multiplayer.SendMessageTo(NET_ID, m.CompressedData, p.SteamUserId);
+                                }
 
-                            switch (m.TargetType)
-                            {
-                                case MessageTarget.Single:
-                                    MyAPIGateway.Multiplayer.SendMessageTo(NET_ID, m.CompressedData, m.Target);
-                                    break;
-                                case MessageTarget.Server:
-                                    MyAPIGateway.Multiplayer.SendMessageToServer(NET_ID, m.CompressedData);
-                                    break;
-                                case MessageTarget.AllClients:
-                                    MyAPIGateway.Players.GetPlayers(_playerCache);
-                                    foreach (var p in _playerCache)
-                                    {
-                                        if (p.SteamUserId == MyAPIGateway.Multiplayer.MyId)
-                                            continue;
-                                        MyAPIGateway.Multiplayer.SendMessageTo(NET_ID, m.CompressedData, p.SteamUserId);
-                                    }
-                                    break;
-                                case MessageTarget.AllExcept:
-                                    MyAPIGateway.Players.GetPlayers(_playerCache);
-                                    foreach (var p in _playerCache)
-                                    {
-                                        if (p.SteamUserId == MyAPIGateway.Multiplayer.MyId || m.Ignore.Contains(p.SteamUserId))
-                                            continue;
-                                        MyAPIGateway.Multiplayer.SendMessageTo(NET_ID, m.CompressedData, p.SteamUserId);
-                                    }
-                                    break;
-                                default:
-                                    throw new Exception();
-                            }
-                            _playerCache.Clear();
-                        });
+                                break;
+                            case MessageTarget.AllExcept:
+                                MyAPIGateway.Players.GetPlayers(_playerCache);
+                                foreach (var p in _playerCache)
+                                {
+                                    if (p.SteamUserId == MyAPIGateway.Multiplayer.MyId || m.Ignore.Contains(p.SteamUserId))
+                                        continue;
+                                    MyAPIGateway.Multiplayer.SendMessageTo(NET_ID, m.CompressedData, p.SteamUserId);
+                                }
+
+                                break;
+                            default:
+                                throw new Exception();
+                        }
+
+                        _playerCache.Clear();
                     }
                 }
                 catch (Exception ex)
@@ -130,7 +149,7 @@ namespace Torch.Mod
                 }
             }
 
-            MyLog.Default.WriteLineAndConsole("TORCH MOD: COMMUNICATION THREAD: EXIT SIGNAL RECEIVED!");
+            MyLog.Default.WriteLineAndConsole("TORCH MOD: INFO: Communication thread shut down successfully! THIS IS NOT AN ERROR");
             //exit signal received. Clean everything and GTFO
             _processing?.Dispose();
             _processing = null;

Torch.Mod/Torch.Mod.projitems

@@ -10,6 +10,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)Messages\IncomingMessage.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Messages\JoinServerMessage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Messages\NotificationMessage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Messages\DialogMessage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Messages\MessageBase.cs" />

Torch.Mod/Torch.Mod.shproj

@@ -7,7 +7,6 @@
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
-  <PropertyGroup />
   <Import Project="Torch.Mod.projitems" Label="Shared" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
 </Project>

Torch.Mod/TorchModCore.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Sandbox.ModAPI;
 using VRage.Game.Components;
 
 namespace Torch.Mod
@@ -10,8 +11,9 @@ namespace Torch.Mod
     [MySessionComponentDescriptor(MyUpdateOrder.AfterSimulation)]
     public class TorchModCore : MySessionComponentBase
     {
-        public const ulong MOD_ID = 1406994352;
+        public const ulong MOD_ID = 2722000298;
         private static bool _init;
+        public static bool Debug;
 
         public override void UpdateAfterSimulation()
         {
@@ -20,12 +22,24 @@ namespace Torch.Mod
 
             _init = true;
             ModCommunication.Register();
+            MyAPIGateway.Utilities.MessageEntered += Utilities_MessageEntered;
+        }
+
+        private void Utilities_MessageEntered(string messageText, ref bool sendToOthers)
+        {
+            if (messageText == "@!debug")
+            {
+                Debug = !Debug;
+                MyAPIGateway.Utilities.ShowMessage("Torch", $"Debug: {Debug}");
+                sendToOthers = false;
+            }
         }
 
         protected override void UnloadData()
         {
             try
             {
+                MyAPIGateway.Utilities.MessageEntered -= Utilities_MessageEntered;
                 ModCommunication.Unregister();
             }
             catch

Torch.Server.Tests/Properties/AssemblyInfo.cs

@@ -1,17 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("Torch Server Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Torch")]
-[assembly: AssemblyCopyright("Copyright © Torch API 2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
-
-#if DEBUG
-[assembly: AssemblyConfiguration("Debug")]
-#else
-[assembly: AssemblyConfiguration("Release")]
-#endif

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

@@ -1,102 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <ProjectGuid>{9EFD1D91-2FA2-47ED-B537-D8BC3B0E543E}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Torch.Server.Tests</RootNamespace>
-    <AssemblyName>Torch.Server.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <TargetFramework>net6-windows</TargetFramework>
+    <LangVersion>10</LangVersion>
     <NoWarn>1591,0649</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(SolutionDir)\bin-test\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
+    <AssemblyTitle>Torch Server Tests</AssemblyTitle>
+    <Product>Torch</Product>
+    <Copyright>Copyright © Torch API 2017</Copyright>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>$(SolutionDir)\bin-test\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
+    <OutputPath>$(SolutionDir)\bin-test\$(Platform)\$(Configuration)\</OutputPath>
     <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>$(SolutionDir)\bin-test\x64\Release\Torch.Server.Tests.xml</DocumentationFile>
+    <Configurations>Debug;Release</Configurations>
+    <Platforms>AnyCPU</Platforms>
   </PropertyGroup>
+  <PropertyGroup Condition="$(Configuration) == 'Release'">
+    <DocumentationFile>$(SolutionDir)\bin-test\$(Platform)\$(Configuration)\Torch.Server.Tests.xml</DocumentationFile>
+  </PropertyGroup>
+<!--   <Import Project="$(SolutionDir)\TransformOnBuild.targets" /> -->
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="NLog" Version="5.0.4" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+  </ItemGroup>
   <ItemGroup>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.12\lib\net45\NLog.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
     <Reference Include="VRage.Game, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\GameBinaries\VRage.Game.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.assert, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.core, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.core.2.2.0\lib\netstandard1.1\xunit.core.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.execution.2.2.0\lib\net452\xunit.execution.desktop.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Versioning\AssemblyVersion.cs">
-      <Link>Properties\AssemblyVersion.cs</Link>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TorchServerReflectionTest.cs" />
-    <Compile Include="TorchServerSessionSettingsTest.cs" />
+    <ProjectReference Include="..\Torch.API\Torch.API.csproj" />
+    <ProjectReference Include="..\Torch.Server\Torch.Server.csproj" />
+    <ProjectReference Include="..\Torch.Tests\Torch.Tests.csproj" />
+    <ProjectReference Include="..\Torch\Torch.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Torch.API\Torch.API.csproj">
-      <Project>{fba5d932-6254-4a1e-baf4-e229fa94e3c2}</Project>
-      <Name>Torch.API</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Torch.Server\Torch.Server.csproj">
-      <Project>{ca50886b-7b22-4cd8-93a0-c06f38d4f77d}</Project>
-      <Name>Torch.Server</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Torch.Tests\Torch.Tests.csproj">
-      <Project>{c3c8b671-6ad1-44aa-a8da-e0c0dc0fedf5}</Project>
-      <Name>Torch.Tests</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Torch\Torch.csproj">
-      <Project>{7e01635c-3b67-472e-bcd6-c5539564f214}</Project>
-      <Name>Torch</Name>
-      <Private>True</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\TransformOnBuild.targets" />
 </Project>

Torch.Server.Tests/packages.config

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Mono.TextTransform" version="1.0.0" targetFramework="net461" />
-  <package id="NLog" version="4.4.12" targetFramework="net461" />
-  <package id="xunit" version="2.2.0" targetFramework="net461" />
-  <package id="xunit.abstractions" version="2.0.1" targetFramework="net461" />
-  <package id="xunit.assert" version="2.2.0" targetFramework="net461" />
-  <package id="xunit.core" version="2.2.0" targetFramework="net461" />
-  <package id="xunit.extensibility.core" version="2.2.0" targetFramework="net461" />
-  <package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net461" />
-  <package id="xunit.runner.console" version="2.2.0" targetFramework="net461" developmentDependency="true" />
-</packages>

Torch.Server/Commands/WhitelistCommands.cs

@@ -41,8 +41,9 @@ namespace Torch.Server.Commands
         [Command("add", "Add a Steam ID to the whitelist.")]
         public void Add(ulong steamId)
         {
-            if (Config.Whitelist.Add(steamId))
+            if (!Config.Whitelist.Contains(steamId))
             {
+                Config.Whitelist.Add(steamId);
                 Context.Respond($"Added {steamId} to the whitelist.");
                 Config.Save();
             }

Torch.Server/FlowDocumentTarget.cs

@@ -1,54 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Documents;
-using System.Windows.Media;
-using NLog;
-using NLog.Targets;
-
-namespace Torch.Server
-{
-    /// <summary>
-    /// NLog target that writes to a <see cref="FlowDocument"/>.
-    /// </summary>
-    [Target("flowDocument")]
-    public sealed class FlowDocumentTarget : TargetWithLayout
-    {
-        private FlowDocument _document = new FlowDocument { Background = new SolidColorBrush(Colors.Black) };
-        private readonly Paragraph _paragraph = new Paragraph();
-        private readonly int _maxLines = 500;
-
-        public FlowDocument Document => _document;
-
-        public FlowDocumentTarget()
-        {
-            _document.Blocks.Add(_paragraph);
-        }
-
-        /// <inheritdoc />
-        protected override void Write(LogEventInfo logEvent)
-        {
-            _document.Dispatcher.BeginInvoke(() =>
-            {
-                var message = $"{Layout.Render(logEvent)}\n";
-                _paragraph.Inlines.Add(new Run(message) {Foreground = LogLevelColors[logEvent.Level]});
-
-                // A massive paragraph slows the UI down
-                if (_paragraph.Inlines.Count > _maxLines)
-                    _paragraph.Inlines.Remove(_paragraph.Inlines.FirstInline);
-            });
-        }
-
-        private static readonly Dictionary<LogLevel, SolidColorBrush> LogLevelColors = new Dictionary<LogLevel, SolidColorBrush>
-        {
-            [LogLevel.Trace] = new SolidColorBrush(Colors.DimGray),
-            [LogLevel.Debug] = new SolidColorBrush(Colors.DarkGray),
-            [LogLevel.Info] = new SolidColorBrush(Colors.White),
-            [LogLevel.Warn] = new SolidColorBrush(Colors.Magenta),
-            [LogLevel.Error] = new SolidColorBrush(Colors.Yellow),
-            [LogLevel.Fatal] = new SolidColorBrush(Colors.Red),
-        };
-    }
-}

Torch.Server/FodyWeavers.xml

@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <PropertyChanged />
+</Weavers>

Torch.Server/FodyWeavers.xsd

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="PropertyChanged" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="InjectOnPropertyNameChanged" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Used to control if the On_PropertyName_Changed feature is enabled.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="TriggerDependentProperties" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Used to control if the Dependent properties feature is enabled.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="EnableIsChangedProperty" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Used to control if the IsChanged property feature is enabled.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="EventInvokerNames" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>Used to change the name of the method that fires the notify event. This is a string that accepts multiple values in a comma separated form.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="CheckForEquality" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Used to control if equality checks should be inserted. If false, equality checking will be disabled for the project.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="CheckForEqualityUsingBaseEquals" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Used to control if equality checks should use the Equals method resolved from the base class.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="UseStaticEqualsFromBase" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Used to control if equality checks should use the static Equals method resolved from the base class.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="SuppressWarnings" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Used to turn off build warnings from this weaver.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="SuppressOnPropertyNameChangedWarning" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Used to turn off build warnings about mismatched On_PropertyName_Changed methods.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

Torch.Server/Initializer.cs

@@ -5,88 +5,77 @@ using System.IO;
 using System.IO.Compression;
 using System.Linq;
 using System.Net;
+using System.Net.Http;
 using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Threading;
+using Microsoft.Extensions.Configuration;
 using NLog;
 using NLog.Targets;
 using Sandbox.Engine.Utils;
 using Torch.Utils;
 using VRage.FileSystem;
-using VRage.Library.Exceptions;
 
 namespace Torch.Server
 {
     public class Initializer
     {
+        internal static Initializer Instance { get; private set; }
+
         private static readonly Logger Log = LogManager.GetLogger(nameof(Initializer));
         private bool _init;
         private const string STEAMCMD_DIR = "steamcmd";
         private const string STEAMCMD_ZIP = "temp.zip";
-        private static readonly string STEAMCMD_PATH = $"{STEAMCMD_DIR}\\steamcmd.exe";
-        private static readonly string RUNSCRIPT_PATH = $"{STEAMCMD_DIR}\\runscript.txt";
-
-        private const string RUNSCRIPT = @"force_install_dir ../
-login anonymous
-app_update 298740
-quit";
-
-        private TorchConfig _config;
+        private static readonly string STEAMCMD_EXE = "steamcmd.exe";
+        private const string STEAMCMD_ARGS = "+force_install_dir \"{0}\" +login anonymous +app_update 298740 +quit";
         private TorchServer _server;
-        private string _basePath;
 
-        public TorchConfig Config => _config;
+        internal Persistent<TorchConfig> ConfigPersistent { get; }
+        public TorchConfig Config => ConfigPersistent?.Data;
         public TorchServer Server => _server;
 
-        public Initializer(string basePath)
+        public Initializer(Persistent<TorchConfig> torchConfig)
         {
-            _basePath = basePath;
+            Instance = this;
+            ConfigPersistent = torchConfig;
         }
 
-        public bool Initialize(string[] args)
+        public bool Initialize(IConfiguration configuration)
         {
             if (_init)
                 return false;
-
-#if !DEBUG
-            AppDomain.CurrentDomain.UnhandledException += HandleException;
+#if DEBUG
+            //enables logging debug messages when built in debug mode. Amazing.
+            LogManager.Configuration.AddRule(LogLevel.Debug, LogLevel.Debug, "main");
+            LogManager.Configuration.AddRule(LogLevel.Debug, LogLevel.Debug, "console");
+            LogManager.Configuration.AddRule(LogLevel.Debug, LogLevel.Debug, "wpf");
+            LogManager.ReconfigExistingLoggers();
+            Log.Debug("Debug logging enabled.");
 #endif
-
-            // This is what happens when Keen is bad and puts extensions into the System namespace.
-            if (!Enumerable.Contains(args, "-noupdate"))
-                RunSteamCmd();
-
-            var basePath = new FileInfo(typeof(Program).Assembly.Location).Directory.ToString();
-            var apiSource = Path.Combine(basePath, "DedicatedServer64", "steam_api64.dll");
-            var apiTarget = Path.Combine(basePath, "steam_api64.dll");
             
-            if (!File.Exists(apiTarget))
-                File.Copy(apiSource, apiTarget);
-            
-            _config = InitConfig();
-            if (!_config.Parse(args))
-                return false;
+            if (!configuration.GetValue("noupdate", false))
+                RunSteamCmd(configuration);
 
-            if (!string.IsNullOrEmpty(_config.WaitForPID))
+            var processPid = configuration.GetValue<int>("waitForPid");
+            if (processPid != 0)
             {
                 try
                 {
-                    var pid = int.Parse(_config.WaitForPID);
-                    var waitProc = Process.GetProcessById(pid);
+                    var waitProc = Process.GetProcessById(processPid);
                     Log.Info("Continuing in 5 seconds.");
-                    Log.Warn($"Waiting for process {pid} to close");
+                    Log.Warn($"Waiting for process {processPid} to close");
                     while (!waitProc.HasExited)
                     {
                         Console.Write(".");
                         Thread.Sleep(1000);
                     }
                 }
-                catch
+                catch (Exception e)
                 {
-                    // ignored
+                    Log.Warn(e);
                 }
             }
 
@@ -96,91 +85,90 @@ quit";
 
         public void Run()
         {
-            _server = new TorchServer(_config);
-            var init = Task.Run(() => _server.Init()).ContinueWith(x =>
-            {
-                if (!x.IsFaulted)
-                    return;
+            _server = new TorchServer(Config, ApplicationContext.Current.InstanceDirectory.FullName, ApplicationContext.Current.InstanceName);
 
-                Log.Error("Error initializing server.");
-                LogException(x.Exception);
-            });
-            if (!_config.NoGui)
+            if (ApplicationContext.Current.IsService || Config.NoGui)
             {
-                if (_config.Autostart)
-                    init.ContinueWith(x => _server.Start());
-
-                Log.Info("Showing UI");
-                Console.SetOut(TextWriter.Null);
-                NativeMethods.FreeConsole();
-                new TorchUI(_server).ShowDialog();
-            }
-            else
-            {
-                init.Wait();
+                _server.Init();
                 _server.Start();
             }
-        }
-
-        private TorchConfig InitConfig()
-        {
-            var configName = "Torch.cfg";
-            var configPath = Path.Combine(Directory.GetCurrentDirectory(), configName);
-            if (File.Exists(configName))
-            {
-                Log.Info($"Loading config {configPath}");
-                return TorchConfig.LoadFrom(configPath);
-            }
             else
             {
-                Log.Info($"Generating default config at {configPath}");
-                var config = new TorchConfig {InstancePath = Path.GetFullPath("Instance")};
-                config.Save(configPath);
-                return config;
+#if !DEBUG
+                if (!Config.IndependentConsole)
+                {
+                    Console.SetOut(TextWriter.Null);
+                    NativeMethods.FreeConsole();
+                }
+#endif
+                
+                var gameThread = new Thread(() =>
+                {
+                    _server.Init();
+
+                    if (Config.Autostart || Config.TempAutostart)
+                    {
+                        Config.TempAutostart = false;
+                        _server.Start();
+                    }
+                });
+                
+                gameThread.Start();
+                
+                var ui = new TorchUI(_server);
+                
+                SynchronizationContext.SetSynchronizationContext(
+                    new DispatcherSynchronizationContext(Dispatcher.CurrentDispatcher));
+                
+                ui.ShowDialog();
             }
         }
-
-        public static void RunSteamCmd()
+        
+        public static void RunSteamCmd(IConfiguration configuration)
         {
             var log = LogManager.GetLogger("SteamCMD");
 
-            if (!Directory.Exists(STEAMCMD_DIR))
+            var path = configuration.GetValue<string>("steamCmdPath") ?? ApplicationContext.Current.TorchDirectory
+                .CreateSubdirectory(STEAMCMD_DIR).FullName;
+            
+            if (!Directory.Exists(path))
             {
-                Directory.CreateDirectory(STEAMCMD_DIR);
+                Directory.CreateDirectory(path);
             }
 
-            if (!File.Exists(RUNSCRIPT_PATH))
-                File.WriteAllText(RUNSCRIPT_PATH, RUNSCRIPT);
-
-            if (!File.Exists(STEAMCMD_PATH))
+            var steamCmdExePath = Path.Combine(path, STEAMCMD_EXE);
+            if (!File.Exists(steamCmdExePath))
             {
                 try
                 {
                     log.Info("Downloading SteamCMD.");
-                    using (var client = new WebClient())
-                        client.DownloadFile("https://steamcdn-a.akamaihd.net/client/installer/steamcmd.zip", STEAMCMD_ZIP);
+                    using (var client = new HttpClient()) 
+                    using (var file = File.Create(STEAMCMD_ZIP))
+                    using (var stream = client.GetStreamAsync("https://steamcdn-a.akamaihd.net/client/installer/steamcmd.zip").Result)
+                        stream.CopyTo(file);
 
-                    ZipFile.ExtractToDirectory(STEAMCMD_ZIP, STEAMCMD_DIR);
+                    ZipFile.ExtractToDirectory(STEAMCMD_ZIP, path);
                     File.Delete(STEAMCMD_ZIP);
                     log.Info("SteamCMD downloaded successfully!");
                 }
-                catch
+                catch (Exception e)
                 {
-                    log.Error("Failed to download SteamCMD, unable to update the DS.");
+                    log.Error(e, "Failed to download SteamCMD, unable to update the DS.");
                     return;
                 }
             }
 
             log.Info("Checking for DS updates.");
-            var steamCmdProc = new ProcessStartInfo(STEAMCMD_PATH, "+runscript runscript.txt")
+            var steamCmdProc = new ProcessStartInfo(steamCmdExePath)
             {
-                WorkingDirectory = Path.Combine(Directory.GetCurrentDirectory(), STEAMCMD_DIR),
+                Arguments = string.Format(STEAMCMD_ARGS, configuration.GetValue("gamePath", "../")),
+                WorkingDirectory = path,
                 UseShellExecute = false,
                 RedirectStandardOutput = true,
                 StandardOutputEncoding = Encoding.ASCII
             };
             var cmd = Process.Start(steamCmdProc);
-
+            
             // ReSharper disable once PossibleNullReferenceException
             while (!cmd.HasExited)
             {
@@ -188,51 +176,5 @@ quit";
                 Thread.Sleep(100);
             }
         }
-
-        private void LogException(Exception ex)
-        {         
-            if (ex.InnerException != null)
-            {
-                LogException(ex.InnerException);
-            }
-
-            Log.Fatal(ex);
-            
-            if (ex is ReflectionTypeLoadException exti)
-                foreach (Exception exl in exti.LoaderExceptions)
-                    LogException(exl);
-            
-            if (ex is AggregateException ag)
-                foreach (Exception e in ag.InnerExceptions)
-                    LogException(e);
-        }
-
-        private void HandleException(object sender, UnhandledExceptionEventArgs e)
-        {
-            var ex = (Exception)e.ExceptionObject;
-            LogException(ex);
-            if (MyFakes.ENABLE_MINIDUMP_SENDING)
-            {
-                string path = Path.Combine(MyFileSystem.UserDataPath, "Minidump.dmp");
-                Log.Info($"Generating minidump at {path}");
-                MyMiniDump.Options options = MyMiniDump.Options.WithProcessThreadData | MyMiniDump.Options.WithThreadInfo;
-                MyMiniDump.Write(path, options, MyMiniDump.ExceptionInfo.Present);
-            }
-            LogManager.Flush();
-            if (_config.RestartOnCrash)
-            {
-                Console.WriteLine("Restarting in 5 seconds.");
-                Thread.Sleep(5000);
-                var exe = typeof(Program).Assembly.Location;
-                _config.WaitForPID = Process.GetCurrentProcess().Id.ToString();
-                Process.Start(exe, _config.ToString());
-            }
-            else
-            {
-                MessageBox.Show("Torch encountered a fatal error and needs to close. Please check the logs for details.");
-            }
-
-            Process.GetCurrentProcess().Kill();
-        }
     }
-}
+}

Torch.Server/LogViewerTarget.cs

@@ -0,0 +1,56 @@
+using System.Collections.Generic;
+using System.Threading;
+using System.Windows.Media;
+using System.Windows.Threading;
+using NLog;
+using NLog.Targets;
+using Torch.Server.ViewModels;
+using Torch.Server.Views;
+
+namespace Torch.Server
+{
+    /// <summary>
+    /// NLog target that writes to a <see cref="LogViewerControl"/>.
+    /// </summary>
+    [Target("logViewer")]
+    public sealed class LogViewerTarget : TargetWithLayout
+    {
+        public IList<LogEntry> LogEntries { get; set; }
+        public SynchronizationContext TargetContext { get; set; }
+        private const int MAX_LINES = 1000;
+
+        /// <inheritdoc />
+        protected override void Write(LogEventInfo logEvent)
+        {
+            TargetContext?.Post(_sendOrPostCallback, logEvent);
+        }
+
+        private void WriteCallback(object state)
+        {
+            var logEvent = (LogEventInfo) state;
+            LogEntries?.Add(new(logEvent.TimeStamp, Layout.Render(logEvent), LogLevelColors[logEvent.Level]));
+            if (LogEntries is not {Count: > MAX_LINES}) return;
+            for (var i = 0; LogEntries.Count > MAX_LINES; i++)
+            {
+                LogEntries.RemoveAt(i);
+            }
+        }
+
+        private static readonly Dictionary<LogLevel, SolidColorBrush> LogLevelColors = new()
+        {
+            [LogLevel.Trace] = new SolidColorBrush(Colors.DimGray),
+            [LogLevel.Debug] = new SolidColorBrush(Colors.DarkGray),
+            [LogLevel.Info] = new SolidColorBrush(Colors.White),
+            [LogLevel.Warn] = new SolidColorBrush(Colors.Magenta),
+            [LogLevel.Error] = new SolidColorBrush(Colors.Yellow),
+            [LogLevel.Fatal] = new SolidColorBrush(Colors.Red),
+        };
+
+        private readonly SendOrPostCallback _sendOrPostCallback;
+
+        public LogViewerTarget()
+        {
+            _sendOrPostCallback = WriteCallback;
+        }
+    }
+}

Torch.Server/Managers/EntityControlManager.cs

@@ -40,15 +40,7 @@ namespace Torch.Server.Managers
 
             protected abstract EntityControlViewModel Create(EntityViewModel evm);
 
-#pragma warning disable 649
-            [ReflectedGetter(Name = "Keys")]
-            private static readonly Func<ConditionalWeakTable<EntityViewModel, EntityControlViewModel>, ICollection<EntityViewModel>> _weakTableKeys;
-#pragma warning restore 649
-
-            /// <summary>
-            /// Warning: Creates a giant list, avoid if possible.
-            /// </summary>
-            internal ICollection<EntityViewModel> Keys => _weakTableKeys(_models);
+            internal IEnumerable<EntityViewModel> Keys => _models.Select(b => b.Key);
 
             internal EntityControlViewModel GetOrCreate(EntityViewModel evm)
             {

Torch.Server/Managers/InstanceManager.cs

@@ -1,22 +1,27 @@
-using System;
+using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 using Havok;
 using NLog;
+using Sandbox;
 using Sandbox.Engine.Networking;
 using Sandbox.Engine.Utils;
 using Sandbox.Game;
 using Sandbox.Game.Gui;
 using Torch.API;
 using Torch.API.Managers;
+using Torch.Collections;
 using Torch.Managers;
 using Torch.Mod;
 using Torch.Server.ViewModels;
+using Torch.Utils;
 using VRage;
 using VRage.FileSystem;
 using VRage.Game;
@@ -26,7 +31,7 @@ using VRage.Plugins;
 
 namespace Torch.Server.Managers
 {
-    public class InstanceManager : Manager
+    public class InstanceManager : Manager, IInstanceManager
     {
         private const string CONFIG_NAME = "SpaceEngineers-Dedicated.cfg";
 
@@ -36,11 +41,15 @@ namespace Torch.Server.Managers
         [Dependency]
         private FilesystemManager _filesystemManager;
 
-        public InstanceManager(ITorchBase torchInstance) : base(torchInstance)
+        private new ITorchServer Torch { get; }
+
+        public InstanceManager(ITorchServer torchInstance) : base(torchInstance)
         {
-            
+            Torch = torchInstance;
         }
-        
+
+        public IWorld SelectedWorld => DedicatedConfig.SelectedWorld;
+
         public void LoadInstance(string path, bool validate = true)
         {
             Log.Info($"Loading instance {path}");
@@ -53,24 +62,37 @@ namespace Torch.Server.Managers
             //Initializes saves path. Why this isn't in Init() we may never know.
             MyFileSystem.InitUserSpecific(null);
 
-            var configPath = Path.Combine(path, CONFIG_NAME);
-            if (!File.Exists(configPath))
-            {
-                Log.Error($"Failed to load dedicated config at {path}");
-                return;
-            }
+            // why?....
+            // var configPath = Path.Combine(path, CONFIG_NAME);
+            // if (!File.Exists(configPath))
+            // {
+            //     Log.Error($"Failed to load dedicated config at {path}");
+            //     return;
+            // }
 
-            var config = new MyConfigDedicated<MyObjectBuilder_SessionSettings>(configPath);
-            config.Load(configPath);
+            
+            // var config = new MyConfigDedicated<MyObjectBuilder_SessionSettings>(configPath);
+            // config.Load(configPath);
 
-            DedicatedConfig = new ConfigDedicatedViewModel(config);
+            DedicatedConfig = new ConfigDedicatedViewModel((MyConfigDedicated<MyObjectBuilder_SessionSettings>) MySandboxGame.ConfigDedicated);
 
-            var worldFolders = Directory.EnumerateDirectories(Path.Combine(Torch.Config.InstancePath, "Saves"));
+            var worldFolders = Directory.EnumerateDirectories(Path.Combine(Torch.InstancePath, "Saves"));
 
             foreach (var f in worldFolders)
             {
-                if (!string.IsNullOrEmpty(f) && File.Exists(Path.Combine(f, "Sandbox.sbc")))
-                    DedicatedConfig.Worlds.Add(new WorldViewModel(f));
+                try
+                {
+                    if (!string.IsNullOrEmpty(f) && File.Exists(Path.Combine(f, "Sandbox.sbc")))
+                    {
+                        var worldViewModel = new WorldViewModel(f, DedicatedConfig.LoadWorld == f);
+                        DedicatedConfig.Worlds.Add(worldViewModel);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Log.Error("Failed to load world at path: " + f);
+                    continue;
+                }
             }
 
             if (DedicatedConfig.Worlds.Count == 0)
@@ -84,17 +106,51 @@ namespace Torch.Server.Managers
             InstanceLoaded?.Invoke(DedicatedConfig);
         }
 
+        public void SelectCreatedWorld(string worldPath)
+        {
+            WorldViewModel worldViewModel;
+            try
+            {
+                worldViewModel = new(worldPath);
+                DedicatedConfig.Worlds.Add(worldViewModel);
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex, "Failed to load world at path: " + worldPath);
+                return;
+            }
+            SelectWorld(worldViewModel, false);
+        }
+
         public void SelectWorld(string worldPath, bool modsOnly = true)
         {
             DedicatedConfig.LoadWorld = worldPath;
-            DedicatedConfig.SelectedWorld = DedicatedConfig.Worlds.FirstOrDefault(x => x.WorldPath == worldPath);
+            
+            var worldInfo = DedicatedConfig.Worlds.FirstOrDefault(x => x.WorldPath == worldPath);
+            try
+            {
+                if (worldInfo?.Checkpoint == null)
+                {
+                    worldInfo = new WorldViewModel(worldPath);
+                    DedicatedConfig.Worlds.Add(worldInfo);
+                }
+            }
+            catch (Exception ex)
+            {
+                Log.Error("Failed to load world at path: " + worldPath);
+                DedicatedConfig.LoadWorld = null;
+                return;
+            }
+
+            DedicatedConfig.SelectedWorld = worldInfo;
             if (DedicatedConfig.SelectedWorld?.Checkpoint != null)
             {
                 DedicatedConfig.Mods.Clear();
                 //remove the Torch mod to avoid running multiple copies of it
-                DedicatedConfig.SelectedWorld.Checkpoint.Mods.RemoveAll(m => m.PublishedFileId == TorchModCore.MOD_ID);
-                foreach (var m in DedicatedConfig.SelectedWorld.Checkpoint.Mods)
-                    DedicatedConfig.Mods.Add(m.PublishedFileId);
+                DedicatedConfig.SelectedWorld.WorldConfiguration.Mods.RemoveAll(m => m.PublishedFileId == TorchModCore.MOD_ID);
+                foreach (var m in DedicatedConfig.SelectedWorld.WorldConfiguration.Mods)
+                    DedicatedConfig.Mods.Add(new ModItemInfo(m));
+                Task.Run(() => DedicatedConfig.UpdateAllModInfosAsync());
             }
         }
 
@@ -106,9 +162,10 @@ namespace Torch.Server.Managers
             {
                 DedicatedConfig.Mods.Clear();
                 //remove the Torch mod to avoid running multiple copies of it
-                DedicatedConfig.SelectedWorld.Checkpoint.Mods.RemoveAll(m => m.PublishedFileId == TorchModCore.MOD_ID);
-                foreach (var m in DedicatedConfig.SelectedWorld.Checkpoint.Mods)
-                    DedicatedConfig.Mods.Add(m.PublishedFileId);
+                DedicatedConfig.SelectedWorld.WorldConfiguration.Mods.RemoveAll(m => m.PublishedFileId == TorchModCore.MOD_ID);
+                foreach (var m in DedicatedConfig.SelectedWorld.WorldConfiguration.Mods)
+                    DedicatedConfig.Mods.Add(new ModItemInfo(m));
+                Task.Run(() => DedicatedConfig.UpdateAllModInfosAsync());
             }
         }
 
@@ -119,17 +176,16 @@ namespace Torch.Server.Managers
 
         private void ImportWorldConfig(WorldViewModel world, bool modsOnly = true)
         {
-            var sb = new StringBuilder();
-            foreach (var mod in world.Checkpoint.Mods)
-                sb.AppendLine(mod.PublishedFileId.ToString());
-            
-            DedicatedConfig.Mods = world.Checkpoint.Mods.Select(x => x.PublishedFileId).ToList();
+            var mods = new MtObservableList<ModItemInfo>();
+            foreach (var mod in world.WorldConfiguration.Mods)
+                mods.Add(new ModItemInfo(mod));
+            DedicatedConfig.Mods = mods;
 
 
             Log.Debug("Loaded mod list from world");
 
             if (!modsOnly)
-                DedicatedConfig.SessionSettings = world.Checkpoint.Settings;
+                DedicatedConfig.SessionSettings = world.WorldConfiguration.Settings;
         }
 
         private void ImportWorldConfig(bool modsOnly = true)
@@ -151,7 +207,10 @@ namespace Torch.Server.Managers
                     return;
                 }
 
-                DedicatedConfig.Mods = checkpoint.Mods.Select(x => x.PublishedFileId).ToList();
+                var mods = new MtObservableList<ModItemInfo>();
+                foreach (var mod in checkpoint.Mods)
+                    mods.Add(new ModItemInfo(mod));
+                DedicatedConfig.Mods = mods;
 
                 Log.Debug("Loaded mod list from world");
 
@@ -167,44 +226,40 @@ namespace Torch.Server.Managers
 
         public void SaveConfig()
         {
-            var cf = Torch.Config as TorchConfig;
-            if (cf?.ReservedPlayers?.Count > 0)
+            if (!((TorchServer)Torch).HasRun)
             {
-                foreach (var res in cf.ReservedPlayers)
-                {
-                    if (!DedicatedConfig.Reserved.Contains(res))
-                        DedicatedConfig.Reserved.Add(res);
-                }
+                DedicatedConfig.Save(Path.Combine(Torch.InstancePath, CONFIG_NAME));
+                Log.Info("Saved dedicated config.");
             }
 
-            DedicatedConfig.Save(Path.Combine(Torch.Config.InstancePath, CONFIG_NAME));
-            Log.Info("Saved dedicated config.");
-
             try
             {
-                var sandboxPath = Path.Combine(DedicatedConfig.LoadWorld, "Sandbox.sbc");
-                MyObjectBuilderSerializer.DeserializeXML(sandboxPath, out MyObjectBuilder_Checkpoint checkpoint, out ulong sizeInBytes);
-                if (checkpoint == null)
+                var world = DedicatedConfig.SelectedWorld;
+
+                world.Checkpoint.SessionName = string.IsNullOrEmpty(world.Checkpoint.SessionName)
+                    ? Path.GetDirectoryName(DedicatedConfig.LoadWorld)
+                    : world.Checkpoint.SessionName;
+                world.WorldConfiguration.Settings = DedicatedConfig.SessionSettings;
+                world.WorldConfiguration.Mods.Clear();
+
+                foreach (var mod in DedicatedConfig.Mods)
                 {
-                    Log.Error($"Failed to load {DedicatedConfig.LoadWorld}, checkpoint null ({sizeInBytes} bytes, instance {Torch.Config.InstancePath})");
-                    return;
+                    var savedMod = ModItemUtils.Create(mod.PublishedFileId);
+                    savedMod.IsDependency = mod.IsDependency;
+                    savedMod.Name = mod.Name;
+                    savedMod.FriendlyName = mod.FriendlyName;
+                    
+                    world.WorldConfiguration.Mods.Add(savedMod);
                 }
+                Task.Run(() => DedicatedConfig.UpdateAllModInfosAsync());
 
-                checkpoint.SessionName = DedicatedConfig.WorldName;
-                checkpoint.Settings = DedicatedConfig.SessionSettings;
-                checkpoint.Mods.Clear();
-                
-                foreach (var modId in DedicatedConfig.Mods)
-                    checkpoint.Mods.Add(new MyObjectBuilder_Checkpoint.ModItem(modId));
+                world.SaveSandbox();
 
-                MyObjectBuilderSerializer.SerializeXML(sandboxPath, false, checkpoint);
-
-                //MyLocalCache.SaveCheckpoint(checkpoint, DedicatedConfig.LoadWorld);
                 Log.Info("Saved world config.");
             }
             catch (Exception e)
             {
-                Log.Error("Failed to write sandbox config, changes will not appear on server");
+                Log.Error("Failed to write sandbox config");
                 Log.Error(e);
             }
         }
@@ -215,7 +270,7 @@ namespace Torch.Server.Managers
         private void ValidateInstance(string path)
         {
             Directory.CreateDirectory(Path.Combine(path, "Saves"));
-            Directory.CreateDirectory(Path.Combine(path, "Mods"));
+            // Directory.CreateDirectory(Path.Combine(path, "Mods"));
             var configPath = Path.Combine(path, CONFIG_NAME);
             if (File.Exists(configPath))
                 return;
@@ -225,43 +280,81 @@ namespace Torch.Server.Managers
         }
     }
 
-    public class WorldViewModel : ViewModel
+    public class WorldViewModel : ViewModel, IWorld
     {
         private static readonly Logger Log = LogManager.GetCurrentClassLogger();
 
-        public string FolderName { get; set; }
         public string WorldPath { get; }
+        public MyObjectBuilder_SessionSettings KeenSessionSettings => WorldConfiguration.Settings;
+        public MyObjectBuilder_Checkpoint KeenCheckpoint => Checkpoint;
         public long WorldSizeKB { get; }
         private string _checkpointPath;
-        public CheckpointViewModel Checkpoint { get; private set; }
+        private string _worldConfigPath;
+        private CheckpointViewModel _checkpoint;
 
-        public WorldViewModel(string worldPath)
+        public CheckpointViewModel Checkpoint
         {
-            WorldPath = worldPath;
-            WorldSizeKB = new DirectoryInfo(worldPath).GetFiles().Sum(x => x.Length) / 1024;
-            _checkpointPath = Path.Combine(WorldPath, "Sandbox.sbc");
-            FolderName = Path.GetFileName(worldPath);
-            BeginLoadCheckpoint();
+            get
+            {
+                if (_checkpoint is null) LoadSandbox();
+                return _checkpoint;
+            }
+            private set => _checkpoint = value;
         }
 
-        public async Task SaveCheckpointAsync()
+        public WorldConfigurationViewModel WorldConfiguration { get; private set; }
+
+        public WorldViewModel(string worldPath, bool loadFiles = true)
         {
-            await Task.Run(() =>
+            try
             {
-                using (var f = File.Open(_checkpointPath, FileMode.Create))
-                    MyObjectBuilderSerializer.SerializeXML(f, Checkpoint);
-            });
+                WorldPath = worldPath;
+                WorldSizeKB = new DirectoryInfo(worldPath).GetFiles().Sum(x => x.Length) / 1024;
+                _checkpointPath = Path.Combine(WorldPath, "Sandbox.sbc");
+                _worldConfigPath = Path.Combine(WorldPath, "Sandbox_config.sbc");
+                if (loadFiles)
+                    LoadSandbox();
+            }
+            catch (ArgumentException ex)
+            {
+                Log.Error($"World view model failed to load the path: {worldPath} Please ensure this is a valid path.");
+                throw; //rethrow to be handled further up the stack
+            }
         }
 
-        private void BeginLoadCheckpoint()
+        public void SaveSandbox()
         {
-            //Task.Run(() =>
+            using (var f = File.Open(_checkpointPath, FileMode.Create))
+                MyObjectBuilderSerializer.SerializeXML(f, Checkpoint);
+
+            using (var f = File.Open(_worldConfigPath, FileMode.Create))
+                MyObjectBuilderSerializer.SerializeXML(f, WorldConfiguration);
+        }
+
+        public void LoadSandbox()
+        {
+            if (!MyObjectBuilderSerializer.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))
             {
-                Log.Info($"Preloading checkpoint {_checkpointPath}");
-                MyObjectBuilderSerializer.DeserializeXML(_checkpointPath, out MyObjectBuilder_Checkpoint checkpoint);
-                Checkpoint = new CheckpointViewModel(checkpoint);
-                OnPropertyChanged(nameof(Checkpoint));
-            }//);
+                if (!MyObjectBuilderSerializer.DeserializeXML(_worldConfigPath, out MyObjectBuilder_WorldConfiguration worldConfig))
+                    throw new SerializationException("Error reading settings, see keen log for details");
+                WorldConfiguration = new WorldConfigurationViewModel(worldConfig);
+            }
+            else
+            {
+                WorldConfiguration = new WorldConfigurationViewModel(new MyObjectBuilder_WorldConfiguration
+                {
+                    Mods = checkpoint.Mods,
+                    Settings = checkpoint.Settings
+                });
+
+                checkpoint.Mods = null;
+                checkpoint.Settings = null;
+            }
         }
     }
 }

Torch.Server/Managers/MultiplayerManagerDedicated.cs

@@ -10,8 +10,8 @@ using NLog.Fluent;
 using Sandbox;
 using Sandbox.Engine.Multiplayer;
 using Sandbox.Engine.Networking;
+using Sandbox.Game.Gui;
 using Sandbox.Game.World;
-using Steamworks;
 using Torch.API;
 using Torch.API.Managers;
 using Torch.Managers;
@@ -62,6 +62,36 @@ namespace Torch.Server.Managers
             });
         }
 
+        /// <inheritdoc />
+        public void PromoteUser(ulong steamId)
+        {
+            Torch.Invoke(() =>
+            {
+                var p = MySession.Static.GetUserPromoteLevel(steamId);
+                if (p < MyPromoteLevel.Admin) //cannot promote to owner by design
+                    //MySession.Static.SetUserPromoteLevel(steamId, p + 1);
+                    MyGuiScreenPlayers.PromoteImplementation(steamId, true);
+            });
+        }
+
+        /// <inheritdoc />
+        public void DemoteUser(ulong steamId)
+        {
+            Torch.Invoke(() =>
+            {
+                var p = MySession.Static.GetUserPromoteLevel(steamId);
+                if (p > MyPromoteLevel.None && p < MyPromoteLevel.Owner) //owner cannot be demoted by design
+                    //MySession.Static.SetUserPromoteLevel(steamId, p - 1);
+                    MyGuiScreenPlayers.PromoteImplementation(steamId, false);
+            });
+        }
+
+        /// <inheritdoc />
+        public MyPromoteLevel GetUserPromoteLevel(ulong steamId)
+        {
+            return MySession.Static.GetUserPromoteLevel(steamId);
+        }
+
         internal void RaiseClientBanned(ulong user, bool banned)
         {
             PlayerBanned?.Invoke(user, banned);
@@ -81,23 +111,43 @@ namespace Torch.Server.Managers
         public bool IsBanned(ulong steamId) => _isClientBanned.Invoke(MyMultiplayer.Static, steamId) ||
                                                MySandboxGame.ConfigDedicated.Banned.Contains(steamId);
 
+
+
+        public bool IsProfiling(ulong steamId) => _Profiling.Invoke((MyDedicatedServerBase)MyMultiplayer.Static, steamId);
+
         /// <inheritdoc />
         public event Action<ulong> PlayerKicked;
 
         /// <inheritdoc />
         public event Action<ulong, bool> PlayerBanned;
 
+        /// <inheritdoc />
+        public event Action<ulong, MyPromoteLevel> PlayerPromoted;
+
+        internal void RaisePromoteChanged(ulong steamId, MyPromoteLevel level)
+        {
+            PlayerPromoted?.Invoke(steamId, level);
+        }
+
         /// <inheritdoc/>
         public override void Attach()
         {
             base.Attach();
-            _gameServerValidateAuthTicketReplacer = _gameServerValidateAuthTicketFactory.Invoke();
-            _gameServerUserGroupStatusReplacer = _gameServerUserGroupStatusFactory.Invoke();
+            if (Torch.Config.UgcServiceType == UGCServiceType.Steam)
+            {
+                _gameServerValidateAuthTicketReplacer = _gameServerValidateAuthTicketFactory.Invoke();
+                _gameServerUserGroupStatusReplacer = _gameServerUserGroupStatusFactory.Invoke();
+            }
+            else
+            {
+                _gameServerValidateAuthTicketReplacer = _eosServerValidateAuthTicketFactory.Invoke();
+                _gameServerUserGroupStatusReplacer = _eosServerUserGroupStatusFactory.Invoke();
+            }
             _gameServerValidateAuthTicketReplacer.Replace(
-                new Action<ulong, JoinResult, ulong>(ValidateAuthTicketResponse), MyGameService.GameServer);
+                new Action<ulong, JoinResult, ulong, string>(ValidateAuthTicketResponse), MyGameService.GameServer);
             _gameServerUserGroupStatusReplacer.Replace(new Action<ulong, ulong, bool, bool>(UserGroupStatusResponse),
                 MyGameService.GameServer);
-            _log.Info("Inserted steam authentication intercept");
+            _log.Info("Inserted authentication intercept");
         }
 
         /// <inheritdoc/>
@@ -107,19 +157,27 @@ namespace Torch.Server.Managers
                 _gameServerValidateAuthTicketReplacer.Restore(MyGameService.GameServer);
             if (_gameServerUserGroupStatusReplacer != null && _gameServerUserGroupStatusReplacer.Replaced)
                 _gameServerUserGroupStatusReplacer.Restore(MyGameService.GameServer);
-            _log.Info("Removed steam authentication intercept");
+            _log.Info("Removed authentication intercept");
             base.Detach();
         }
 
 
 #pragma warning disable 649
-        [ReflectedEventReplace(typeof(MySteamGameServer), nameof(MySteamGameServer.ValidateAuthTicketResponse),
+        [ReflectedEventReplace("VRage.Steam.MySteamGameServer, VRage.Steam", "ValidateAuthTicketResponse",
             typeof(MyDedicatedServerBase), "GameServer_ValidateAuthTicketResponse")]
         private static Func<ReflectedEventReplacer> _gameServerValidateAuthTicketFactory;
 
-        [ReflectedEventReplace(typeof(MySteamGameServer), nameof(MySteamGameServer.UserGroupStatusResponse),
+        [ReflectedEventReplace("VRage.Steam.MySteamGameServer, VRage.Steam", "UserGroupStatusResponse",
             typeof(MyDedicatedServerBase), "GameServer_UserGroupStatus")]
         private static Func<ReflectedEventReplacer> _gameServerUserGroupStatusFactory;
+        
+        [ReflectedEventReplace("VRage.EOS.MyEOSGameServer, VRage.EOS", "ValidateAuthTicketResponse",
+            typeof(MyDedicatedServerBase), "GameServer_ValidateAuthTicketResponse")]
+        private static Func<ReflectedEventReplacer> _eosServerValidateAuthTicketFactory;
+
+        [ReflectedEventReplace("VRage.EOS.MyEOSGameServer, VRage.EOS", "UserGroupStatusResponse",
+            typeof(MyDedicatedServerBase), "GameServer_UserGroupStatus")]
+        private static Func<ReflectedEventReplacer> _eosServerUserGroupStatusFactory;
 
         private ReflectedEventReplacer _gameServerValidateAuthTicketReplacer;
         private ReflectedEventReplacer _gameServerUserGroupStatusReplacer;
@@ -134,6 +192,9 @@ namespace Torch.Server.Managers
         [ReflectedStaticMethod(Type = typeof(MyGameService), Name = "GetServerAccountType")]
         private static Func<ulong, MyGameServiceAccountType> _getServerAccountType;
 
+        [ReflectedMethod(Name = "ClientIsProfiling")]
+        private static Func<MyDedicatedServerBase, ulong, bool> _Profiling;
+
         [ReflectedMethod(Name = "UserAccepted")]
         private static Action<MyDedicatedServerBase, ulong> _userAcceptedImpl;
 
@@ -168,10 +229,10 @@ namespace Torch.Server.Managers
         }
 
         //Largely copied from SE
-        private void ValidateAuthTicketResponse(ulong steamId, JoinResult response, ulong steamOwner)
-        {
+        private void ValidateAuthTicketResponse(ulong steamId, JoinResult response, ulong steamOwner, string serviceName)
+        {           
             var state = new MyP2PSessionState();
-            MySteamService.Static.Peer2Peer.GetSessionState(steamId, ref state);
+            Sandbox.Engine.Networking.MyGameService.Peer2Peer.GetSessionState(steamId, ref state);
             var ip = new IPAddress(BitConverter.GetBytes(state.RemoteIP).Reverse().ToArray());
 
             Torch.CurrentSession.KeenSession.PromotedUsers.TryGetValue(steamId, out MyPromoteLevel promoteLevel);
@@ -179,8 +240,13 @@ namespace Torch.Server.Managers
             _log.Debug($"ValidateAuthTicketResponse(user={steamId}, response={response}, owner={steamOwner}, permissions={promoteLevel})");
 
             _log.Info($"Connection attempt by {steamId} from {ip}");
-            
-            if (Torch.CurrentSession.KeenSession.OnlineMode == MyOnlineModeEnum.OFFLINE &&
+
+            if (IsProfiling(steamId))
+            {
+                _log.Warn($"Rejecting user {steamId} for using Profiler/ModSDK!");
+                UserRejected(steamId, JoinResult.ProfilingNotAllowed);
+            }
+            else if (Torch.CurrentSession.KeenSession.OnlineMode == MyOnlineModeEnum.OFFLINE &&
                      promoteLevel < MyPromoteLevel.Admin)
             {
                 _log.Warn($"Rejecting user {steamId}, world is set to offline and user is not admin.");
@@ -254,6 +320,11 @@ namespace Torch.Server.Managers
                     _log.Error(task.Exception, $"Future validation verdict faulted");
                     verdict = JoinResult.TicketCanceled;
                 }
+                else if (Players.ContainsKey(info.SteamID))
+                {
+                    _log.Warn($"Player {info.SteamID} has already joined!");
+                    verdict = JoinResult.AlreadyJoined;
+                }
                 else
                     verdict = task.Result;
 
@@ -298,4 +369,4 @@ namespace Torch.Server.Managers
 
         #endregion
     }
-}
+}

Torch.Server/Managers/RemoteAPIManager.cs

@@ -0,0 +1,40 @@
+using NLog;
+using Sandbox;
+using Torch.API;
+using Torch.Managers;
+using VRage.Dedicated.RemoteAPI;
+
+namespace Torch.Server.Managers
+{
+    public class RemoteAPIManager : Manager
+    {
+        /// <inheritdoc />
+        public RemoteAPIManager(ITorchBase torchInstance) : base(torchInstance)
+        {
+            
+        }
+        
+        /// <inheritdoc />
+        public override void Attach()
+        {
+            Torch.GameStateChanged += TorchOnGameStateChanged;
+            base.Attach();
+        }
+
+        /// <inheritdoc />
+        public override void Detach()
+        {
+            Torch.GameStateChanged -= TorchOnGameStateChanged;
+            base.Detach();
+        }
+
+        private void TorchOnGameStateChanged(MySandboxGame game, TorchGameState newstate)
+        {
+            if (newstate == TorchGameState.Loading && MySandboxGame.ConfigDedicated.RemoteApiEnabled && !string.IsNullOrEmpty(MySandboxGame.ConfigDedicated.RemoteSecurityKey))
+            {
+                var myRemoteServer = new MyRemoteServer(MySandboxGame.ConfigDedicated.RemoteApiPort, MySandboxGame.ConfigDedicated.RemoteSecurityKey);
+                LogManager.GetCurrentClassLogger().Info($"Remote API started on port {myRemoteServer.Port}");
+            }
+        }
+    }
+}

Torch.Server/Patches/CheckpointLoadPatch.cs

@@ -0,0 +1,46 @@
+using System.Reflection;
+using NLog;
+using Sandbox.Engine.Networking;
+using Torch.API.Managers;
+using Torch.Managers.PatchManager;
+using Torch.Server;
+using Torch.Server.Managers;
+using Torch.Utils;
+using VRage.Game;
+
+namespace Torch.Patches;
+
+[PatchShim]
+public static class CheckpointLoadPatch
+{
+    private static readonly ILogger Log = LogManager.GetCurrentClassLogger();
+    
+    [ReflectedMethodInfo(typeof(MyLocalCache), "LoadCheckpoint")]
+    private static MethodInfo LoadCheckpointMethod = null!;
+    
+    public static void Patch(PatchContext context)
+    {
+        context.GetPattern(LoadCheckpointMethod).AddPrefix();
+    }
+
+    private static bool Prefix(ref MyObjectBuilder_Checkpoint __result)
+    {
+#pragma warning disable CS0618
+        if (!((TorchServer)TorchBase.Instance).HasRun)
+            return true;
+        
+        var world = TorchBase.Instance.Managers.GetManager<InstanceManager>().DedicatedConfig.SelectedWorld;
+#pragma warning restore CS0618
+        if (world is null)
+        {
+            Log.Error("Selected world is null");
+            return false;
+        }
+
+        world.KeenCheckpoint.Settings = world.WorldConfiguration.Settings;
+        world.KeenCheckpoint.Mods = world.WorldConfiguration.Mods;
+
+        __result = world.Checkpoint;
+        return false;
+    }
+}

Torch.Server/Patches/PromotePatch.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using NLog;
+using Sandbox.Game.World;
+using Torch.Managers.PatchManager;
+using VRage.Game.ModAPI;
+using Torch.API.Managers;
+using Torch.Server.Managers;
+
+namespace Torch.Patches
+{
+    [PatchShim]
+    internal static class PromotePatch
+    {
+        private static Logger _log = LogManager.GetCurrentClassLogger();
+        private static IMultiplayerManagerServer _backing;
+
+        private static IMultiplayerManagerServer ServerManager => _backing ?? (_backing = TorchBase.Instance?.CurrentSession?.Managers.GetManager<IMultiplayerManagerServer>());
+
+        public static void Patch(PatchContext ctx)
+        {
+            _log.Info("patching promote");
+            ctx.GetPattern(typeof(MySession).GetMethod("OnPromoteLevelSet", BindingFlags.NonPublic | BindingFlags.Static)).Prefixes.Add(typeof(PromotePatch).GetMethod(nameof(PromotePrefix)));
+        }
+
+        public static void PromotePrefix(ulong steamId, MyPromoteLevel level)
+        {
+            if (ServerManager is MultiplayerManagerDedicated d)
+                d.RaisePromoteChanged(steamId, level);
+            else
+                throw new NotSupportedException();
+        }
+    }
+}

Torch.Server/Patches/ServerResponsePatch.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Reflection.Emit;
+using NLog;
+using Sandbox.Engine.Multiplayer;
+using Sandbox.Game.World;
+using Torch.API.Managers;
+using Torch.Managers.PatchManager;
+using Torch.Managers.PatchManager.MSIL;
+using Torch.Server.Managers;
+using VRage.Game.ModAPI;
+
+namespace Torch.Patches
+{
+    [PatchShim]
+    public static class ServerResponsePatch
+    {
+        private static Logger _log = LogManager.GetCurrentClassLogger();
+
+        public static void Patch(PatchContext ctx)
+        {
+            var transpiler = typeof(ServerResponsePatch).GetMethod(nameof(Transpile), BindingFlags.Public | BindingFlags.Static);
+            ctx.GetPattern(typeof(MyDedicatedServerBase).GetMethod("Initialize", BindingFlags.NonPublic | BindingFlags.Instance))
+               .Transpilers.Add(transpiler);
+            _log.Info("Patching Steam response polling");
+        }
+
+        public static IEnumerable<MsilInstruction> Transpile(IEnumerable<MsilInstruction> instructions)
+        {
+            // 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)
+                {
+                    _log.Info("Patching Steam response timeout to 5 seconds");
+                    inlineI32.Value = 50;
+                }
+
+                yield return instruction;
+            }
+        }
+    }
+}

Torch.Server/Patches/SteamLoginPatch.cs

@@ -0,0 +1,35 @@
+using System.Reflection;
+using NLog;
+using Steamworks;
+using Torch.Managers.PatchManager;
+using Torch.Utils;
+
+namespace Torch.Patches;
+
+[PatchShim]
+public static class SteamLoginPatch
+{
+    private static readonly ILogger Log = LogManager.GetCurrentClassLogger();
+    
+    [ReflectedMethodInfo(null, "LogOnAnonymous", TypeName = "VRage.Steam.MySteamGameServer, VRage.Steam")]
+    private static MethodInfo LoginMethod = null!;
+
+    public static void Patch(PatchContext context)
+    {
+        context.GetPattern(LoginMethod).AddPrefix();
+    }
+        
+    private static bool Prefix()
+    {
+#pragma warning disable CS0618
+        var token = TorchBase.Instance.Config.LoginToken;
+#pragma warning restore CS0618
+
+        if (string.IsNullOrEmpty(token))
+            return true;
+
+        Log.Info("Logging in to Steam with GSLT");
+        SteamGameServer.LogOn(token);
+        return false;
+    }
+}

Torch.Server/Patches/WorldLoadExceptionPatch.cs

@@ -0,0 +1,52 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Reflection;
+using System.Reflection.Emit;
+using NLog;
+using Sandbox;
+using Torch.Managers.PatchManager;
+using Torch.Managers.PatchManager.MSIL;
+using Torch.Utils;
+
+namespace Torch.Patches
+{
+    /// <summary>
+    /// Patches MySandboxGame.InitQuickLaunch to rethrow exceptions caught during session load.
+    /// </summary>
+    [PatchShim]
+    public static class WorldLoadExceptionPatch
+    {
+        private static readonly ILogger Log = LogManager.GetCurrentClassLogger();
+
+        [ReflectedMethodInfo(typeof(MySandboxGame), "InitQuickLaunch")]
+        private static MethodInfo _quickLaunchMethod = null!;
+
+        public static void Patch(PatchContext ctx)
+        {
+            ctx.GetPattern(_quickLaunchMethod).AddTranspiler(nameof(Transpile));
+        }
+
+        private static IEnumerable<MsilInstruction> Transpile(IEnumerable<MsilInstruction> method)
+        {
+            var msil = method.ToList();
+            for (var i = 0; i < msil.Count; i++)
+            {
+                var instruction = msil[i];
+                if (instruction.IsLocalStore() && instruction.Operand is MsilOperandInline.MsilOperandLocal {Value.Index: 19} operand)
+                {
+                    msil.InsertRange(i + 1, new []
+                    {
+                        operand.Instruction.CopyWith(OpCodes.Ldloc_S),
+                        new MsilInstruction(OpCodes.Call).InlineValue(new Action<Exception>(LogFatal).Method)
+                    });
+                }
+            }
+            return msil;
+        }
+
+        private static void LogFatal(Exception e) => Log.Fatal(e.ToStringDemystified());
+    }
+}

Torch.Server/Program.cs

@@ -1,50 +1,112 @@
 using System;
-using System.Diagnostics;
 using System.IO;
-using System.IO.Compression;
-using System.Net;
-using System.Reflection;
-using System.ServiceProcess;
-using System.Text;
-using System.Threading;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration.Xml;
 using NLog;
+using NLog.Config;
 using NLog.Targets;
+using Torch.API;
 using Torch.Utils;
 
 namespace Torch.Server
 {
     internal static class Program
     {
-        /// <remarks>
-        /// This method must *NOT* load any types/assemblies from the vanilla game, otherwise automatic updates will fail.
-        /// </remarks>
         [STAThread]
         public static void Main(string[] args)
         {
-            Target.Register<FlowDocumentTarget>("FlowDocument");
-            //Ensures that all the files are downloaded in the Torch directory.
-            var workingDir = new FileInfo(typeof(Program).Assembly.Location).Directory.ToString();
-            var binDir = Path.Combine(workingDir, "DedicatedServer64");
-            Directory.SetCurrentDirectory(workingDir);
+            var configurationBuilder = new ConfigurationBuilder()
+                .AddEnvironmentVariables("TORCH")
+                .AddCommandLine(args);
+            var configuration = configurationBuilder.Build();
+            
+            var context = CreateApplicationContext(configuration);
 
-            if (!TorchLauncher.IsTorchWrapped())
-            {
-                TorchLauncher.Launch(Assembly.GetEntryAssembly().FullName, args, binDir);
-                return;
-            }
+            SetupLogging(context, configuration);
+            var config = SetupConfiguration(context, configurationBuilder, out configuration);
+            
+            var handler = new UnhandledExceptionHandler(config.Data);
+            AppDomain.CurrentDomain.UnhandledException += handler.OnUnhandledException;
 
-            if (!Environment.UserInteractive)
-            {
-                using (var service = new TorchService())
-                    ServiceBase.Run(service);
-                return;
-            }
+            var initializer = new Initializer(config);
+            if (!initializer.Initialize(configuration))
+                Environment.Exit(1);
 
-            var initializer = new Initializer(workingDir);
-            if (!initializer.Initialize(args))
-                return;
+#if DEBUG
+            TorchLauncher.Launch(context.TorchDirectory.FullName, context.GameBinariesDirectory.FullName);
+#else
+            TorchLauncher.Launch(context.TorchDirectory.FullName, Path.Combine(context.TorchDirectory.FullName, "torch64"),
+                context.GameBinariesDirectory.FullName);
+#endif
 
             initializer.Run();
         }
+
+        private static void SetupLogging(IApplicationContext context, IConfiguration configuration)
+        {
+            var oldNlog = Path.Combine(context.TorchDirectory.FullName, "NLog.config");
+            var newNlog = configuration.GetValue("loggingConfigPath", Path.Combine(context.InstanceDirectory.FullName, "NLog.config"));
+            if (File.Exists(oldNlog) && !File.ReadAllText(oldNlog).Contains("FlowDocument"))
+                File.Move(oldNlog, newNlog);
+            else if (!File.Exists(newNlog))
+                using (var f = File.Create(newNlog!))
+                    typeof(Program).Assembly.GetManifestResourceStream("Torch.Server.NLog.config")!.CopyTo(f);
+            
+            Target.Register<LogViewerTarget>(nameof(LogViewerTarget));
+            TorchLogManager.RegisterTargets(configuration.GetValue("loggingExtensionsPath",
+                                                                   Path.Combine(
+                                                                       context.InstanceDirectory.FullName,
+                                                                       "LoggingExtensions")));
+            
+            TorchLogManager.SetConfiguration(new XmlLoggingConfiguration(newNlog));
+        }
+
+        private static Persistent<TorchConfig> SetupConfiguration(IApplicationContext context,
+                                                                  IConfigurationBuilder builder,
+                                                                  out IConfigurationRoot configuration)
+        {
+            var oldTorchCfg = Path.Combine(context.TorchDirectory.FullName, "Torch.cfg");
+            var torchCfg = Path.Combine(context.InstanceDirectory.FullName, "Torch.cfg");
+            
+            if (File.Exists(oldTorchCfg))
+                File.Move(oldTorchCfg, torchCfg);
+
+            builder.AddXmlFile(torchCfg, true, true);
+
+            configuration = builder.Build();
+
+            var config = new Persistent<TorchConfig>(torchCfg, configuration.Get<TorchConfig>() ?? new());
+            config.Data.InstanceName = context.InstanceName;
+            config.Data.InstancePath = context.InstanceDirectory.FullName;
+
+            return config;
+        }
+
+        private static IApplicationContext CreateApplicationContext(IConfiguration configuration)
+        {
+            var isService = configuration.GetValue("service", false);
+            
+            var workingDir = AppContext.BaseDirectory;
+            var gamePath = configuration.GetValue("gamePath", workingDir);
+            var binDir = Path.Combine(gamePath, "DedicatedServer64");
+
+            var instanceName = configuration.GetValue("instanceName", "Instance");
+            string instancePath;
+            
+            if (Path.IsPathRooted(instanceName))
+            {
+                instancePath = instanceName;
+                instanceName = Path.GetDirectoryName(instanceName);
+            }
+            else
+            {
+                instancePath = Directory.CreateDirectory(instanceName!).FullName;
+            }
+            
+            Directory.SetCurrentDirectory(gamePath);
+            
+            return new ApplicationContext(new(workingDir), new(gamePath), new(binDir), 
+                new(instancePath), instanceName, isService);
+        }
     }
-}
+}

Torch.Server/Properties/AssemblyInfo.cs

@@ -1,17 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("Torch Server")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Torch")]
-[assembly: AssemblyCopyright("Copyright © Torch API 2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
-
-#if DEBUG
-[assembly: AssemblyConfiguration("Debug")]
-#else
-[assembly: AssemblyConfiguration("Release")]
-#endif

Torch.Server/Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace Torch.Server.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {

Torch.Server/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace Torch.Server.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

Torch.Server/Properties/launchSettings.json

@@ -0,0 +1,11 @@
+{
+  "$schema": "https://json.schemastore.org/launchsettings.json",
+  "profiles": {
+    "Torch.Server": {
+      "commandName": "Project",
+      "commandLineArgs": "--noupdate true --gamepath \"C:\\Program Files (x86)\\Steam\\steamapps\\common\\SpaceEngineersDedicatedServer\"",
+      "use64Bit": true,
+      "hotReloadEnabled": false
+    }
+  }
+}

Torch.Server/Themes/Dark Theme Animated.xaml

@@ -4,11 +4,9 @@
         <!-- MahApps.Metro resource dictionaries. Make sure that all file names are Case Sensitive! -->
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Colors.xaml" />
-        <!-- Accent and AppTheme setting -->
-        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Blue.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseDark.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.AnimatedSingleRowTabControl.xaml" />
+        <!-- AppTheme setting -->
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Dark.Blue.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.Tabcontrol.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
     <Style TargetType="Hyperlink" x:Name="LegalshtuffLink">

Torch.Server/Themes/Dark Theme.xaml

@@ -5,10 +5,9 @@
         <!-- MahApps.Metro resource dictionaries. Make sure that all file names are Case Sensitive! -->
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Colors.xaml" />
-        <!-- Accent and AppTheme setting -->
-        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Blue.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseDark.xaml" />
+        <!-- AppTheme setting -->
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Dark.Blue.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.Tabcontrol.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
     <Style TargetType="TabControl">

Torch.Server/Themes/Light Theme Animated.xaml

@@ -6,11 +6,9 @@
         <!-- MahApps.Metro resource dictionaries. Make sure that all file names are Case Sensitive! -->
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Colors.xaml" />
-        <!-- Accent and AppTheme setting -->
-        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Blue.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseLight.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.AnimatedSingleRowTabControl.xaml" />
+        <!-- AppTheme setting -->
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Light.Blue.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.Tabcontrol.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
     <Style TargetType="Hyperlink" x:Name="LegalshtuffLink">

Torch.Server/Themes/Light Theme.xaml

@@ -5,10 +5,9 @@
         <!-- MahApps.Metro resource dictionaries. Make sure that all file names are Case Sensitive! -->
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Colors.xaml" />
-        <!-- Accent and AppTheme setting -->
-        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Blue.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseLight.xaml" />
+        <!-- AppTheme setting -->
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Light.Blue.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.Tabcontrol.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
     <Style TargetType="TabControl">

Torch.Server/Torch.Server.csproj

@@ -1,476 +1,80 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <ProjectGuid>{CA50886B-7B22-4CD8-93A0-C06F38D4F77D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Torch.Server</RootNamespace>
-    <AssemblyName>Torch.Server</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
+    <TargetFramework>net6-windows</TargetFramework>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <LangVersion>10</LangVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
+    <AssemblyTitle>Torch Server</AssemblyTitle>
+    <Product>Torch</Product>
+    <Copyright>Copyright © Torch API 2017</Copyright>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <OutputPath>..\bin\$(Platform)\$(Configuration)\</OutputPath>
+    <UseWPF>true</UseWPF>
+    <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
+    <NeutralLanguage>en</NeutralLanguage>
+    <EnableWindowsTargeting>true</EnableWindowsTargeting>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(SolutionDir)\bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>$(SolutionDir)\bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-    <DocumentationFile>$(SolutionDir)\bin\x64\Release\Torch.Server.xml</DocumentationFile>
+  
+  <PropertyGroup>
+    <BeautyLibsDir>torch64</BeautyLibsDir>
+    <NoBeautyFlag>True</NoBeautyFlag>
+    <ForceBeauty>True</ForceBeauty>
   </PropertyGroup>
+  
   <PropertyGroup>
     <StartupObject>Torch.Server.Program</StartupObject>
   </PropertyGroup>
+  
   <PropertyGroup>
     <ApplicationIcon>torchicon.ico</ApplicationIcon>
   </PropertyGroup>
+  
   <ItemGroup>
-    <Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
-    </Reference>
-    <Reference Include="HavokWrapper, Version=1.0.6051.28726, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\HavokWrapper.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="MahApps.Metro, Version=1.6.1.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MahApps.Metro.1.6.1\lib\net45\MahApps.Metro.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.CodeAnalysis, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\Microsoft.CodeAnalysis.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.12\lib\net45\NLog.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Sandbox.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\Sandbox.Common.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Sandbox.Game, Version=0.1.6305.30774, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\Sandbox.Game.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Sandbox.Graphics, Version=0.1.6305.30761, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\Sandbox.Graphics.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="SpaceEngineers.Game, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\SpaceEngineers.Game.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="SpaceEngineers.ObjectBuilders, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\SpaceEngineers.ObjectBuilders.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="SpaceEngineers.ObjectBuilders.XmlSerializers, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\SpaceEngineers.ObjectBuilders.XmlSerializers.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Steamworks.NET">
-      <HintPath>..\GameBinaries\Steamworks.NET.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Configuration.Install" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.IO.Compression.FileSystem" />
-    <Reference Include="System.ServiceProcess" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\System.Windows.Interactivity.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="VRage, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\VRage.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.Audio, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\VRage.Audio.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.Dedicated, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\VRage.Dedicated.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.Game, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\VRage.Game.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.Game.XmlSerializers, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\VRage.Game.XmlSerializers.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.Input, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\VRage.Input.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.Library, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\VRage.Library.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.Math, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\VRage.Math.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.Native, Version=0.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\VRage.Native.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.OpenVRWrapper, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\VRage.OpenVRWrapper.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.Render, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\VRage.Render.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.Render11, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\VRage.Render11.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.Scripting, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\GameBinaries\VRage.Scripting.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="VRage.Steam">
-      <HintPath>..\GameBinaries\VRage.Steam.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
+    <PackageReference Include="AutoCompleteTextBox" Version="1.6.0" />
+    <PackageReference Include="Ben.Demystifier" Version="0.4.1" />
+    <PackageReference Include="ControlzEx" Version="5.0.1" />
+    <PackageReference Include="MahApps.Metro" Version="2.4.9" />
+    <PackageReference Include="MdXaml" Version="1.16.0" />
+    <PackageReference Include="Microsoft.Diagnostics.Runtime" Version="2.2.332302" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="6.0.0" />
+    <PackageReference Include="NLog" Version="5.0.4" />
+    <PackageReference Include="PropertyChanged.Fody" Version="4.0.3" PrivateAssets="all" />
+    <PackageReference Include="Steamworks.NET" Version="20.1.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>compile</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
+    <PackageReference Include="System.Management" Version="6.0.0" />
+    <PackageReference Include="nulastudio.NetCoreBeauty" Version="1.2.9.3" />
+    <PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.201.13">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>compile</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
+  
   <ItemGroup>
-    <Compile Include="..\Versioning\AssemblyVersion.cs">
-      <Link>Properties\AssemblyVersion.cs</Link>
-    </Compile>
-    <Compile Include="Commands\WhitelistCommands.cs" />
-    <Compile Include="FlowDocumentTarget.cs" />
-    <Compile Include="ListBoxExtensions.cs" />
-    <Compile Include="Managers\EntityControlManager.cs" />
-    <Compile Include="Managers\MultiplayerManagerDedicated.cs" />
-    <Compile Include="Managers\InstanceManager.cs" />
-    <Compile Include="Managers\MultiplayerManagerDedicatedEventShim.cs" />
-    <Compile Include="Managers\MultiplayerManagerDedicatedPatchShim.cs" />
-    <Compile Include="NativeMethods.cs" />
-    <Compile Include="Initializer.cs" />
-    <Compile Include="Properties\Annotations.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TorchConfig.cs" />
-    <Compile Include="TorchService.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="TorchServiceInstaller.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="ViewModels\BlockLimitViewModel.cs" />
-    <Compile Include="ViewModels\CheckpointViewModel.cs" />
-    <Compile Include="ViewModels\Entities\Blocks\BlockViewModel.cs" />
-    <Compile Include="ViewModels\Entities\Blocks\BlockViewModelGenerator.cs" />
-    <Compile Include="ViewModels\Entities\Blocks\PropertyViewModel.cs" />
-    <Compile Include="ViewModels\Entities\CharacterViewModel.cs" />
-    <Compile Include="ViewModels\ConfigDedicatedViewModel.cs" />
-    <Compile Include="ViewModels\Entities\EntityControlViewModel.cs" />
-    <Compile Include="ViewModels\SessionSettingsViewModel.cs" />
-    <Compile Include="Views\Converters\DefinitionToIdConverter.cs" />
-    <Compile Include="Views\Converters\BooleanAndConverter.cs" />
-    <Compile Include="Views\Converters\ListConverter.cs" />
-    <Compile Include="MultiTextWriter.cs" />
-    <Compile Include="RichTextBoxWriter.cs" />
-    <Compile Include="Views\Entities\CharacterView.xaml.cs">
-      <DependentUpon>CharacterView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\ThemeControl.xaml.cs">
-      <DependentUpon>ThemeControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\ValidationRules\ListConverterValidationRule.cs" />
-    <Compile Include="Views\Entities\EntityControlHost.xaml.cs">
-      <DependentUpon>EntityControlHost.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Entities\EntityControlsView.xaml.cs">
-      <DependentUpon>EntityControlsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="ViewModels\EntityTreeViewModel.cs" />
-    <Compile Include="ViewModels\Entities\EntityViewModel.cs" />
-    <Compile Include="ViewModels\Entities\FloatingObjectViewModel.cs" />
-    <Compile Include="ViewModels\Entities\GridViewModel.cs" />
-    <Compile Include="ViewModels\ILazyLoad.cs" />
-    <Compile Include="ViewModels\PluginManagerViewModel.cs" />
-    <Compile Include="ViewModels\PluginViewModel.cs" />
-    <Compile Include="ViewModels\Entities\VoxelMapViewModel.cs" />
-    <Compile Include="ViewModels\SteamUserViewModel.cs" />
-    <Compile Include="Views\AddWorkshopItemsDialog.xaml.cs">
-      <DependentUpon>AddWorkshopItemsDialog.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Converters\InverseBooleanConverter.cs" />
-    <Compile Include="Views\Converters\Vector3DConverter.cs" />
-    <Compile Include="Views\Entities\Blocks\BlockView.xaml.cs">
-      <DependentUpon>BlockView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Entities\Blocks\PropertyView.xaml.cs">
-      <DependentUpon>PropertyView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\ChatControl.xaml.cs">
-      <DependentUpon>ChatControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\ConfigControl.xaml.cs">
-      <DependentUpon>ConfigControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\EntitiesControl.xaml.cs">
-      <DependentUpon>EntitiesControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Converters\StringBuilderConverter.cs" />
-    <Compile Include="Views\Converters\StringIdConverter.cs" />
-    <Compile Include="Views\Entities\GridView.xaml.cs">
-      <DependentUpon>GridView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Entities\VoxelMapView.xaml.cs">
-      <DependentUpon>VoxelMapView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\ModsControl.xaml.cs">
-      <DependentUpon>ModsControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\PluginsControl.xaml.cs">
-      <DependentUpon>PluginsControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\SessionSettingsView.xaml.cs">
-      <DependentUpon>SessionSettingsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\TorchUI.xaml.cs">
-      <DependentUpon>TorchUI.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\PlayerListControl.xaml.cs">
-      <DependentUpon>PlayerListControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Program.cs" />
-    <Compile Include="TorchServer.cs" />
-    <Compile Include="Views\ValidationRules\NumberValidationRule.cs" />
-    <Compile Include="Views\WorldGeneratorDialog.xaml.cs">
-      <DependentUpon>WorldGeneratorDialog.xaml</DependentUpon>
-    </Compile>
+    <Compile Remove="ServerManager.cs" />
+    <Compile Remove="ViewModels\SessionSettingsViewModel1.cs" />
+    <Compile Remove="Views\WorldSelectControl.xaml.cs" />
   </ItemGroup>
+  
   <ItemGroup>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <None Include="packages.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Torch.API\Torch.API.csproj">
-      <Project>{fba5d932-6254-4a1e-baf4-e229fa94e3c2}</Project>
-      <Name>Torch.API</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\Torch\Torch.csproj">
-      <Project>{7e01635c-3b67-472e-bcd6-c5539564f214}</Project>
-      <Name>Torch</Name>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="Themes\Dark Theme Animated.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Themes\Dark Theme.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Themes\Light Theme Animated.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Themes\Light Theme.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\Entities\EntityControlHost.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\Entities\EntityControlsView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\AddWorkshopItemsDialog.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\Entities\Blocks\BlockView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\Entities\Blocks\PropertyView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\ChatControl.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\ConfigControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\EntitiesControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\Entities\CharacterView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\Entities\GridView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\PluginsControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\Entities\VoxelMapView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\ModsControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\Resources.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\SessionSettingsView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\ThemeControl.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\TorchUI.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\PlayerListControl.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\WorldGeneratorDialog.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
+    <ProjectReference Include="..\Torch.API\Torch.API.csproj" />
+    <ProjectReference Include="..\Torch\Torch.csproj" />
   </ItemGroup>
+  
   <ItemGroup>
     <Resource Include="torchicon.ico" />
   </ItemGroup>
+  
   <ItemGroup>
-    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
+    <Page Remove="Views\WorldSelectControl.xaml" />
+    <EmbeddedResource Include="..\NLog.config" Visible="false" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include=".NETFramework,Version=v4.6.1">
-      <Visible>False</Visible>
-      <ProductName>Microsoft .NET Framework 4.6.1 %28x86 and x64%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\TransformOnBuild.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>copy "$(SolutionDir)NLog.config" "$(TargetDir)"</PostBuildEvent>
-  </PropertyGroup>
 </Project>

Torch.Server/Torch.Server.csproj.DotSettings

@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeEditing/Localization/Localizable/@EntryValue">No</s:String></wpf:ResourceDictionary>

Torch.Server/TorchConfig.cs

@@ -1,130 +1,124 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
-using System.Windows;
 using System.Xml.Serialization;
-using Newtonsoft.Json;
-using NLog;
+using Torch.API;
+using Torch.Views;
 
-namespace Torch.Server
+namespace Torch.Server;
+
+public class TorchConfig : ViewModel, ITorchConfig
 {
-    // TODO: redesign this gerbage
-    public class TorchConfig : CommandLine, ITorchConfig
+    public bool ShouldUpdatePlugins => (GetPluginUpdates && !NoUpdate) || ForceUpdate;
+    public bool ShouldUpdateTorch => (GetTorchUpdates && !NoUpdate) || ForceUpdate;
+
+    /// <inheritdoc />
+    [XmlIgnore]
+    public bool NoUpdate { get; set; }
+
+    /// <inheritdoc />
+    [XmlIgnore]
+    public bool ForceUpdate { get; set; }
+
+    /// <summary>
+    /// Permanent flag to ALWAYS automatically start the server
+    /// </summary>
+    [Display(Name = "Auto Start", Description = "Permanent flag to ALWAYS automatically start the server.", GroupName = "Server")]
+    public bool Autostart { get; set; }
+
+    /// <summary>
+    /// Temporary flag to automatically start the server only on the next run
+    /// </summary>
+    [XmlIgnore]
+    public bool TempAutostart { get; set; }
+
+    /// <inheritdoc />
+    [Display(Name = "Restart On Crash", Description = "Automatically restart the server if it crashes.", GroupName = "Server")]
+    public bool RestartOnCrash { get; set; }
+
+    public string InstancePath { get; set; }
+
+    /// <inheritdoc />
+    [Display(Name = "No GUI", Description = "Do not show the Torch UI.", GroupName = "Window")]
+    public bool NoGui { get; set; }
+
+    /// <inheritdoc />
+    [Display(Name = "Update Torch", Description = "Check every start for new versions of torch.",
+             GroupName = "Server")]
+    public bool GetTorchUpdates { get; set; } = true;
+
+    public string InstanceName { get; set; }
+
+    /// <inheritdoc />
+    [Display(Name = "Update Plugins", Description = "Check every start for new versions of plugins.",
+             GroupName = "Server")]
+    public bool GetPluginUpdates { get; set; } = true;
+
+    /// <inheritdoc />
+    [Display(Name = "Watchdog Timeout", Description = "Watchdog timeout (in seconds).", GroupName = "Server")]
+    public int TickTimeout { get; set; } = 60;
+
+    /// <inheritdoc />
+    public List<Guid> Plugins { get; set; } = new();
+
+    [Display(Name = "Local Plugins", Description = "Loads all pluhins from disk, ignores the plugins defined in config.", GroupName = "In-Game")]
+    public bool LocalPlugins { get; set; }
+
+    [Display(Name = "Auto Disconnect", Description = "When server restarts, all clients are rejected to main menu to prevent auto rejoin.", GroupName = "In-Game")]
+    public bool DisconnectOnRestart { get; set; }
+
+    [Display(Name = "Chat Name", Description = "Default name for chat from gui, broadcasts etc..",
+             GroupName = "In-Game")]
+    public string ChatName { get; set; } = "Server";
+
+    [Display(Name = "Chat Color",
+             Description = "Default color for chat from gui, broadcasts etc.. (Red, Blue, White, Green)",
+             GroupName = "In-Game")]
+    public string ChatColor { get; set; } = "Red";
+
+    [Display(Name = "Enable Whitelist", Description = "Enable Whitelist to prevent random players join while maintance, tests or other.", GroupName = "In-Game")]
+    public bool EnableWhitelist { get; set; }
+
+    [Display(Name = "Whitelist", Description = "Collection of whitelisted steam ids.", GroupName = "In-Game")]
+    public List<ulong> Whitelist { get; set; } = new();
+
+    [Display(Name = "Width", Description = "Default window width.", GroupName = "Window")]
+    public int WindowWidth { get; set; } = 980;
+
+    [Display(Name = "Height", Description = "Default window height", GroupName = "Window")]
+    public int WindowHeight { get; set; } = 588;
+
+    [Display(Name = "Font Size", Description = "Font size for logging text box. (default is 16)",
+             GroupName = "Window")]
+    public int FontSize { get; set; } = 16;
+
+    [Display(Name = "UGC Service Type", Description = "Service for downloading mods", GroupName = "Server")]
+    public UGCServiceType UgcServiceType { get; set; } = UGCServiceType.Steam;
+
+    public string LastUsedTheme { get; set; } = "Torch Theme";
+
+    [Display(Name = "Independent Console", Description = "Keeps a separate console window open after the main UI loads.", GroupName = "Window")]
+    public bool IndependentConsole { get; set; }
+
+    [XmlIgnore]
+    public string TestPlugin { get; set; }
+
+    [Display(Name = "Enable Asserts", Description = "Enable Keen's assert logging.", GroupName = "Server")]
+    public bool EnableAsserts { get; set; }
+
+    [Display(Name = "Enable Entity Manager", Description = "Enable Entity Manager tab. (can affect performance)",
+             GroupName = "Server")]
+    public bool EntityManagerEnabled { get; set; } = true;
+
+    [Display(Name = "Login Token", Description = "Steam GSLT (can be used if you have dynamic ip)", GroupName = "Server")]
+    public string LoginToken { get; set; }
+
+    public UpdateSource UpdateSource { get; set; } = new()
     {
-        private static Logger _log = LogManager.GetLogger("Config");
+        Repository = "PveTeam/Torch",
+        Url = "https://api.github.com",
+        SourceType = UpdateSourceType.Github
+    };
 
-        public bool ShouldUpdatePlugins => (GetPluginUpdates && !NoUpdate) || ForceUpdate;
-        public bool ShouldUpdateTorch => (GetTorchUpdates && !NoUpdate) || ForceUpdate;
-
-        /// <inheritdoc />
-        [Arg("instancename", "The name of the Torch instance.")]
-        public string InstanceName { get; set; }
-
-        /// <inheritdoc />
-        [Arg("instancepath", "Server data folder where saves and mods are stored.")]
-        public string InstancePath { get; set; }
-
-        /// <inheritdoc />
-        [XmlIgnore, Arg("noupdate", "Disable automatically downloading game and plugin updates.")]
-        public bool NoUpdate { get; set; }
-
-        /// <inheritdoc />
-        [XmlIgnore, Arg("forceupdate", "Manually check for and install updates.")]
-        public bool ForceUpdate { get; set; }
-
-        /// <inheritdoc />
-        [Arg("autostart", "Start the server immediately.")]
-        public bool Autostart { get; set; }
-
-        /// <inheritdoc />
-        [Arg("restartoncrash", "Automatically restart the server if it crashes.")]
-        public bool RestartOnCrash { get; set; }
-
-        /// <inheritdoc />
-        [Arg("nogui", "Do not show the Torch UI.")]
-        public bool NoGui { get; set; }
-
-        /// <inheritdoc />
-        [XmlIgnore, Arg("waitforpid", "Makes Torch wait for another process to exit.")]
-        public string WaitForPID { get; set; }
-
-        /// <inheritdoc />
-        public bool GetTorchUpdates { get; set; } = true;
-
-        /// <inheritdoc />
-        public bool GetPluginUpdates { get; set; } = true;
-
-        /// <inheritdoc />
-        public int TickTimeout { get; set; } = 60;
-
-        /// <inheritdoc />
-        public List<string> Plugins { get; set; } = new List<string>();
-
-        public bool EnableWhitelist { get; set; } = false;
-        public HashSet<ulong> Whitelist { get; set; } = new HashSet<ulong>();
-
-        internal Point WindowSize { get; set; } = new Point(800, 600);
-        internal Point WindowPosition { get; set; } = new Point();
-
-        public string LastUsedTheme { get; set; } = "Torch Theme";
-
-        //TODO: REMOVE ME BY JULY 2019
-        [Obsolete("Use vanilla reserved slot config")]
-        public HashSet<ulong> ReservedPlayers { get; set; } = new HashSet<ulong>();
-
-        //Prevent reserved players being written to disk, but allow it to bre read
-        //remove this when ReservedPlayers is removed
-        private bool ShouldSerializeReservedPlayers() => false;
-
-        [XmlIgnore]
-        private string _path;
-
-        public TorchConfig() : this("Torch") { }
-
-        public TorchConfig(string instanceName = "Torch", string instancePath = null)
-        {
-            InstanceName = instanceName;
-            InstancePath = instancePath ?? Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "SpaceEngineersDedicated");
-        }
-
-        public static TorchConfig LoadFrom(string path)
-        {
-            try
-            {
-                var ser = new XmlSerializer(typeof(TorchConfig));
-                using (var f = File.OpenRead(path))
-                {
-                    var config = (TorchConfig)ser.Deserialize(f);
-                    config._path = path;
-                    return config;
-                }
-            }
-            catch (Exception e)
-            {
-                _log.Error(e);
-                return null;
-            }
-        }
-
-        public bool Save(string path = null)
-        {
-            if (path == null)
-                path = _path;
-            else
-                _path = path;
-
-            try
-            {
-                var ser = new XmlSerializer(typeof(TorchConfig));
-                using (var f = File.Create(path))
-                    ser.Serialize(f, this);
-                return true;
-            }
-            catch (Exception e)
-            {
-                _log.Error(e);
-                return false;
-            }
-        }
-    }
-}
+    // for backward compatibility
+    public void Save(string path = null) => Initializer.Instance?.ConfigPersistent?.Save(path);
+}

Torch.Server/TorchServer.cs

@@ -3,30 +3,30 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Net;
+using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Windows.Forms;
+using Microsoft.Diagnostics.Runtime;
 using NLog;
+using PropertyChanged;
 using Sandbox;
-using Sandbox.Engine.Networking;
+using Sandbox.Engine.Multiplayer;
 using Sandbox.Game.Multiplayer;
 using Sandbox.Game.World;
 using Torch.API;
 using Torch.API.Managers;
 using Torch.API.Session;
 using Torch.Commands;
+using Torch.Managers.PatchManager;
 using Torch.Mod;
+using Torch.Mod.Messages;
+using Torch.Patches;
 using Torch.Server.Commands;
 using Torch.Server.Managers;
 using Torch.Utils;
 using VRage;
-using VRage.Dedicated;
-using VRage.Dedicated.RemoteAPI;
-using VRage.GameServices;
-using VRage.Steam;
 using Timer = System.Threading.Timer;
 
 #endregion
@@ -37,47 +37,82 @@ namespace Torch.Server
 {
     public class TorchServer : TorchBase, ITorchServer
     {
-        private bool _canRun;
-        private TimeSpan _elapsedPlayTime;
-        private bool _hasRun;
-        private bool _isRunning;
         private float _simRatio;
-        private ServerState _state;
         private Stopwatch _uptime;
         private Timer _watchdog;
+        private MultiplayerManagerDedicated _multiplayerManagerDedicated;
+        
+        internal bool FatalException { get; set; }
 
+        private System.Timers.Timer _simUpdateTimer = new System.Timers.Timer(200);
+        private bool _simDirty;
+
+        //Here to trigger rebuild
         /// <inheritdoc />
-       public TorchServer(TorchConfig config = null)
+        public TorchServer(ITorchConfig config, string instancePath, string instanceName) : base(config)
         {
+            InstancePath = instancePath;
+            InstanceName = instanceName;
             DedicatedInstance = new InstanceManager(this);
             AddManager(DedicatedInstance);
-            AddManager(new EntityControlManager(this));
-            Config = config ?? new TorchConfig();
+            if (config.EntityManagerEnabled)
+                AddManager(new EntityControlManager(this));
+            AddManager(new RemoteAPIManager(this));
 
             var sessionManager = Managers.GetManager<ITorchSessionManager>();
             sessionManager.AddFactory(x => new MultiplayerManagerDedicated(this));
+            sessionManager.SessionStateChanged += OnSessionStateChanged;
+            
+            // Needs to be done at some point after MyVRageWindows.Init
+            // where the debug listeners are registered
+            if (!((TorchConfig)Config).EnableAsserts)
+                MyDebug.Listeners.Clear();
+            
+            _simUpdateTimer.Elapsed += SimUpdateElapsed;
+            _simUpdateTimer.Start();
+        }
+
+        private void SimUpdateElapsed(object sender, System.Timers.ElapsedEventArgs e)
+        {
+            if (_simDirty)
+            {
+                OnPropertyChanged(nameof(SimulationRatio));
+                _simDirty = false;
+            }
+        }
+
+        public bool HasRun { get; set; }
+
+        
+        /// <inheritdoc />
+        public float SimulationRatio
+        {
+            get => _simRatio;
+            set
+            {
+                if (_simRatio.IsEqual(value, 0.01f))
+                    return;
+
+                _simRatio = value;
+                _simDirty = true;
+                //SetValue(ref _simRatio, value);
+            }
         }
 
         /// <inheritdoc />
-        public float SimulationRatio { get => _simRatio; set => SetValue(ref _simRatio, value); }
+        public TimeSpan ElapsedPlayTime { get; set; }
 
         /// <inheritdoc />
-        public TimeSpan ElapsedPlayTime { get => _elapsedPlayTime; set => SetValue(ref _elapsedPlayTime, value); }
+        public Thread GameThread => MySandboxGame.Static?.UpdateThread;
 
         /// <inheritdoc />
-        public Thread GameThread { get; private set; }
+        public bool IsRunning { get; set; }
 
-        /// <inheritdoc />
-        public bool IsRunning { get => _isRunning; set => SetValue(ref _isRunning, value); }
-
-        public bool CanRun { get => _canRun; set => SetValue(ref _canRun, value); }
+        public bool CanRun { get; set; }
 
         /// <inheritdoc />
         public InstanceManager DedicatedInstance { get; }
 
-        /// <inheritdoc />
-        public string InstanceName => Config?.InstanceName;
-
         /// <inheritdoc />
         protected override uint SteamAppId => 244850;
 
@@ -85,24 +120,21 @@ namespace Torch.Server
         protected override string SteamAppName => "SpaceEngineersDedicated";
 
         /// <inheritdoc />
-        public ServerState State { get => _state; private set => SetValue(ref _state, value); }
+        public ServerState State { get; private set; }
 
         public event Action<ITorchServer> Initialized;
 
-        /// <inheritdoc />
-        public string InstancePath => Config?.InstancePath;
+        public int OnlinePlayers { get; private set; }
 
         /// <inheritdoc />
         public override void Init()
         {
             Log.Info("Initializing server");
-            MySandboxGame.IsDedicated = true;
             base.Init();
-            Managers.GetManager<ITorchSessionManager>().SessionStateChanged += OnSessionStateChanged;
-            GetManager<InstanceManager>().LoadInstance(Config.InstancePath);
+            GetManager<InstanceManager>().LoadInstance(InstancePath);
             CanRun = true;
             Initialized?.Invoke(this);
-            Log.Info($"Initialized server '{Config.InstanceName}' at '{Config.InstancePath}'");
+            Log.Info($"Initialized server '{InstanceName}' at '{InstancePath}'");
         }
 
         /// <inheritdoc />
@@ -111,7 +143,7 @@ namespace Torch.Server
             if (State != ServerState.Stopped)
                 return;
 
-            if (_hasRun)
+            if (IsRunning || HasRun)
             {
                 Restart();
                 return;
@@ -119,16 +151,12 @@ namespace Torch.Server
 
             State = ServerState.Starting;
             IsRunning = true;
+            HasRun = true;
             CanRun = false;
-            _hasRun = true;
+            PatchManager.CommitInternal();
             Log.Info("Starting server.");
             MySandboxGame.ConfigDedicated = DedicatedInstance.DedicatedConfig.Model;
-            if (MySandboxGame.ConfigDedicated.RemoteApiEnabled && !string.IsNullOrEmpty(MySandboxGame.ConfigDedicated.RemoteSecurityKey))
-            {
-                var myRemoteServer = new MyRemoteServer(MySandboxGame.ConfigDedicated.RemoteApiPort, MySandboxGame.ConfigDedicated.RemoteSecurityKey);
-                Log.Info($"Remote API started on port {myRemoteServer.Port}");
-            }
-            
+
             _uptime = Stopwatch.StartNew();
             base.Start();
         }
@@ -138,6 +166,17 @@ namespace Torch.Server
         {
             if (State == ServerState.Stopped)
                 Log.Error("Server is already stopped");
+            if (Thread.CurrentThread == GameThread)
+                new Thread(StopInternal)
+                {
+                    Name = "Stopping Thread"
+                }.Start();
+            else
+                StopInternal();
+        }
+
+        private void StopInternal()
+        {
             Log.Info("Stopping server.");
             base.Stop();
             Log.Info("Server stopped.");
@@ -145,58 +184,98 @@ namespace Torch.Server
             State = ServerState.Stopped;
             IsRunning = false;
             CanRun = true;
+            SimulationRatio = 0;
         }
 
         /// <summary>
         ///     Restart the program.
         /// </summary>
-        public override void Restart()
+        public override void Restart(bool save = true)
         {
-            if (IsRunning)
-                Save().ContinueWith(DoRestart, this, TaskContinuationOptions.RunContinuationsAsynchronously);
-            else
-                DoRestart(null, this);
-
-            void DoRestart(Task<GameSaveResult> task, object torch0)
+            if (Config.DisconnectOnRestart)
             {
-                var torch = (TorchServer)torch0;
-                torch.Stop();
-                // TODO clone this
-                var config = (TorchConfig)torch.Config;
-                LogManager.Flush();
+                foreach (var member in MyMultiplayer.Static.Members)
+                {
+                    MyMultiplayer.Static.DisconnectClient(member);
+                }
 
-                string exe = Assembly.GetExecutingAssembly().Location;
-                Debug.Assert(exe != null);
-                config.WaitForPID = Process.GetCurrentProcess().Id.ToString();
-                config.Autostart = true;
-                Process.Start(exe, config.ToString());
-
-                Process.GetCurrentProcess().Kill();
+                Log.Info("Ejected all players from server for restart.");
             }
+
+            new Thread(() =>
+            {
+                StopInternal();
+                LogManager.Flush();
+                
+#if DEBUG
+                Environment.Exit(0);
+#endif
+
+                var exe = Assembly.GetExecutingAssembly().Location.Replace("dll", "exe");
+
+                var args = Environment.GetCommandLineArgs();
+
+                for (var i = 0; i < args.Length; i++)
+                {
+                    if (args[i].Contains(' '))
+                        args[i] = $"\"{args[i]}\"";
+                    
+                    if (!args[i].Contains("--tempAutostart", StringComparison.InvariantCultureIgnoreCase) &&
+                        !args[i].Contains("--waitForPid", StringComparison.InvariantCultureIgnoreCase)) 
+                        continue;
+                    
+                    args[i] = string.Empty;
+                    args[++i] = string.Empty;
+                }
+
+                Process.Start(exe, $"--waitForPid {Environment.ProcessId} --tempAutostart true {string.Join(" ", args)}");
+            })
+            {
+                Name = "Restart thread"
+            }.Start();
         }
 
+        [SuppressPropertyChangedWarnings]
         private void OnSessionStateChanged(ITorchSession session, TorchSessionState newState)
         {
-            if (newState == TorchSessionState.Unloading || newState == TorchSessionState.Unloaded)
+            switch (newState)
             {
-                _watchdog?.Dispose();
-                _watchdog = null;
-                ModCommunication.Unregister();
+                case TorchSessionState.Unloading:
+                    _watchdog?.Dispose();
+                    _watchdog = null;
+                    ModCommunication.Unregister();
+                    break;
+                case TorchSessionState.Loaded:
+                    _multiplayerManagerDedicated = CurrentSession.Managers.GetManager<MultiplayerManagerDedicated>();
+                    _multiplayerManagerDedicated.PlayerJoined += MultiplayerManagerDedicatedOnPlayerJoined;
+                    _multiplayerManagerDedicated.PlayerLeft += MultiplayerManagerDedicatedOnPlayerLeft;
+                    CurrentSession.Managers.GetManager<CommandManager>().RegisterCommandModule(typeof(WhitelistCommands));
+                    ModCommunication.Register();
+                    break;
+                case TorchSessionState.Loading:
+                case TorchSessionState.Unloaded:
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(newState), newState, null);
             }
 
-            if (newState == TorchSessionState.Loaded)
-            {
-                CurrentSession.Managers.GetManager<CommandManager>().RegisterCommandModule(typeof(WhitelistCommands));
-                ModCommunication.Register();
-            }
+        }
+
+        private void MultiplayerManagerDedicatedOnPlayerLeft(IPlayer player)
+        {
+            OnlinePlayers--;
+        }
+
+        private void MultiplayerManagerDedicatedOnPlayerJoined(IPlayer player)
+        {
+            OnlinePlayers++;
         }
 
         /// <inheritdoc />
         public override void Init(object gameInstance)
         {
             base.Init(gameInstance);
-            var game = gameInstance as MySandboxGame;
-            if (game != null && MySession.Static != null)
+            if (gameInstance is MySandboxGame && MySession.Static != null)
                 State = ServerState.Running;
             else
                 State = ServerState.Stopped;
@@ -223,10 +302,16 @@ namespace Torch.Server
 
         private static void CheckServerResponding(object state)
         {
+            var server = (TorchServer)state;
             var mre = new ManualResetEvent(false);
-            ((TorchServer)state).Invoke(() => mre.Set());
+            server.Invoke(() => mre.Set());
             if (!mre.WaitOne(TimeSpan.FromSeconds(Instance.Config.TickTimeout)))
             {
+                if (server.FatalException)
+                {
+                    server._watchdog.Dispose();
+                    return;
+                }
 #if DEBUG
                 Log.Error(
                     $"Server watchdog detected that the server was frozen for at least {((TorchServer) state).Config.TickTimeout} seconds.");
@@ -246,7 +331,7 @@ namespace Torch.Server
             var totalSize = 0;
             for (var i = 0; i < traces; i++)
             {
-                string dump = DumpStack(thread).ToString();
+                string dump = DumpStack(thread);
                 totalSize += dump.Length;
                 stacks.Add(dump);
                 Thread.Sleep(pause);
@@ -269,30 +354,61 @@ namespace Torch.Server
             return result.ToString();
         }
 
-        private static StackTrace DumpStack(Thread thread)
+        private static string DumpStack(Thread thread)
         {
-            try
+            // Deprecated in .NET Core and later
+            // try
+            // {
+            //     thread.Suspend();
+            // }
+            // catch
+            // {
+            //     // ignored
+            // }
+            //
+            // var stack = new StackTrace(thread, true);
+            // try
+            // {
+            //     thread.Resume();
+            // }
+            // catch
+            // {
+            //     // ignored
+            // }
+            //
+            // return stack.ToString();
+
+            // Modified from https://www.examplefiles.net/cs/579311
+            using var target = DataTarget.CreateSnapshotAndAttach(Environment.ProcessId);
+            
+            var runtime = target.ClrVersions[0].CreateRuntime();
+
+            var clrThread = runtime.Threads.First(b => b.ManagedThreadId == thread.ManagedThreadId);
+
+            var sb = new StringBuilder();
+                
+            foreach (var frame in clrThread.EnumerateStackTrace())
             {
-                thread.Suspend();
-            }
-            catch
-            {
-                // ignored
+                sb.Append('\t');
+                switch (frame.Kind)
+                {
+                    case ClrStackFrameKind.Unknown:
+                        sb.AppendLine("[Unknown]");
+                        break;
+                    case ClrStackFrameKind.ManagedMethod:
+                        sb.AppendLine(frame.Method?.Signature ?? "[Unable to get method signature]");
+                        break;
+                    case ClrStackFrameKind.Runtime:
+                        sb.AppendLine("[CLR Runtime]");
+                        break;
+                    default:
+                        throw new ArgumentOutOfRangeException(nameof(frame.Kind), frame.Kind, "Incorrect value in EnumerateStackTrace");
+                }
             }
 
-            var stack = new StackTrace(thread, true);
-            try
-            {
-                thread.Resume();
-            }
-            catch
-            {
-                // ignored
-            }
-
-            return stack;
+            return sb.ToString();
         }
 
         #endregion
     }
-}
+}

Torch.Server/TorchService.cs

@@ -1,10 +1,13 @@
-using System;
+#if TORCH_SERVICE
+using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.ServiceProcess;
+using System.Threading;
 using NLog;
 using Torch.API;
 
@@ -12,12 +15,14 @@ namespace Torch.Server
 {
     class TorchService : ServiceBase
     {
+        private static readonly Logger Log = LogManager.GetCurrentClassLogger();
         public const string Name = "Torch (SEDS)";
-        private TorchServer _server;
         private Initializer _initializer;
+        private string[] _args;
 
-        public TorchService()
+        public TorchService(string[] args)
         {
+            _args = args;
             var workingDir = new FileInfo(typeof(TorchService).Assembly.Location).Directory.ToString();
             Directory.SetCurrentDirectory(workingDir);
             _initializer = new Initializer(workingDir);
@@ -29,19 +34,22 @@ namespace Torch.Server
         }
 
         /// <inheritdoc />
-        protected override void OnStart(string[] args)
+        protected override void OnStart(string[] _)
         {
-            base.OnStart(args);
+            base.OnStart(_args);
 
-            _initializer.Initialize(args);
+            _initializer.Initialize(_args);
             _initializer.Run();
         }
 
         /// <inheritdoc />
         protected override void OnStop()
         {
-            _server.Stop();
-            base.OnStop();
+            var mre = new ManualResetEvent(false);
+            Task.Run(() => _initializer.Server.Stop());
+            if (!mre.WaitOne(TimeSpan.FromMinutes(1)))
+                Process.GetCurrentProcess().Kill();
         }
     }
 }
+#endif

Torch.Server/TorchServiceInstaller.cs

@@ -1,4 +1,5 @@
-using System;
+#if TORCH_SERVICE
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -17,21 +18,8 @@ namespace Torch.Server
 
         public TorchServiceInstaller()
         {
-            var serviceProcessInstaller = new ServiceProcessInstaller();
-            _serviceInstaller = new ServiceInstaller();
-
-            serviceProcessInstaller.Account = ServiceAccount.LocalSystem;
-            serviceProcessInstaller.Username = null;
-            serviceProcessInstaller.Password = null;
-
             _serviceInstaller.DisplayName = "Torch (SEDS)";
             _serviceInstaller.Description = "Service for Torch (SE Dedicated Server)";
-            _serviceInstaller.StartType = ServiceStartMode.Manual;
-
-            _serviceInstaller.ServiceName = TorchService.Name;
-
-            Installers.Add(serviceProcessInstaller);
-            Installers.Add(_serviceInstaller);
         }
 
         /// <inheritdoc />
@@ -59,3 +47,4 @@ namespace Torch.Server
         }
     }
 }
+#endif

Torch.Server/UnhandledExceptionHandler.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Diagnostics;
+using System.Threading;
+using NLog;
+using VRage;
+
+namespace Torch.Server;
+
+internal class UnhandledExceptionHandler
+{
+    private readonly TorchConfig _config;
+    private static readonly ILogger Log = LogManager.GetCurrentClassLogger();
+
+    public UnhandledExceptionHandler(TorchConfig config)
+    {
+        _config = config;
+    }
+    
+    internal void OnUnhandledException(object sender, UnhandledExceptionEventArgs e)
+    {
+        if (Debugger.IsAttached)
+            return;
+        var ex = (Exception)e.ExceptionObject;
+        Log.Fatal(ex.ToStringDemystified());
+        LogManager.Flush();
+        
+        if (ApplicationContext.Current.IsService)
+            Environment.Exit(1);
+        
+        if (_config.RestartOnCrash)
+        {
+            Console.WriteLine("Restarting in 5 seconds.");
+            Thread.Sleep(5000);
+            var exe = typeof(Program).Assembly.Location;
+            
+            Process.Start(exe, $"-waitForPid {Environment.ProcessId} {_config}");
+        }
+        else
+        {
+            MyVRage.Platform.Windows.MessageBox(
+                "Torch encountered a fatal error and needs to close. Please check the logs for details.",
+                "Fatal exception", MessageBoxOptions.OkOnly);
+        }
+
+        Environment.Exit(1);
+    } 
+}

Torch.Server/ViewModels/BlockLimitViewModel.cs

@@ -11,19 +11,17 @@ namespace Torch.Server.ViewModels
     public class BlockLimitViewModel : ViewModel
     {
         private SessionSettingsViewModel _sessionSettings;
-        private string _blockType;
-        private short _limit;
 
-        public string BlockType { get => _blockType; set { _blockType = value; OnPropertyChanged(); } }
-        public short Limit { get => _limit; set { _limit = value; OnPropertyChanged(); } }
+        public string BlockType { get; set; }
+        public short Limit { get; set; }
 
         //public CommandBinding Delete { get; } = new CommandBinding(new DeleteCommand());
 
         public BlockLimitViewModel(SessionSettingsViewModel sessionSettings, string blockType, short limit)
         {
             _sessionSettings = sessionSettings;
-            _blockType = blockType;
-            _limit = limit;
+            BlockType = blockType;
+            Limit = limit;
         }
 
         /* TODO: figure out how WPF commands work

Torch.Server/ViewModels/CheckpointViewModel.cs

@@ -15,13 +15,13 @@ namespace Torch.Server.ViewModels
 {
     public class CheckpointViewModel : ViewModel
     {
-        private MyObjectBuilder_Checkpoint _checkpoint;
-        private SessionSettingsViewModel _sessionSettings;
+        private readonly MyObjectBuilder_Checkpoint _checkpoint;
+        //private SessionSettingsViewModel _sessionSettings;
 
         public CheckpointViewModel(MyObjectBuilder_Checkpoint checkpoint)
         {
             _checkpoint = checkpoint;
-            _sessionSettings = new SessionSettingsViewModel(_checkpoint.Settings);
+            //_sessionSettings = new SessionSettingsViewModel(_checkpoint.Settings);
         }
 
         public static implicit operator MyObjectBuilder_Checkpoint(CheckpointViewModel model)
@@ -59,15 +59,15 @@ namespace Torch.Server.ViewModels
 
         public SerializableDictionary<long, MyObjectBuilder_Checkpoint.PlayerId> ControlledEntities { get => _checkpoint.ControlledEntities; set => SetValue(ref _checkpoint.ControlledEntities, value); }
 
-        public SessionSettingsViewModel Settings
-        {
-            get => _sessionSettings;
-            set
-            {
-                SetValue(ref _sessionSettings, value);
-                _checkpoint.Settings = _sessionSettings;
-            }
-        }
+        //public SessionSettingsViewModel Settings
+        //{
+        //    get => _sessionSettings;
+        //    set
+        //    {
+        //        SetValue(ref _sessionSettings, value);
+        //        _checkpoint.Settings = _sessionSettings;
+        //    }
+        //}
 
         public MyObjectBuilder_ScriptManager ScriptManagerData => throw new NotImplementedException();
 
@@ -75,7 +75,7 @@ namespace Torch.Server.ViewModels
 
         public MyObjectBuilder_FactionCollection Factions => throw new NotImplementedException();
 
-        public List<MyObjectBuilder_Checkpoint.ModItem> Mods { get => _checkpoint.Mods; set => SetValue(ref _checkpoint.Mods, value); }
+        //public List<MyObjectBuilder_Checkpoint.ModItem> Mods { get => _checkpoint.Mods; set => SetValue(ref _checkpoint.Mods, value); }
 
         public SerializableDictionary<ulong, MyPromoteLevel> PromotedUsers { get => _checkpoint.PromotedUsers; set => SetValue(ref _checkpoint.PromotedUsers, value); }
 
@@ -115,14 +115,6 @@ namespace Torch.Server.ViewModels
 
         public DateTime InGameTime { get => _checkpoint.InGameTime; set => SetValue(ref _checkpoint.InGameTime, value); }
 
-        public MyObjectBuilder_SessionComponentMission MissionTriggers { get => _checkpoint.MissionTriggers; set => SetValue(ref _checkpoint.MissionTriggers, value); }
-
-        public string Briefing { get => _checkpoint.Briefing; set => SetValue(ref _checkpoint.Briefing, value); }
-
-        public string BriefingVideo { get => _checkpoint.BriefingVideo; set => SetValue(ref _checkpoint.BriefingVideo, value); }
-
-        public string CustomLoadingScreenImage { get => _checkpoint.CustomLoadingScreenImage; set => SetValue(ref _checkpoint.BriefingVideo, value); }
-
         public string CustomLoadingScreenText { get => _checkpoint.CustomLoadingScreenText; set => SetValue(ref _checkpoint.CustomLoadingScreenText, value); }
 
         public string CustomSkybox { get => _checkpoint.CustomSkybox; set => SetValue(ref _checkpoint.CustomSkybox, value); }

Torch.Server/ViewModels/ConfigDedicatedViewModel.cs

@@ -1,15 +1,14 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using NLog;
 using Sandbox.Engine.Utils;
 using Torch.Collections;
 using Torch.Server.Managers;
+using Torch.Utils;
 using VRage.Game;
-using VRage.Game.ModAPI;
+using VRage.GameServices;
 
 namespace Torch.Server.ViewModels
 {
@@ -19,24 +18,19 @@ namespace Torch.Server.ViewModels
         private MyConfigDedicated<MyObjectBuilder_SessionSettings> _config;
         public MyConfigDedicated<MyObjectBuilder_SessionSettings> Model => _config;
 
-        public ConfigDedicatedViewModel() : this(new MyConfigDedicated<MyObjectBuilder_SessionSettings>(""))
-        {
-
-        }
-
         public ConfigDedicatedViewModel(MyConfigDedicated<MyObjectBuilder_SessionSettings> configDedicated)
         {
             _config = configDedicated;
             _config.IgnoreLastSession = true;
             SessionSettings = new SessionSettingsViewModel(_config.SessionSettings);
+            Task.Run(() => UpdateAllModInfosAsync());
         }
 
         public void Save(string path = null)
         {
             Validate();
 
-            _config.SessionSettings = _sessionSettings;
-            // Never ever
+            _config.SessionSettings = SessionSettings;
             _config.IgnoreLastSession = true;
             _config.Save(path);
         }
@@ -58,8 +52,7 @@ namespace Torch.Server.ViewModels
             return true;
         }
 
-        private SessionSettingsViewModel _sessionSettings;
-        public SessionSettingsViewModel SessionSettings { get => _sessionSettings; set { _sessionSettings = value; OnPropertyChanged(); } }
+        public SessionSettingsViewModel SessionSettings { get; set; }
 
         public MtObservableList<WorldViewModel> Worlds { get; } = new MtObservableList<WorldViewModel>();
         private WorldViewModel _selectedWorld;
@@ -69,18 +62,55 @@ namespace Torch.Server.ViewModels
             set
             {
                 SetValue(ref _selectedWorld, value);
+                SessionSettings = value.WorldConfiguration.Settings;
                 LoadWorld = _selectedWorld?.WorldPath;
             }
         }
 
+        public Task UpdateAllModInfosAsync()
+        {
+            return Task.CompletedTask;
+            /*if (!Mods.Any())
+                return;
+            List<MyWorkshopItem> modInfos;
+            try
+            {
+                modInfos = await WorkshopQueryUtils.GetModsInfo(Mods.Select(b =>
+                    new MyObjectBuilder_Checkpoint.ModItem(b.PublishedFileId, b.UgcService, b.IsDependency)));
+            }
+            catch (Exception e)
+            {
+                Log.Error(e);
+                return;
+            }
+
+            Log.Info("Mods Info successfully retrieved!");
+
+            foreach (var modItem in Mods
+                         .Select(b => new MyObjectBuilder_Checkpoint.ModItem(b.PublishedFileId, b.UgcService))
+                         .Except(modInfos.Select(b => new MyObjectBuilder_Checkpoint.ModItem(b.Id, b.ServiceName))))
+            {
+                Log.Error($"Unable to retreive info about {modItem.PublishedFileId}:{modItem.PublishedServiceName}");
+            }*/
+        }
+
         public List<string> Administrators { get => _config.Administrators; set => SetValue(x => _config.Administrators = x, value); }
 
         public List<ulong> Banned { get => _config.Banned; set => SetValue(x => _config.Banned = x, value); }
 
+        private MtObservableList<ModItemInfo> _mods = new MtObservableList<ModItemInfo>();
+        public MtObservableList<ModItemInfo> Mods
+        {
+            get => _mods;
+            set
+            {
+                SetValue(x => _mods = x, value);
+                Task.Run(() => UpdateAllModInfosAsync());
+            }
+        }
+
         public List<ulong> Reserved { get => _config.Reserved; set => SetValue(x => _config.Reserved = x, value); }
 
-        private List<ulong> _mods = new List<ulong>();
-        public List<ulong> Mods { get => _mods; set => SetValue(x => _mods = x, value); }
 
         public int AsteroidAmount { get => _config.AsteroidAmount; set => SetValue(x => _config.AsteroidAmount = x, value); }
 

Torch.Server/ViewModels/Entities/Blocks/BlockViewModel.cs

@@ -25,7 +25,9 @@ namespace Torch.Server.ViewModels.Blocks
             get => Block?.CustomName ?? "null";
             set
             {
+#pragma warning disable CS0618
                 TorchBase.Instance.Invoke(() =>
+#pragma warning restore CS0618
                 {
                     Block.CustomName = value;
                     OnPropertyChanged();
@@ -41,7 +43,9 @@ namespace Torch.Server.ViewModels.Blocks
             get => ((MySlimBlock)Block?.SlimBlock)?.BuiltBy ?? 0;
             set
             {
+#pragma warning disable CS0618
                 TorchBase.Instance.Invoke(() =>
+#pragma warning restore CS0618
                 {
                     ((MySlimBlock)Block.SlimBlock).TransferAuthorship(value);
                     OnPropertyChanged();

Torch.Server/ViewModels/Entities/Blocks/BlockViewModelGenerator.cs

@@ -3,18 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Reflection.Emit;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis;
+using NLog;
 using Sandbox.Game.Entities.Cube;
 using Sandbox.ModAPI;
 using Sandbox.ModAPI.Interfaces;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using NLog;
-using Sandbox.ModAPI.Interfaces.Terminal;
 
-namespace Torch.Server.ViewModels.Blocks
+namespace Torch.Server.ViewModels.Entities.Blocks
 {
     public static class BlockViewModelGenerator
     {
@@ -27,8 +21,8 @@ namespace Torch.Server.ViewModels.Blocks
         static BlockViewModelGenerator()
         {
             _asmName = new AssemblyName("Torch.Server.ViewModels.Generated");
-            _ab = AppDomain.CurrentDomain.DefineDynamicAssembly(_asmName, AssemblyBuilderAccess.RunAndSave);
-            _mb = _ab.DefineDynamicModule(_asmName.Name);
+            _ab = AssemblyBuilder.DefineDynamicAssembly(_asmName, AssemblyBuilderAccess.RunAndCollect);
+            _mb = _ab.DefineDynamicModule(_asmName.Name ?? "Torch.Server.ViewModels.Generated");
         }
 
         public static void GenerateModels()
@@ -40,7 +34,6 @@ namespace Torch.Server.ViewModels.Blocks
                     GenerateModel(type);
                 }
             }
-            _ab.Save("Generated.dll", PortableExecutableKinds.ILOnly, ImageFileMachine.AMD64);
         }
 
         public static Type GenerateModel(Type blockType, bool force = false)

Torch.Server/ViewModels/Entities/Blocks/PropertyViewModel.cs

@@ -19,7 +19,9 @@ namespace Torch.Server.ViewModels.Blocks
             get => _prop.GetValue(Block.Block);
             set
             {
+#pragma warning disable CS0618
                 TorchBase.Instance.Invoke(() =>
+#pragma warning restore CS0618
                 {
                     _prop.SetValue(Block.Block, value);
                     OnPropertyChanged();