use depot downloader instead of steamcmd because its having some troubles with branching

keen has thrown a bunch of new static ctors so factory patch cannot be revied :(

Torch.API/Torch.API.csproj

@@ -21,7 +21,7 @@
     <PackageReference Include="NuGet.Commands" Version="6.4.0" />
     <PackageReference Include="NuGet.DependencyResolver.Core" Version="6.4.0" />
     <PackageReference Include="SemanticVersioning" Version="2.0.2" />
-    <PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.201.13">
+    <PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.48">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>compile</IncludeAssets>
     </PackageReference>

Torch.API/packages.lock.json

@@ -43,9 +43,9 @@
       },
       "SpaceEngineersDedicated.ReferenceAssemblies": {
         "type": "Direct",
-        "requested": "[1.201.13, )",
-        "resolved": "1.201.13",
-        "contentHash": "FRXuNLENsz5jGQvL0QkogAGsxEJyUQlXhvWHBWfZiHCnCrAWMD60nEis6yt0xCQpazszfMtHonbxz72XMxnFoQ==",
+        "requested": "[1.202.48, )",
+        "resolved": "1.202.48",
+        "contentHash": "iP34MZD14Z/4HTg8rcKQlzJ+azM8/9HVScMJqdYejYbSDAiZzaZS6wlbPkDOKGhbLV2+iW7N5Ix/hCUATBYGuw==",
         "dependencies": {
           "protobuf-net": "1.0.0"
         }

Torch.Server/Initializer.cs

@@ -27,10 +27,10 @@ namespace Torch.Server
 
         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_EXE = "steamcmd.exe";
-        private const string STEAMCMD_ARGS = "+force_install_dir \"{0}\" +login anonymous +app_update 298740 +quit";
+        private const string TOOL_DIR = "tool";
+        private const string TOOL_ZIP = "temp.zip";
+        private static readonly string TOOL_EXE = "DepotDownloader.exe";
+        private const string TOOL_ARGS = "-app 298740 -depot 298741 -beta automatons-beta -dir \"{0}\"";
         private TorchServer _server;
 
         internal Persistent<TorchConfig> ConfigPersistent { get; }
@@ -56,8 +56,8 @@ namespace Torch.Server
             Log.Debug("Debug logging enabled.");
 #endif
             
-            if (!configuration.GetValue("noupdate", false))
-                RunSteamCmd(configuration);
+            if (configuration.GetValue("getGameUpdates", true) && !configuration.GetValue("noupdate", false))
+                RunSteamCmdAsync(configuration).Wait();
 
             var processPid = configuration.GetValue<int>("waitForPid");
             if (processPid != 0)
@@ -124,36 +124,36 @@ namespace Torch.Server
             }
         }
         
-        public static void RunSteamCmd(IConfiguration configuration)
+        public static async Task RunSteamCmdAsync(IConfiguration configuration)
         {
-            var log = LogManager.GetLogger("SteamCMD");
+            var log = LogManager.GetLogger("SteamTool");
 
-            var path = configuration.GetValue<string>("steamCmdPath") ?? ApplicationContext.Current.TorchDirectory
-                .CreateSubdirectory(STEAMCMD_DIR).FullName;
+            var path = configuration.GetValue<string>("steamToolPath") ?? ApplicationContext.Current.TorchDirectory
+                .CreateSubdirectory(TOOL_DIR).FullName;
             
             if (!Directory.Exists(path))
             {
                 Directory.CreateDirectory(path);
             }
 
-            var steamCmdExePath = Path.Combine(path, STEAMCMD_EXE);
+            var steamCmdExePath = Path.Combine(path, TOOL_EXE);
             if (!File.Exists(steamCmdExePath))
             {
                 try
                 {
-                    log.Info("Downloading SteamCMD.");
+                    log.Info("Downloading Steam Tool.");
                     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);
+                    await using (var file = File.Create(TOOL_ZIP))
+                    await using (var stream = await client.GetStreamAsync("https://github.com/SteamRE/DepotDownloader/releases/download/DepotDownloader_2.4.7/depotdownloader-2.4.7.zip"))
+                        await stream.CopyToAsync(file);
 
-                    ZipFile.ExtractToDirectory(STEAMCMD_ZIP, path);
-                    File.Delete(STEAMCMD_ZIP);
-                    log.Info("SteamCMD downloaded successfully!");
+                    ZipFile.ExtractToDirectory(TOOL_ZIP, path);
+                    File.Delete(TOOL_ZIP);
+                    log.Info("Steam Tool downloaded successfully!");
                 }
                 catch (Exception e)
                 {
-                    log.Error(e, "Failed to download SteamCMD, unable to update the DS.");
+                    log.Error(e, "Failed to download Steam Tool, unable to update the DS.");
                     return;
                 }
             }
