diff --git a/.github/workflows/ci-launcher.yml b/.github/workflows/ci-launcher.yml
index 17d187aad..6745df9c1 100644
--- a/.github/workflows/ci-launcher.yml
+++ b/.github/workflows/ci-launcher.yml
@@ -56,13 +56,13 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'recursive'
 
       - uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: '6.0.x' # SDK Version to use; x will use the latest version of the 3.1 channel
+          dotnet-version: '9.0.x' # SDK Version to use; x will use the latest version of the 3.1 channel
 
       # - name: MonoMod dev build
       #   run: dotnet nuget add source https://pkgs.dev.azure.com/MonoMod/MonoMod/_packaging/DevBuilds%40Local/nuget/v3/index.json -n DevBuilds@Local
@@ -70,12 +70,12 @@ jobs:
       - name: Build
         run: |
             cd OTAPI.Client.Launcher
-            dotnet publish -r ${{ matrix.profile.runtime_identifier }} --framework net6.0 -p:PublishReadyToRun=true --self-contained false -c Release
+            dotnet publish -r ${{ matrix.profile.runtime_identifier }} --framework net9.0 -p:PublishReadyToRun=true --self-contained false -c Release
             if ${{ matrix.profile.runs_on != 'macos-latest' }} ; then
-              7z a ../${{ matrix.profile.archive_name }} './bin/Release/net6.0/${{ matrix.profile.runtime_identifier }}/publish/*'
+              7z a ../${{ matrix.profile.archive_name }} './bin/Release/net9.0/${{ matrix.profile.runtime_identifier }}/publish/*'
             else
               mkdir -p OTAPI.app/Contents/Resources
-              mv bin/Release/net6.0/osx-x64/publish OTAPI.app/Contents/MacOS
+              mv bin/Release/net9.0/osx-x64/publish OTAPI.app/Contents/MacOS
               cp ../docs/MacOS.Info.plist OTAPI.app/Contents/Info.plist
               cp OTAPI.osx.sh OTAPI.app/Contents/MacOS/OTAPI
               chmod +x OTAPI.app/Contents/MacOS/OTAPI
@@ -85,7 +85,7 @@ jobs:
       # - uses: actions/upload-artifact@v2
       #   with:
       #     name: ${{ matrix.profile.name }} Launcher
-      #     path: OTAPI.Client.Launcher/bin/Release/net6.0/${{ matrix.profile.runtime_identifier }}/publish
+      #     path: OTAPI.Client.Launcher/bin/Release/net9.0/${{ matrix.profile.runtime_identifier }}/publish
 
       - uses: "marvinpinto/action-automatic-releases@latest"
         with:
diff --git a/.github/workflows/ci-nuget.yml b/.github/workflows/ci-nuget.yml
index a0dc01118..641cc4303 100644
--- a/.github/workflows/ci-nuget.yml
+++ b/.github/workflows/ci-nuget.yml
@@ -36,38 +36,38 @@ jobs:
     name: ${{ matrix.profile.name }} Server
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'recursive'
 
-      - uses: actions/setup-dotnet@v3
+      - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '6.0.x'
+          dotnet-version: '9.0.x'
 
       - name: Build the project
         run: |
           dotnet build OTAPI.Mods.slnf
-          (cd OTAPI.Patcher/bin/Debug/net6.0 && exec dotnet run --project ../../../OTAPI.Patcher.csproj -patchTarget=${{ matrix.profile.patch_target }} -latest=n --framework net6.0)
+          (cd OTAPI.Patcher/bin/Debug/net9.0 && exec dotnet run --project ../../../OTAPI.Patcher.csproj -patchTarget=${{ matrix.profile.patch_target }} -latest=n --framework net9.0)
           dotnet build OTAPI.Server.Launcher.slnf
-          (cd OTAPI.Server.Launcher/bin/Debug/net6.0 && exec dotnet OTAPI.Server.Launcher.dll -test-init)
+          (cd OTAPI.Server.Launcher/bin/Debug/net9.0 && exec dotnet OTAPI.Server.Launcher.dll -test-init)
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.profile.name }} NuGet Package
-          path: OTAPI.Patcher/bin/Debug/net6.0/${{ matrix.profile.package_path }}
+          path: OTAPI.Patcher/bin/Debug/net9.0/${{ matrix.profile.package_path }}
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.profile.name }} Binaries
           path: |
