From 46fe58f7433c833ab05d7a8084af8f944f82306d Mon Sep 17 00:00:00 2001
From: Luke <rt.luke.s@gmail.com>
Date: Tue, 31 Dec 2024 10:35:11 +1000
Subject: [PATCH] Client updates for net9

---
 OTAPI.Client.Launcher/Actions/OTAPI.cs        |  11 +-
 OTAPI.Client.Launcher/MainWindow.axaml        |   2 +-
 OTAPI.Client.Launcher/MainWindow.axaml.cs     |  61 ++++++-
 .../OTAPI.Client.Launcher.csproj              |  17 +-
 OTAPI.Client.Launcher/Program.cs              |  10 +-
 .../Targets/IPlatformTarget.cs                |   6 +-
 .../Targets/InstallTarget.Extensions.cs       | 141 ++++++++-------
 .../Targets/LinuxPlatformTarget.cs            |   8 +-
 .../Targets/MacOSPlatformTarget.cs            |   8 +-
 .../Targets/WindowsPlatformTarget.cs          |   8 +-
 .../otapi/otapi-runtime/ImGuiRenderer.cs      | 170 +++++++++++-------
 OTAPI.Patcher/Common.cs                       |  12 +-
 OTAPI.Patcher/OTAPI.Patcher.csproj            |   6 +-
 OTAPI.Patcher/Targets/PCClientTarget.cs       |  20 +--
 .../Mods/CorrectLegacyAudioPaths.Client.cs    |  40 +++++
 OTAPI.Scripts/OTAPI.Scripts.csproj            |   2 +-
 .../OTAPI.Server.Launcher.csproj              |  10 +-
 .../RuntimeExample.Server.csproj              |   2 +-
 18 files changed, 337 insertions(+), 197 deletions(-)
 create mode 100644 OTAPI.Scripts/Mods/CorrectLegacyAudioPaths.Client.cs

diff --git a/OTAPI.Client.Launcher/Actions/OTAPI.cs b/OTAPI.Client.Launcher/Actions/OTAPI.cs
index 82c7f7ec5..653270de6 100644
--- a/OTAPI.Client.Launcher/Actions/OTAPI.cs
+++ b/OTAPI.Client.Launcher/Actions/OTAPI.cs
@@ -114,7 +114,6 @@ public static void Launch(string[] args)
 
         GC.Collect();
 
-
         CSharpLoader.OnCompilationContext += CSharpLoader_OnCompilationContext;
 
         AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
@@ -232,7 +231,7 @@ static string ResolveFile(string path)
                 using var stream = root.GetManifestResourceStream(text);
                 if (stream is null) return null;
                 byte[] array = new byte[stream.Length];
-                stream.Read(array, 0, array.Length);
+                stream.ReadExactly(array);
                 stream.Seek(0, SeekOrigin.Begin);
 
                 // if (!File.Exists(resourceName))
@@ -267,10 +266,10 @@ static IntPtr ResolveNativeDep(string libraryName, Assembly assembly, DllImportS
         IEnumerable<string> matches = Enumerable.Empty<string>();
 
         foreach (var basePath in new[] {
-                Environment.CurrentDirectory,
-                AppContext.BaseDirectory,
-                Path.Combine(Environment.CurrentDirectory, "client")
-            })
+            Environment.CurrentDirectory,
+            AppContext.BaseDirectory,
+            Path.Combine(Environment.CurrentDirectory, "client")
+        })
         {
             if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
             {
diff --git a/OTAPI.Client.Launcher/MainWindow.axaml b/OTAPI.Client.Launcher/MainWindow.axaml
index b47eaf06f..39a3a3505 100644
--- a/OTAPI.Client.Launcher/MainWindow.axaml
+++ b/OTAPI.Client.Launcher/MainWindow.axaml
@@ -23,7 +23,7 @@
     </Style>
 
     <Style Selector="TextBox.install-path">
-      <Setter Property="FontSize" Value="8" />
+      <Setter Property="FontSize" Value="15" />
       <Setter Property="FontWeight" Value="300" />
     </Style>
     <Style Selector="TextBlock.h1">
diff --git a/OTAPI.Client.Launcher/MainWindow.axaml.cs b/OTAPI.Client.Launcher/MainWindow.axaml.cs
index 7fd47a6e7..957b4268c 100644
--- a/OTAPI.Client.Launcher/MainWindow.axaml.cs
+++ b/OTAPI.Client.Launcher/MainWindow.axaml.cs
@@ -20,14 +20,16 @@ You should have received a copy of the GNU General Public License
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
-using Newtonsoft.Json.Linq;
+using Mono.Cecil;
+using Mono.Cecil.Cil;
 using OTAPI.Client.Launcher.Targets;
 using OTAPI.Common;
 using OTAPI.Patcher.Targets;
 using System;
-using System.ComponentModel;
 using System.IO;
+using System.Linq;
 using System.Runtime.InteropServices;
+using System.Threading.Tasks;
 
 namespace OTAPI.Client.Launcher;
 
@@ -80,6 +82,8 @@ public MainWindow()
 
         if (Program.ConsoleWriter is not null)
             Program.ConsoleWriter.LineReceived += OnConsoleLineReceived;
+
+        PatchMonoMod();
     }
 
     private void OnConsoleLineReceived(string line)
@@ -204,13 +208,17 @@ public void OpenFolder(string folder)
         process.Start();
     }
 
+    System.Threading.CancellationTokenSource CancellationTokenSource { get; set; } = new System.Threading.CancellationTokenSource();
+
     public void OnInstall(object sender, RoutedEventArgs e)
     {
         if (Context.IsInstalling || Context.InstallPath?.Path is null || Context.LaunchTarget is null) return;
         Context.IsInstalling = true;
 
-        new System.Threading.Thread(() =>
+        Task.Run(async () =>
         {
+            CancellationTokenSource.Cancel();
+            CancellationTokenSource = new();
             try
             {
                 var target = new PCClientTarget();
@@ -221,7 +229,7 @@ public void OnInstall(object sender, RoutedEventArgs e)
                 Context.InstallStatus = "Patching completed, installing to existing installation...";
 
                 Context.InstallPath.Target.StatusUpdate += (sender, e) => Context.InstallStatus = e.Text;
-                Context.InstallPath.Target.Install(Context.InstallPath.Path);
+                await Context.InstallPath.Target.InstallAsync(Context.InstallPath.Path, CancellationTokenSource.Token);
 
                 Context.InstallStatus = "Install completed";
 
@@ -235,6 +243,49 @@ public void OnInstall(object sender, RoutedEventArgs e)
                 Context.InstallStatus = "Err: " + ex.ToString();
                 OnConsoleLineReceived(ex.ToString());
             }
-        }).Start();
+        });
+    }
+
+    /// <summary>
+    /// Current MonoMod is outdated, and the new reorg is not ready yet, however we need v25 RD for NET9, yet Patcher v22 is the latest, and is not compatible with v25.
+    /// Ultimately the problem is OTAPI Client using both at once, unlike the server setup which doesnt.
+    /// For now, the intention is to replace the entire both with "return new string[0];" to prevent the GAC IL from being used (which it isn't anyway)
+    /// </summary>
+    void PatchMonoMod()
+    {
+        var bin = File.ReadAllBytes("MonoMod.dll");
+        using MemoryStream ms = new(bin);
+        var asm = AssemblyDefinition.ReadAssembly(ms);
+        var modder = asm.MainModule.Types.Single(x => x.FullName == "MonoMod.MonoModder");
+        var gacPaths = modder.Methods.Single(m => m.Name == "get_GACPaths");
+        var il = gacPaths.Body.GetILProcessor();
+        if (il.Body.Instructions.Count != 3)
+        {
+            il.Body.Instructions.Clear();
+            il.Emit(OpCodes.Ldc_I4_0);
+            il.Emit(OpCodes.Newarr, asm.MainModule.ImportReference(typeof(string)));
+            il.Emit(OpCodes.Ret);
+
+            // clear MonoModder.MatchingConditionals(cap, asmName), with "return false;"
+            var mc = modder.Methods.Single(m => m.Name == "MatchingConditionals" && m.Parameters.Count == 2 && m.Parameters[1].ParameterType.Name == "AssemblyNameReference");
+            il = mc.Body.GetILProcessor();
+            mc.Body.Instructions.Clear();
+            mc.Body.Variables.Clear();
+            mc.Body.ExceptionHandlers.Clear();
+            il.Emit(OpCodes.Ldc_I4_1);
+            il.Emit(OpCodes.Ret);
+
+            var writerParams = modder.Methods.Single(m => m.Name == "get_WriterParameters");
+            il = writerParams.Body.GetILProcessor();
+            var get_Current = writerParams.Body.Instructions.Single(x => x.Operand is MethodReference mref && mref.Name == "get_Current");
+            // replace get_Current with a number, and remove the bitwise checks
+            il.Remove(get_Current.Next);
+            il.Remove(get_Current.Next);
+            il.Replace(get_Current, Instruction.Create(
+                OpCodes.Ldc_I4, RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? 37 : 0
+            ));
+
+            asm.Write("MonoMod.dll");
+        }
     }
 }
