refactoring and proper game state destruction

Torch.API/IPlayer.cs

@@ -1,11 +1,4 @@
-using System;
+namespace Torch.API
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using VRage.Game.ModAPI;
-
-namespace Torch.API
 {
     /// <summary>
     /// Represents a player on the server.

Torch.API/ITorchBase.cs

@@ -1,13 +1,9 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.CompilerServices;
-using System.Text;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Configuration;
 using Torch.API.Managers;
 using Torch.API.Session;
-using VRage.Game.ModAPI;
 using Version = SemanticVersioning.Version;
 
 namespace Torch.API

Torch.API/Managers/IChatManagerClient.cs

@@ -1,17 +1,9 @@
 using System;
-using System.Collections.Generic;
-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
 {

Torch.API/Managers/IChatManagerServer.cs

@@ -1,11 +1,6 @@
 using System;
-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

Torch.API/Managers/IDependencyManager.cs

@@ -1,8 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Torch.API.Managers
 {

Torch.API/Managers/IDependencyProvider.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Torch.API.Managers
 {

Torch.API/Managers/IManager.cs

@@ -1,10 +1,4 @@
-using System;
+namespace Torch.API.Managers
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Torch.API.Managers
 {
     /// <summary>
     /// Base interface for Torch managers.

Torch.API/Managers/IMultiplayerManagerBase.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using VRage.Game;
 using VRage.Game.ModAPI;
 
 namespace Torch.API.Managers

Torch.API/Managers/IMultiplayerManagerClient.cs

@@ -1,10 +1,4 @@
-using System;
+namespace Torch.API.Managers
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Torch.API.Managers
 {
     public interface IMultiplayerManagerClient : IMultiplayerManagerBase
     {

Torch.API/Managers/IMultiplayerManagerServer.cs

@@ -1,8 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using VRage.Game.ModAPI;
 
 namespace Torch.API.Managers

Torch.API/Managers/INetworkManager.cs

@@ -1,9 +1,4 @@
-using System;
+using VRage;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using VRage;
 using VRage.Library.Collections;
 using VRage.Network;
 

Torch.API/Managers/IPackageManager.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
-using System.Runtime.Loader;
 using Torch.API.WebAPI.Plugins;
 
 namespace Torch.API.Managers;

Torch.API/Managers/IPluginManager.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using Torch.API.Plugins;
-using VRage.Collections;
-using VRage.Plugins;
 
 namespace Torch.API.Managers
 {

Torch.API/ModAPI/Ingame/GridExtensions.cs

@@ -1,14 +1,4 @@
-using System;
+namespace Torch.API.ModAPI.Ingame
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Sandbox.Game.Entities.Blocks;
-using Sandbox.ModAPI.Ingame;
-using VRage.Game.ModAPI.Ingame;
-
-namespace Torch.API.ModAPI.Ingame
 {
     public static class GridExtensions
     {

Torch.API/ModAPI/TorchAPI.cs

@@ -1,9 +1,4 @@
-using System;
+using System.Runtime.CompilerServices;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Text;
-using System.Threading.Tasks;
 
 //Needed so Torch can set the instance here without exposing anything bad to mods or creating a circular dependency.
 [assembly: InternalsVisibleTo("Torch")]

Torch.API/Plugins/ITorchPlugin.cs

@@ -1,9 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Torch.API.Plugins
 {

Torch.API/Plugins/IWpfPlugin.cs

@@ -1,9 +1,4 @@
-using System;
+using System.Windows.Controls;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Controls;
 
 namespace Torch.API.Plugins
 {

Torch.API/Plugins/PluginAttribute.cs

@@ -1,9 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Torch.API.Plugins
 {

Torch.API/ServerState.cs

@@ -1,10 +1,4 @@
-using System;
+namespace Torch.API
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Torch.API
 {
     /// <summary>
     /// Used to indicate the state of the dedicated server.

Torch.API/Session/GameSaveResult.cs

@@ -1,10 +1,4 @@
-using System;
+namespace Torch.API.Session
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Torch.API.Session
 {
     /// <summary>
     /// The result of a save operation

Torch.API/Session/ITorchSession.cs

@@ -1,9 +1,4 @@
-using System;
+using Sandbox.Game.World;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Sandbox.Game.World;
 using Torch.API.Managers;
 
 namespace Torch.API.Session

Torch.API/Session/ITorchSessionManager.cs

@@ -1,9 +1,6 @@
 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;
 

Torch.API/Session/TorchSessionState.cs

@@ -1,10 +1,4 @@
-using System;
+namespace Torch.API.Session
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Torch.API.Session
 {
     /// <summary>
     /// Represents the state of a <see cref="ITorchSession"/>

Torch.API/Torch.API.csproj

@@ -12,6 +12,7 @@
   </PropertyGroup>
   
   <ItemGroup>
+    <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
     <PackageReference Include="NLog" Version="5.3.2" />
     <PackageReference Include="NuGet.Commands" Version="6.9.1" />

Torch.API/TorchGameState.cs

@@ -1,9 +1,4 @@
-using System;
+using Sandbox;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Sandbox;
 
 namespace Torch.API
 {

Torch.API/Utils/StringUtils.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace Torch.Utils
 {

Torch.API/WebAPI/Plugins/IPackageReader.cs

@@ -1,7 +1,5 @@
 #nullable enable
 using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Threading.Tasks;
 
 namespace Torch.API.WebAPI.Plugins;

Torch.API/packages.lock.json

@@ -2,6 +2,12 @@
   "version": 1,
   "dependencies": {
     "net8.0-windows7.0": {
+      "JetBrains.Annotations": {
+        "type": "Direct",
+        "requested": "[2023.3.0, )",
+        "resolved": "2023.3.0",
+        "contentHash": "PHfnvdBUdGaTVG9bR/GEfxgTwWM0Z97Y6X3710wiljELBISipSfF5okn/vz+C2gfO+ihoEyVPjaJwn8ZalVukA=="
+      },
       "Microsoft.Extensions.Configuration.Binder": {
         "type": "Direct",
         "requested": "[8.0.1, )",

Torch.Mod/Messages/DialogMessage.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using ProtoBuf;
 using Sandbox.ModAPI;
 

Torch.Mod/Messages/JoinServerMessage.cs

@@ -1,7 +1,4 @@
-using System;
+using ProtoBuf;
-using System.Collections.Generic;
-using System.Text;
-using ProtoBuf;
 using Sandbox.ModAPI;
 
 namespace Torch.Mod.Messages

Torch.Mod/Messages/NotificationMessage.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using ProtoBuf;
 using Sandbox.ModAPI;
 

Torch.Mod/Messages/VoxelResetMessage.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using ProtoBuf;
 using Sandbox.ModAPI;
 using VRage.ModAPI;

Torch.Server.Tests/TorchServerSessionSettingsTest.cs

@@ -2,8 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 using Torch.Server.ViewModels;
 using VRage.Game;
 using Xunit;

Torch.Server.Tests/packages.lock.json

@@ -64,6 +64,11 @@
           "MonoMod.RuntimeDetour": "25.1.0-prerelease.1"
         }
       },
+      "JetBrains.Annotations": {
+        "type": "Transitive",
+        "resolved": "2023.3.0",
+        "contentHash": "PHfnvdBUdGaTVG9bR/GEfxgTwWM0Z97Y6X3710wiljELBISipSfF5okn/vz+C2gfO+ihoEyVPjaJwn8ZalVukA=="
+      },
       "MahApps.Metro": {
         "type": "Transitive",
         "resolved": "2.4.10",
@@ -641,6 +646,7 @@
       "torch.api": {
         "type": "Project",
         "dependencies": {
+          "JetBrains.Annotations": "[2023.3.0, )",
           "Microsoft.Extensions.Configuration.Binder": "[8.0.1, )",
           "NLog": "[5.3.2, )",
           "NuGet.Commands": "[6.9.1, )",

Torch.Server/Commands/WhitelistCommands.cs

@@ -1,9 +1,4 @@
-using System;
+using Torch.Commands;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Torch.Commands;
 
 namespace Torch.Server.Commands
 {

Torch.Server/Initializer.cs

@@ -1,24 +1,13 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 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 SpaceEngineers.Game;
-using Torch.Utils;
-using VRage.FileSystem;
 
 namespace Torch.Server
 {

Torch.Server/LogViewerTarget.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Windows.Media;
-using System.Windows.Threading;
 using NLog;
 using NLog.Targets;
 using Torch.Server.ViewModels;

Torch.Server/Managers/EntityControlManager.cs

@@ -1,19 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.CompilerServices;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 using System.Windows.Controls;
 using NLog;
-using NLog.Fluent;
 using Torch.API;
 using Torch.Collections;
 using Torch.Managers;
 using Torch.Server.ViewModels.Entities;
-using Torch.Utils;
 
 namespace Torch.Server.Managers
 {

Torch.Server/Managers/InstanceManager.cs

@@ -1,21 +1,12 @@
 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;
 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;
@@ -23,13 +14,10 @@ using Torch.Managers;
 using Torch.Mod;
 using Torch.Server.ViewModels;
 using Torch.Utils;
-using VRage;
 using VRage.FileSystem;
 using VRage.Game;
-using VRage.Game.ObjectBuilder;
 using VRage.ObjectBuilders;
 using VRage.ObjectBuilders.Private;
-using VRage.Plugins;
 
 namespace Torch.Server.Managers
 {

Torch.Server/Managers/MultiplayerManagerDedicated.cs

@@ -2,11 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
-using System.Reflection;
-using System.Text;
 using System.Threading.Tasks;
 using NLog;
-using NLog.Fluent;
 using Sandbox;
 using Sandbox.Engine.Multiplayer;
 using Sandbox.Engine.Networking;
@@ -16,12 +13,10 @@ using Torch.API;
 using Torch.API.Managers;
 using Torch.Managers;
 using Torch.Utils;
-using Torch.ViewModels;
 using VRage.Game;
 using VRage.Game.ModAPI;
 using VRage.GameServices;
 using VRage.Network;
-using VRage.Steam;
 
 namespace Torch.Server.Managers
 {

Torch.Server/Managers/MultiplayerManagerDedicatedEventShim.cs

@@ -1,10 +1,4 @@
-using System;
+using System.Threading.Tasks;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using NLog;
-using Sandbox;
 using Torch.API.Event;
 using Torch.Event;
 using VRage.Network;

Torch.Server/Managers/MultiplayerManagerDedicatedPatchShim.cs

@@ -1,10 +1,4 @@
-using System;
+using Sandbox.Engine.Multiplayer;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using NLog;
-using Sandbox.Engine.Multiplayer;
 using Torch.Managers.PatchManager;
 using Torch.API.Managers;
 

Torch.Server/NativeMethods.cs

@@ -1,9 +1,4 @@
-using System;
+using System.Runtime.InteropServices;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Torch.Server
 {

Torch.Server/Patches/PromotePatch.cs

@@ -1,9 +1,5 @@
 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;

Torch.Server/Patches/ServerResponsePatch.cs

@@ -1,15 +1,10 @@
-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
 {

Torch.Server/Patches/WorldLoadExceptionPatch.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;

Torch.Server/Program.cs

@@ -1,8 +1,6 @@
 using System;
 using System.IO;
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Configuration.Xml;
-using NLog;
 using NLog.Config;
 using NLog.Targets;
 using Torch.API;

Torch.Server/TorchServer.cs

@@ -20,7 +20,6 @@ using Torch.API.Managers;
 using Torch.API.Session;
 using Torch.Commands;
 using Torch.Managers.PatchManager;
-using Torch.Mod;
 using Torch.Server.Commands;
 using Torch.Server.Managers;
 using Torch.Utils;
@@ -75,7 +74,7 @@ namespace Torch.Server
                 if (State == ServerState.Running)
                     Stop();
                 
-                Environment.Exit(0);
+                Destroy();
             };
         }
 
@@ -244,7 +243,18 @@ namespace Torch.Server
 
             new Thread(() =>
             {
+                if (save)
+                {
+                    var saveResult = Save().Result;
+                    if (saveResult is not (GameSaveResult.Success or GameSaveResult.TimedOut))
+                    {
+                        Log.Error("Save failed due to {Reason}. Restart aborted!", saveResult);
+                        return;
+                    }
+                }
+                
                 StopInternal();
+                Destroy();
                 LogManager.Flush();
                 
                 if (
@@ -254,7 +264,7 @@ namespace Torch.Server
 #endif
                     ApplicationContext.Current.IsService
                     )
-                    Environment.Exit(0);
+                    return;
 
                 var exe = Path.Combine(AppContext.BaseDirectory, "Torch.Server.exe");
 
@@ -274,8 +284,6 @@ namespace Torch.Server
                 }
 
                 Process.Start(exe, $"--waitForPid {Environment.ProcessId} --tempAutostart true {string.Join(" ", args)}");
-                
-                Environment.Exit(0);
             })
             {
                 Name = "Restart thread"

Torch.Server/ViewModels/BlockLimitViewModel.cs

@@ -1,12 +1,4 @@
-using System;
+namespace Torch.Server.ViewModels
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using VRage.Game;
-
-namespace Torch.Server.ViewModels
 {
     public class BlockLimitViewModel : ViewModel
     {

Torch.Server/ViewModels/CheckpointViewModel.cs

@@ -1,9 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Torch.Collections;
 using VRage;
 using VRage.Game;
 using VRage.Game.ModAPI;

Torch.Server/ViewModels/ConfigDedicatedViewModel.cs

@@ -1,14 +1,10 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
 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.GameServices;
 
 namespace Torch.Server.ViewModels
 {

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

@@ -1,10 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing.Text;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 using Sandbox.Game.Entities.Cube;
 using Sandbox.ModAPI;
 using Sandbox.ModAPI.Interfaces;

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

@@ -1,9 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Sandbox.ModAPI;
 using Sandbox.ModAPI.Interfaces;
 
 namespace Torch.Server.ViewModels.Blocks

Torch.Server/ViewModels/Entities/EntityControlViewModel.cs

@@ -1,9 +1,4 @@
-using System;
+using System.Windows;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
 
 namespace Torch.Server.ViewModels.Entities
 {

Torch.Server/ViewModels/Entities/EntityViewModel.cs

@@ -1,16 +1,11 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Windows.Controls;
 using NLog;
 using Sandbox.Game.Entities;
-using Sandbox.Game.World;
 using Torch.API.Managers;
 using Torch.Collections;
 using Torch.Server.Managers;
 using Torch.Utils;
-using VRage.Game.Entity;
-using VRage.Game.ModAPI;
 using VRage.ModAPI;
 using VRageMath;
 

Torch.Server/ViewModels/Entities/GridViewModel.cs

@@ -1,12 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.CompilerServices;
 using Sandbox.Definitions;
 using Sandbox.Game.Entities;
 using Sandbox.Game.Entities.Cube;
-using Sandbox.ModAPI;
-using Torch.API.Managers;
 using Torch.Collections;
 using Torch.Server.ViewModels.Blocks;
 using VRage.Game;

Torch.Server/ViewModels/Entities/VoxelMapViewModel.cs

@@ -1,8 +1,4 @@
-using System.Collections.Generic;
+using Sandbox.Game.Entities;
-using System.Linq;
-using Sandbox.Game.Entities;
-using VRage.Game.Entity;
-using VRage.Game.ModAPI;
 using System.Threading.Tasks;
 using Torch.Collections;
 

Torch.Server/ViewModels/EntityTreeViewModel.cs

@@ -1,18 +1,11 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Controls;
 using Sandbox.Game.Entities;
 using Sandbox.Game.Entities.Character;
 using Torch.Server.ViewModels.Entities;
-using VRage.Game.ModAPI;
-using VRage.ModAPI;
 using System.Windows.Threading;
 using NLog;
 using Torch.Collections;
-using Torch.Server.Views.Entities;
 
 namespace Torch.Server.ViewModels
 {

Torch.Server/ViewModels/ILazyLoad.cs

@@ -1,10 +1,4 @@
-using System;
+namespace Torch.Server.ViewModels
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Torch.Server.ViewModels
 {
     public interface ILazyLoad
     {

Torch.Server/ViewModels/ModItemInfo.cs

@@ -1,9 +1,6 @@
-using System;
+using System.Threading.Tasks;
-using System.Threading.Tasks;
 using NLog;
 using VRage.Game;
-using Torch.Utils;
-using VRage.GameServices;
 
 namespace Torch.Server.ViewModels
 {

Torch.Server/ViewModels/PluginManagerViewModel.cs

@@ -1,9 +1,5 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Torch.API;
 using Torch.API.Managers;
 using Torch.API.Plugins;
 using Torch.Collections;

Torch.Server/ViewModels/PluginViewModel.cs

@@ -1,13 +1,8 @@
 using System;
-using System.Collections.Generic;
 using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using NLog;
-using Torch.API;
 using Torch.API.Plugins;
 using Torch.Server.Views;
 

Torch.Server/ViewModels/SessionSettingsViewModel.cs

@@ -1,14 +1,7 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using Torch;
-using Torch.Collections;
-using Torch.Views;
 using VRage.Game;
 using VRage.Library.Utils;
-using VRage.Serialization;
 
 namespace Torch.Server.ViewModels
 {

Torch.Server/Views/AddWorkshopItemsDialog.xaml.cs

@@ -1,17 +1,5 @@
-using System;
+using System.Text.RegularExpressions;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 
 namespace Torch.Server
 {

Torch.Server/Views/ChatControl.xaml.cs

@@ -1,35 +1,20 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Linq;
 using System.Reflection;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
 using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Threading;
 using NLog;
-using Torch;
-using Sandbox;
-using Sandbox.Engine.Multiplayer;
 using Sandbox.Game.Gui;
-using Sandbox.Game.Multiplayer;
 using Sandbox.Game.World;
 using Torch.API;
 using Torch.API.Managers;
 using Torch.API.Session;
-using Torch.Managers;
-using Torch.Server.Managers;
 using Torch.Server.Views;
-using VRage.Game;
 using Color = VRageMath.Color;
 
 namespace Torch.Server

Torch.Server/Views/ConfigControl.xaml.cs

@@ -6,17 +6,14 @@ using System.Runtime.CompilerServices;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
-using System.Windows.Media;
 using System.Windows.Threading;
+using JetBrains.Annotations;
 using Sandbox;
 using Torch.API;
 using Torch.API.Managers;
-using Torch.Server.Annotations;
 using Torch.Server.Managers;
 using Torch.Server.ViewModels;
-using Torch.Views;
 using VRage.Game.ModAPI;
-using VRage.Serialization;
 
 namespace Torch.Server.Views
 {

Torch.Server/Views/Converters/BooleanAndConverter.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Data;
 
 namespace Torch.Server.Views.Converters

Torch.Server/Views/Converters/DefinitionToIdConverter.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Globalization;
-using System.Windows;
 using System.Windows.Data;
 using Sandbox.Definitions;
 using VRage.Game;

Torch.Server/Views/Converters/ListConverter.cs

@@ -3,11 +3,8 @@ using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Globalization;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Data;
-using System.Windows.Navigation;
 
 namespace Torch.Server.Views.Converters
 {

Torch.Server/Views/Converters/ListConverterWorkshopId.cs

@@ -1,16 +1,12 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Globalization;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Data;
-using Sandbox.Engine.Networking;
 using Torch.Server.ViewModels;
 using Torch.Utils;
-using VRage.Game;
 
 namespace Torch.Server.Views.Converters
 {

Torch.Server/Views/Converters/Vector3DConverter.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Data;
 using VRageMath;
 

Torch.Server/Views/Entities/Blocks/BlockView.xaml.cs

@@ -1,22 +1,5 @@
-using System;
+using System.Windows;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using Sandbox.ModAPI;
-using Sandbox.ModAPI.Interfaces;
-using Torch.Server.ViewModels.Blocks;
-using VRage.Game.ModAPI;
 
 namespace Torch.Server.Views.Blocks
 {

Torch.Server/Views/Entities/Blocks/PropertyView.xaml.cs

@@ -1,17 +1,7 @@
-using System.Collections.Generic;
+using System.Text;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
 using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 using Torch.Server.ViewModels.Blocks;
 using Torch.Server.Views.Converters;
 

Torch.Server/Views/Entities/CharacterView.xaml.cs

@@ -1,17 +1,5 @@
-using System;
+using System.Windows;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace Torch.Server.Views.Entities
 {

Torch.Server/Views/Entities/GridView.xaml.cs

@@ -1,17 +1,5 @@
-using System;
+using System.Windows;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace Torch.Server.Views.Entities
 {

Torch.Server/Views/Entities/VoxelMapView.xaml.cs

@@ -1,17 +1,6 @@
-using System;
+using System.Threading.Tasks;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 using Torch.Server.ViewModels.Entities;
 
 namespace Torch.Server.Views.Entities

Torch.Server/Views/EntitiesControl.xaml.cs

@@ -1,20 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 using NLog;
-using Torch.Collections;
 using Torch.Server.ViewModels;
 using Torch.Server.ViewModels.Blocks;
 using Torch.Server.ViewModels.Entities;

Torch.Server/Views/Extensions.cs

@@ -1,9 +1,4 @@
-using System;
+using System.Windows;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
 
 namespace Torch.Server.Views
 {

Torch.Server/Views/LogViewerControl.xaml.cs

@@ -1,11 +1,7 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Media;
-using Torch.Collections;
 using Torch.Server.ViewModels;
 
 namespace Torch.Server.Views;

Torch.Server/Views/ModsControl.xaml.cs

@@ -1,21 +1,7 @@
-using System;
+using System.Diagnostics;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using Sandbox.Engine.Networking;
-using VRage.Game;
 
 namespace Torch.Server
 {

Torch.Server/Views/PlayerListControl.xaml.cs

@@ -1,31 +1,12 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 using NLog;
-using Torch;
-using Sandbox;
-using Sandbox.Engine.Multiplayer;
-using Sandbox.Game.Gui;
-using Sandbox.Game.Multiplayer;
-using Sandbox.Game.World;
-using Sandbox.ModAPI;
 using Torch.API;
 using Torch.API.Managers;
 using Torch.API.Session;
-using Torch.Managers;
 using Torch.Server.Managers;
-using Torch.Utils;
 using Torch.ViewModels;
 using VRage.Game.ModAPI;
 

Torch.Server/Views/PluginBrowser.xaml.cs

@@ -3,24 +3,14 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;
 using System.Linq;
-using System.Net;
-using System.Net.Http;
 using System.Runtime.CompilerServices;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
+using JetBrains.Annotations;
-using System.Windows.Shapes;
 using NLog;
-using Torch.API.WebAPI;
 using Torch.Collections;
-using Torch.Server.Annotations;
-using Torch.Managers;
 using Torch.API.Managers;
 using Torch.API.Plugins;
 using Torch.API.WebAPI.Plugin;

Torch.Server/Views/PluginDownloader.xaml.cs

@@ -1,18 +1,6 @@
 using System;
 using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
-using Torch.API.WebAPI;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 using System.ComponentModel;
 using Torch.API.WebAPI.Plugin;
 

Torch.Server/Views/PluginsControl.xaml.cs

@@ -1,21 +1,7 @@
-using System;
+using System.ComponentModel;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
 using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using NLog;
 using Torch.API;
 using Torch.API.Managers;
 using Torch.Managers;

Torch.Server/Views/RoleEditor.xaml.cs

@@ -3,18 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-using Torch.Server.Managers;
 using Torch.Views;
 using VRage.Game.ModAPI;
 

Torch.Server/Views/SessionSettingsView.xaml.cs

@@ -1,17 +1,5 @@
-using System;
+using System.Windows;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 using Torch.Server.ViewModels;
 
 namespace Torch.Server.Views

Torch.Server/Views/ThemeControl.xaml.cs

@@ -2,19 +2,11 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using System.Runtime.CompilerServices;
 using System.Diagnostics;
 using System.Windows.Navigation;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Media;
-using System.Windows.Threading;
-using Torch.API.Managers;
 using Torch.API.Plugins;
-using Torch.Server.Annotations;
-using Torch.Server.Managers;
-using Torch.Server.ViewModels;
 
 namespace Torch.Server.Views
 {

Torch.Server/Views/TorchUI.xaml.cs

@@ -1,26 +1,11 @@
 using System;
 using System.ComponentModel;
-using System.Diagnostics;
-using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Timers;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Threading;
 using NLog;
 using NLog.Targets.Wrappers;
-using Sandbox;
 using Torch.API;
-using Torch.API.Managers;
-using Torch.Server.Managers;
 using Torch.Server.ViewModels;
 using Torch.Server.Views;
 using MessageBoxResult = System.Windows.MessageBoxResult;
@@ -113,10 +98,10 @@ namespace Torch.Server
 
             //_config.Save(); //you idiot
 
-            if (_server?.State == ServerState.Running)
+            if (_server.CurrentSession is not null)
                 _server.Stop();
-
+            
-            Environment.Exit(0);
+            _server.Destroy();
         }
     }
 }

Torch.Server/Views/ValidationRules/NumberValidationRule.cs

@@ -1,9 +1,4 @@
-using System;
+using System.Globalization;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Controls;
 
 namespace Torch.Server.Views.ValidationRules

Torch.Server/Views/WorldGeneratorDialog.xaml.cs

@@ -1,18 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using NLog;
-using Sandbox.Definitions;
 using Sandbox.Engine.Networking;
 using Sandbox.Game.World;
 using Torch.Server.Managers;
@@ -22,7 +12,6 @@ using VRage;
 using VRage.Dedicated;
 using VRage.FileSystem;
 using VRage.Game;
-using VRage.Game.Localization;
 using VRage.Utils;
 
 namespace Torch.Server

Torch.Server/packages.lock.json

@@ -165,6 +165,11 @@
           "MonoMod.RuntimeDetour": "25.1.0-prerelease.1"
         }
       },
+      "JetBrains.Annotations": {
+        "type": "Transitive",
+        "resolved": "2023.3.0",
+        "contentHash": "PHfnvdBUdGaTVG9bR/GEfxgTwWM0Z97Y6X3710wiljELBISipSfF5okn/vz+C2gfO+ihoEyVPjaJwn8ZalVukA=="
+      },
       "MdXaml.Plugins": {
         "type": "Transitive",
         "resolved": "1.27.0",
@@ -592,6 +597,7 @@
       "torch.api": {
         "type": "Project",
         "dependencies": {
+          "JetBrains.Annotations": "[2023.3.0, )",
           "Microsoft.Extensions.Configuration.Binder": "[8.0.1, )",
           "NLog": "[5.3.2, )",
           "NuGet.Commands": "[6.9.1, )",

Torch.Tests/ReflectionTestManager.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Reflection;
 using Torch.Utils;
 

Torch.Tests/TestUtils.cs

@@ -1,11 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 using Torch.Utils;
 
 namespace Torch.Tests

Torch.Tests/packages.lock.json

@@ -46,6 +46,11 @@
           "MonoMod.RuntimeDetour": "25.1.0-prerelease.1"
         }
       },
+      "JetBrains.Annotations": {
+        "type": "Transitive",
+        "resolved": "2023.3.0",
+        "contentHash": "PHfnvdBUdGaTVG9bR/GEfxgTwWM0Z97Y6X3710wiljELBISipSfF5okn/vz+C2gfO+ihoEyVPjaJwn8ZalVukA=="
+      },
       "MahApps.Metro": {
         "type": "Transitive",
         "resolved": "2.4.10",
@@ -465,6 +470,7 @@
       "torch.api": {
         "type": "Project",
         "dependencies": {
+          "JetBrains.Annotations": "[2023.3.0, )",
           "Microsoft.Extensions.Configuration.Binder": "[8.0.1, )",
           "NLog": "[5.3.2, )",
           "NuGet.Commands": "[6.9.1, )",

Torch/Collections/BinaryMinHeap.cs

@@ -1,8 +1,6 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
 
 namespace Torch.Collections
 {

Torch/Collections/KeyTree.cs

@@ -1,8 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Torch.Collections
 {

Torch/Collections/MTObservableCollection.cs

@@ -1,13 +1,7 @@
 using System;
-using System.Collections;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
 using Torch.Utils;
 
 namespace Torch.Collections

Torch/Collections/MtObservableCollectionBase.cs

@@ -4,10 +4,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
 using PropertyChanged;
 using Torch.Utils;
 

Torch/Collections/MtObservableList.cs

@@ -2,9 +2,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using PropertyChanged;
 using Torch.Utils;