-            OTAPI.Patcher/bin/Debug/net6.0/artifact-*/*
+            OTAPI.Patcher/bin/Debug/net9.0/artifact-*/*
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.profile.name }} Wiki MD files
-          path: OTAPI.Patcher/bin/Debug/net6.0/*.mfw.md
+          path: OTAPI.Patcher/bin/Debug/net9.0/*.mfw.md
 
       - name: "Releasing to NuGet: ${{ matrix.profile.name }}"
         env:
           NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
-        run: dotnet nuget push OTAPI.Patcher/bin/Debug/net6.0/${{ matrix.profile.package_path }} --source https://api.nuget.org/v3/index.json --api-key "$NUGET_API_KEY"
+        run: dotnet nuget push OTAPI.Patcher/bin/Debug/net9.0/${{ matrix.profile.package_path }} --source https://api.nuget.org/v3/index.json --api-key "$NUGET_API_KEY"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5912ab5a8..3016681d3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,11 +15,23 @@ on:
 jobs:
 
   Server:
-    runs-on: ubuntu-latest
-
     strategy:
       fail-fast: false
       matrix:
+        os: [ 
+          {
+            name: Windows,
+            runs-on: windows-latest,
+          },
+          {
+            name: Ubuntu,
+            runs-on: ubuntu-latest,
+          },
+          {
+            name: macOS,
+            runs-on: macos-latest,
+          }
+        ]
         profile: [
           {
             name: PC,
@@ -31,43 +43,50 @@ jobs:
             patch_target: m,
             package_path: OTAPI.Mobile.nupkg,
           },
-          {
-            name: tModLoader,
-            patch_target: t,
-            package_path: OTAPI.TML.nupkg,
-          },
+          # { this is ultimately not supported yet, consideration in future when time permits
+          #   name: tModLoader,
+          #   patch_target: t,
+          #   package_path: OTAPI.TML.nupkg,
+          # },
         ]
+        
+    runs-on: ${{ matrix.os.runs-on }}
 
-    name: ${{ matrix.profile.name }} Server
+    name: ${{ matrix.os.name }} ${{ matrix.profile.name }} Server
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'recursive'
 
-      - uses: actions/setup-dotnet@v3
+      - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '6.0.x'
+          dotnet-version: '9.0.x'
 
-      - name: Build the project
+      - name: Server patch
         run: |
           dotnet build OTAPI.Mods.slnf
-          (cd OTAPI.Patcher/bin/Debug/net6.0 && exec dotnet run --project ../../../OTAPI.Patcher.csproj -patchTarget=${{ matrix.profile.patch_target }} -latest=n --framework net6.0)
+          cd OTAPI.Patcher/bin/Debug/net9.0
+          dotnet run --project ../../../OTAPI.Patcher.csproj -patchTarget=${{ matrix.profile.patch_target }} -latest=n --framework net9.0
+
+      - name: Server boot
+        run: |
           dotnet build OTAPI.Server.Launcher.slnf
-          (cd OTAPI.Server.Launcher/bin/Debug/net6.0 && exec dotnet OTAPI.Server.Launcher.dll -test-init)
+          cd OTAPI.Server.Launcher/bin/Debug/net9.0
+          dotnet OTAPI.Server.Launcher.dll -test-init
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.profile.name }} NuGet Package
-          path: OTAPI.Patcher/bin/Debug/net6.0/${{ matrix.profile.package_path }}
+          name: ${{ matrix.os.name }} ${{ matrix.profile.name }} NuGet Package
+          path: OTAPI.Patcher/bin/Debug/net9.0/${{ matrix.profile.package_path }}
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.profile.name }} Binaries
+          name: ${{ matrix.os.name }} ${{ matrix.profile.name }} Binaries
           path: |
-            OTAPI.Patcher/bin/Debug/net6.0/artifact-*/*
+            OTAPI.Patcher/bin/Debug/net9.0/artifact-*/*
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.profile.name }} Wiki MD files
-          path: OTAPI.Patcher/bin/Debug/net6.0/*.mfw.md
+          name: ${{ matrix.os.name }} ${{ matrix.profile.name }} Wiki MD files
+          path: OTAPI.Patcher/bin/Debug/net9.0/*.mfw.md
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 2875a6c4e..37e80afd0 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -1,52 +1,20 @@
 {
-    // Use IntelliSense to find out which attributes exist for C# debugging
-    // Use hover for the description of the existing attributes
-    // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Setup (Vanilla)",
-            "type": "coreclr",
+            "name": "C#: Patcher Debug",
+            "type": "dotnet",
             "request": "launch",
-            "preLaunchTask": "build-setup",
-            // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/OTAPI.Setup/bin/Debug/net6.0/OTAPI.Setup.dll",
-            "args": ["-patchTarget=v", "-latestVanilla=n"],
-            "cwd": "${workspaceFolder}/OTAPI.Setup/bin/Debug/net6.0/",
-            // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
-            "console": "internalConsole",
-            "stopAtEntry": false
+            "projectPath": "${workspaceFolder}/OTAPI.Patcher/OTAPI.Patcher.csproj"
         },
         {
-            "name": "Patcher (Vanilla)",
-            "type": "coreclr",
+            "name": "C#: Server Launcher Debug",
+            "type": "dotnet",
             "request": "launch",
-            "preLaunchTask": "build-mods",
-            // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/OTAPI.Patcher/bin/Debug/net6.0/OTAPI.Patcher.dll",
-            "args": ["-patchTarget=v", "-latestVanilla=n"],
-            "cwd": "${workspaceFolder}/OTAPI.Patcher/bin/Debug/net6.0/",
-            // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
-            "console": "internalConsole",
-            "stopAtEntry": false
-        },
-        {
-            "name": "Launcher (Vanilla)",
-            "type": "coreclr",
-            "request": "launch",
-            "preLaunchTask": "build-launcher",
-            // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/OTAPI.Launcher/bin/Debug/net6.0/OTAPI.Launcher.dll",
-            "args": ["-patchTarget=v", "-latestVanilla=n"],
-            "cwd": "${workspaceFolder}/OTAPI.Launcher/bin/Debug/net6.0/", // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
-            "console": "externalTerminal",
-            "stopAtEntry": false
-        },
-        {
-            "name": ".NET Core Attach",
-            "type": "coreclr",
-            "request": "attach",
-            "processId": "${command:pickProcess}"
+            "projectPath": "${workspaceFolder}/OTAPI.Server.Launcher/OTAPI.Server.Launcher.csproj"
         }
     ]
 }
\ No newline at end of file
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
deleted file mode 100644
index 88604a428..000000000
--- a/.vscode/tasks.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "build-setup",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "build",
-                "${workspaceFolder}/OTAPI.Setup.sln",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "build-mods",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "build",
-                "${workspaceFolder}/OTAPI.Mods.slnf",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "build-launcher",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "build",
-                "${workspaceFolder}/OTAPI.Launcher.sln",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "publish",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "publish",
-                "${workspaceFolder}/OTAPI.Patcher/OTAPI.Patcher.csproj",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "watch",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "watch",
-                "run",
-                "${workspaceFolder}/OTAPI.Patcher/OTAPI.Patcher.csproj",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "problemMatcher": "$msCompile"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/FNA b/FNA
index 99cf22d42..ebadfa609 160000
--- a/FNA
+++ b/FNA
@@ -1 +1 @@
-Subproject commit 99cf22d427b54643e8f2719a4bee99a780d04c80
+Subproject commit ebadfa609c510206da7f872c24325fae5bd802a5
diff --git a/OTAPI.Client.Launcher/Actions/OTAPI.cs b/OTAPI.Client.Launcher/Actions/OTAPI.cs
index 82c7f7ec5..33c6b4b6d 100644
--- a/OTAPI.Client.Launcher/Actions/OTAPI.cs
+++ b/OTAPI.Client.Launcher/Actions/OTAPI.cs
@@ -30,7 +30,7 @@ namespace OTAPI.Client.Launcher.Actions;
 
 static class OTAPI
 {
-    static Assembly Terraria;
+    static Assembly? Terraria;
 
     static void CompileAndInstall() //considering to keep or not. this can recompile OTAPI mods on launch...which will be great for developing it. will look into when i get back to it one day
     {
@@ -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/App.axaml b/OTAPI.Client.Launcher/App.axaml
index 82860bb36..d7a96c19c 100644
--- a/OTAPI.Client.Launcher/App.axaml
+++ b/OTAPI.Client.Launcher/App.axaml
@@ -8,9 +8,12 @@
     <Application.Resources>
         <themes:BundledTheme BaseTheme="Light" PrimaryColor="Teal" SecondaryColor="Amber"/>
     </Application.Resources>
-    <Application.Styles>
+    <!--<Application.Styles>
         <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
         <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/>
         <StyleInclude Source="avares://Material.Avalonia/Material.Avalonia.Templates.xaml" />
-    </Application.Styles>
+    </Application.Styles>-->
+	<Application.Styles>
+		<themes:MaterialTheme BaseTheme="Dark" PrimaryColor="Purple" SecondaryColor="Lime" />
+	</Application.Styles>
 </Application>
diff --git a/OTAPI.Client.Launcher/MainWindow.axaml b/OTAPI.Client.Launcher/MainWindow.axaml
index 7542ad181..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">
@@ -169,7 +169,7 @@
       Plugins
     </TextBlock>
     <ScrollViewer Height="200" Classes="scrollview">
-      <ItemsControl Items="{Binding Plugins}">
+      <ItemsControl ItemsSource="{Binding Plugins}">
         <ItemsControl.ItemTemplate>
           <DataTemplate>
             <CheckBox Margin="4"
@@ -184,10 +184,8 @@
       Status
     </TextBlock>
     <ScrollViewer Height="100" Classes="scrollview">
-      <!--<TextBlock Classes="installStatus"
-                 Text="{Binding InstallStatus}" />-->
       
-      <ItemsControl Items="{Binding Console}">
+      <ItemsControl ItemsSource="{Binding Console}">
         <ItemsControl.ItemTemplate>
           <DataTemplate>
             <TextBlock Margin="5" Text="{Binding}" />
diff --git a/OTAPI.Client.Launcher/MainWindow.axaml.cs b/OTAPI.Client.Launcher/MainWindow.axaml.cs
index e2400eadb..34bcb026b 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,14 +82,17 @@ public MainWindow()
 
         if (Program.ConsoleWriter is not null)
             Program.ConsoleWriter.LineReceived += OnConsoleLineReceived;
+
+        PatchMonoMod();
     }
 
     private void OnConsoleLineReceived(string line)
     {
         Context.Console.Insert(0, $"[{DateTime.Now:yyyyMMdd HH:mm:ss}] {line}");
+        System.Diagnostics.Debug.WriteLine($"[OTAPI.Launcher] {line}");
     }
 
-    protected override void OnClosing(CancelEventArgs e)
+    protected override void OnClosing(WindowClosingEventArgs e)
     {
         base.OnClosing(e);
         _watcher?.Dispose();
@@ -204,13 +209,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 +230,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 +244,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/MessageBoxWindow.axaml.cs b/OTAPI.Client.Launcher/MessageBoxWindow.axaml.cs
index 0cda6df5a..a8d31f697 100644
--- a/OTAPI.Client.Launcher/MessageBoxWindow.axaml.cs
+++ b/OTAPI.Client.Launcher/MessageBoxWindow.axaml.cs
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2020 DeathCradle
+Copyright (C) 2020-2024 SignatureBeef
 
 This file is part of Open Terraria API v3 (OTAPI)
 
@@ -59,7 +59,8 @@ public static void Show(string text, string title)
             }
         };
         wnd.Show();
-        Application.Current.Run(wnd);
+        var app = Application.Current ?? throw new System.Exception("Failed to launch MessageBoxWindow");
+        app.Run(wnd);
     }
 }
 
diff --git a/OTAPI.Client.Launcher/OTAPI.Client.Launcher.csproj b/OTAPI.Client.Launcher/OTAPI.Client.Launcher.csproj
index 1d34acd40..9c12d3422 100644
--- a/OTAPI.Client.Launcher/OTAPI.Client.Launcher.csproj
+++ b/OTAPI.Client.Launcher/OTAPI.Client.Launcher.csproj
@@ -1,10 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net9.0</TargetFramework>
 		<Nullable>enable</Nullable>
 		<DebugType>embedded</DebugType>
 		<RunPostBuildEvent>Always</RunPostBuildEvent>
+		<UseCurrentRuntimeIdentifier Condition="'$(UseCurrentRuntimeIdentifier)' == ''">true</UseCurrentRuntimeIdentifier>
+		<SelfContained Condition="'$(SelfContained)' == ''">false</SelfContained>
 	</PropertyGroup>
 	<ItemGroup>
 		<AvaloniaXaml Remove="Properties\**" />
@@ -27,15 +29,17 @@
 		<None Include="csharp\plugins\scripts\otapi\test-runtime.cs" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Avalonia" Version="0.10.18" />
-		<PackageReference Include="Avalonia.Desktop" Version="0.10.18" />
-		<PackageReference Include="Avalonia.Diagnostics" Version="0.10.18" />
-		<PackageReference Include="CefGlue.Avalonia" Version="91.4472.30" />
-		<PackageReference Include="CefGlue.Common" Version="91.4472.30" />
-		<PackageReference Include="Material.Avalonia" Version="2.5.1" />
-		<PackageReference Include="Projektanker.Icons.Avalonia.FontAwesome" Version="5.5.0" />
-		<PackageReference Include="ReactiveUI" Version="18.3.1" />
-		<PackageReference Include="System.Reactive.Linq" Version="5.0.0" />
+		<PackageReference Include="Avalonia" Version="11.2.3" />
+		<PackageReference Include="Avalonia.Desktop" Version="11.2.3" />
+		<PackageReference Include="Avalonia.Diagnostics" Version="11.2.3" />
+		<PackageReference Include="CefGlue.Avalonia" Version="120.6099.210" />
+		<PackageReference Include="CefGlue.Common" Version="120.6099.210" />
+		<PackageReference Include="Material.Avalonia" Version="3.9.1" />
+		<PackageReference Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.6.0" />
+		<PackageReference Include="ReactiveUI" Version="20.1.63" />
+		<PackageReference Include="Steamworks.NET" Version="2024.8.0" />
+		<PackageReference Include="System.Private.Uri" Version="4.3.2" />
+		<PackageReference Include="System.Reactive.Linq" Version="6.0.1" />
 		<PackageReference Include="Microsoft.Win32.Registry" Version="6.0.0-preview.5.21301.5" GeneratePathProperty="true" />
 	</ItemGroup>
 	<ItemGroup>
@@ -48,14 +52,19 @@
 		</ProjectReference>
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="ImGui.NET" Version="1.87.3" GeneratePathProperty="true" />
-		<PackageReference Include="ModFramework.Modules.ClearScript" Version="1.1.7" GeneratePathProperty="true" />
-		<PackageReference Include="ModFramework.Modules.CSharp" Version="1.1.7" GeneratePathProperty="true" />
-		<PackageReference Include="ModFramework.Modules.Lua" Version="1.1.7" GeneratePathProperty="true" />
-		<PackageReference Include="MonoMod.RuntimeDetour.HookGen" Version="22.5.1.1" />
-		<PackageReference Include="SharpZipLib" Version="1.4.0" />
-		<PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
-		<PackageReference Include="System.Drawing.Primitives" Version="4.3.0" />
+		<PackageReference Include="ImGui.NET" Version="1.91.0.1" GeneratePathProperty="true" />
+		<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.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)" />
@@ -79,7 +88,7 @@
 			<DependentUpon>MessageBoxWindow.axaml</DependentUpon>
 		</Compile>
 	</ItemGroup>
-	<Target Name="PostBuild" AfterTargets="AfterBuild;PostBuildEvent">
+	<Target Name="PostBuild" AfterTargets="AfterBuild;PreBuildEvent">
 		<Message Text="Copying OTAPI patch files" Importance="high" />
 		<MakeDir Directories="$(TargetDir)modifications/" />
 		<RemoveDir Directories="$(TargetDir)modifications/" />
@@ -121,7 +130,7 @@
 		<Copy SourceFiles="@(ClientLua)" DestinationFolder="$(TargetDir)lua/%(RecursiveDir)" />
 
 		<Copy SourceFiles="$(PkgMicrosoft_Win32_Registry)/lib/netstandard2.0/Microsoft.Win32.Registry.dll" DestinationFolder="$(TargetDir)" SkipUnchangedFiles="false" />
-		<Copy SourceFiles="$(PkgImGui_NET)/runtimes/osx-universal/native/libcimgui.dylib" DestinationFolder="$(TargetDir)" SkipUnchangedFiles="false" />
+		<Copy SourceFiles="$(PkgImGui_NET)/runtimes/osx/native/libcimgui.dylib" DestinationFolder="$(TargetDir)" SkipUnchangedFiles="false" />
 	</Target>
 	<Target Name="AfterPrepareForPublish" AfterTargets="Publish">
 		<Message Text="Copying release OTAPI patch files" Importance="high" />
@@ -215,7 +224,7 @@
 	</Target>
 	<Target Name="CreateScriptAfterPublish" AfterTargets="Publish" Condition="'$(RuntimeIdentifier)' != 'win-x64'">
 		<Copy SourceFiles="$(ProjectDir)OTAPI.sh" DestinationFolder="$(PublishDir)" />
-        <Exec Command="chmod +x $(PublishDir)OTAPI.sh" />
-        <Message Text="Run the launcher with: cd bin/$(Configuration)/$(TargetFramework)/$(RuntimeIdentifier)/publish &amp;&amp; ./OTAPI.sh" Importance="High" />
+		<Exec Command="chmod +x $(PublishDir)OTAPI.sh" />
+		<Message Text="Run the launcher with: cd bin/$(Configuration)/$(TargetFramework)/$(RuntimeIdentifier)/publish &amp;&amp; ./OTAPI.sh" Importance="High" />
 	</Target>
 </Project>
diff --git a/OTAPI.Client.Launcher/Program.cs b/OTAPI.Client.Launcher/Program.cs
index b9b1b97e3..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()
@@ -170,6 +168,7 @@ static void Start(string[] args)
             plg.OnEnabledChanged += OnPluginChanged;
 
         // start the launcher, then OTAPI if requested
+        IconProvider.Current.Register(new FontAwesomeIconProvider());
         BuildAvaloniaApp()
             .StartWithClassicDesktopLifetime(args);
 
@@ -189,7 +188,5 @@ private static void OnPluginChanged(object? sender, EventArgs e)
     public static AppBuilder BuildAvaloniaApp()
         => AppBuilder.Configure<App>()
             .UsePlatformDetect()
-            .LogToTrace()
-            .WithIcons(container => container
-                .Register<FontAwesomeIconProvider>());
+            .LogToTrace();
 }
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 c5396b8c7..88a2e4fde 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)
@@ -49,10 +51,10 @@ public static void CopyOTAPI(this IPlatformTarget target, string otapiFolder, IE
 
         File.WriteAllText(Path.Combine(otapiFolder, "Terraria.runtimeconfig.json"), @"{
   ""runtimeOptions"": {
-    ""tfm"": ""net6.0"",
+    ""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,20 +228,18 @@ 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"));
         compilation = compilation.AddReferences(MetadataReference.CreateFromFile("ImGui.NET.dll"));
         compilation = compilation.AddReferences(MetadataReference.CreateFromFile("OTAPI.exe"));
         compilation = compilation.AddReferences(MetadataReference.CreateFromFile("OTAPI.Runtime.dll"));
-        //compilation = compilation.AddReferences(MetadataReference.CreateFromFile(Path.Combine(hostDir, @"..\OTAPI.Client.Installer\bin\Debug\net6.0\OTAPI.exe")));
-        //compilation = compilation.AddReferences(MetadataReference.CreateFromFile(Path.Combine(hostDir, @"..\OTAPI.Client.Installer\bin\Debug\net6.0\OTAPI.Runtime.dll")));
 
         var outPdbPath = Path.Combine(output, "OTAPI.Client.Installer.pdb");
         var emitOptions = new EmitOptions(
@@ -251,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,
@@ -273,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)
+    public static async Task<string> PublishHostLauncherAsync(this IPlatformTarget target)
     {
-        var url = "https://api.github.com/repos/DeathCradle/Open-Terraria-API/releases";
+        var url = "https://api.github.com/repos/SignatureBeef/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 data = await client.GetStringAsync(url);
+        var releases = Newtonsoft.Json.JsonConvert.DeserializeObject<GHRelease[]>(data) ?? throw new Exception("Unable to read release data");
 
         GHRelease release;
         if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
@@ -310,10 +307,11 @@ 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;
+        using var launcher = await client.GetStreamAsync(url);
 
         if (File.Exists("launcher.zip")) File.Delete("launcher.zip");
         using (var fs = File.OpenWrite("launcher.zip"))
@@ -322,7 +320,7 @@ public static string PublishHostLauncher(this IPlatformTarget target)
             int read;
             while (launcher.CanRead)
             {
-                if ((read = launcher.Read(buffer, 0, buffer.Length)) == 0)
+                if ((read = await launcher.ReadAsync(buffer, 0, buffer.Length)) == 0)
                     break;
 
                 fs.Write(buffer, 0, read);
@@ -331,44 +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)));
-
-        //Console.WriteLine(target.Status = "Building launcher, this may take a long time...");
-        //var hostDir = "../../../../OTAPI.Client.Launcher/";
-
-        //var package = RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
-        //    ? "win-x64" : (
-        //    RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ? "osx.10.11-x64" : "ubuntu.16.04-x64"
-        //);
-
-        //using var process = new System.Diagnostics.Process()
-        //{
-        //    StartInfo = new System.Diagnostics.ProcessStartInfo()
-        //    {
-        //        FileName = "dotnet",
-        //        Arguments = $"publish -r {package} --framework net6.0 -p:PublishTrimmed=true -p:PublishSingleFile=true -p:PublishReadyToRun=true --self-contained true -c Release",
-        //        //Arguments = "msbuild -restore -t:PublishAllRids",
-        //        WorkingDirectory = hostDir
-        //    },
-        //};
-        //process.Start();
-        //process.WaitForExit();
-
-        //Console.WriteLine("Published");
-
-        //return Path.Combine(hostDir, "bin", "Release", "net6.0", package, "publish");
+        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);
@@ -382,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}%");
+                    }
                 }
             }
 
@@ -436,8 +419,8 @@ public static void GenerateTypings(this IPlatformTarget target, string rootFolde
                 if (File.Exists(dll))
                     return Assembly.LoadFile(dll);
 
-                exe = Path.Combine(patcherDir, "bin", "Debug", "net6.0", "EmbeddedResources", $"{asr.Name}.exe");
-                dll = Path.Combine(patcherDir, "bin", "Debug", "net6.0", "EmbeddedResources", $"{asr.Name}.dll");
+                exe = Path.Combine(patcherDir, "bin", "Debug", "net9.0", "EmbeddedResources", $"{asr.Name}.exe");
+                dll = Path.Combine(patcherDir, "bin", "Debug", "net9.0", "EmbeddedResources", $"{asr.Name}.dll");
 
                 if (File.Exists(exe))
                     return Assembly.LoadFile(exe);
@@ -486,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/SignatureBeef/fnalibs/raw/refs/heads/main/fnalibs.20241231.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);
@@ -520,7 +502,7 @@ public static void InstallSteamworks64(this IPlatformTarget target, string insta
         }
     }
 
-    public static void PatchOSXLaunch(this IPlatformTarget target, string installPath)
+    public static async Task PatchOSXLaunchAsync(this IPlatformTarget target, string installPath)
     {
         var launch_script = Path.Combine(installPath, "MacOS/Terraria");
         var backup_launch_script = Path.Combine(installPath, "MacOS/Terraria.bak.otapi");
@@ -572,9 +554,8 @@ cd ../otapi
         // publish and copy OTAPI.Client.Launcher
         {
             Console.WriteLine("Publishing and creating launcher...this will take a while.");
-            var output = target.PublishHostLauncher();
+            var output = await target.PublishHostLauncherAsync();
             var launcher = Path.Combine(output, "Terraria");
-            //var otapi = Path.Combine(installPath, "OTAPI.Client.Launcher");
 
             if (!File.Exists(launcher))
                 throw new Exception($"Failed to produce launcher to: {launcher}");
@@ -584,7 +565,7 @@ cd ../otapi
         }
     }
 
-    public static void PatchWindowsLaunch(this IPlatformTarget target, string installPath)
+    public static async Task PatchWindowsLaunch(this IPlatformTarget target, string installPath)
     {
         var launch_file = Path.Combine(installPath, "Terraria.exe");
 
@@ -600,7 +581,7 @@ public static void PatchWindowsLaunch(this IPlatformTarget target, string instal
 
         // publish and copy OTAPI.Client.Launcher
         {
-            var output = target.PublishHostLauncher();
+            var output = await target.PublishHostLauncherAsync();
             var launcher = Path.Combine(output, "Terraria.exe");
 
             if (!File.Exists(launcher))
@@ -613,7 +594,7 @@ public static void PatchWindowsLaunch(this IPlatformTarget target, string instal
         }
     }
 
-    public static void PatchLinuxLaunch(this IPlatformTarget target, string installPath)
+    public static async Task PatchLinuxLaunch(this IPlatformTarget target, string installPath)
     {
         var otapi_launcher = Path.Combine(installPath, "otapi_launcher");
         var launch_script = Path.Combine(installPath, "Terraria");
@@ -669,9 +650,8 @@ cd ../otapi
         // publish and copy OTAPI.Client.Launcher
         {
             Console.WriteLine("Publishing and creating launcher...this will take a while.");
-            var output = target.PublishHostLauncher();
+            var output = await target.PublishHostLauncherAsync();
             var launcher = Path.Combine(output, "Terraria");
-            //var otapi = Path.Combine(installPath, "OTAPI.Client.Launcher");
 
             if (!File.Exists(launcher))
                 throw new Exception($"Failed to produce launcher to: {launcher}");
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.Client.Launcher/csharp/plugins/scripts/otapi/cef-runtime.cs b/OTAPI.Client.Launcher/csharp/plugins/scripts/otapi/cef-runtime.cs
index 5939a200b..6bb5cffb9 100644
--- a/OTAPI.Client.Launcher/csharp/plugins/scripts/otapi/cef-runtime.cs
+++ b/OTAPI.Client.Launcher/csharp/plugins/scripts/otapi/cef-runtime.cs
@@ -8,6 +8,7 @@
 
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
+using System.Runtime.InteropServices;
 using ImGuiNET;
 
 //ChromiumWebBrowser browser;
@@ -24,12 +25,12 @@ void OnUpdate(On.Terraria.Main.orig_Update orig, Terraria.Main self, GameTime ga
     try
     {
 
-        if (CefRuntime.IsInitialized && CefRuntime.Platform != CefRuntimePlatform.Windows)
+        if (CefRuntime.IsInitialized) // && CefRuntime.Platform != CefRuntimePlatform.Windows)
         {
             CefRuntime.DoMessageLoopWork();
         }
     }
-    catch(Exception ex)
+    catch (Exception ex)
     {
         Console.WriteLine("CEF.OnUpdate", ex);
     }
@@ -86,7 +87,7 @@ void OnGUI(On.Terraria.Main.orig_OnExtGUI orig)
             }
         }
     }
-    catch(Exception ex)
+    catch (Exception ex)
     {
         Console.WriteLine("CEF.OnGUI", ex);
     }
@@ -96,6 +97,7 @@ void OnGUI(On.Terraria.Main.orig_OnExtGUI orig)
 void OnStart()
 {
     System.Console.WriteLine("Starting CefSharp");
+    //System.Diagnistics.Debug.WriteLine("Starting CefSharpx");
     ready = true;
 }
 
@@ -298,13 +300,13 @@ public override void Render(IntPtr buffer)
             buffer,
             _target.Width * _target.Height
         );
-        // var length = _target.Width * _target.Height;
-        // int[] imgData = new int[length];
-        // var temporaryBuffer = new int[length];
+        //var length = _target.Width * _target.Height;
+        //int[] imgData = new int[length];
+        //var temporaryBuffer = new int[length];
 
-        // Marshal.Copy(buffer, temporaryBuffer, 0, length);
+        //Marshal.Copy(buffer, temporaryBuffer, 0, length);
 
-        // _target.SetData(temporaryBuffer);
+        _target.SetData(temporaryBuffer);
     }
 
     private bool disposedValue;
@@ -391,14 +393,24 @@ public OffscreenBrowser(IOffscreenRenderTarget renderTarget, string url)
 
         Client.LifeSpanHandler.Created += LifeSpanHandler_Created;
 
-        if (!CefRuntime.IsInitialized)
-        {
-            var cefsettings = new CefSettings()
-            {
-                WindowlessRenderingEnabled = true
-            };
-            CefLoader.Load(cefsettings);
-        }
+        //if (!CefRuntime.IsInitialized)
+        //{
+        //    var cachePath = Path.Combine(Environment.CurrentDirectory, "cef-cache");
+        //    if (!Directory.Exists(cachePath))
+        //        Directory.CreateDirectory(cachePath);
+        //    var cefsettings = new CefSettings()
+        //    {
+        //        WindowlessRenderingEnabled = true,
+        //        LogSeverity = CefLogSeverity.Verbose,
+        //        LogFile = "cef_debug.log",
+        //        RootCachePath = cachePath,
+        //        MultiThreadedMessageLoop = true,
+        //        SingleProcess = false,
+        //    };
+        //    CefLoader.Load(cefsettings);
+        //}
+
+        CefLoader.Load();
 
         //Browser = CefBrowserHost.CreateBrowserSync(wi, client, bsettings, "https://google.com.au/");
         CefBrowserHost.CreateBrowser(wi, Client, bsettings, url);
@@ -572,6 +584,15 @@ public static OffscreenApp Load(CefSettings? settings = null, OffscreenApp? app
         settings.BrowserSubprocessPath = DiscoverSubProcess();
         settings.UncaughtExceptionStackSize = 10;
 
+        settings.WindowlessRenderingEnabled = true;
+        settings.LogSeverity = CefLogSeverity.Verbose;
+        settings.LogFile = "cef_debug.log";
+
+        var cachePath = Path.Combine(Environment.CurrentDirectory, "cef-cache");
+        if (!Directory.Exists(cachePath))
+            Directory.CreateDirectory(cachePath);
+        settings.RootCachePath = cachePath;
+
         switch (CefRuntime.Platform)
         {
             case CefRuntimePlatform.Windows:
diff --git a/OTAPI.Common/OTAPI.Common.csproj b/OTAPI.Common/OTAPI.Common.csproj
index 1506adfd3..d758188f1 100644
--- a/OTAPI.Common/OTAPI.Common.csproj
+++ b/OTAPI.Common/OTAPI.Common.csproj
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net9.0</TargetFramework>
 		<Nullable>disable</Nullable>
 	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Win32.Registry" Version="6.0.0-preview.5.21301.5" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Win32.Registry" Version="6.0.0-preview.5.21301.5" />
+	</ItemGroup>
 
-  <Target Name="CleanAll" AfterTargets="Clean">
+	<Target Name="CleanAll" AfterTargets="Clean">
 		<RemoveDir Directories="$(OUTDIR)" />
 	</Target>
 </Project>
\ 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/NugetPackageBuilder.cs b/OTAPI.Patcher/NugetPackageBuilder.cs
index 9b0ec6031..8f388491a 100644
--- a/OTAPI.Patcher/NugetPackageBuilder.cs
+++ b/OTAPI.Patcher/NugetPackageBuilder.cs
@@ -52,7 +52,7 @@ public void Build(ModFwModder modder)
         var commitSha = Common.GetGitCommitSha();
         nuspec_xml = nuspec_xml.Replace("[INJECT_GIT_HASH]", String.IsNullOrWhiteSpace(commitSha) ? "" : $" git#{commitSha}");
 
-        var platforms = new[] { "net6.0" }; // relinker only does net6 currently. until there is a reason to implement it...
+        var platforms = new[] { "net9.0" }; // relinker only does net9 currently. until there is a reason to implement it...
         var steamworks = modder.Module.AssemblyReferences.First(x => x.Name == "Steamworks.NET");
         var newtonsoft = modder.Module.AssemblyReferences.First(x => x.Name == "Newtonsoft.Json");
         var dependencies = new[]
diff --git a/OTAPI.Patcher/OTAPI.Patcher.csproj b/OTAPI.Patcher/OTAPI.Patcher.csproj
index 5e6030ef5..63c44b8de 100644
--- a/OTAPI.Patcher/OTAPI.Patcher.csproj
+++ b/OTAPI.Patcher/OTAPI.Patcher.csproj
@@ -2,22 +2,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>net6.0</TargetFramework>
-		<Version>3.1.21</Version>
+		<TargetFramework>net9.0</TargetFramework>
+		<Version>3.2.0</Version>
 		<PreserveCompilationContext>true</PreserveCompilationContext>
-		<PlatformTarget>x64</PlatformTarget>
-		<RuntimeIdentifiers>win7-x64;osx.10.11-x64;ubuntu.16.04-x64</RuntimeIdentifiers>
+		<RuntimeIdentifiers>win;osx;linux;</RuntimeIdentifiers>
 		<Nullable>enable</Nullable>
-		<PackageReleaseNotes>Initial 1.4.4.9 support</PackageReleaseNotes>
+		<PackageReleaseNotes>Terraria 1.4.4.9 on .NET9</PackageReleaseNotes>
 	</PropertyGroup>
 	<ItemGroup>
-    <PackageReference Include="ModFramework.Modules.ClearScript" Version="1.1.7" />
-    <PackageReference Include="ModFramework.Modules.CSharp" Version="1.1.7" />
-    <PackageReference Include="ModFramework.Modules.Lua" Version="1.1.7" />
-    <PackageReference Include="MonoMod.RuntimeDetour.HookGen" Version="22.5.1.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="System.Security.Permissions" Version="6.0.0" />
-    <PackageReference Include="Steamworks.NET" Version="20.1.0" />
+		<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" />
+		<PackageReference Include="System.Private.Uri" Version="4.3.2" />
+		<PackageReference Include="System.Security.Permissions" Version="9.0.0" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\FNA\FNA.Core.csproj" />
diff --git a/OTAPI.Patcher/Properties/launchSettings.json b/OTAPI.Patcher/Properties/launchSettings.json
deleted file mode 100644
index 6fb85821d..000000000
--- a/OTAPI.Patcher/Properties/launchSettings.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "profiles": {
-    "Manual": {
-      "commandName": "Project"
-    },
-    "Vanilla": {
-      "commandName": "Project",
-      "commandLineArgs": "-patchTarget=v -latestVanilla=n"
-    },
-    "TML": {
-      "commandName": "Project",
-      "commandLineArgs": "-patchTarget=m"
-    }
-  }
-}
\ No newline at end of file
diff --git a/OTAPI.Patcher/Targets/IPatchTarget.cs b/OTAPI.Patcher/Targets/IPatchTarget.cs
index 23d3c0af1..4272f4d16 100644
--- a/OTAPI.Patcher/Targets/IPatchTarget.cs
+++ b/OTAPI.Patcher/Targets/IPatchTarget.cs
@@ -124,7 +124,7 @@ public static void CreateRuntimeHooks(this ModFwModder modder, string output)
 
             GACPaths = new string[] { } // avoid MonoMod looking up the GAC, which causes an exception on .netcore
         };
-        mm.Log($"[OTAPI] Processing corelibs to be net6: {fileName}");
+        mm.Log($"[OTAPI] Processing corelibs to be net9: {fileName}");
 
         mm.Read();
 
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.Patcher/Targets/PCServerTarget.cs b/OTAPI.Patcher/Targets/PCServerTarget.cs
index 6e81af147..bc86d7505 100644
--- a/OTAPI.Patcher/Targets/PCServerTarget.cs
+++ b/OTAPI.Patcher/Targets/PCServerTarget.cs
@@ -1,5 +1,6 @@
 using ModFramework;
 using ModFramework.Modules.CSharp;
+using MonoMod.Utils;
 using OTAPI.Patcher.Resolvers;
 using System;
 using System.Collections.Generic;
@@ -30,7 +31,7 @@ public class PCServerTarget : IServerPatchTarget
     public virtual string ArtifactName { get; } = "artifact-pc";
 
     public virtual bool PublicEverything => true;
-    public virtual bool GenerateSymbols => true;
+    public virtual bool GenerateSymbols => false;
 
     public virtual string GetEmbeddedResourcesDirectory(string fileinput)
     {
@@ -85,18 +86,18 @@ public void Patch()
         {
             Common.AddMarkdownFormatter();
 
-            var input = DownloadServer();
-            var inputName = Path.GetFileNameWithoutExtension(input);
+            var vanillaDllPath = DownloadServer();
+            var vanillaName = Path.GetFileNameWithoutExtension(vanillaDllPath);
 
             Console.WriteLine("[OTAPI] Extracting embedded binaries and packing into one binary...");
-            var embeddedResources = this.ExtractResources(input);
+            var embeddedResources = this.ExtractResources(vanillaDllPath);
 
-            var basepath = Path.Combine(ModContext.BaseDirectory, "outputs");
-            Directory.CreateDirectory(basepath);
+            var putputsPath = Path.Combine(ModContext.BaseDirectory, "outputs");
+            Directory.CreateDirectory(putputsPath);
 
-            var refs = Path.Combine(basepath, "TerrariaServer.dll");
-            var otapi = Path.Combine(ModContext.BaseDirectory, "OTAPI.dll");
-            var hooks = Path.Combine(ModContext.BaseDirectory, "OTAPI.Runtime.dll");
+            var terrariaServerDllDestination = Path.Combine(putputsPath, "TerrariaServer.dll");
+            var otapiDllDestination = Path.Combine(ModContext.BaseDirectory, "OTAPI.dll");
+            var otapiRuntimeDllDestination = Path.Combine(ModContext.BaseDirectory, "OTAPI.Runtime.dll");
 
             ModContext.ReferenceFiles.AddRange(new[]
             {
@@ -111,7 +112,7 @@ public void Patch()
             });
 
             // expose types to be public, so private IL refs can be ref'd by compiling mods
-            this.Patch("Merging and pregenerating files", input, refs, PublicEverything, (modType, mm) =>
+            this.Patch("Merging and pregenerating files", vanillaDllPath, terrariaServerDllDestination, PublicEverything, (modType, mm) =>
             {
                 if (mm is not null)
                 {
@@ -129,16 +130,16 @@ public void Patch()
 
                         CompileAndReadShims(mm);
                         MergeReLogic(mm, embeddedResources);
-                        this.AddPatchMetadata(mm, mm.Module.Name, input);
+                        this.AddPatchMetadata(mm, mm.Module.Name, vanillaDllPath);
                     }
                 }
                 return EApplyResult.Continue;
             });
 
-            ModContext.ReferenceFiles.Add(refs);
+            ModContext.ReferenceFiles.Add(terrariaServerDllDestination);
 
             // load into the current app domain for patch refs
-            var asm = Assembly.LoadFile(refs);
+            var asm = Assembly.LoadFile(terrariaServerDllDestination);
             var cache = new Dictionary<string, Assembly>();
 
             Assembly? ResolvingFile(AssemblyLoadContext arg1, AssemblyName args)
@@ -177,36 +178,53 @@ public void Patch()
             AssemblyLoadContext.Default.Resolving += ResolvingFile;
             try
             {
-                this.Patch("Applying modifications", refs, otapi, false, (modType, modder) =>
+                this.Patch("Applying modifications", terrariaServerDllDestination, otapiDllDestination, false, (modType, mm) =>
                 {
-                    if (modder is not null)
+                    if (mm is not null)
                     {
                         if (modType == ModType.PreRead)
                         {
-                            modder.AssemblyResolver.AddSearchDirectory(embeddedResources);
+                            mm.AssemblyResolver.AddSearchDirectory(embeddedResources);
                         }
                         else if (modType == ModType.Read)
                         {
                             // assembly is loaded, can use it to add in constants
                             // before the plugins are invoked
-                            this.AddConstants(inputName, modder);
+                            this.AddConstants(vanillaName, mm);
 
                             LoadModifications();
                         }
                         else if (modType == ModType.PreWrite)
                         {
-                            modder.ModContext.TargetAssemblyName = "OTAPI"; // change the target assembly since otapi is now valid for write events
-                            AddVersion(modder);
-                            this.AddPatchMetadata(modder);
-                            modder.AddEnvMetadata();
+                            mm.ModContext.TargetAssemblyName = "OTAPI"; // change the target assembly since otapi is now valid for write events
+                            AddVersion(mm);
+                            this.AddPatchMetadata(mm);
+                            mm.AddEnvMetadata();
+
+                            // generate static hooks
+                            Console.Write("[OTAPI] Generating static hooks...");
+                            mm.Module.GetType("Terraria.Main").CreateHooks(mm);
+                            mm.Module.GetType("Terraria.Item").CreateHooks(mm);
+                            mm.Module.GetType("Terraria.NetMessage").CreateHooks(mm);
+                            mm.Module.GetType("Terraria.Netplay").CreateHooks(mm);
+                            mm.Module.GetType("Terraria.NPC").CreateHooks(mm);
+                            mm.Module.GetType("Terraria.WorldGen").CreateHooks(mm);
+                            mm.Module.GetType("Terraria.Chat.ChatHelper").CreateHooks(mm);
+                            mm.Module.GetType("Terraria.IO.WorldFile").CreateHooks(mm);
+                            mm.Module.GetType("Terraria.Net.NetManager").CreateHooks(mm);
+                            mm.Module.GetType("Terraria.Projectile").CreateHooks(mm);
+                            mm.Module.GetType("Terraria.RemoteClient").CreateHooks(mm);
+                            mm.Module.GetType("Terraria.Liquid").CreateHooks(mm);
+                            mm.Module.GetType("Terraria.Program").CreateHooks(mm);
+                            Console.WriteLine("Done");
                         }
                         else if (modType == ModType.Write)
                         {
-                            modder.ModContext = new("OTAPI.Runtime"); // done with the context. they will be triggered again by runtime hooks if not for this
-                            modder.CreateRuntimeHooks(hooks);
+                            mm.ModContext = new("OTAPI.Runtime"); // done with the context. they will be triggered again by runtime hooks if not for this
+                            mm.CreateRuntimeHooks(otapiRuntimeDllDestination);
 
                             Console.WriteLine("[OTAPI] Building NuGet package...");
-                            NugetPackager.Build(modder);
+                            NugetPackager.Build(mm);
                         }
                     }
                     return EApplyResult.Continue;
@@ -258,6 +276,9 @@ public string GetZipUrl()
 
         if (cli != "n")
         {
+            if (Console.IsInputRedirected)
+                return FileResolver.AquireLatestBinaryUrl();
+
             int attempts = 5;
             do
             {
diff --git a/OTAPI.Patcher/Targets/PatchTargets.cs b/OTAPI.Patcher/Targets/PatchTargets.cs
index aab64fd18..ac69b6628 100644
--- a/OTAPI.Patcher/Targets/PatchTargets.cs
+++ b/OTAPI.Patcher/Targets/PatchTargets.cs
@@ -42,6 +42,9 @@ public static IPatchTarget DeterminePatchTarget()
         if (!String.IsNullOrWhiteSpace(cli) && _targets.TryGetValue(cli[0], out IPatchTarget? match))
             return match;
 
+        if(Console.IsInputRedirected)
+            return new PCServerTarget();
+
         int attempts = 5;
         do
         {
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/Mods/OnPacketWrite.Server.cs b/OTAPI.Scripts/Mods/OnPacketWrite.Server.cs
index 24f53ebed..2131338da 100644
--- a/OTAPI.Scripts/Mods/OnPacketWrite.Server.cs
+++ b/OTAPI.Scripts/Mods/OnPacketWrite.Server.cs
@@ -64,10 +64,10 @@ void OnPacketWrite(MonoModder modder)
     sendData.Emit(OpCodes.Ldloc, ms);
     sendData.Emit(OpCodes.Ldloc, bw);
 
-    foreach (var method in sendData.Method.Parameters)
+    foreach (var prm in sendData.Method.Parameters)
     {
-        callback.Parameters.Add(method.Clone());
-        sendData.Emit(OpCodes.Ldarg, method);
+        callback.Parameters.Add(prm.Clone());
+        sendData.Emit(OpCodes.Ldarg, prm);
     }
 
     sendData.Emit(OpCodes.Call, callback);
diff --git a/OTAPI.Scripts/Mods/PatchSteamworks.cs b/OTAPI.Scripts/Mods/PatchSteamworks.cs
index 9b6787bda..70d3f6f14 100644
--- a/OTAPI.Scripts/Mods/PatchSteamworks.cs
+++ b/OTAPI.Scripts/Mods/PatchSteamworks.cs
@@ -23,8 +23,8 @@ You should have received a copy of the GNU General Public License
 #else
 using ModFramework;
 using Mono.Cecil;
+using Mono.Cecil.Cil;
 using MonoMod;
-using System.IO;
 using System.Linq;
 
 /// <summary>
@@ -32,16 +32,17 @@ You should have received a copy of the GNU General Public License
 /// </summary>
 [Modification(ModType.PreMerge, "Patching Steamworks.NET")]
 [MonoMod.MonoModIgnore]
-void PatchSteam(MonoModder modder)
+void PatchSteam(ModFwModder modder)
 {
-    var desired = typeof(Steamworks.SteamShutdown_t).Assembly.GetName().Version;
+    var steamworks = AssemblyDefinition.ReadAssembly("Steamworks.NET.dll"); // Avoid using type refs, as arm64 will die on this assembly.
+    var version = steamworks.Name.Version; // Avoid using type refs, as arm64 will die on this assembly.
 
     //Update the references to match what is installed
     foreach (var reference in modder.Module.AssemblyReferences)
     {
         if (reference.Name == "Steamworks.NET")
         {
-            reference.Version = desired;
+            reference.Version = version;
             break;
         }
     }
@@ -50,5 +51,35 @@ void PatchSteam(MonoModder modder)
     modder.Module.Resources.Remove(
         modder.Module.Resources.Single(x => x.Name.EndsWith("Steamworks.NET.dll"))
     );
+
+    // Wire in changes since Terraria implemented this library - we are using the latest!
+    var steamNetworkingIdentity = modder.Module.ImportReference(steamworks.MainModule.Types.Single(x => x.FullName == "Steamworks.SteamNetworkingIdentity"));
+    modder.OnRewritingMethodBody += (MonoModder modder, MethodBody body, Instruction instr, int instri) =>
+    {
+        if (instr.OpCode == OpCodes.Call && instr.Operand is MethodReference methodRef)
+        {
+            if (methodRef.DeclaringType.FullName == "Steamworks.SteamUGC" &&
+                methodRef.Name == "SetItemTags" &&
+                instr.Previous.OpCode != OpCodes.Ldc_I4_0)
+            {
+                // add bAllowAdminTags = false to the call
+                body.Instructions.Insert(instri, Instruction.Create(OpCodes.Ldc_I4_0));
+                methodRef.Parameters.Add(new("bAllowAdminTags", ParameterAttributes.None, methodRef.Module.TypeSystem.Boolean));
+            }
+
+            if (methodRef.DeclaringType.FullName == "Steamworks.SteamUser" &&
+                methodRef.Name == "GetAuthSessionTicket" &&
+                instr.Previous.OpCode != OpCodes.Ldloca_S)
+            {
+                // create a new local variable to store SteamNetworkingIdentity 
+                var steamNetworkingIdentityVar = new VariableDefinition(steamNetworkingIdentity);
+                body.Variables.Add(steamNetworkingIdentityVar);
+                body.InitLocals = true;
+                body.Instructions.Insert(instri, Instruction.Create(OpCodes.Ldloca_S, steamNetworkingIdentityVar));
+                // add parameter: ref SteamNetworkingIdentity pSteamNetworkingIdentity
+                methodRef.Parameters.Add(new("pSteamNetworkingIdentity", ParameterAttributes.None, new ByReferenceType(steamNetworkingIdentity)));
+            }
+        }
+    };
 }
 #endif
\ No newline at end of file
diff --git a/OTAPI.Scripts/OTAPI.Scripts.csproj b/OTAPI.Scripts/OTAPI.Scripts.csproj
index 3aac0802e..f6ddff2c6 100644
--- a/OTAPI.Scripts/OTAPI.Scripts.csproj
+++ b/OTAPI.Scripts/OTAPI.Scripts.csproj
@@ -1,45 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <PreserveCompilationReferences>true</PreserveCompilationReferences>
-    <PreserveCompilationContext>true</PreserveCompilationContext>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-  <Import Condition="Exists('..\OTAPI.Patcher\bin\Debug\net6.0\AutoGenerated.target')" Project="..\OTAPI.Patcher\bin\Debug\net6.0\AutoGenerated.target" />
-  <Import Condition="Exists('..\OTAPI.Client.Launcher\bin\Debug\net6.0\AutoGenerated.target')" Project="..\OTAPI.Client.Launcher\bin\Debug\net6.0\AutoGenerated.target" />
-  <ItemGroup>
-    <Reference Include="OTAPI" Condition="Exists('..\OTAPI.Patcher\bin\Debug\net6.0\OTAPI.exe')">
-      <HintPath>..\OTAPI.Patcher\bin\Debug\net6.0\OTAPI.exe</HintPath>
-    </Reference>
-    <Reference Include="OTAPI" Condition="Exists('..\OTAPI.Patcher\bin\Debug\net6.0\OTAPI.dll')">
-      <HintPath>..\OTAPI.Patcher\bin\Debug\net6.0\OTAPI.dll</HintPath>
-    </Reference>
-    <Reference Include="OTAPI" Condition="Exists('..\OTAPI.Patcher\bin\Debug\net6.0\OTAPI.Runtime.dll')">
-      <HintPath>..\OTAPI.Patcher\bin\Debug\net6.0\OTAPI.Runtime.dll</HintPath>
-    </Reference>
-    <Reference Include="Steamworks.NET" Condition="Exists('..\OTAPI.Patcher\bin\Debug\net6.0\EmbeddedResources\Steamworks.NET.dll')">
-      <HintPath>..\OTAPI.Patcher\bin\Debug\net6.0\EmbeddedResources\Steamworks.NET.dll</HintPath>
-    </Reference>
-    <Reference Include="OTAPI" Condition="Exists('..\OTAPI.Client.Launcher\bin\x64\Debug\net6.0\client\OTAPI.exe')">
-      <HintPath>..\OTAPI.Client.Launcher\bin\x64\Debug\net6.0\client\OTAPI.exe</HintPath>
-    </Reference>
-    <Reference Include="OTAPI" Condition="Exists('..\OTAPI.Client.Launcher\bin\x64\Debug\net6.0\client\OTAPI.Runtime.dll')">
-      <HintPath>..\OTAPI.Client.Launcher\bin\x64\Debug\net6.0\client\OTAPI.Runtime.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\FNA\FNA.Core.csproj" />
-    <PackageReference Include="ModFramework" Version="1.1.7" />
-    <PackageReference Include="MonoMod" Version="22.5.1.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="Steamworks.NET" Version="20.1.0" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Modules\OTAPI.Mods\Resources\" />
-  </ItemGroup>
-  <Target Name="CleanAll" AfterTargets="Clean">
-    <RemoveDir Directories="$(OUTDIR)" />
-  </Target>
+	<PropertyGroup>
+		<TargetFramework>net9.0</TargetFramework>
+		<PreserveCompilationReferences>true</PreserveCompilationReferences>
+		<PreserveCompilationContext>true</PreserveCompilationContext>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
+	<Import Condition="Exists('..\OTAPI.Patcher\bin\Debug\net9.0\AutoGenerated.target')" Project="..\OTAPI.Patcher\bin\Debug\net9.0\AutoGenerated.target" />
+	<Import Condition="Exists('..\OTAPI.Client.Launcher\bin\Debug\net9.0\AutoGenerated.target')" Project="..\OTAPI.Client.Launcher\bin\Debug\net9.0\AutoGenerated.target" />
+	<ItemGroup>
+		<Reference Include="OTAPI" Condition="Exists('..\OTAPI.Patcher\bin\Debug\net9.0\OTAPI.exe')">
+			<HintPath>..\OTAPI.Patcher\bin\Debug\net9.0\OTAPI.exe</HintPath>
+		</Reference>
+		<Reference Include="OTAPI" Condition="Exists('..\OTAPI.Patcher\bin\Debug\net9.0\OTAPI.dll')">
+			<HintPath>..\OTAPI.Patcher\bin\Debug\net9.0\OTAPI.dll</HintPath>
+		</Reference>
+		<Reference Include="OTAPI" Condition="Exists('..\OTAPI.Patcher\bin\Debug\net9.0\OTAPI.Runtime.dll')">
+			<HintPath>..\OTAPI.Patcher\bin\Debug\net9.0\OTAPI.Runtime.dll</HintPath>
+		</Reference>
+		<Reference Include="Steamworks.NET" Condition="Exists('..\OTAPI.Patcher\bin\Debug\net9.0\EmbeddedResources\Steamworks.NET.dll')">
+			<HintPath>..\OTAPI.Patcher\bin\Debug\net9.0\EmbeddedResources\Steamworks.NET.dll</HintPath>
+		</Reference>
+		<Reference Include="OTAPI" Condition="Exists('..\OTAPI.Client.Launcher\bin\x64\Debug\net9.0\client\OTAPI.exe')">
+			<HintPath>..\OTAPI.Client.Launcher\bin\x64\Debug\net9.0\client\OTAPI.exe</HintPath>
+		</Reference>
+		<Reference Include="OTAPI" Condition="Exists('..\OTAPI.Client.Launcher\bin\x64\Debug\net9.0\client\OTAPI.Runtime.dll')">
+			<HintPath>..\OTAPI.Client.Launcher\bin\x64\Debug\net9.0\client\OTAPI.Runtime.dll</HintPath>
+		</Reference>
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\FNA\FNA.Core.csproj" />
+		<PackageReference Include="Steamworks.NET" Version="2024.8.0" />
+		<PackageReference Include="ModFramework" Version="1.1.11" />
+		<PackageReference Include="MonoMod" Version="22.7.31.1" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+	</ItemGroup>
+	<ItemGroup>
+		<Folder Include="Modules\OTAPI.Mods\Resources\" />
+	</ItemGroup>
+	<Target Name="CleanAll" AfterTargets="Clean">
+		<RemoveDir Directories="$(OUTDIR)" />
+	</Target>
 </Project>
diff --git a/OTAPI.Scripts/Patches/ModifyCollisionSwitchTiles.Server.cs b/OTAPI.Scripts/Patches/ModifyCollisionSwitchTiles.Server.cs
index 92fc30194..53d228372 100644
--- a/OTAPI.Scripts/Patches/ModifyCollisionSwitchTiles.Server.cs
+++ b/OTAPI.Scripts/Patches/ModifyCollisionSwitchTiles.Server.cs
@@ -33,84 +33,89 @@ You should have received a copy of the GNU General Public License
 [MonoModIgnore]
 partial class CollisionSwitchTiles
 {
-    static ParameterDefinition Entity { get; set; }
-    static MethodDefinition SwitchTiles { get; set; }
+    //static ParameterDefinition Entity { get; set; }
+    //static MethodDefinition SwitchTiles { get; set; }
 
     [Modification(ModType.PreMerge, "Patching Collision.SwitchTiles")]
     static void ModifyCollisionSwitchTiles(ModFramework.ModFwModder modder)
     {
         var csr = modder.GetILCursor(() => Terraria.Collision.SwitchTiles(default, 0, 0, default, 0));
-        SwitchTiles = csr.Method;
+        var redirects = csr.Method.DeclaringType.Methods
+            .Where(x => (HookEmitter.HookMethodNamePrefix + x.Name) == csr.Method.Name || ("orig_" + x.Name) == csr.Method.Name)
+            .Select(x => x.GetILCursor())
+            .ToArray();
+        //SwitchTiles = csr.Method;
 
-        csr.Method.Parameters.Add(Entity = new ParameterDefinition("entity",
-            ParameterAttributes.HasDefault | ParameterAttributes.Optional,
-
-            modder.Module.ImportReference(modder.GetDefinition<Terraria.Entity>())
-        )
+        foreach (var method in redirects.Append(csr))
         {
-            Constant = null
-        });
-
-        modder.OnRewritingMethodBody += PatchCollisionSwitchTiles_OnRewritingMethodBody;
-
-        // inject the callback
-        {
-            // find all the HitSwitch calls
-            // add a branch around them, until after the SendData call
-
-            var calls = csr.Body.Instructions.Where(ins => ins.Operand is MethodReference mref && mref.Name == "HitSwitch").ToArray();
+            ParameterDefinition entity;
+            method.Method.Parameters.Add(entity = new("entity",
+                ParameterAttributes.HasDefault | ParameterAttributes.Optional,
 
-            foreach (var hitswitch in calls)
+                modder.Module.ImportReference(modder.GetDefinition<Terraria.Entity>())
+            )
             {
-                var arg_x = hitswitch.Previous.Previous;
-                var arg_y = hitswitch.Previous;
-
-                csr.Goto(hitswitch, MonoMod.Cil.MoveType.Before);
-
-                //// find the continuation branch (via SendData)
-                //var continuation = hitswitch.Next(ins => ins.Operand is MethodReference mref && mref.Name == "SendData");
-
-                csr.Emit(OpCodes.Ldarg, Entity);
-                csr.EmitDelegate<PressurePlateCallback>(OTAPI.Hooks.Collision.InvokePressurePlate);
-                var cancellation = csr.EmitAll(
-                    new { OpCodes.Nop },
-                    new { OpCodes.Ldc_I4_0 },
-                    new { OpCodes.Ret }
-                );
-
-                // we consumed the stack with our callback, readd the x/y for the HitSwitch call to use
-                var continuation = csr.EmitAll(
-                    new { arg_x.OpCode, arg_x.Operand },
-                    new { arg_y.OpCode, arg_y.Operand }
-                );
-
-                var nop = cancellation.First();
-                nop.OpCode = OpCodes.Brtrue_S;
-                nop.Operand = continuation.First();
-            }
-        }
-    }
+                Constant = null
+            });
 
-    private static void PatchCollisionSwitchTiles_OnRewritingMethodBody(MonoModder modder, MethodBody body, Instruction instr, int instri)
-    {
-        if (instr.Operand is MethodReference methodReference)
-        {
-            if (methodReference.DeclaringType.Name == SwitchTiles.DeclaringType.Name
-                && methodReference.Name == SwitchTiles.Name)
+            modder.OnRewritingMethodBody += (MonoModder modder, MethodBody body, Instruction instr, int instri) =>
             {
-                if (methodReference.Parameters.Any(x => x.Name == Entity.Name))
+                if (instr.Operand is MethodReference methodReference &&
+                    methodReference.DeclaringType.Name == method.Method.DeclaringType.Name &&
+                    methodReference.Name == method.Method.Name
+                )
                 {
-                    return;
+                    if (methodReference.Parameters.Any(x => x.Name == entity.Name))
+                        return;
+
+                    methodReference.Parameters.Add(entity);
+
+                    if (body.Method.DeclaringType.BaseType.FullName == typeof(Terraria.Entity).FullName)
+                    {
+                        body.GetILProcessor().InsertBefore(instr,
+                            new { OpCodes.Ldarg_0 }
+                        );
+                    }
+                    else throw new NotImplementedException($"{body.Method.Name} is not a supported caller for this modification");
                 }
-                methodReference.Parameters.Add(Entity);
+            };
 
-                if (body.Method.DeclaringType.BaseType.FullName == typeof(Terraria.Entity).FullName)
+            // inject the callback if the target
+            if(method == csr)
+            {
+                // find all the HitSwitch calls
+                // add a branch around them, until after the SendData call
+
+                var calls = csr.Body.Instructions.Where(ins => ins.Operand is MethodReference mref && mref.Name == "HitSwitch").ToArray();
+
+                foreach (var hitswitch in calls)
                 {
-                    body.GetILProcessor().InsertBefore(instr,
-                        new { OpCodes.Ldarg_0 }
+                    var arg_x = hitswitch.Previous.Previous;
+                    var arg_y = hitswitch.Previous;
+
+                    csr.Goto(hitswitch, MonoMod.Cil.MoveType.Before);
+
+                    //// find the continuation branch (via SendData)
+                    //var continuation = hitswitch.Next(ins => ins.Operand is MethodReference mref && mref.Name == "SendData");
+
+                    csr.Emit(OpCodes.Ldarg, entity);
+                    csr.EmitDelegate<PressurePlateCallback>(OTAPI.Hooks.Collision.InvokePressurePlate);
+                    var cancellation = csr.EmitAll(
+                        new { OpCodes.Nop },
+                        new { OpCodes.Ldc_I4_0 },
+                        new { OpCodes.Ret }
+                    );
+
+                    // we consumed the stack with our callback, readd the x/y for the HitSwitch call to use
+                    var continuation = csr.EmitAll(
+                        new { arg_x.OpCode, arg_x.Operand },
+                        new { arg_y.OpCode, arg_y.Operand }
                     );
+
+                    var nop = cancellation.First();
+                    nop.OpCode = OpCodes.Brtrue_S;
+                    nop.Operand = continuation.First();
                 }
-                else throw new NotImplementedException($"{body.Method.Name} is not a supported caller for this modification");
             }
         }
     }
diff --git a/OTAPI.Scripts/Patches/PatchNpcStrikeArgs.Server.cs b/OTAPI.Scripts/Patches/PatchNpcStrikeArgs.Server.cs
index a92897ee9..4280e9ad9 100644
--- a/OTAPI.Scripts/Patches/PatchNpcStrikeArgs.Server.cs
+++ b/OTAPI.Scripts/Patches/PatchNpcStrikeArgs.Server.cs
@@ -30,72 +30,79 @@ You should have received a copy of the GNU General Public License
 [MonoModIgnore]
 partial class NpcStrikeArgs
 {
-    static ParameterDefinition Entity { get; set; }
-    static MethodDefinition StrikeNPC { get; set; }
+    //static ParameterDefinition Entity { get; set; }
+    //static MethodDefinition StrikeNPC { get; set; }
 
     [Modification(ModType.PreMerge, "Patching in entity source for NPC strike")]
     static void PatchNpcStrikeArgs(ModFwModder modder)
     {
-        var csr = modder.GetILCursor(() => (new Terraria.NPC()).StrikeNPC(0, 0, 0, false, false, false));
-        StrikeNPC = csr.Method;
-
-        csr.Method.Parameters.Add(Entity = new ParameterDefinition("entity",
-            ParameterAttributes.HasDefault | ParameterAttributes.Optional,
-
-            modder.Module.ImportReference(modder.GetDefinition<Terraria.Entity>())
-        )
-        {
-            Constant = null
-        });
-
-        modder.OnRewritingMethodBody += Modder_OnRewritingMethodBody;
-    }
-
-    private static void Modder_OnRewritingMethodBody(MonoModder modder, MethodBody body, Instruction instr, int instri)
-    {
-        if (instr.Operand is MethodReference methodReference)
-        {
-            if (methodReference.DeclaringType.Name == StrikeNPC.DeclaringType.Name
-                && methodReference.Name == StrikeNPC.Name)
-            {
-                if (methodReference.Parameters.Any(x => x.Name == Entity.Name))
-                {
-                    return;
-                }
-                methodReference.Parameters.Add(Entity);
-
-                switch (body.Method.DeclaringType.Name + "." + body.Method.Name)
-                {
-                    case "MessageBuffer.GetData":
-                        body.GetILProcessor().InsertBefore(instr,
-                            new { OpCodes.Ldsfld, Operand = modder.Module.ImportReference(modder.GetFieldDefinition(() => Terraria.Main.player)) },
-                            new { OpCodes.Ldarg_0 },
-                            new { OpCodes.Ldfld, Operand = modder.Module.ImportReference(modder.GetFieldDefinition(() => (new Terraria.MessageBuffer()).whoAmI)) },
-                            new { OpCodes.Ldelem_Ref }
-                        );
-                        break;
-
-                    case "NPC.StrikeNPCNoInteraction":
-                        // this is via world, so null is expected.
-                        body.GetILProcessor().InsertBefore(instr,
-                            new { OpCodes.Ldnull }
-                        );
-                        break;
-
-                    case "Player.ApplyDamageToNPC":
-                    case "Player.ItemCheck_MeleeHitNPCs":
-                    case "Projectile.Damage":
-                    case "Player.ProcessHitAgainstNPC":
-                        body.GetILProcessor().InsertBefore(instr,
-                            new { OpCodes.Ldarg_0 }
-                        );
-                        break;
+        var csr = modder.GetILCursor(() => (new Terraria.NPC()).StrikeNPC(0, 0, 0, false, false, false));
+        var redirects = csr.Method.DeclaringType.Methods
+            .Where(x => (HookEmitter.HookMethodNamePrefix + x.Name) == csr.Method.Name || ("orig_" + x.Name) == csr.Method.Name)
+            .Select(x => x.GetILCursor())
+            .ToArray();
+
+        foreach (var method in redirects.Append(csr))
+        {
+            ParameterDefinition Entity;
+            method.Method.Parameters.Add(Entity = new ("entity",
+                ParameterAttributes.HasDefault | ParameterAttributes.Optional,
 
-                    default:
-                        throw new NotImplementedException($"{body.Method.Name} is not a supported caller for this modification");
-                }
-            }
+                modder.Module.ImportReference(modder.GetDefinition<Terraria.Entity>())
+            )
+            {
+                Constant = null
+            });
+
+            modder.OnRewritingMethodBody += (MonoModder modder, MethodBody body, Instruction instr, int instri) =>
+            {
+                if (instr.Operand is MethodReference methodReference)
+                {
+                    if (methodReference.DeclaringType.Name == method.Method.DeclaringType.Name
+                        && methodReference.Name == method.Method.Name)
+                    {
+                        if (methodReference.Parameters.Any(x => x.Name == Entity.Name))
+                        {
+                            return;
+                        }
+                        methodReference.Parameters.Add(Entity);
+
+                        var methodName = body.Method.DeclaringType.Name + "." + body.Method.Name;
+                        switch (methodName.Replace(HookEmitter.HookMethodNamePrefix, ""))
+                        {
+                            case "MessageBuffer.GetData":
+                                body.GetILProcessor().InsertBefore(instr,
+                                    new { OpCodes.Ldsfld, Operand = modder.Module.ImportReference(modder.GetFieldDefinition(() => Terraria.Main.player)) },
+                                    new { OpCodes.Ldarg_0 },
+                                    new { OpCodes.Ldfld, Operand = modder.Module.ImportReference(modder.GetFieldDefinition(() => (new Terraria.MessageBuffer()).whoAmI)) },
+                                    new { OpCodes.Ldelem_Ref }
+                                );
+                                break;
+
+                            case "NPC.StrikeNPCNoInteraction":
+                                // this is via world, so null is expected.
+                                body.GetILProcessor().InsertBefore(instr,
+                                    new { OpCodes.Ldnull }
+                                );
+                                break;
+
+                            case "Player.ApplyDamageToNPC":
+                            case "Player.ItemCheck_MeleeHitNPCs":
+                            case "Projectile.Damage":
+                            case "Player.ProcessHitAgainstNPC":
+                            case "NPC.StrikeNPC":
+                                body.GetILProcessor().InsertBefore(instr,
+                                    new { OpCodes.Ldarg_0 }
+                                );
+                                break;
+
+                            default:
+                                throw new NotImplementedException($"{body.Method.Name} is not a supported caller for this modification");
+                        }
+                    }
+                }
+            };
         }
     }
-}
+}
 #endif
\ No newline at end of file
diff --git a/OTAPI.Server.Launcher/OTAPI.Server.Launcher.csproj b/OTAPI.Server.Launcher/OTAPI.Server.Launcher.csproj
index 45420852e..82c92ca7e 100644
--- a/OTAPI.Server.Launcher/OTAPI.Server.Launcher.csproj
+++ b/OTAPI.Server.Launcher/OTAPI.Server.Launcher.csproj
@@ -1,102 +1,102 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-    <PreserveCompilationContext>true</PreserveCompilationContext>
-    <Configurations>Debug;Release</Configurations>
-  </PropertyGroup>
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>net9.0</TargetFramework>
+		<PreserveCompilationContext>true</PreserveCompilationContext>
+		<Configurations>Debug;Release</Configurations>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="csharp\plugins\modules\otapi\Example.cs" />
-  </ItemGroup>
+	<ItemGroup>
+		<Compile Remove="csharp\plugins\modules\otapi\Example.cs" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="ModFramework" Version="1.1.7">
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-    </PackageReference>
-    <PackageReference Include="ModFramework.Modules.ClearScript" Version="1.1.7" />
-    <PackageReference Include="ModFramework.Modules.CSharp" Version="1.1.7" />
-    <PackageReference Include="ModFramework.Modules.Lua" Version="1.1.7" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="Steamworks.NET" Version="20.1.0" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
-    <PackageReference Include="System.IO.Packaging" Version="6.0.0" />
-    <PackageReference Include="System.Security.Permissions" Version="6.0.0" />
-    <PackageReference Include="Mono.Cecil" Version="0.11.4" />
-    <PackageReference Include="MonoMod.RuntimeDetour.HookGen" Version="22.5.1.1" />
-    <PackageReference Include="MonoMod" Version="22.5.1.1">
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-    </PackageReference>
-    <PackageReference Include="MonoMod.RuntimeDetour" Version="22.5.1.1">
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-    </PackageReference>
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="ModFramework" Version="1.1.11">
+			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+		</PackageReference>
+		<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" />
+		<PackageReference Include="System.Drawing.Common" Version="9.0.0" />
+		<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" Version="22.7.31.1">
+			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+		</PackageReference>
+		<PackageReference Include="MonoMod.RuntimeDetour" Version="25.2.2">
+			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+		</PackageReference>
+	</ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="OTAPI">
-      <HintPath>..\OTAPI.Patcher\bin\$(Configuration)\$(TargetFramework)\OTAPI.dll</HintPath>
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-    </Reference>
-    <Reference Include="OTAPI.Runtime">
-      <HintPath>..\OTAPI.Patcher\bin\$(Configuration)\$(TargetFramework)\OTAPI.Runtime.dll</HintPath>
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-    </Reference>
-  </ItemGroup>
+	<ItemGroup>
+		<Reference Include="OTAPI">
+			<HintPath>..\OTAPI.Patcher\bin\$(Configuration)\$(TargetFramework)\OTAPI.dll</HintPath>
+			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+		</Reference>
+		<Reference Include="OTAPI.Runtime">
+			<HintPath>..\OTAPI.Patcher\bin\$(Configuration)\$(TargetFramework)\OTAPI.Runtime.dll</HintPath>
+			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+		</Reference>
+	</ItemGroup>
 
-  <Import Condition="Exists('..\OTAPI.Patcher\bin\$(Configuration)\$(TargetFramework)\AutoGenerated.target')" Project="..\OTAPI.Patcher\bin\$(Configuration)\$(TargetFramework)\AutoGenerated.target" />
+	<Import Condition="Exists('..\OTAPI.Patcher\bin\$(Configuration)\$(TargetFramework)\AutoGenerated.target')" Project="..\OTAPI.Patcher\bin\$(Configuration)\$(TargetFramework)\AutoGenerated.target" />
 
-  <ItemGroup>
-    <ProjectReference Include="..\examples\RuntimeExample.Server\RuntimeExample.Server.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\examples\RuntimeExample.Server\RuntimeExample.Server.csproj" />
+	</ItemGroup>
 
-  <ItemGroup Condition="Exists('..\OTAPI.Patcher\bin\$(Configuration)\$(TargetFramework)\tModLoader')">
-    <Content Include="..\OTAPI.Patcher\bin\$(Configuration)\$(TargetFramework)\tModLoader\**\*.*">
-        <Link>tModLoader\%(RecursiveDir)%(Filename)%(Extension)</Link>
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <PropertyGroup Condition="Exists('..\OTAPI.Patcher\bin\$(Configuration)\$(TargetFramework)\tModLoader')">
-    <DefineConstants>$(DefineConstants);TML</DefineConstants>
-  </PropertyGroup>
+	<ItemGroup Condition="Exists('..\OTAPI.Patcher\bin\$(Configuration)\$(TargetFramework)\tModLoader')">
+		<Content Include="..\OTAPI.Patcher\bin\$(Configuration)\$(TargetFramework)\tModLoader\**\*.*">
+			<Link>tModLoader\%(RecursiveDir)%(Filename)%(Extension)</Link>
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+	</ItemGroup>
+	<PropertyGroup Condition="Exists('..\OTAPI.Patcher\bin\$(Configuration)\$(TargetFramework)\tModLoader')">
+		<DefineConstants>$(DefineConstants);TML</DefineConstants>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <Folder Include="lua\" />
-  </ItemGroup>
+	<ItemGroup>
+		<Folder Include="lua\" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <None Include="csharp\plugins\modules\otapi\example\Example.cs">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="csharp\Metadata.refs">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="csharp\modifications\Metadata.refs">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="lua\test.lua">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="csharp\plugins\Metadata.refs">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="clearscript\test.js">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="csharp\plugins\modules\example\Example.cs">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Compile>
-  </ItemGroup>
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <MakeDir Directories="$(TargetDir)modifications\" />
-    <Copy SourceFiles="$(TargetDir)ModFramework.Modules.CSharp.dll" DestinationFolder="$(TargetDir)modifications" SkipUnchangedFiles="false" />
-    <Copy SourceFiles="$(TargetDir)ModFramework.Modules.Lua.dll" DestinationFolder="$(TargetDir)modifications" SkipUnchangedFiles="false" />
-    <Copy SourceFiles="$(TargetDir)ModFramework.Modules.ClearScript.dll" DestinationFolder="$(TargetDir)modifications" SkipUnchangedFiles="false" />
+	<ItemGroup>
+		<None Include="csharp\plugins\modules\otapi\example\Example.cs">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Update="csharp\Metadata.refs">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Update="csharp\modifications\Metadata.refs">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Update="lua\test.lua">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Update="csharp\plugins\Metadata.refs">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Update="clearscript\test.js">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>
+	<ItemGroup>
+		<Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="csharp\plugins\modules\example\Example.cs">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Compile>
+	</ItemGroup>
+	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
+		<MakeDir Directories="$(TargetDir)modifications\" />
+		<Copy SourceFiles="$(TargetDir)ModFramework.Modules.CSharp.dll" DestinationFolder="$(TargetDir)modifications" SkipUnchangedFiles="false" />
+		<Copy SourceFiles="$(TargetDir)ModFramework.Modules.Lua.dll" DestinationFolder="$(TargetDir)modifications" SkipUnchangedFiles="false" />
+		<Copy SourceFiles="$(TargetDir)ModFramework.Modules.ClearScript.dll" DestinationFolder="$(TargetDir)modifications" SkipUnchangedFiles="false" />
 
-    <Copy SourceFiles="$(TargetDir)RuntimeExample.Server.dll" DestinationFolder="$(TargetDir)modifications" SkipUnchangedFiles="false" />
-    <Copy SourceFiles="$(TargetDir)RuntimeExample.Server.pdb" DestinationFolder="$(TargetDir)modifications" SkipUnchangedFiles="false" />
-  </Target>
+		<Copy SourceFiles="$(TargetDir)RuntimeExample.Server.dll" DestinationFolder="$(TargetDir)modifications" SkipUnchangedFiles="false" />
+		<Copy SourceFiles="$(TargetDir)RuntimeExample.Server.pdb" DestinationFolder="$(TargetDir)modifications" SkipUnchangedFiles="false" />
+	</Target>
 
 </Project>
diff --git a/OTAPI.Server.Launcher/Program.cs b/OTAPI.Server.Launcher/Program.cs
index 074421d80..cc6dcdeba 100644
--- a/OTAPI.Server.Launcher/Program.cs
+++ b/OTAPI.Server.Launcher/Program.cs
@@ -23,11 +23,15 @@ You should have received a copy of the GNU General Public License
 #endif
 using System;
 using System.IO;
+using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.InteropServices;
 
 //namespace OTAPI.Launcher;
 
+Console.WriteLine($"OTAPI.Server.Launcher Arch: {RuntimeInformation.ProcessArchitecture}");
+
 static Assembly GetTerrariaAssembly() => typeof(Terraria.Animation).Assembly;
 
 static Hook LazyHook(string type, string method, Delegate callback)
@@ -44,35 +48,99 @@ static Hook LazyHook(string type, string method, Delegate callback)
 
 static void Nop() { }
 
-static void Program_LaunchGame(On.Terraria.Program.orig_LaunchGame orig, string[] args, bool monoArgs)
+static void Program_LaunchGame(object sender, HookEvents.Terraria.Program.LaunchGameEventArgs e)
 {
 #if !TML
+    var SavePath = typeof(Terraria.Program).GetField("SavePath"); //1442+
+    if (SavePath is not null)
+    {
+        SavePath.SetValue(null, Terraria.Program.LaunchParameters.ContainsKey("-savedirectory") ? Terraria.Program.LaunchParameters["-savedirectory"] : Platform.Get<IPathService>().GetStoragePath("Terraria"));
+    }
+
+    // Steamworks.NET is not supported on ARM64, and will cause a crash
+    // TODO: create a shim generator in modfw to dynamically remove this for servers while keeping API compatibility
+    // Terraria.Main.SkipAssemblyLoad = true;
+    if (RuntimeInformation.ProcessArchitecture == Architecture.Arm64)
+    {
+        var SkipAssemblyLoad = typeof(Terraria.Main).GetField("SkipAssemblyLoad");
+        SkipAssemblyLoad.SetValue(null, true);
+        return;
+    }
+
     Console.WriteLine("Preloading assembly...");
 
     if (GetTerrariaAssembly().EntryPoint.DeclaringType.Name != "MonoLaunch")
     {
-        var SavePath = typeof(Terraria.Program).GetField("SavePath"); //1442+
-        if (SavePath is not null)
-        {
-            SavePath.SetValue(null, Terraria.Program.LaunchParameters.ContainsKey("-savedirectory") ? Terraria.Program.LaunchParameters["-savedirectory"] : Platform.Get<IPathService>().GetStoragePath("Terraria"));
-        }
         Terraria.Main.dedServ = true;
         Terraria.Program.ForceLoadAssembly(GetTerrariaAssembly(), initializeStaticMembers: true);
     }
+#endif
+}
+
+static void TShockHooks()
+{
+    Dictionary<string, int> calls = new();
+
+    // only print every 1s
+    DateTime lastUpdate = DateTime.Now;
+    void Print<TSender, TArgs>(TSender sender, TArgs args)
+    {
+        dynamic evt = args;
+        var name = evt.OriginalMethod.Method.Name;
+        if (!calls.ContainsKey(name))
+            calls[name] = 0;
+        calls[name] += 1;
+        if ((DateTime.Now - lastUpdate).TotalSeconds >= 1)
+        {
+            Console.WriteLine(String.Join($"{Environment.NewLine}", calls.Keys.OrderByDescending(x => calls[x]).Select(name => $"\t- {name}:{calls[name]}")));
+            lastUpdate = DateTime.Now;
+        }
+
+        //evt.ContinueExecution = false;
+    }
 
+    HookEvents.Terraria.Main.Update += Print;
+    HookEvents.Terraria.Main.Initialize += Print;
+    HookEvents.Terraria.Main.checkXMas += Print;
+    HookEvents.Terraria.Main.checkHalloween += Print;
+    HookEvents.Terraria.Main.startDedInput += Print;
+#if !TML
+    HookEvents.Terraria.Item.SetDefaults_Int32_Boolean_ItemVariant += Print;
 #endif
-    orig(args, monoArgs);
+    HookEvents.Terraria.Item.netDefaults += Print;
+    HookEvents.Terraria.NetMessage.greetPlayer += Print;
+    HookEvents.Terraria.Netplay.StartServer += Print;
+    HookEvents.Terraria.Netplay.OnConnectionAccepted += Print;
+    HookEvents.Terraria.NPC.SetDefaults += Print;
+    HookEvents.Terraria.NPC.SetDefaultsFromNetId += Print;
+    // HookEvents.Terraria.NPC.StrikeNPC += (npc, args) => args.ContinueExecution = false;
+    HookEvents.Terraria.NPC.StrikeNPC += Print;
+    HookEvents.Terraria.NPC.Transform += Print;
+    HookEvents.Terraria.NPC.AI += Print;
+    HookEvents.Terraria.WorldGen.StartHardmode += Print;
+    HookEvents.Terraria.WorldGen.SpreadGrass += Print;
+    HookEvents.Terraria.Chat.ChatHelper.BroadcastChatMessage += Print;
+    HookEvents.Terraria.IO.WorldFile.SaveWorld_Boolean_Boolean += Print;
+    HookEvents.Terraria.Net.NetManager.SendData += Print;
+    HookEvents.Terraria.Projectile.SetDefaults += Print;
+    HookEvents.Terraria.Projectile.AI += Print;
+    HookEvents.Terraria.RemoteClient.Reset += Print;
 }
 
 static void Program_OnLaunched(object sender, EventArgs e)
 {
-    Console.WriteLine($"MonoMod runtime hooks active, runtime: " + DetourHelper.Runtime.GetType().Name);
+    //Console.WriteLine($"MonoMod runtime hooks active, runtime: " + DetourHelper.Runtime.GetType().Name);
 
     if (Common.IsTMLServer)
     {
         LazyHook("Terraria.ModLoader.Engine.HiDefGraphicsIssues", "Init", new Action(Nop));
     }
 
+    HookEvents.Terraria.Main.DedServ += (_, args) =>
+    {
+        Console.WriteLine($"DedServEvent");
+    };
+
     On.Terraria.Main.ctor += Main_ctor;
 
     Hooks.MessageBuffer.ClientUUIDReceived += (_, args) =>
@@ -89,16 +157,14 @@ static void Program_OnLaunched(object sender, EventArgs e)
         Console.WriteLine($"Hooks.Item.MechSpawn x={args.X}, y={args.Y}, type={args.Type}, num={args.Num}, num2={args.Num2}, num3={args.Num3}");
     };
 
-    On.Terraria.Main.DedServ += Main_DedServ;
-
     On.Terraria.RemoteClient.Update += (orig, rc) =>
     {
-        Console.WriteLine($"RemoteClient.Update: HOOK ID#{rc.Id} IsActive:{rc.IsActive},PT:{rc.PendingTermination}");
+        //Console.WriteLine($"RemoteClient.Update: HOOK ID#{rc.Id} IsActive:{rc.IsActive},PT:{rc.PendingTermination}");
         orig(rc);
     };
     On.Terraria.RemoteClient.Reset += (orig, rc) =>
     {
-        Console.WriteLine($"RemoteClient.Reset: HOOK ID#{rc.Id} IsActive:{rc.IsActive},PT:{rc.PendingTermination}");
+        //Console.WriteLine($"RemoteClient.Reset: HOOK ID#{rc.Id} IsActive:{rc.IsActive},PT:{rc.PendingTermination}");
         orig(rc);
     };
 }
@@ -110,16 +176,24 @@ static void Main_ctor(On.Terraria.Main.orig_ctor orig, Terraria.Main self)
     Console.WriteLine("Main invoked");
 }
 
-static void Main_DedServ(On.Terraria.Main.orig_DedServ orig, Terraria.Main self)
+static void Main_DedServ(object sender, HookEvents.Terraria.Main.DedServEventArgs e)
 {
     Console.WriteLine($"Server init process successful");
 
-    if (!Environment.GetCommandLineArgs().Any(x => x.ToLower() == "-test-init"))
-        orig(self);
+    if (Environment.GetCommandLineArgs().Any(x => x.ToLower() == "-test-init"))
+        e.ContinueExecution = false;
 }
 
-Terraria.Program.OnLaunched += Program_OnLaunched;
-On.Terraria.Program.LaunchGame += Program_LaunchGame;
+HookEvents.Terraria.Main.DedServ += Main_DedServ;
+HookEvents.Terraria.Program.LaunchGame += Program_LaunchGame;
+if (RuntimeInformation.ProcessArchitecture != Architecture.Arm64)
+{
+    Terraria.Program.OnLaunched += Program_OnLaunched;
+}
+else
+{
+    TShockHooks();
+}
 
 #if TML
 On.MonoLaunch.GetBaseDirectory += (orig) =>
diff --git a/OTAPI.Server.Launcher/csharp/plugins/modules/otapi/example/Example.cs b/OTAPI.Server.Launcher/csharp/plugins/modules/otapi/example/Example.cs
index de18cb35e..3ca217431 100644
--- a/OTAPI.Server.Launcher/csharp/plugins/modules/otapi/example/Example.cs
+++ b/OTAPI.Server.Launcher/csharp/plugins/modules/otapi/example/Example.cs
@@ -28,13 +28,6 @@ public static class Hooks
         public static void OnRunning()
         {
             Console.WriteLine("[LauncherScript] Hello World! from a script");
-            On.Terraria.Program.LaunchGame += Program_LaunchGame;
-        }
-
-        private static void Program_LaunchGame(On.Terraria.Program.orig_LaunchGame orig, string[] args, bool monoArgs)
-        {
-            Console.WriteLine("[LauncherScript] LaunchGame was called!");
-            orig(args, monoArgs);
         }
     }
 }
diff --git a/OTAPI.sln b/OTAPI.sln
index d2051539d..c3e071093 100644
--- a/OTAPI.sln
+++ b/OTAPI.sln
@@ -34,12 +34,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OTAPI.Scripts", "OTAPI.Scri
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OTAPI.Common", "OTAPI.Common\OTAPI.Common.csproj", "{430E8B48-4F60-4A21-8B15-771A1681C812}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FNA.Core", "FNA\FNA.Core.csproj", "{63B4C17F-29A6-4519-9302-9317DE8B5FDC}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OTAPI.Server.Launcher", "OTAPI.Server.Launcher\OTAPI.Server.Launcher.csproj", "{1BD8B7AC-62D7-4E6B-B16E-012CB8869FA8}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RuntimeExample.Server", "examples\RuntimeExample.Server\RuntimeExample.Server.csproj", "{62AE846B-35AA-4558-8376-6351574AE9BC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FNA.Core", "FNA\FNA.Core.csproj", "{76251340-608B-429A-AA5C-9EF84FE29145}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RuntimeExample.Client", "examples\RuntimeExample.Client\RuntimeExample.Client.csproj", "{7A5FEE90-C1E1-4452-8A7A-360921A1B050}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -188,42 +190,6 @@ Global
 		{430E8B48-4F60-4A21-8B15-771A1681C812}.ReleaseTrace|x64.Build.0 = Release|Any CPU
 		{430E8B48-4F60-4A21-8B15-771A1681C812}.ReleaseTrace|x86.ActiveCfg = Release|Any CPU
 		{430E8B48-4F60-4A21-8B15-771A1681C812}.ReleaseTrace|x86.Build.0 = Release|Any CPU
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.Debug|Any CPU.Build.0 = Debug|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.Debug|x64.ActiveCfg = Debug|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.Debug|x64.Build.0 = Debug|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.Debug|x86.ActiveCfg = Debug|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.Debug|x86.Build.0 = Debug|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.DebugLegacy|Any CPU.ActiveCfg = Debug|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.DebugLegacy|Any CPU.Build.0 = Debug|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.DebugLegacy|x64.ActiveCfg = Debug|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.DebugLegacy|x64.Build.0 = Debug|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.DebugLegacy|x86.ActiveCfg = Debug|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.DebugLegacy|x86.Build.0 = Debug|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.DebugTrace|Any CPU.ActiveCfg = Debug|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.DebugTrace|Any CPU.Build.0 = Debug|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.DebugTrace|x64.ActiveCfg = Debug|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.DebugTrace|x64.Build.0 = Debug|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.DebugTrace|x86.ActiveCfg = Debug|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.DebugTrace|x86.Build.0 = Debug|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.Release|Any CPU.ActiveCfg = Release|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.Release|Any CPU.Build.0 = Release|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.Release|x64.ActiveCfg = Release|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.Release|x64.Build.0 = Release|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.Release|x86.ActiveCfg = Release|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.Release|x86.Build.0 = Release|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.ReleaseLegacy|Any CPU.ActiveCfg = Release|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.ReleaseLegacy|Any CPU.Build.0 = Release|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.ReleaseLegacy|x64.ActiveCfg = Release|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.ReleaseLegacy|x64.Build.0 = Release|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.ReleaseLegacy|x86.ActiveCfg = Release|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.ReleaseLegacy|x86.Build.0 = Release|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.ReleaseTrace|Any CPU.ActiveCfg = Release|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.ReleaseTrace|Any CPU.Build.0 = Release|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.ReleaseTrace|x64.ActiveCfg = Release|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.ReleaseTrace|x64.Build.0 = Release|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.ReleaseTrace|x86.ActiveCfg = Release|x64
-		{63B4C17F-29A6-4519-9302-9317DE8B5FDC}.ReleaseTrace|x86.Build.0 = Release|x64
 		{1BD8B7AC-62D7-4E6B-B16E-012CB8869FA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1BD8B7AC-62D7-4E6B-B16E-012CB8869FA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1BD8B7AC-62D7-4E6B-B16E-012CB8869FA8}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -296,6 +262,78 @@ Global
 		{62AE846B-35AA-4558-8376-6351574AE9BC}.ReleaseTrace|x64.Build.0 = Release|Any CPU
 		{62AE846B-35AA-4558-8376-6351574AE9BC}.ReleaseTrace|x86.ActiveCfg = Release|Any CPU
 		{62AE846B-35AA-4558-8376-6351574AE9BC}.ReleaseTrace|x86.Build.0 = Release|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.Debug|x64.Build.0 = Debug|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.Debug|x86.Build.0 = Debug|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.DebugLegacy|Any CPU.ActiveCfg = Debug|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.DebugLegacy|Any CPU.Build.0 = Debug|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.DebugLegacy|x64.ActiveCfg = Debug|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.DebugLegacy|x64.Build.0 = Debug|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.DebugLegacy|x86.ActiveCfg = Debug|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.DebugLegacy|x86.Build.0 = Debug|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.DebugTrace|Any CPU.ActiveCfg = Debug|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.DebugTrace|Any CPU.Build.0 = Debug|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.DebugTrace|x64.ActiveCfg = Debug|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.DebugTrace|x64.Build.0 = Debug|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.DebugTrace|x86.ActiveCfg = Debug|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.DebugTrace|x86.Build.0 = Debug|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.Release|Any CPU.Build.0 = Release|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.Release|x64.ActiveCfg = Release|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.Release|x64.Build.0 = Release|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.Release|x86.ActiveCfg = Release|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.Release|x86.Build.0 = Release|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.ReleaseLegacy|Any CPU.ActiveCfg = Release|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.ReleaseLegacy|Any CPU.Build.0 = Release|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.ReleaseLegacy|x64.ActiveCfg = Release|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.ReleaseLegacy|x64.Build.0 = Release|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.ReleaseLegacy|x86.ActiveCfg = Release|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.ReleaseLegacy|x86.Build.0 = Release|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.ReleaseTrace|Any CPU.ActiveCfg = Release|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.ReleaseTrace|Any CPU.Build.0 = Release|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.ReleaseTrace|x64.ActiveCfg = Release|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.ReleaseTrace|x64.Build.0 = Release|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.ReleaseTrace|x86.ActiveCfg = Release|Any CPU
+		{76251340-608B-429A-AA5C-9EF84FE29145}.ReleaseTrace|x86.Build.0 = Release|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.Debug|x64.Build.0 = Debug|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.Debug|x86.Build.0 = Debug|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.DebugLegacy|Any CPU.ActiveCfg = Debug|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.DebugLegacy|Any CPU.Build.0 = Debug|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.DebugLegacy|x64.ActiveCfg = Debug|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.DebugLegacy|x64.Build.0 = Debug|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.DebugLegacy|x86.ActiveCfg = Debug|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.DebugLegacy|x86.Build.0 = Debug|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.DebugTrace|Any CPU.ActiveCfg = Debug|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.DebugTrace|Any CPU.Build.0 = Debug|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.DebugTrace|x64.ActiveCfg = Debug|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.DebugTrace|x64.Build.0 = Debug|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.DebugTrace|x86.ActiveCfg = Debug|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.DebugTrace|x86.Build.0 = Debug|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.Release|x64.ActiveCfg = Release|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.Release|x64.Build.0 = Release|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.Release|x86.ActiveCfg = Release|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.Release|x86.Build.0 = Release|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.ReleaseLegacy|Any CPU.ActiveCfg = Release|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.ReleaseLegacy|Any CPU.Build.0 = Release|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.ReleaseLegacy|x64.ActiveCfg = Release|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.ReleaseLegacy|x64.Build.0 = Release|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.ReleaseLegacy|x86.ActiveCfg = Release|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.ReleaseLegacy|x86.Build.0 = Release|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.ReleaseTrace|Any CPU.ActiveCfg = Release|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.ReleaseTrace|Any CPU.Build.0 = Release|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.ReleaseTrace|x64.ActiveCfg = Release|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.ReleaseTrace|x64.Build.0 = Release|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.ReleaseTrace|x86.ActiveCfg = Release|Any CPU
+		{7A5FEE90-C1E1-4452-8A7A-360921A1B050}.ReleaseTrace|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/README.md b/README.md
index 23a1dd266..44a879c65 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ The [upcoming branch](https://github.com/SignatureBeef/Open-Terraria-API/tree/up
 Significant changes this redesign brings are...
 * Modular script system, allowing single file patches using [csharp](https://www.nuget.org/packages/ModFramework.Modules.CSharp/), [javascript](https://www.nuget.org/packages/ModFramework.Modules.ClearScript/) and [lua](https://www.nuget.org/packages/ModFramework.Modules.Lua/)
 * A strong set of libraries with methods and extensions for use in extending or contributing back
-* .NET6 projects for all without Terraria's dependency to net4.
+* .NET9 projects for all without Terraria's dependency to net4.
 
 The stack consists upon:
 * [OTAPI Scripts](https://github.com/SignatureBeef/Open-Terraria-API/tree/upcoming/OTAPI.Scripts), a directory containing all the scripts used to patch the pc, mobile & client assemblies.
diff --git a/build.sh b/build.sh
index 79872c12a..b21f9452b 100755
--- a/build.sh
+++ b/build.sh
@@ -1,24 +1,24 @@
 dotnet restore OTAPI.Mods.slnf
 dotnet restore OTAPI.Server.Launcher.slnf
 dotnet build OTAPI.Mods.slnf
-cd OTAPI.Patcher/bin/Debug/net6.0
-dotnet run --project ../../../OTAPI.Patcher.csproj -patchTarget=p -latest=n --framework net6.0
+cd OTAPI.Patcher/bin/Debug/net9.0
+dotnet run --project ../../../OTAPI.Patcher.csproj -patchTarget=p -latest=n --framework net9.0
 cd ../../../../
 dotnet build OTAPI.Server.Launcher.slnf
-cd OTAPI.Server.Launcher/bin/Debug/net6.0
+cd OTAPI.Server.Launcher/bin/Debug/net9.0
 dotnet OTAPI.Server.Launcher.dll -test-init
 cd ../../../../
-cd OTAPI.Patcher/bin/Debug/net6.0
-dotnet run --project ../../../OTAPI.Patcher.csproj -patchTarget=m -latest=n --framework net6.0
+cd OTAPI.Patcher/bin/Debug/net9.0
+dotnet run --project ../../../OTAPI.Patcher.csproj -patchTarget=m -latest=n --framework net9.0
 cd ../../../../
 dotnet build OTAPI.Server.Launcher.slnf
-cd OTAPI.Server.Launcher/bin/Debug/net6.0
+cd OTAPI.Server.Launcher/bin/Debug/net9.0
 dotnet OTAPI.Server.Launcher.dll -test-init
 cd ../../../../
-cd OTAPI.Patcher/bin/Debug/net6.0
-dotnet run --project ../../../OTAPI.Patcher.csproj -patchTarget=t -latest=n --framework net6.0
+cd OTAPI.Patcher/bin/Debug/net9.0
+dotnet run --project ../../../OTAPI.Patcher.csproj -patchTarget=t -latest=n --framework net9.0
 cd ../../../../
 dotnet build OTAPI.Server.Launcher.slnf
-cd OTAPI.Server.Launcher/bin/Debug/net6.0
+cd OTAPI.Server.Launcher/bin/Debug/net9.0
 dotnet OTAPI.Server.Launcher.dll -test-init
 cd ../../../../
\ No newline at end of file
diff --git a/docs/OTAPI.Mobile.nuspec b/docs/OTAPI.Mobile.nuspec
index 8f317ab04..2d33d8d16 100644
--- a/docs/OTAPI.Mobile.nuspec
+++ b/docs/OTAPI.Mobile.nuspec
@@ -14,12 +14,12 @@
 
         OTAPI is primarily a server modification and is available as a cross platform package via NuGet.
 
-        Version 3.0 is now a .NET6 library thanks to ModFramework being able to retarget the .NET4 vanilla assembly up to .NET6.
-        This means that any mod you create can be written as a .NET6 module and later merged into the patched assembly thanks to MonoMod.
+        Version 3.0 is now a .NET9 library thanks to ModFramework being able to retarget the .NET4 vanilla assembly up to .NET9.
+        This means that any mod you create can be written as a .NET9 module and later merged into the patched assembly thanks to MonoMod.
 
         Here is what is now possible:
          - Native Runtime hooks, just reference OTAPI.Runtime.dll and register to MonoMod events generated from the Terraria assembly.
-         - Full .NET6 ecosystem and its performance improvements. No need for two targets such as Windows &amp; Mono anymore either.
+         - Full .9 ecosystem and its performance improvements. No need for two targets such as Windows &amp; Mono anymore either.
          - A new optional internal module system via ModFramework to load precompiled dll's, .cs files or even top level classes.
          - A strong set of libraries with methods and extensions to help you build more mods.
          - Create 1 file MonoMod patches to rewrite or inject new meta data to the assembly.
diff --git a/docs/OTAPI.PC.nuspec b/docs/OTAPI.PC.nuspec
index 2b7faf6b1..9b789074b 100644
--- a/docs/OTAPI.PC.nuspec
+++ b/docs/OTAPI.PC.nuspec
@@ -14,12 +14,12 @@
 
         OTAPI is primarily a server modification and is available as a cross platform package via NuGet.
 
-        Version 3.0 is now a .NET6 library thanks to ModFramework being able to retarget the .NET4 vanilla assembly up to .NET6.
-        This means that any mod you create can be written as a .NET6 module and later merged into the patched assembly thanks to MonoMod.
+        Version 3.0 is now a .NET9 library thanks to ModFramework being able to retarget the .NET4 vanilla assembly up to .NET9.
+        This means that any mod you create can be written as a .NET9 module and later merged into the patched assembly thanks to MonoMod.
 
         Here is what is now possible:
          - Native Runtime hooks, just reference OTAPI.Runtime.dll and register to MonoMod events generated from the Terraria assembly.
-         - Full .NET6 ecosystem and its performance improvements. No need for two targets such as Windows &amp; Mono anymore either.
+         - Full .NET9 ecosystem and its performance improvements. No need for two targets such as Windows &amp; Mono anymore either.
          - A new optional internal module system via ModFramework to load precompiled dll's, .cs files or even top level classes.
          - A strong set of libraries with methods and extensions to help you build more mods.
          - Create 1 file MonoMod patches to rewrite or inject new meta data to the assembly.
diff --git a/docs/OTAPI.TML.nuspec b/docs/OTAPI.TML.nuspec
index c8d4abd58..3bc758bd3 100644
--- a/docs/OTAPI.TML.nuspec
+++ b/docs/OTAPI.TML.nuspec
@@ -14,12 +14,12 @@
 
         OTAPI is primarily a server modification and is available as a cross platform package via NuGet.
 
-        Version 3.0 is now a .NET6 library thanks to ModFramework being able to retarget the .NET4 vanilla assembly up to .NET6.
-        This means that any mod you create can be written as a .NET6 module and later merged into the patched assembly thanks to MonoMod.
+        Version 3.0 is now a .NET9 library thanks to ModFramework being able to retarget the .NET4 vanilla assembly up to .NET9.
+        This means that any mod you create can be written as a .NET9 module and later merged into the patched assembly thanks to MonoMod.
 
         Here is what is now possible:
          - Native Runtime hooks, just reference OTAPI.Runtime.dll and register to MonoMod events generated from the Terraria assembly.
-         - Full .NET6 ecosystem and its performance improvements. No need for two targets such as Windows &amp; Mono anymore either.
+         - Full .NET9 ecosystem and its performance improvements. No need for two targets such as Windows &amp; Mono anymore either.
          - A new optional internal module system via ModFramework to load precompiled dll's, .cs files or even top level classes.
          - A strong set of libraries with methods and extensions to help you build more mods.
          - Create 1 file MonoMod patches to rewrite or inject new meta data to the assembly.
diff --git a/examples/RuntimeExample.Client/RuntimeExample.Client.csproj b/examples/RuntimeExample.Client/RuntimeExample.Client.csproj
index c648d96d3..7bedff42a 100644
--- a/examples/RuntimeExample.Client/RuntimeExample.Client.csproj
+++ b/examples/RuntimeExample.Client/RuntimeExample.Client.csproj
@@ -1,30 +1,30 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net9.0</TargetFramework>
+	</PropertyGroup>
 
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\ModFramework\ModFramework.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="OTAPI.Runtime">
-      <HintPath>..\..\OTAPI.Client.Installer\bin\Debug\net472\OTAPI.Runtime.dll</HintPath>
-    </Reference>
-    <Reference Include="OTAPI">
-      <HintPath>..\..\OTAPI.Patcher\bin\Debug\net6.0\OTAPI.exe</HintPath>
-    </Reference>
-    <Reference Include="FNA">
-      <HintPath>..\..\OTAPI.Patcher\bin\Debug\net6.0\FNA.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="ImGui.NET" Version="1.78.0" />
-  </ItemGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="ModFramework" Version="1.1.11" />
+	</ItemGroup>
+	<ItemGroup>
+		<Reference Include="OTAPI.Runtime">
+			<HintPath>..\..\OTAPI.Client.Launcher\bin\Debug\$(TargetFramework)\client\OTAPI.Runtime.dll</HintPath>
+		</Reference>
+		<Reference Include="OTAPI">
+			<HintPath>..\..\OTAPI.Client.Launcher\bin\Debug\$(TargetFramework)\client\OTAPI.exe</HintPath>
+		</Reference>
+		<Reference Include="FNA">
+			<HintPath>..\..\OTAPI.Patcher\bin\Debug\$(TargetFramework)\FNA.dll</HintPath>
+		</Reference>
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="ImGui.NET" Version="1.78.0" />
+	</ItemGroup>
 </Project>
diff --git a/examples/RuntimeExample.Server/MyClass.cs b/examples/RuntimeExample.Server/MyClass.cs
index f6a6b4ef4..1a2f25ce8 100644
--- a/examples/RuntimeExample.Server/MyClass.cs
+++ b/examples/RuntimeExample.Server/MyClass.cs
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2020 DeathCradle
+Copyright (C) 2020-2024 SignatureBeef
 
 This file is part of Open Terraria API v3 (OTAPI)
 
@@ -17,30 +17,34 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-using System;
+using System;
+using System.Runtime.InteropServices;
 using ModFramework;
 
-namespace RuntimeExample.Server;
-
-public static class Hooks
-{
-    [Modification(ModType.Runtime, "Loading Runtime Example!")]
-    public static void OnRunning()
-    {
-        Console.WriteLine("[RuntimeExample Server] Hello World! from a compiled DLL");
-        On.Terraria.Program.LaunchGame += Program_LaunchGame;
-        On.Terraria.NetMessage.greetPlayer += NetMessage_greetPlayer;
-    }
-
-    private static void NetMessage_greetPlayer(On.Terraria.NetMessage.orig_greetPlayer orig, int plr)
-    {
-        Console.WriteLine($"[RuntimeExample Server] Greet player: {plr}");
-        orig(plr);
-    }
-
-    private static void Program_LaunchGame(On.Terraria.Program.orig_LaunchGame orig, string[] args, bool monoArgs)
-    {
-        Console.WriteLine("[RuntimeExample Server] LaunchGame was called!");
-        orig(args, monoArgs);
-    }
+namespace RuntimeExample.Server;
+
+public static class Hooks
+{
+    [Modification(ModType.Runtime, "Loading Runtime Example!")]
+    public static void OnRunning()
+    {
+        Console.WriteLine("[RuntimeExample Server] Hello World! from a compiled DLL");
+
+        if (RuntimeInformation.ProcessArchitecture != Architecture.Arm64)
+            On.Terraria.NetMessage.greetPlayer += MonoMod_greetPlayer;
+        else
+            HookEvents.Terraria.NetMessage.greetPlayer += Modfw_greetPlayer;
+    }
+
+    private static void MonoMod_greetPlayer(On.Terraria.NetMessage.orig_greetPlayer orig, int plr)
+    {
+        Console.WriteLine($"[RuntimeExample Server] Greet player: {plr}");
+        orig(plr);
+    }
+
+    private static void Modfw_greetPlayer(object sender, HookEvents.Terraria.NetMessage.greetPlayerEventArgs args)
+    {
+        Console.WriteLine($"[RuntimeExample Server] Greet player: {args.plr}");
+        args.OriginalMethod(args.plr);
+    }
 }
diff --git a/examples/RuntimeExample.Server/RuntimeExample.Server.csproj b/examples/RuntimeExample.Server/RuntimeExample.Server.csproj
index 87bcff5eb..7edbfda9c 100644
--- a/examples/RuntimeExample.Server/RuntimeExample.Server.csproj
+++ b/examples/RuntimeExample.Server/RuntimeExample.Server.csproj
@@ -1,24 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <OutputType>Library</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-    <Configurations>Debug;Release</Configurations>
-  </PropertyGroup>
+	<PropertyGroup>
+		<OutputType>Library</OutputType>
+		<TargetFramework>net9.0</TargetFramework>
+		<Configurations>Debug;Release</Configurations>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="ModFramework" Version="1.1.7" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="ModFramework" Version="1.1.11" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="OTAPI">
-      <HintPath>..\..\OTAPI.Patcher\bin\Debug\$(TargetFramework)\OTAPI.dll</HintPath>
-    </Reference>
-    <Reference Include="OTAPI.Runtime">
-      <HintPath>..\..\OTAPI.Patcher\bin\Debug\$(TargetFramework)\OTAPI.Runtime.dll</HintPath>
-    </Reference>
-  </ItemGroup>
+	<ItemGroup>
+		<Reference Include="OTAPI">
+			<HintPath>..\..\OTAPI.Patcher\bin\Debug\$(TargetFramework)\OTAPI.dll</HintPath>
+		</Reference>
+		<Reference Include="OTAPI.Runtime">
+			<HintPath>..\..\OTAPI.Patcher\bin\Debug\$(TargetFramework)\OTAPI.Runtime.dll</HintPath>
+		</Reference>
+	</ItemGroup>
 
-  <Import Condition="Exists('..\OTAPI.Patcher\bin\Debug\$(TargetFramework)\AutoGenerated.target')" Project="..\OTAPI.Patcher\bin\Debug\$(TargetFramework)\AutoGenerated.target" />
+	<Import Condition="Exists('..\OTAPI.Patcher\bin\Debug\$(TargetFramework)\AutoGenerated.target')" Project="..\OTAPI.Patcher\bin\Debug\$(TargetFramework)\AutoGenerated.target" />
 </Project>
diff --git a/start-server.ps1 b/start-server.ps1
index a454bf8cd..a165feac1 100644
--- a/start-server.ps1
+++ b/start-server.ps1
@@ -7,7 +7,7 @@ function Write-RuntimeConfig {
 
     $runtimejson = @{
         "runtimeOptions"= @{
-        "tfm"= "net6.0"
+        "tfm"= "net9.0"
         "framework"= @{
             "name"= "Microsoft.NETCore.App"
             "version"= "6.0.0"
@@ -31,8 +31,8 @@ function PC-Server {
     Find-Package -Name Mono.Cecil -ProviderName NuGet | Install-Package -Destination ./server/packages -SkipDependencies
     Find-Package -Name Newtonsoft.Json -ProviderName NuGet | Install-Package -Destination ./server/packages -SkipDependencies
 
-    Copy-Item "./server/packages/OTAPI.Upcoming.3*/lib/net6.0/OTAPI.dll" -Destination "./server/pc/"
-    Copy-Item "./server/packages/ModFramework*/lib/net6.0/ModFramework.dll" -Destination "./server/pc/"
+    Copy-Item "./server/packages/OTAPI.Upcoming.3*/lib/net9.0/OTAPI.dll" -Destination "./server/pc/"
+    Copy-Item "./server/packages/ModFramework*/lib/net9.0/ModFramework.dll" -Destination "./server/pc/"
     Copy-Item "./server/packages/MonoMod*/lib/net5.0/MonoMod.dll" -Destination "./server/pc/"
     Copy-Item "./server/packages/MonoMod.Utils*/lib/net5.0/MonoMod.Utils.dll" -Destination "./server/pc/"
     Copy-Item "./server/packages/MonoMod.RuntimeDetour*/lib/net5.0/MonoMod.RuntimeDetour.dll" -Destination "./server/pc/"