diff --git a/OTAPI.Client.Launcher/OTAPI.Client.Launcher.csproj b/OTAPI.Client.Launcher/OTAPI.Client.Launcher.csproj
index 6a902a460..5769afbe4 100644
--- a/OTAPI.Client.Launcher/OTAPI.Client.Launcher.csproj
+++ b/OTAPI.Client.Launcher/OTAPI.Client.Launcher.csproj
@@ -51,13 +51,18 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="ImGui.NET" Version="1.91.0.1" GeneratePathProperty="true" />
-		<PackageReference Include="ModFramework.Modules.ClearScript" Version="1.1.9" GeneratePathProperty="true" />
-		<PackageReference Include="ModFramework.Modules.CSharp" Version="1.1.9" GeneratePathProperty="true" />
-		<PackageReference Include="ModFramework.Modules.Lua" Version="1.1.9" GeneratePathProperty="true" />
-		<PackageReference Include="MonoMod.RuntimeDetour.HookGen" Version="22.7.31.1" />
+		<PackageReference Include="ModFramework.Modules.ClearScript" Version="1.1.11" GeneratePathProperty="true" />
+		<PackageReference Include="ModFramework.Modules.CSharp" Version="1.1.11" GeneratePathProperty="true" />
+		<PackageReference Include="ModFramework.Modules.Lua" Version="1.1.11" GeneratePathProperty="true" />
 		<PackageReference Include="SharpZipLib" Version="1.4.2" />
-		<PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
-		<PackageReference Include="System.Drawing.Primitives" Version="4.3.0" />
+		<PackageReference Include="System.Drawing.Common" Version="9.0.0" />
+		<PackageReference Include="MonoMod.RuntimeDetour.HookGen" Version="22.7.31.1" />
+		<PackageReference Include="MonoMod" Version="22.7.31.1">
+			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+		</PackageReference>
+		<PackageReference Include="MonoMod.RuntimeDetour" Version="25.2.2">
+			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+		</PackageReference>
 	</ItemGroup>
 	<Target Name="CleanAll" AfterTargets="Clean">
 		<RemoveDir Directories="$(OUTDIR)" />
diff --git a/OTAPI.Client.Launcher/Program.cs b/OTAPI.Client.Launcher/Program.cs
index 4a5267c86..d61b546df 100644
--- a/OTAPI.Client.Launcher/Program.cs
+++ b/OTAPI.Client.Launcher/Program.cs
@@ -116,22 +116,20 @@ public static void Main(string[] args)
         Start(args);
     }
 
-    public static IEnumerable<string> DiscoverFilesInFolder(string folder, string pattern, SearchOption searchOption = SearchOption.AllDirectories)
+    public static string[] DiscoverFilesInFolder(string folder, string pattern, SearchOption searchOption = SearchOption.AllDirectories)
     {
         if (Directory.Exists(folder))
             return Directory.GetFiles(folder, pattern, searchOption);
-
-        return Enumerable.Empty<string>();
+        return [];
     }
 
-    public static IEnumerable<string> DiscoverFoldersInFolder(string folder, string? pattern = null, SearchOption searchOption = SearchOption.AllDirectories)
+    public static string[] DiscoverFoldersInFolder(string folder, string? pattern = null, SearchOption searchOption = SearchOption.AllDirectories)
     {
         if (Directory.Exists(folder))
             return pattern is not null ?
                 Directory.GetDirectories(folder, pattern, searchOption)
                 : Directory.GetDirectories(folder);
-
-        return Enumerable.Empty<string>();
+        return [];
     }
 
     public static string[] DiscoverPlugins()