@@ -161,19 +161,16 @@ namespace Torch.Server
             log.Info("Checking for DS updates.");
             var steamCmdProc = new ProcessStartInfo(steamCmdExePath)
             {
-                Arguments = string.Format(STEAMCMD_ARGS, configuration.GetValue("gamePath", "../")),
+                Arguments = string.Format(TOOL_ARGS, configuration.GetValue("gamePath", "../")),
                 WorkingDirectory = path,
-                UseShellExecute = false,
-                RedirectStandardOutput = true,
-                StandardOutputEncoding = Encoding.ASCII
+                RedirectStandardOutput = true
             };
-            var cmd = Process.Start(steamCmdProc);
+            var cmd = Process.Start(steamCmdProc)!;
             
-            // ReSharper disable once PossibleNullReferenceException
             while (!cmd.HasExited)
             {
-                log.Info(cmd.StandardOutput.ReadLine());
-                Thread.Sleep(100);
+                if (await cmd.StandardOutput.ReadLineAsync() is { } line)
+                    log.Info(line);
             }
         }
     }

Torch.Server/Torch.Server.csproj

@@ -51,7 +51,7 @@
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageReference Include="System.Management" Version="7.0.0" />
     <PackageReference Include="nulastudio.NetCoreBeauty" Version="1.2.9.3" />
-    <PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.201.13">
+    <PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.48">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>compile</IncludeAssets>
     </PackageReference>

Torch.Server/UnhandledExceptionHandler.cs

@@ -32,9 +32,25 @@ internal class UnhandledExceptionHandler
         {
             Console.WriteLine("Restarting in 5 seconds.");
             Thread.Sleep(5000);
+            
             var exe = Path.Combine(AppContext.BaseDirectory, "Torch.Server.exe");
 
-            Process.Start(exe, $"-waitForPid {Environment.ProcessId} {_config}");
+            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)}");
         }
         else
         {

Torch.Server/packages.lock.json

@@ -122,9 +122,9 @@
       },
       "SpaceEngineersDedicated.ReferenceAssemblies": {
         "type": "Direct",
-        "requested": "[1.201.13, )",
-        "resolved": "1.201.13",
-        "contentHash": "FRXuNLENsz5jGQvL0QkogAGsxEJyUQlXhvWHBWfZiHCnCrAWMD60nEis6yt0xCQpazszfMtHonbxz72XMxnFoQ==",
+        "requested": "[1.202.48, )",
+        "resolved": "1.202.48",
+        "contentHash": "iP34MZD14Z/4HTg8rcKQlzJ+azM8/9HVScMJqdYejYbSDAiZzaZS6wlbPkDOKGhbLV2+iW7N5Ix/hCUATBYGuw==",
         "dependencies": {
           "protobuf-net": "1.0.0"
         }

Torch/Managers/FilesystemManager.cs

@@ -58,21 +58,18 @@ namespace Torch.Managers
             if (!File.Exists(source))
                 return;
 
-            var tempFilePath = Path.Combine(path, file + ".old");
-            if (File.Exists(tempFilePath))
-                File.Delete(tempFilePath);
+            try
+            {
+                File.Delete(source);
+            }
+            catch (IOException)
+            {
+                var tempFilePath = Path.Combine(path, file + ".old");
+                if (File.Exists(tempFilePath))
+                    File.Delete(tempFilePath);
 
-            var errorCode = Rename(source, tempFilePath);
-            if (Marshal.GetExceptionForHR(errorCode) is { } exception)
-                throw exception;
+                File.Move(source, tempFilePath);
+            }
         }
-        
-        [LibraryImport("msvcrt", SetLastError = true, EntryPoint = "rename")]
-        [UnmanagedCallConv(CallConvs = new[] { typeof(System.Runtime.CompilerServices.CallConvCdecl) })]
-        private static partial int Rename(
-            [MarshalAs(UnmanagedType.LPWStr)]
-            string oldpath,
-            [MarshalAs(UnmanagedType.LPWStr)]
-            string newpath);
     }
 }

Torch/Patches/ObjectFactoryInitPatch.cs