@@ -60,8 +60,8 @@ function Mobile-Server {
     Find-Package -Name Newtonsoft.Json -ProviderName NuGet | Install-Package -Destination ./server/packages -SkipDependencies
     Find-Package -Name System.IO.Packaging -ProviderName NuGet | Install-Package -Destination ./server/packages -SkipDependencies
 
-    Copy-Item "./server/packages/OTAPI.Upcoming.Mobile*/lib/net6.0/OTAPI.dll" -Destination "./server/mobile/"
-    Copy-Item "./server/packages/ModFramework*/lib/net6.0/ModFramework.dll" -Destination "./server/mobile/"
+    Copy-Item "./server/packages/OTAPI.Upcoming.Mobile*/lib/net9.0/OTAPI.dll" -Destination "./server/mobile/"
+    Copy-Item "./server/packages/ModFramework*/lib/net9.0/ModFramework.dll" -Destination "./server/mobile/"
     Copy-Item "./server/packages/MonoMod*/lib/net5.0/MonoMod.dll" -Destination "./server/mobile/"
     Copy-Item "./server/packages/MonoMod.Utils*/lib/net5.0/MonoMod.Utils.dll" -Destination "./server/mobile/"
     Copy-Item "./server/packages/MonoMod.RuntimeDetour*/lib/net5.0/MonoMod.RuntimeDetour.dll" -Destination "./server/mobile/"
@@ -98,11 +98,11 @@ function TML-Server {
 
     Expand-Archive -Force ./server/tModLoader.zip -DestinationPath ./server/tModLoader
 
-    Copy-Item "./server/packages/OTAPI.Upcoming.tModLoader*/lib/net6.0/OTAPI.dll" -Destination "./server/tModLoader/"
-    Copy-Item "./server/packages/OTAPI.Upcoming.tModLoader*/lib/net6.0/OTAPI.Runtime.dll" -Destination "./server/tModLoader/"
+    Copy-Item "./server/packages/OTAPI.Upcoming.tModLoader*/lib/net9.0/OTAPI.dll" -Destination "./server/tModLoader/"
+    Copy-Item "./server/packages/OTAPI.Upcoming.tModLoader*/lib/net9.0/OTAPI.Runtime.dll" -Destination "./server/tModLoader/"
 
-    New-Item -ItemType Directory -Force -Path ./server/tModLoader/Libraries/ModFramework/1.0.46-alpha/lib/net6.0
-    Copy-Item "./server/packages/ModFramework*/lib/net6.0/ModFramework.dll" -Destination "./server/tModLoader/Libraries/ModFramework/1.0.46-alpha/lib/net6.0"
+    New-Item -ItemType Directory -Force -Path ./server/tModLoader/Libraries/ModFramework/1.0.46-alpha/lib/net9.0
+    Copy-Item "./server/packages/ModFramework*/lib/net().0/ModFramework.dll" -Destination "./server/tModLoader/Libraries/ModFramework/1.0.46-alpha/lib/net9.0"
 
     New-Item -ItemType Directory -Force -Path ./server/tModLoader/Libraries/monomod/22.5.1.1/lib/net5.0
     Copy-Item "./server/packages/MonoMod*/lib/net5.0/MonoMod.dll" -Destination "./server/tModLoader/Libraries/monomod/22.5.1.1/lib/net5.0"
@@ -154,7 +154,7 @@ function TML-Server {
         }
     }
 
-    Add-Deps-Package -AssemblyName "ModFramework" -AssemblyVersion "1.0.46-alpha" -FrameworkVersion "net6.0"
+    Add-Deps-Package -AssemblyName "ModFramework" -AssemblyVersion "1.0.46-alpha" -FrameworkVersion "net9.0"
     Add-Deps-Package -AssemblyName "MonoMod" -AssemblyVersion "22.5.1.1" -FrameworkVersion "net5.0"
 
     $json = $deps | ConvertTo-Json -Depth 100