diff --git a/OTAPI.Client.Launcher/Targets/IPlatformTarget.cs b/OTAPI.Client.Launcher/Targets/IPlatformTarget.cs
index e0157ffcd..21590a867 100644
--- a/OTAPI.Client.Launcher/Targets/IPlatformTarget.cs
+++ b/OTAPI.Client.Launcher/Targets/IPlatformTarget.cs
@@ -18,13 +18,15 @@ You should have received a copy of the GNU General Public License
 */
 using OTAPI.Common;
 using System;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace OTAPI.Client.Launcher.Targets;
 
 public interface IPlatformTarget : IInstallDiscoverer
 {
-    void Install(string installPath);
-    bool IsValidInstallPath(string installPath);
+    Task InstallAsync(string installPath, CancellationToken cancellationToken);
+    //bool IsValidInstallPath(string installPath);
     event EventHandler<InstallStatusUpdate> StatusUpdate;
     string Status { set; }
 
diff --git a/OTAPI.Client.Launcher/Targets/InstallTarget.Extensions.cs b/OTAPI.Client.Launcher/Targets/InstallTarget.Extensions.cs
index 19f8508ba..13727b4b0 100644
--- a/OTAPI.Client.Launcher/Targets/InstallTarget.Extensions.cs
+++ b/OTAPI.Client.Launcher/Targets/InstallTarget.Extensions.cs
@@ -34,12 +34,14 @@ You should have received a copy of the GNU General Public License
 using System.Net.Http;
 using System.Reflection;
 using System.Runtime.InteropServices;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace OTAPI.Client.Launcher.Targets;
 
 public static class InstallTargetExtensions
 {
-    public static void CopyOTAPI(this IPlatformTarget target, string otapiFolder, IEnumerable<string> packagePaths)
+    public static void CopyOTAPI(this IPlatformTarget target, string otapiFolder, IReadOnlyCollection<string> packagePaths)
     {
         Console.WriteLine(target.Status = "Copying OTAPI...");
         foreach (var packagePath in packagePaths)
@@ -52,7 +54,7 @@ public static void CopyOTAPI(this IPlatformTarget target, string otapiFolder, IE
     ""tfm"": ""net9.0"",
     ""framework"": {
       ""name"": ""Microsoft.NETCore.App"",
-      ""version"": ""5.0.0""
+      ""version"": ""9.0.0""
     }
   }
 }");
@@ -158,7 +160,7 @@ public static void CopyOTAPI(this IPlatformTarget target, string otapiFolder, IE
         }
     }
 
-    public static IEnumerable<string> PublishHostGame(this IPlatformTarget target)
+    public static string PublishHostGame(this IPlatformTarget target)
     {
         Console.WriteLine(target.Status = "Building host game...");
 
@@ -177,25 +179,22 @@ public static IEnumerable<string> PublishHostGame(this IPlatformTarget target)
             .WithAllowUnsafe(true);
 
         var files = Directory.EnumerateFiles(hostDir, "*.cs");
-        var parsed = CSharpLoader.ParseFiles(files, constants);
+        var parsed = CSharpLoader.ParseFiles(files, constants).ToList();
 
-        {
-            //var folder = Path.GetFileName(Path.GetDirectoryName(file));
-
-            var encoding = System.Text.Encoding.UTF8;
-            var parse_options = CSharpParseOptions.Default
-                .WithKind(SourceCodeKind.Regular)
-                .WithPreprocessorSymbols(constants.Select(s => s.Replace("#define ", "")))
-                .WithDocumentationMode(DocumentationMode.Parse)
-                .WithLanguageVersion(LanguageVersion.Preview); // allows toplevel functions
+        var encoding = System.Text.Encoding.UTF8;
+        var parse_options = CSharpParseOptions.Default
+            .WithKind(SourceCodeKind.Regular)
+            .WithPreprocessorSymbols(constants.Select(s => s.Replace("#define ", "")))
+            .WithDocumentationMode(DocumentationMode.Parse)
+            .WithLanguageVersion(LanguageVersion.Preview); // allows toplevel functions
 
-            var src = @"
+        var src = @"
 using System.Diagnostics;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.Versioning;
 
-[assembly: TargetFramework("".NETCoreApp,Version=v5.0"", FrameworkDisplayName = """")]
+[assembly: TargetFramework("".NETCoreApp,Version=v9.0"", FrameworkDisplayName = """")]
 [assembly: AssemblyCompany(""OTAPI.Client.Installer"")]
 [assembly: AssemblyFileVersion(""1.0.0.0"")]
 [assembly: AssemblyInformationalVersion(""1.0.0"")]
@@ -203,24 +202,24 @@ public static IEnumerable<string> PublishHostGame(this IPlatformTarget target)
 [assembly: AssemblyTitle(""OTAPI.Client.Installer"")]
 [assembly: AssemblyVersion(""1.0.0.0"")]
 ";
-            var source = SourceText.From(src, encoding);
-            var encoded = CSharpSyntaxTree.ParseText(source, parse_options);
+        var source = SourceText.From(src, encoding);
+        var encoded = CSharpSyntaxTree.ParseText(source, parse_options);
 
-            parsed = parsed.Concat(new[]{
-                    new CSharpLoader.CompilationFile()
-                    {
-                        SyntaxTree = encoded,
-                    }
-                 });
-        }
+        parsed.Add(new()
+        {
+            SyntaxTree = encoded,
+        });
 
-        var syntaxTrees = parsed.Select(x => x.SyntaxTree);
+        var syntaxTrees = parsed
+            .Where(x => x.SyntaxTree is not null)
+            .Select(x => x.SyntaxTree!)
+            .ToArray();
 
         var compilation = CSharpCompilation
             .Create("OTAPI.Client.Installer", syntaxTrees, options: compile_options)
         ;
 
-        var libs = ((String)AppContext.GetData("TRUSTED_PLATFORM_ASSEMBLIES"))
+        var libs = (AppContext.GetData("TRUSTED_PLATFORM_ASSEMBLIES") as string ?? throw new Exception("No trusted assemblies found"))
             .Split(Path.PathSeparator)
             .Where(x => !x.StartsWith(Environment.CurrentDirectory));
         foreach (var lib in libs)
@@ -229,12 +228,12 @@ public static IEnumerable<string> PublishHostGame(this IPlatformTarget target)
         }
 
 #if RELEASE
-            foreach (var lib in System.IO.Directory.GetFiles(Environment.CurrentDirectory, "System.*.dll"))
-            {
-                compilation = compilation.AddReferences(MetadataReference.CreateFromFile(lib));
-            }
-            compilation = compilation.AddReferences(MetadataReference.CreateFromFile("mscorlib.dll"));
-            compilation = compilation.AddReferences(MetadataReference.CreateFromFile("netstandard.dll"));
+        foreach (var lib in System.IO.Directory.GetFiles(Environment.CurrentDirectory, "System.*.dll"))
+        {
+            compilation = compilation.AddReferences(MetadataReference.CreateFromFile(lib));
+        }
+        compilation = compilation.AddReferences(MetadataReference.CreateFromFile("mscorlib.dll"));
+        compilation = compilation.AddReferences(MetadataReference.CreateFromFile("netstandard.dll"));
 #endif
 
         compilation = compilation.AddReferences(MetadataReference.CreateFromFile("FNA.dll"));
@@ -249,9 +248,9 @@ public static IEnumerable<string> PublishHostGame(this IPlatformTarget target)
         );
 
 
-        var dllStream = new MemoryStream();
-        var pdbStream = new MemoryStream();
-        var xmlStream = new MemoryStream();
+        MemoryStream dllStream = new();
+        MemoryStream pdbStream = new();
+        MemoryStream xmlStream = new();
         var result = compilation.Emit(
             peStream: dllStream,
             pdbStream: pdbStream,
@@ -271,34 +270,34 @@ public static IEnumerable<string> PublishHostGame(this IPlatformTarget target)
 
         Console.WriteLine("Published");
 
-        return new[] { output };
+        return output;
     }
 
     class GHRelease
     {
         [JsonProperty("name")]
-        public string Name { get; set; }
+        public string? Name { get; set; }
 
         [JsonProperty("assets")]
-        public IEnumerable<GHArtifact> Assets { get; set; }
+        public GHArtifact[]? Assets { get; set; }
     }
     class GHArtifact
     {
         [JsonProperty("name")]
-        public string Name { get; set; }
+        public string? Name { get; set; }
 
         [JsonProperty("browser_download_url")]
-        public string BrowserDownloadUrl { get; set; }
+        public string? BrowserDownloadUrl { get; set; }
     }
 
     public static string PublishHostLauncher(this IPlatformTarget target)
     {
         var url = "https://api.github.com/repos/DeathCradle/Open-Terraria-API/releases";
 
-        using var client = new HttpClient();
+        using HttpClient client = new();
         client.DefaultRequestHeaders.UserAgent.ParseAdd("OTAPI3-Installer");
         var data = client.GetStringAsync(url).Result;
-        var releases = Newtonsoft.Json.JsonConvert.DeserializeObject<GHRelease[]>(data);
+        var releases = Newtonsoft.Json.JsonConvert.DeserializeObject<GHRelease[]>(data) ?? throw new Exception("Unable to read release data");
 
         GHRelease release;
         if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
@@ -308,7 +307,8 @@ public static string PublishHostLauncher(this IPlatformTarget target)
         else // linux
             release = releases.First(a => a.Name == "Linux Launcher");
 
-        url = release.Assets.First(a => a.Name.EndsWith(".zip", StringComparison.CurrentCultureIgnoreCase)).BrowserDownloadUrl;
+        url = release?.Assets?.First(a => a.Name?.EndsWith(".zip", StringComparison.CurrentCultureIgnoreCase) == true).BrowserDownloadUrl
+            ?? throw new Exception("Failed to find zip file in installer release");
 
         Console.WriteLine(target.Status = "Downloading launcher, this may take a long time...");
         using var launcher = client.GetStreamAsync(url).Result;
@@ -329,19 +329,19 @@ public static string PublishHostLauncher(this IPlatformTarget target)
             fs.Close();
         }
 
-        if (Directory.Exists("launcher_files")) Directory.Delete("launcher_files", true);
-        Directory.CreateDirectory("launcher_files");
+        var directory = "launcher_files";
+        if (Directory.Exists(directory)) Directory.Delete(directory, true);
+        Directory.CreateDirectory(directory);
         ZipFile.ExtractToDirectory("launcher.zip", "launcher_files");
 
-        var files = Directory.GetFiles("launcher_files", "*", SearchOption.AllDirectories);
+        var files = Directory.GetFiles(directory, "*", SearchOption.AllDirectories);
 
-        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            return Path.GetDirectoryName(files.Single(x => Path.GetFileName(x).Equals("Terraria.exe", StringComparison.CurrentCultureIgnoreCase)));
-        else // linux+osx
-            return Path.GetDirectoryName(files.Single(x => Path.GetFileName(x).Equals("Terraria", StringComparison.CurrentCultureIgnoreCase)));
+        var exeName = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "Terraria.exe" : "Terraria";
+        var location = files.Single(x => Path.GetFileName(x).Equals(exeName, StringComparison.CurrentCultureIgnoreCase));
+        return Path.GetDirectoryName(location) ?? throw new Exception($"Failed to find {exeName} in {directory}");
     }
 
-    public static string DownloadZip(this IPlatformTarget target, string url, string name)
+    public async static Task<string> DownloadZipAsync(this IPlatformTarget target, string url, string name, CancellationToken cancellationToken)
     {
         Console.WriteLine($"Downloading {url}");
         var uri = new Uri(url);
@@ -355,18 +355,28 @@ public static string DownloadZip(this IPlatformTarget target, string url, string
 
             if (!info.Exists || info.Length == 0)
             {
-                using (var wc = new System.Net.WebClient())
+                using var destination = File.OpenWrite(savePath);
+                using HttpClient http = new();
+                using var response = await http.GetAsync(url, HttpCompletionOption.ResponseHeadersRead);
+                response.EnsureSuccessStatusCode();
+                var contentLength = response.Content.Headers.ContentLength;
+
+                using var download = await response.Content.ReadAsStreamAsync(cancellationToken);
+
+                if (!contentLength.HasValue)
+                    await download.CopyToAsync(destination);
+                else
                 {
-                    int lastPercentage = -1;
-                    wc.DownloadProgressChanged += (s, e) =>
+                    // download in chunks
+                    var buffer = new byte[65535];
+                    var read = 0;
+                    var totalRead = 0;
+                    while ((read = await download.ReadAsync(buffer, 0, buffer.Length, cancellationToken)) > 0)
                     {
-                        if (lastPercentage != e.ProgressPercentage && e.ProgressPercentage % 10 == 0)
-                        {
-                            lastPercentage = e.ProgressPercentage;
-                            Console.WriteLine($"Downloading {name}...{e.ProgressPercentage}%");
-                        }
-                    };
-                    wc.DownloadFileTaskAsync(new Uri(url), savePath).Wait();
+                        await destination.WriteAsync(buffer, 0, read, cancellationToken);
+                        totalRead += read;
+                        Console.WriteLine($"Downloading {name}...{totalRead / contentLength.Value * 100}%");
+                    }
                 }
             }
 
@@ -459,16 +469,15 @@ public static void CopyInstallFiles(this IPlatformTarget target, string otapiIns
         Utils.CopyFiles("install", otapiInstallPath);
     }
 
-    public static void InstallLibs(this IPlatformTarget target, string installPath)
+    public async static Task InstallLibsAsync(this IPlatformTarget target, string installPath, CancellationToken cancellationToken)
     {
-        //var zipPath = target.DownloadZip("http://fna.flibitijibibo.com/archive/fnalibs.tar.bz2", "fnalibs");
-        var zipPath = target.DownloadZip("https://github.com/DeathCradle/fnalibs/raw/main/fnalibs.20211125.tar.bz2", "fnalibs");
+        var zipPath = await target.DownloadZipAsync("https://github.com/DeathCradle/fnalibs/raw/main/fnalibs.20211125.tar.bz2", "fnalibs", cancellationToken);
         target.ExtractBZip2(zipPath, installPath);
     }
 
-    public static void InstallSteamworks64(this IPlatformTarget target, string installPath, string steam_appid_folder)
+    public async static Task InstallSteamworks64Async(this IPlatformTarget target, string installPath, string steam_appid_folder, CancellationToken cancellationToken)
     {
-        var zipPath = target.DownloadZip("https://github.com/rlabrecque/Steamworks.NET/releases/download/20.1.0/Steamworks.NET-Standalone_20.1.0.zip", "steamworks64");
+        var zipPath = await target.DownloadZipAsync("https://github.com/rlabrecque/Steamworks.NET/releases/download/2024.8.0/Steamworks.NET-Standalone_2024.8.0.zip", "steamworks64", cancellationToken);
         var folderName = Path.GetFileNameWithoutExtension(zipPath);
         if (Directory.Exists(folderName)) Directory.Delete(folderName, true);
         ZipFile.ExtractToDirectory(zipPath, folderName);
diff --git a/OTAPI.Client.Launcher/Targets/LinuxPlatformTarget.cs b/OTAPI.Client.Launcher/Targets/LinuxPlatformTarget.cs
index 9067b6dc0..a9b251d69 100644
--- a/OTAPI.Client.Launcher/Targets/LinuxPlatformTarget.cs
+++ b/OTAPI.Client.Launcher/Targets/LinuxPlatformTarget.cs
@@ -19,6 +19,8 @@ You should have received a copy of the GNU General Public License
 using OTAPI.Common;
 using System;
 using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace OTAPI.Client.Launcher.Targets;
 
@@ -30,7 +32,7 @@ public void OnUILoad(MainWindowViewModel vm)
         vm.VanillaExe = (vm.InstallPath?.Path is not null && Directory.Exists(vm.InstallPath.Path)) ? Path.Combine(vm.InstallPath.Path, "Terraria.exe") : null;
     }
 
-    public void Install(string installPath)
+    public async Task InstallAsync(string installPath, CancellationToken cancellationToken)
     {
         var sourceContentPath = Path.Combine(installPath, "Content");
         var clientPath = Path.Combine(Environment.CurrentDirectory, "client");
@@ -41,10 +43,10 @@ public void Install(string installPath)
 #endif
 
         Console.WriteLine(Status = "Installing FNA libs...");
-        this.InstallLibs(clientPath);
+        await this.InstallLibsAsync(clientPath, cancellationToken);
 
         Console.WriteLine(Status = "Installing Steamworks...");
-        this.InstallSteamworks64(clientPath, installPath);
+        await this.InstallSteamworks64Async(clientPath, installPath, cancellationToken);
 
         Console.WriteLine(Status = "Linking Terraria Content files...");
         if (!Directory.Exists(destContentPath))
diff --git a/OTAPI.Client.Launcher/Targets/MacOSPlatformTarget.cs b/OTAPI.Client.Launcher/Targets/MacOSPlatformTarget.cs
index efe06a6fe..31a374930 100644
--- a/OTAPI.Client.Launcher/Targets/MacOSPlatformTarget.cs
+++ b/OTAPI.Client.Launcher/Targets/MacOSPlatformTarget.cs
@@ -19,6 +19,8 @@ You should have received a copy of the GNU General Public License
 using OTAPI.Common;
 using System;
 using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace OTAPI.Client.Launcher.Targets;
 
@@ -30,7 +32,7 @@ public void OnUILoad(MainWindowViewModel vm)
         vm.VanillaExe = (vm.InstallPath?.Path is not null && Directory.Exists(vm.InstallPath.Path)) ? Path.Combine(vm.InstallPath.Path, "Resources", "Terraria.exe") : null;
     }
 
-    public void Install(string installPath)
+    public async Task InstallAsync(string installPath, CancellationToken cancellationToken)
     {
         var sourceContentPath = Path.Combine(installPath, "Resources", "Content");
         var clientPath = Path.Combine(Environment.CurrentDirectory, "client");
@@ -42,10 +44,10 @@ public void Install(string installPath)
         var macOS = Path.Combine(installPath, "MacOS");
 
         Console.WriteLine(Status = "Installing FNA libs...");
-        this.InstallLibs(clientPath);
+        await this.InstallLibsAsync(clientPath, cancellationToken);
 
         Console.WriteLine(Status = "Installing Steamworks...");
-        this.InstallSteamworks64(clientPath, macOS);
+        await this.InstallSteamworks64Async(clientPath, macOS, cancellationToken);
 
         Console.WriteLine(Status = "Linking Terraria Content files...");
         if (!Directory.Exists(destContentPath))
diff --git a/OTAPI.Client.Launcher/Targets/WindowsPlatformTarget.cs b/OTAPI.Client.Launcher/Targets/WindowsPlatformTarget.cs
index f4f9d12bc..8b7a9ce16 100644
--- a/OTAPI.Client.Launcher/Targets/WindowsPlatformTarget.cs
+++ b/OTAPI.Client.Launcher/Targets/WindowsPlatformTarget.cs
@@ -19,6 +19,8 @@ You should have received a copy of the GNU General Public License
 using OTAPI.Common;
 using System;
 using System.IO;
+using System.Threading.Tasks;
+using System.Threading;
 
 namespace OTAPI.Client.Launcher.Targets;
 
@@ -30,7 +32,7 @@ public void OnUILoad(MainWindowViewModel vm)
         vm.VanillaExe = (vm.InstallPath?.Path is not null && Directory.Exists(vm.InstallPath.Path)) ? Path.Combine(vm.InstallPath.Path, "Terraria.exe") : null;
     }
 
-    public void Install(string installPath)
+    public async Task InstallAsync(string installPath, CancellationToken cancellationToken)
     {
         var sourceContentPath = Path.Combine(installPath, "Content");
         var clientPath = Path.Combine(Environment.CurrentDirectory, "client");
@@ -41,10 +43,10 @@ public void Install(string installPath)
 #endif
 
         Console.WriteLine(Status = "Installing FNA libs...");
-        this.InstallLibs(clientPath);
+        await this.InstallLibsAsync(clientPath, cancellationToken);
 
         Console.WriteLine(Status = "Installing Steamworks...");
-        this.InstallSteamworks64(clientPath, installPath);
+        await this.InstallSteamworks64Async(clientPath, installPath, cancellationToken);
 
         Console.WriteLine(Status = "Linking Terraria Content files...");
         if (!Directory.Exists(destContentPath))
diff --git a/OTAPI.Client.Launcher/csharp/plugins/modules/otapi/otapi-runtime/ImGuiRenderer.cs b/OTAPI.Client.Launcher/csharp/plugins/modules/otapi/otapi-runtime/ImGuiRenderer.cs
index debec1160..cba0748eb 100644
--- a/OTAPI.Client.Launcher/csharp/plugins/modules/otapi/otapi-runtime/ImGuiRenderer.cs
+++ b/OTAPI.Client.Launcher/csharp/plugins/modules/otapi/otapi-runtime/ImGuiRenderer.cs
@@ -1,21 +1,4 @@
-/*
-Copyright (C) 2020 DeathCradle
-
-This file is part of Open Terraria API v3 (OTAPI)
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
+// see https://github.com/ImGuiNET/ImGui.NET/tree/master/src/ImGui.NET.SampleProgram.XNA
 
 using ModFramework;
 using System;
@@ -84,8 +67,9 @@ public class ImGuiRenderer
 
     // Input
     private int _scrollWheelValue;
-
-    private List<int> _keys = new List<int>();
+    //private int _horizontalScrollWheelValue;
+    private readonly float WHEEL_DELTA = 120;
+    private Keys[] _allKeys = Enum.GetValues<Keys>();
 
     public ImGuiRenderer(Game game)
     {
@@ -187,40 +171,19 @@ public virtual void AfterLayout()
     #region Setup & Update
 
     /// <summary>
-    /// Maps ImGui keys to XNA keys. We use this later on to tell ImGui what keys were pressed
+    /// Setup key input event handler.
     /// </summary>
     protected virtual void SetupInput()
     {
         var io = ImGui.GetIO();
 
-        _keys.Add(io.KeyMap[(int)ImGuiKey.Tab] = (int)Keys.Tab);
-        _keys.Add(io.KeyMap[(int)ImGuiKey.LeftArrow] = (int)Keys.Left);
-        _keys.Add(io.KeyMap[(int)ImGuiKey.RightArrow] = (int)Keys.Right);
-        _keys.Add(io.KeyMap[(int)ImGuiKey.UpArrow] = (int)Keys.Up);
-        _keys.Add(io.KeyMap[(int)ImGuiKey.DownArrow] = (int)Keys.Down);
-        _keys.Add(io.KeyMap[(int)ImGuiKey.PageUp] = (int)Keys.PageUp);
-        _keys.Add(io.KeyMap[(int)ImGuiKey.PageDown] = (int)Keys.PageDown);
-        _keys.Add(io.KeyMap[(int)ImGuiKey.Home] = (int)Keys.Home);
-        _keys.Add(io.KeyMap[(int)ImGuiKey.End] = (int)Keys.End);
-        _keys.Add(io.KeyMap[(int)ImGuiKey.Delete] = (int)Keys.Delete);
-        _keys.Add(io.KeyMap[(int)ImGuiKey.Backspace] = (int)Keys.Back);
-        _keys.Add(io.KeyMap[(int)ImGuiKey.Enter] = (int)Keys.Enter);
-        _keys.Add(io.KeyMap[(int)ImGuiKey.Escape] = (int)Keys.Escape);
-        _keys.Add(io.KeyMap[(int)ImGuiKey.Space] = (int)Keys.Space);
-        _keys.Add(io.KeyMap[(int)ImGuiKey.A] = (int)Keys.A);
-        _keys.Add(io.KeyMap[(int)ImGuiKey.C] = (int)Keys.C);
-        _keys.Add(io.KeyMap[(int)ImGuiKey.V] = (int)Keys.V);
-        _keys.Add(io.KeyMap[(int)ImGuiKey.X] = (int)Keys.X);
-        _keys.Add(io.KeyMap[(int)ImGuiKey.Y] = (int)Keys.Y);
-        _keys.Add(io.KeyMap[(int)ImGuiKey.Z] = (int)Keys.Z);
-
         //// MonoGame-specific //////////////////////
         //_game.Window.TextInput += (s, a) =>
         //{
         //    if (a.Character == '\t') return;
-
         //    io.AddInputCharacter(a.Character);
         //};
+
         ///////////////////////////////////////////
 
         // FNA-specific ///////////////////////////
@@ -231,8 +194,6 @@ protected virtual void SetupInput()
             ImGui.GetIO().AddInputCharacter(c);
         };
         ///////////////////////////////////////////
-
-        ImGui.GetIO().Fonts.AddFontDefault();
     }
 
     /// <summary>
@@ -259,33 +220,98 @@ protected virtual Effect UpdateEffect(Texture2D texture)
     /// </summary>
     protected virtual void UpdateInput()
     {
+        if (!_game.IsActive) return;
+
         var io = ImGui.GetIO();
 
         var mouse = Mouse.GetState();
         var keyboard = Keyboard.GetState();
+        io.AddMousePosEvent(mouse.X, mouse.Y);
+        io.AddMouseButtonEvent(0, mouse.LeftButton == ButtonState.Pressed);
+        io.AddMouseButtonEvent(1, mouse.RightButton == ButtonState.Pressed);
+        io.AddMouseButtonEvent(2, mouse.MiddleButton == ButtonState.Pressed);
+        io.AddMouseButtonEvent(3, mouse.XButton1 == ButtonState.Pressed);
+        io.AddMouseButtonEvent(4, mouse.XButton2 == ButtonState.Pressed);
+
+        io.AddMouseWheelEvent(
+            /*(mouse.HorizontalScrollWheelValue - _horizontalScrollWheelValue) / WHEEL_DELTA*/ 0,
+            (mouse.ScrollWheelValue - _scrollWheelValue) / WHEEL_DELTA);
+        _scrollWheelValue = mouse.ScrollWheelValue;
+        //_horizontalScrollWheelValue = mouse.HorizontalScrollWheelValue;
 
-        for (int i = 0; i < _keys.Count; i++)
+        foreach (var key in _allKeys)
         {
-            io.KeysDown[_keys[i]] = keyboard.IsKeyDown((Keys)_keys[i]);
+            if (TryMapKeys(key, out ImGuiKey imguikey))
+            {
+                io.AddKeyEvent(imguikey, keyboard.IsKeyDown(key));
+            }
         }
 
-        io.KeyShift = keyboard.IsKeyDown(Keys.LeftShift) || keyboard.IsKeyDown(Keys.RightShift);
-        io.KeyCtrl = keyboard.IsKeyDown(Keys.LeftControl) || keyboard.IsKeyDown(Keys.RightControl);
-        io.KeyAlt = keyboard.IsKeyDown(Keys.LeftAlt) || keyboard.IsKeyDown(Keys.RightAlt);
-        io.KeySuper = keyboard.IsKeyDown(Keys.LeftWindows) || keyboard.IsKeyDown(Keys.RightWindows);
-
         io.DisplaySize = new System.Numerics.Vector2(_graphicsDevice.PresentationParameters.BackBufferWidth, _graphicsDevice.PresentationParameters.BackBufferHeight);
         io.DisplayFramebufferScale = new System.Numerics.Vector2(1f, 1f);
+    }
 
-        io.MousePos = new System.Numerics.Vector2(mouse.X, mouse.Y);
+    private bool TryMapKeys(Keys key, out ImGuiKey imguikey)
+    {
+        //Special case not handed in the switch...
+        //If the actual key we put in is "None", return none and true. 
+        //otherwise, return none and false.
+        if (key == Keys.None)
+        {
+            imguikey = ImGuiKey.None;
+            return true;
+        }
 
-        io.MouseDown[0] = mouse.LeftButton == ButtonState.Pressed;
-        io.MouseDown[1] = mouse.RightButton == ButtonState.Pressed;
-        io.MouseDown[2] = mouse.MiddleButton == ButtonState.Pressed;
+        imguikey = key switch
+        {
+            Keys.Back => ImGuiKey.Backspace,
+            Keys.Tab => ImGuiKey.Tab,
+            Keys.Enter => ImGuiKey.Enter,
+            Keys.CapsLock => ImGuiKey.CapsLock,
+            Keys.Escape => ImGuiKey.Escape,
+            Keys.Space => ImGuiKey.Space,
+            Keys.PageUp => ImGuiKey.PageUp,
+            Keys.PageDown => ImGuiKey.PageDown,
+            Keys.End => ImGuiKey.End,
+            Keys.Home => ImGuiKey.Home,
+            Keys.Left => ImGuiKey.LeftArrow,
+            Keys.Right => ImGuiKey.RightArrow,
+            Keys.Up => ImGuiKey.UpArrow,
+            Keys.Down => ImGuiKey.DownArrow,
+            Keys.PrintScreen => ImGuiKey.PrintScreen,
+            Keys.Insert => ImGuiKey.Insert,
+            Keys.Delete => ImGuiKey.Delete,
+            >= Keys.D0 and <= Keys.D9 => ImGuiKey._0 + (key - Keys.D0),
+            >= Keys.A and <= Keys.Z => ImGuiKey.A + (key - Keys.A),
+            >= Keys.NumPad0 and <= Keys.NumPad9 => ImGuiKey.Keypad0 + (key - Keys.NumPad0),
+            Keys.Multiply => ImGuiKey.KeypadMultiply,
+            Keys.Add => ImGuiKey.KeypadAdd,
+            Keys.Subtract => ImGuiKey.KeypadSubtract,
+            Keys.Decimal => ImGuiKey.KeypadDecimal,
+            Keys.Divide => ImGuiKey.KeypadDivide,
+            >= Keys.F1 and <= Keys.F24 => ImGuiKey.F1 + (key - Keys.F1),
+            Keys.NumLock => ImGuiKey.NumLock,
+            Keys.Scroll => ImGuiKey.ScrollLock,
+            Keys.LeftShift => ImGuiKey.ModShift,
+            Keys.LeftControl => ImGuiKey.ModCtrl,
+            Keys.LeftAlt => ImGuiKey.ModAlt,
+            Keys.OemSemicolon => ImGuiKey.Semicolon,
+            Keys.OemPlus => ImGuiKey.Equal,
+            Keys.OemComma => ImGuiKey.Comma,
+            Keys.OemMinus => ImGuiKey.Minus,
+            Keys.OemPeriod => ImGuiKey.Period,
+            Keys.OemQuestion => ImGuiKey.Slash,
+            Keys.OemTilde => ImGuiKey.GraveAccent,
+            Keys.OemOpenBrackets => ImGuiKey.LeftBracket,
+            Keys.OemCloseBrackets => ImGuiKey.RightBracket,
+            Keys.OemPipe => ImGuiKey.Backslash,
+            Keys.OemQuotes => ImGuiKey.Apostrophe,
+            Keys.BrowserBack => ImGuiKey.AppBack,
+            Keys.BrowserForward => ImGuiKey.AppForward,
+            _ => ImGuiKey.None,
+        };
 
-        var scrollDelta = mouse.ScrollWheelValue - _scrollWheelValue;
-        io.MouseWheel = scrollDelta > 0 ? 1 : scrollDelta < 0 ? -1 : 0;
-        _scrollWheelValue = mouse.ScrollWheelValue;
+        return imguikey != ImGuiKey.None;
     }
 
     #endregion Setup & Update
@@ -300,6 +326,10 @@ private void RenderDrawData(ImDrawDataPtr drawData)
         // Setup render state: alpha-blending enabled, no face culling, no depth testing, scissor enabled, vertex/texcoord/color pointers
         var lastViewport = _graphicsDevice.Viewport;
         var lastScissorBox = _graphicsDevice.ScissorRectangle;
+        var lastRasterizer = _graphicsDevice.RasterizerState;
+        var lastDepthStencil = _graphicsDevice.DepthStencilState;
+        var lastBlendFactor = _graphicsDevice.BlendFactor;
+        var lastBlendState = _graphicsDevice.BlendState;
 
         _graphicsDevice.BlendFactor = Color.White;
         _graphicsDevice.BlendState = BlendState.NonPremultiplied;
@@ -319,6 +349,10 @@ private void RenderDrawData(ImDrawDataPtr drawData)
         // Restore modified state
         _graphicsDevice.Viewport = lastViewport;
         _graphicsDevice.ScissorRectangle = lastScissorBox;
+        _graphicsDevice.RasterizerState = lastRasterizer;
+        _graphicsDevice.DepthStencilState = lastDepthStencil;
+        _graphicsDevice.BlendState = lastBlendState;
+        _graphicsDevice.BlendFactor = lastBlendFactor;
     }
 
     private unsafe void UpdateBuffers(ImDrawDataPtr drawData)