@@ -1,139 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using Sandbox;
-using Sandbox.Game.Entities;
-using Torch.Utils;
-using VRage.Game.Common;
-using VRage.Game.Components;
-using VRage.Game.Entity;
-using VRage.ObjectBuilders;
-using VRage.Plugins;
-using VRage.Utils;
-
-namespace Torch.Patches
-{
-
-    /// <summary>
-    /// There are places in static ctors where the registered assembly depends on the <see cref="Assembly.GetCallingAssembly"/>
-    /// or <see cref="MyPlugins"/>.  Here we force those registrations with the proper assemblies to ensure they work correctly.
-    /// </summary>
-    internal static class ObjectFactoryInitPatch
-    {
-#pragma warning disable 649
-        [ReflectedGetter(Name = "m_objectFactory", TypeName = "Sandbox.Game.Entities.MyEntityFactory, Sandbox.Game")]
-        private static Func<MyObjectFactory<MyEntityTypeAttribute, MyEntity>> EntityFactoryObjectFactory;
-#pragma warning restore 649
-
-        internal static void ForceRegisterAssemblies()
-        {
-            var userAssemblies = MyPlugins.UserAssemblies;
-            // static MyEntities() called by MySandboxGame.ForceStaticCtor
-            RuntimeHelpers.RunClassConstructor(typeof(MyEntities).TypeHandle);
-            {
-                MyObjectFactory<MyEntityTypeAttribute, MyEntity> factory = EntityFactoryObjectFactory();
-                ObjectFactory_RegisterFromAssemblySafe(factory, typeof(MySandboxGame).Assembly); // calling assembly
-                ObjectFactory_RegisterFromAssemblySafe(factory, MyPlugins.GameAssembly);
-                ObjectFactory_RegisterFromAssemblySafe(factory, MyPlugins.SandboxAssembly);
-                //ObjectFactory_RegisterFromAssemblySafe(factory, MyPlugins.UserAssembly);
-                if (userAssemblies != null)
-                {
-                    foreach (var assembly in userAssemblies)
-                    {
-                        ObjectFactory_RegisterFromAssemblySafe(factory, assembly);
-                    }
-                }
-            }
-
-            // static MyGuiManager():
-            // MyGuiControlsFactory.RegisterDescriptorsFromAssembly();
-
-            // static MyComponentTypeFactory() called by MyComponentContainer.Add
-            RuntimeHelpers.RunClassConstructor(typeof(MyComponentTypeFactory).TypeHandle);
-            {
-                ComponentTypeFactory_RegisterFromAssemblySafe(typeof(MyComponentContainer).Assembly); // calling assembly
-                ComponentTypeFactory_RegisterFromAssemblySafe(MyPlugins.SandboxAssembly);
-                ComponentTypeFactory_RegisterFromAssemblySafe(MyPlugins.GameAssembly);
-                ComponentTypeFactory_RegisterFromAssemblySafe(MyPlugins.SandboxGameAssembly);
-                //ComponentTypeFactory_RegisterFromAssemblySafe(MyPlugins.UserAssembly);
-                if (userAssemblies != null)
-                {
-                    foreach (var assembly in userAssemblies)
-                    {
-                        ComponentTypeFactory_RegisterFromAssemblySafe(assembly);
-                    }
-                }
-            }
-
-            MyEntities.Orchestrator = new MyParallelEntityUpdateOrchestrator();
-
-            // static MyObjectPoolManager()
-            // Render, so should be fine.
-        }
-
-        #region MyObjectFactory Adders
-        private static void ObjectFactory_RegisterDescriptorSafe<TAttribute, TCreatedObjectBase>(
-            MyObjectFactory<TAttribute, TCreatedObjectBase> factory, TAttribute descriptor, Type type) where TAttribute : MyFactoryTagAttribute where TCreatedObjectBase : class
-        {
-            if (factory.Attributes.TryGetValue(type, out _))
-                return;
-            if (descriptor.ObjectBuilderType != null && factory.TryGetProducedType(descriptor.ObjectBuilderType) != null)
-                return;
-            if (typeof(MyObjectBuilder_Base).IsAssignableFrom(descriptor.ProducedType) &&
-                factory.TryGetProducedType(descriptor.ProducedType) != null)
-                return;
-            factory.RegisterDescriptor(descriptor, type);
-        }
-
-        private static void ObjectFactory_RegisterFromAssemblySafe<TAttribute, TCreatedObjectBase>(MyObjectFactory<TAttribute, TCreatedObjectBase> factory, Assembly assembly) where TAttribute : MyFactoryTagAttribute where TCreatedObjectBase : class
-        {
-            if (assembly == null)
-            {
-                return;
-            }
-            foreach (Type type in assembly.GetTypes())
-            {
-                foreach (TAttribute descriptor in type.GetCustomAttributes<TAttribute>())
-                {
-                    ObjectFactory_RegisterDescriptorSafe(factory, descriptor, type);
-                }
-            }
-        }
-        #endregion
-        #region MyComponentTypeFactory Adders
-
-        [ReflectedGetter(Name = "m_idToType", Type = typeof(MyComponentTypeFactory))]
-        private static Func<Dictionary<MyStringId, Type>> ComponentTypeFactoryIdToType = null!;
-        [ReflectedGetter(Name = "m_typeToId", Type = typeof(MyComponentTypeFactory))]
-        private static Func<Dictionary<Type, MyStringId>> ComponentTypeFactoryTypeToId = null!;
-        [ReflectedGetter(Name = "m_typeToContainerComponentType", Type = typeof(MyComponentTypeFactory))]
-        private static Func<Dictionary<Type, Type>> ComponentTypeFactoryContainerComponentType = null!;
-
-        private static void ComponentTypeFactory_RegisterFromAssemblySafe(Assembly assembly)
-        {
-            if (assembly == null)
-                return;
-            foreach (Type type in assembly.GetTypes())
-                if (typeof(MyComponentBase).IsAssignableFrom(type))
-                {
-                    ComponentTypeFactory_AddIdSafe(type, MyStringId.GetOrCompute(type.Name));
-                    ComponentTypeFactory_RegisterComponentTypeAttributeSafe(type);
-                }
-        }
-
-        private static void ComponentTypeFactory_RegisterComponentTypeAttributeSafe(Type type)
-        {
-            Type componentType = type.GetCustomAttribute<MyComponentTypeAttribute>(true)?.ComponentType;
-            if (componentType != null)
-                ComponentTypeFactoryContainerComponentType()[type] = componentType;
-        }
-
-        private static void ComponentTypeFactory_AddIdSafe(Type type, MyStringId id)
-        {
-            ComponentTypeFactoryIdToType()[id] = type;
-            ComponentTypeFactoryTypeToId()[type] = id;
-        }
-        #endregion
-    }
-}