@@ -353,7 +387,7 @@ private unsafe void UpdateBuffers(ImDrawDataPtr drawData)
 
         for (int n = 0; n < drawData.CmdListsCount; n++)
         {
-            ImDrawListPtr cmdList = drawData.CmdListsRange[n];
+            ImDrawListPtr cmdList = drawData.CmdLists[n];
 
             fixed (void* vtxDstPtr = &_vertexData[vtxOffset * DrawVertDeclaration.Size])
             fixed (void* idxDstPtr = &_indexData[idxOffset * sizeof(ushort)])
@@ -381,12 +415,17 @@ private unsafe void RenderCommandLists(ImDrawDataPtr drawData)
 
         for (int n = 0; n < drawData.CmdListsCount; n++)
         {
-            ImDrawListPtr cmdList = drawData.CmdListsRange[n];
+            ImDrawListPtr cmdList = drawData.CmdLists[n];
 
             for (int cmdi = 0; cmdi < cmdList.CmdBuffer.Size; cmdi++)
             {
                 ImDrawCmdPtr drawCmd = cmdList.CmdBuffer[cmdi];
 
+                if (drawCmd.ElemCount == 0)
+                {
+                    continue;
+                }
+
                 if (!_loadedTextures.ContainsKey(drawCmd.TextureId))
                 {
                     throw new InvalidOperationException($"Could not find a texture with id '{drawCmd.TextureId}', please check your bindings");
@@ -408,21 +447,20 @@ private unsafe void RenderCommandLists(ImDrawDataPtr drawData)
 #pragma warning disable CS0618 // // FNA does not expose an alternative method.
                     _graphicsDevice.DrawIndexedPrimitives(
                         primitiveType: PrimitiveType.TriangleList,
-                        baseVertex: vtxOffset,
+                        baseVertex: (int)drawCmd.VtxOffset + vtxOffset,
                         minVertexIndex: 0,
                         numVertices: cmdList.VtxBuffer.Size,
-                        startIndex: idxOffset,
+                        startIndex: (int)drawCmd.IdxOffset + idxOffset,
                         primitiveCount: (int)drawCmd.ElemCount / 3
                     );
 #pragma warning restore CS0618
                 }
-
-                idxOffset += (int)drawCmd.ElemCount;
             }
 
             vtxOffset += cmdList.VtxBuffer.Size;
+            idxOffset += cmdList.IdxBuffer.Size;
         }
     }
 
     #endregion Internals
-}
\ No newline at end of file
+}
diff --git a/OTAPI.Patcher/Common.cs b/OTAPI.Patcher/Common.cs
index e05260a07..08859528b 100644
--- a/OTAPI.Patcher/Common.cs
+++ b/OTAPI.Patcher/Common.cs
@@ -31,9 +31,10 @@ public static partial class Common
 {
     public static string GetVersion()
     {
-        return typeof(Common).Assembly
-            .GetCustomAttribute<AssemblyInformationalVersionAttribute>()
-            .InformationalVersion;
+        var attr = typeof(Common).Assembly
+            .GetCustomAttribute<AssemblyInformationalVersionAttribute>() ??
+            throw new Exception("Unable to get version attribute");
+        return attr.InformationalVersion;
     }
 
     public static void Log(string message)
@@ -41,14 +42,14 @@ public static void Log(string message)
         Console.WriteLine($"[ModFw] {message}");
     }
 
-    public static string GetCliValue(string key)
+    public static string? GetCliValue(string key)
     {
         string find = $"-{key}=";
         var match = Array.Find(Environment.GetCommandLineArgs(), x => x.StartsWith(find, StringComparison.CurrentCultureIgnoreCase));
         return match?.Substring(find.Length)?.ToLower();
     }
 
-    public static string GetGitCommitSha()
+    public static string? GetGitCommitSha()
     {
         var commitSha = Environment.GetEnvironmentVariable("GITHUB_SHA")?.Trim();
         if (commitSha != null && commitSha.Length >= 7)
@@ -107,6 +108,7 @@ public static void AddMarkdownFormatter()
         {
             if (header) return HeaderFormat;
 
+            if (data?.FilePath is null) throw new Exception("Unable to determine ");
             var filename = Path.GetFileName(data.FilePath);
             var client = data.FilePath.Contains("patchtime", StringComparison.CurrentCultureIgnoreCase);
 
diff --git a/OTAPI.Patcher/OTAPI.Patcher.csproj b/OTAPI.Patcher/OTAPI.Patcher.csproj
index 3a2a736d0..7982746d6 100644
--- a/OTAPI.Patcher/OTAPI.Patcher.csproj
+++ b/OTAPI.Patcher/OTAPI.Patcher.csproj
@@ -10,9 +10,9 @@
 		<PackageReleaseNotes>Initial 1.4.4.9 support</PackageReleaseNotes>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="ModFramework.Modules.ClearScript" Version="1.1.9" />
-		<PackageReference Include="ModFramework.Modules.CSharp" Version="1.1.9" />
-		<PackageReference Include="ModFramework.Modules.Lua" Version="1.1.9" />
+		<PackageReference Include="ModFramework.Modules.ClearScript" Version="1.1.11" />
+		<PackageReference Include="ModFramework.Modules.CSharp" Version="1.1.11" />
+		<PackageReference Include="ModFramework.Modules.Lua" Version="1.1.11" />
 		<PackageReference Include="Steamworks.NET" Version="2024.8.0" />
 		<PackageReference Include="MonoMod.RuntimeDetour.HookGen" Version="22.7.31.1" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
diff --git a/OTAPI.Patcher/Targets/PCClientTarget.cs b/OTAPI.Patcher/Targets/PCClientTarget.cs
index fd5266ada..9b203fce1 100644
--- a/OTAPI.Patcher/Targets/PCClientTarget.cs
+++ b/OTAPI.Patcher/Targets/PCClientTarget.cs
@@ -214,23 +214,17 @@ public void Patch()
                         mm.ReadMod(typeof(HookEvent).Assembly.Location);
                         mm.ReadMod(Path.Combine(embeddedResourcesPath, "ReLogic.dll"));
                         mm.ReadMod(Path.Combine(embeddedResourcesPath, "RailSDK.Net.dll"));
-                    //}
-                    //else if (modType == ModType.PostMapDependencies)
-                    //{
+
                         foreach (var path in shims)
                         {
                             SetStatus($"Reading: {Path.GetFileNameWithoutExtension(path)}");
                             mm.ReadMod(path);
                         }
-                        //mm.ReadMod("Microsoft.Win32.Registry.dll");
 
                         // relink / merge into the output
                         mm.RelinkAssembly("ReLogic");
                         mm.RelinkAssembly("RailSDK.Net");
                         mm.RelinkAssembly("System.Windows.Forms");
-
-                        //var reg = ModuleDefinition.ReadModule("Microsoft.Win32.Registry.dll");
-                        //mm.RelinkAssembly("Microsoft.Win32.Registry", reg);
                     }
                 }
                 return EApplyResult.Continue;