Torch/Plugins/PluginManager.cs

@@ -386,11 +386,7 @@ namespace Torch.Managers
             }
 
             var harmonyAssembly = assemblies.FirstOrDefault(b => b.FullName?.StartsWith("0Harmony") == true);
-            if (harmonyAssembly is { })
-            {
-                _log.Warn($"Plugin {item.Manifest.Name} is using harmony library, logic collision between plugins could be encountered!");
-                assemblies.Remove(harmonyAssembly);
-            }
+            if (harmonyAssembly is { }) assemblies.Remove(harmonyAssembly);
 
             RegisterAllAssemblies(assemblies);
             InstantiatePlugin(item.Manifest, assemblies);

Torch/Torch.csproj

@@ -35,7 +35,7 @@
     <PackageReference Include="protobuf-net" Version="3.1.26" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageReference Include="Torch.SixLabors.ImageSharp" Version="1.0.0-beta6" />
-    <PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.201.13">
+    <PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.48">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>compile</IncludeAssets>
     </PackageReference>

Torch/TorchBase.cs

@@ -133,13 +133,7 @@ namespace Torch
             GameStateChanged += (game, state) =>
             {
                 if (state == TorchGameState.Created) 
-                {
-                    // If the attached assemblies change (MySandboxGame.ctor => MySandboxGame.ParseArgs => MyPlugins.RegisterFromArgs)
-                    // attach assemblies to object factories again.
-                    ObjectFactoryInitPatch.ForceRegisterAssemblies();
-                    // safe to commit here; all important static ctors have run
                     PatchManager.CommitInternal();
-                }
             };
 
             var harmonyLog = LogManager.GetLogger("HarmonyX");
@@ -259,7 +253,6 @@ namespace Torch
         public virtual void Init()
         {
             Debug.Assert(!_init, "Torch instance is already initialized.");
-            ObjectFactoryInitPatch.ForceRegisterAssemblies();
             VRageGame.SetupVersionInfo();
 
             Debug.Assert(MyPerGameSettings.BasicGameInfo.GameVersion != null, "MyPerGameSettings.BasicGameInfo.GameVersion != null");

Torch/packages.lock.json

@@ -102,9 +102,9 @@
       },
       "SpaceEngineersDedicated.ReferenceAssemblies": {
         "type": "Direct",
-        "requested": "[1.201.13, )",
-        "resolved": "1.201.13",
-        "contentHash": "FRXuNLENsz5jGQvL0QkogAGsxEJyUQlXhvWHBWfZiHCnCrAWMD60nEis6yt0xCQpazszfMtHonbxz72XMxnFoQ==",
+        "requested": "[1.202.48, )",
+        "resolved": "1.202.48",
+        "contentHash": "iP34MZD14Z/4HTg8rcKQlzJ+azM8/9HVScMJqdYejYbSDAiZzaZS6wlbPkDOKGhbLV2+iW7N5Ix/hCUATBYGuw==",
         "dependencies": {
           "protobuf-net": "1.0.0"
         }