@@ -238,8 +232,6 @@ public void Patch()
 
             ModContext.ReferenceFiles.Add(refs);
 
-            //var knownFiles = Directory.GetFiles(Environment.CurrentDirectory, "*.dll");
-
             var asm = Assembly.LoadFile(refs);
             var cache = new Dictionary<string, Assembly>();
             Assembly? ResolvingFile(AssemblyLoadContext arg1, AssemblyName args)
@@ -255,11 +247,7 @@ public void Patch()
                 }
 
                 var dll = $"{args.Name}.dll";
-                //var dll = knownFiles.FirstOrDefault(f => Path.GetFileNameWithoutExtension(f).Replace(".", "")
-                //    .Equals(args.Name.Replace(".", ""), StringComparison.CurrentCultureIgnoreCase)
-                //);
-
-                if (dll is not null && File.Exists(dll))
+                if (File.Exists(dll))
                 {
                     asmm = Assembly.Load(File.ReadAllBytes(dll));
                     cache[args.Name] = asmm;
@@ -340,6 +328,7 @@ void CompileModules(string otapiexe)
 
         ModContext.TargetAssemblyName = "OTAPI"; // change the target assembly since otapi is now valid for write events
 
+        if (Hooks.Loader is null) throw new Exception("Hooks.Loader is null");
         Hooks.Loader.LoadModifications("modules-patched", CSharpLoader.EModification.Module);
     }
 
@@ -408,7 +397,8 @@ public virtual void AddVersion(ModFwModder modder)
 
     public virtual string GetEmbeddedResourcesDirectory(string fileinput)
     {
-        return Path.Combine(ModContext.BaseDirectory, Path.GetDirectoryName(fileinput));
+        var name = Path.GetDirectoryName(fileinput) ?? throw new Exception($"Unable to determine directory name for input: {fileinput}");
+        return Path.Combine(ModContext.BaseDirectory, name);
     }
     public virtual void AddSearchDirectories(ModFwModder modder) { }
 
diff --git a/OTAPI.Scripts/Mods/CorrectLegacyAudioPaths.Client.cs b/OTAPI.Scripts/Mods/CorrectLegacyAudioPaths.Client.cs
new file mode 100644
index 000000000..e5ba363c1
--- /dev/null
+++ b/OTAPI.Scripts/Mods/CorrectLegacyAudioPaths.Client.cs
@@ -0,0 +1,40 @@
+/*
+Copyright (C) 2024 SignatureBeef
+
+This file is part of Open Terraria API v3 (OTAPI)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma warning disable CS8321 // Local function is declared but never used
+
+using ModFramework;
+using Mono.Cecil.Cil;
+using MonoMod.Utils;
+using System.Linq;
+
+/// <summary>
+/// @doc Updates paths in LegacyAudioSystem
+/// </summary>
+[Modification(ModType.PreMerge, "Updating paths in LegacyAudioSystem")]
+[MonoMod.MonoModIgnore]
+void CorrectLegacyAudioPaths(ModFwModder modder)
+{
+    // for each string, if starts with "Content", replace with "client/Content"
+    var type = modder.Module.GetType("Terraria.Audio.LegacyAudioSystem");
+    var ctor = type.FindMethod(".ctor");
+
+    foreach (var inst in ctor.Body.Instructions)
+        if (inst.Operand is string str && str.StartsWith("Content"))
+            inst.Operand = "client\\" + str;
+}
\ No newline at end of file
diff --git a/OTAPI.Scripts/OTAPI.Scripts.csproj b/OTAPI.Scripts/OTAPI.Scripts.csproj
index 8d1ebaed4..f6ddff2c6 100644
--- a/OTAPI.Scripts/OTAPI.Scripts.csproj
+++ b/OTAPI.Scripts/OTAPI.Scripts.csproj
@@ -32,7 +32,7 @@
 	<ItemGroup>
 		<ProjectReference Include="..\FNA\FNA.Core.csproj" />
 		<PackageReference Include="Steamworks.NET" Version="2024.8.0" />
-		<PackageReference Include="ModFramework" Version="1.1.9" />
+		<PackageReference Include="ModFramework" Version="1.1.11" />
 		<PackageReference Include="MonoMod" Version="22.7.31.1" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 	</ItemGroup>
diff --git a/OTAPI.Server.Launcher/OTAPI.Server.Launcher.csproj b/OTAPI.Server.Launcher/OTAPI.Server.Launcher.csproj
index c292a57b1..1a00010ad 100644
--- a/OTAPI.Server.Launcher/OTAPI.Server.Launcher.csproj
+++ b/OTAPI.Server.Launcher/OTAPI.Server.Launcher.csproj
@@ -12,12 +12,12 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ModFramework" Version="1.1.9">
+		<PackageReference Include="ModFramework" Version="1.1.11">
 			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
 		</PackageReference>
-		<PackageReference Include="ModFramework.Modules.ClearScript" Version="1.1.9" />
-		<PackageReference Include="ModFramework.Modules.CSharp" Version="1.1.9" />
-		<PackageReference Include="ModFramework.Modules.Lua" Version="1.1.9" />
+		<PackageReference Include="ModFramework.Modules.ClearScript" Version="1.1.11" />
+		<PackageReference Include="ModFramework.Modules.CSharp" Version="1.1.11" />
+		<PackageReference Include="ModFramework.Modules.Lua" Version="1.1.11" />
 		<PackageReference Include="Steamworks.NET" Version="2024.8.0" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
@@ -25,7 +25,7 @@
 		<PackageReference Include="System.IO.Packaging" Version="9.0.0" />
 		<PackageReference Include="System.Security.Permissions" Version="9.0.0" />
 		<PackageReference Include="Mono.Cecil" Version="0.11.6" />
-		<PackageReference Include="MonoMod.RuntimeDetour.HookGen" Version="22.7.31.1" />
+		<!--<PackageReference Include="MonoMod.RuntimeDetour.HookGen" Version="22.7.31.1" />-->
 		<PackageReference Include="MonoMod" Version="22.7.31.1">
 			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
 		</PackageReference>
diff --git a/examples/RuntimeExample.Server/RuntimeExample.Server.csproj b/examples/RuntimeExample.Server/RuntimeExample.Server.csproj
index 48706d8a1..7edbfda9c 100644
--- a/examples/RuntimeExample.Server/RuntimeExample.Server.csproj
+++ b/examples/RuntimeExample.Server/RuntimeExample.Server.csproj
@@ -7,7 +7,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ModFramework" Version="1.1.9" />
+		<PackageReference Include="ModFramework" Version="1.1.11" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 	</ItemGroup>