Upgrade to .NET 9 and OTAPI Static Hooks for ARM64

.github/workflows/ci-otapi3-nuget.yml

@@ -11,13 +11,13 @@ jobs:
     environment: release
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: 'recursive'
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 6.0.400
+        dotnet-version: 9.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

.github/workflows/ci-otapi3.yml

@@ -7,13 +7,13 @@ jobs:
     runs-on: windows-latest
 
     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.100'
+          dotnet-version: 9.0.x
 
       - name: Run tests
         run: dotnet test
@@ -25,53 +25,53 @@ jobs:
         arch: ["win-x64", "osx-x64", "linux-x64", "linux-arm64", "linux-arm"]
 
     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.100'
+          dotnet-version: 9.0.x
 
       - name: Install msgfmt
         run: sudo apt-get install -y gettext
 
       - name: Produce installer
         run: |
             cd TShockInstaller
-            dotnet publish -r ${{ matrix.arch }} -f net6.0 -c Release -p:PublishSingleFile=true --self-contained true
+            dotnet publish -r ${{ matrix.arch }} -f net9.0 -c Release -p:PublishSingleFile=true --self-contained true
 
       - name: Produce build
         run: |
             cd TShockLauncher
-            dotnet publish -r ${{ matrix.arch }} -f net6.0 -c Release -p:PublishSingleFile=true --self-contained false
+            dotnet publish -r ${{ matrix.arch }} -f net9.0 -c Release -p:PublishSingleFile=true --self-contained false
 
       - name: Chmod scripts
         if: ${{ matrix.arch != 'win-x64' }}
         run: |
-            chmod +x TShockLauncher/bin/Release/net6.0/${{ matrix.arch }}/publish/TShock.Server
+            chmod +x TShockLauncher/bin/Release/net9.0/${{ matrix.arch }}/publish/TShock.Server
 
       - name: Copy installer
         run: |
-            cp TShockInstaller/bin/Release/net6.0/${{ matrix.arch }}/publish/* TShockLauncher/bin/Release/net6.0/${{ matrix.arch }}/publish/
+            cp TShockInstaller/bin/Release/net9.0/${{ matrix.arch }}/publish/* TShockLauncher/bin/Release/net9.0/${{ matrix.arch }}/publish/
 
       # preserve file perms: https://github.com/actions/upload-artifact#maintaining-file-permissions-and-case-sensitive-files
       - name: Tarball artifact (non-Windows)
         if: ${{ matrix.arch != 'win-x64' }}
         run: |
-            cd TShockLauncher/bin/Release/net6.0/${{ matrix.arch }}/publish/
+            cd TShockLauncher/bin/Release/net9.0/${{ matrix.arch }}/publish/
             tar -cvf ../../../../../../TShock-Beta-${{ matrix.arch }}-Release.tar *
 
       - name: Upload artifact (non-Windows)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ matrix.arch != 'win-x64' }}
         with:
           name: TShock-Beta-${{ matrix.arch }}-Release
           path: TShock-Beta-${{ matrix.arch }}-Release.tar
 
       - name: Upload artifact (Windows)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ matrix.arch == 'win-x64' }}
         with:
           name: TShock-Beta-${{ matrix.arch }}-Release
-          path: TShockLauncher/bin/Release/net6.0/${{ matrix.arch }}/publish/
+          path: TShockLauncher/bin/Release/net9.0/${{ matrix.arch }}/publish/

.vscode/launch.json

@@ -9,12 +9,9 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/TShockLauncher/bin/Debug/net6.0/TShock.Run.dll",
-            "windows": {
-                "program": "${workspaceFolder}/TShockLauncher/bin/Debug/net6.0/TShock.dll",
-            },
+            "program": "${workspaceFolder}/TShockLauncher/bin/Debug/net9.0/TShock.Server.dll",
             "args": [],
-            "cwd": "${workspaceFolder}/TShockLauncher/bin/Debug/net6.0/",
+            "cwd": "${workspaceFolder}/TShockLauncher/bin/Debug/net9.0/",
             "console": "integratedTerminal",
             "stopAtEntry": false
         },

.vscode/tasks.json

@@ -35,7 +35,7 @@
         {
             "label": "Remote Publish",
             "options": {
-                "cwd": "TShockLauncher/bin/Debug/net6.0/linux-arm64"
+                "cwd": "TShockLauncher/bin/Debug/net9.0/linux-arm64"
             },
             "command": "C:\\Program Files\\PuTTY\\pscp.exe",
             "type": "process",

Dockerfile

@@ -1,7 +1,7 @@
 # TARGETPLATFORM and BUILDPLATFORM are automatically filled in by Docker buildx.
 # They should not be set in the global scope manually.
 
-FROM --platform=${BUILDPLATFORM} mcr.microsoft.com/dotnet/sdk:6.0 AS builder
+FROM --platform=${BUILDPLATFORM} mcr.microsoft.com/dotnet/sdk:9.0 AS builder
 
 # Copy build context
 WORKDIR /TShock
@@ -27,7 +27,7 @@ RUN \
     *) echo "Error: Unsupported platform ${TARGETPLATFORM}" && exit 1 \
     ;; \
   esac && \
-  dotnet publish -o output/ -r "${ARCH}" -v m -f net6.0 -c Release -p:PublishSingleFile=true --self-contained false
+  dotnet publish -o output/ -r "${ARCH}" -v m -f net9.0 -c Release -p:PublishSingleFile=true --self-contained false
 
 # Runtime image
 FROM --platform=${TARGETPLATFORM} mcr.microsoft.com/dotnet/runtime:6.0 AS runner

README.md

@@ -32,9 +32,9 @@ If you want to run the `TShockLauncher` (which runs a server), run:
 To produce a packaged release (suitable for distribution), run:
 
 1. `cd TShockLauncher`
-1. `dotnet publish -r win-x64 -f net6.0 -c Release -p:PublishSingleFile=true --self-contained false`
+1. `dotnet publish -r win-x64 -f net9.0 -c Release -p:PublishSingleFile=true --self-contained false`
 
-Note that in this example, you'd be building for `win-x64`. You can build for `win-x64`, `osx-x64`, `linux-x64`, `linux-arm64`, `linux-arm`. Your release will be in the `TShockLauncher/bin/Release/net6.0/` folder under the architecture you specified.
+Note that in this example, you'd be building for `win-x64`. You can build for `win-x64`, `osx-x64`, `linux-x64`, `linux-arm64`, `linux-arm`. Your release will be in the `TShockLauncher/bin/Release/net9.0/` folder under the architecture you specified.
 
 ### Working with Terraria
 

README_cn.md

@@ -30,9 +30,9 @@ TShock是为泰拉瑞亚服务器和社区开发的一个工具箱。这个工
 如果要生成打包后的发行版，运行：
 
 1. `cd TShockLauncher`
-1. `dotnet publish -r win-x64 -f net6.0 -c Release -p:PublishSingleFile=true --self-contained false`
+1. `dotnet publish -r win-x64 -f net9.0 -c Release -p:PublishSingleFile=true --self-contained false`
 
-注意在这个例子中你将会生成`win-x64`架构的版本。你也可以生成`win-x64`、`osx-x64`、`linux-x64`、`linux-arm64`、`linux-arm`的版本。你可以在`TShockLauncher/bin/Release/net6.0/`文件夹下对应架构的文件夹里找到生成后的发行版。
+注意在这个例子中你将会生成`win-x64`架构的版本。你也可以生成`win-x64`、`osx-x64`、`linux-x64`、`linux-arm64`、`linux-arm`的版本。你可以在`TShockLauncher/bin/Release/net9.0/`文件夹下对应架构的文件夹里找到生成后的发行版。
 
 ### 跟泰拉瑞亚本体代码交互
 

TShockAPI/TShock.cs

@@ -428,8 +428,6 @@
 				Hooks.AccountHooks.AccountDelete += OnAccountDelete;
 				Hooks.AccountHooks.AccountCreate += OnAccountCreate;
 
-				On.Terraria.RemoteClient.Reset += RemoteClient_Reset;
-
 				GetDataHandlers.InitGetDataHandler();
 				Commands.InitCommands();
 
@@ -449,7 +447,7 @@
 					// Initialize the AchievementManager, which is normally only done on clients.
 					Game._achievements = new AchievementManager();
 
-					IL.Terraria.Initializers.AchievementInitializer.Load += OnAchievementInitializerLoad;
+					OTAPI.Hooks.Initializers.AchievementInitializerLoad += OnAchievementInitializerLoad;
 
 					// Actually call AchievementInitializer.Load, which is also normally only done on clients.
 					AchievementInitializer.Load();
@@ -498,17 +496,9 @@
 			}
 		}
 
-		private static void RemoteClient_Reset(On.Terraria.RemoteClient.orig_Reset orig, RemoteClient client)
-		{
-			client.ClientUUID = null;
-			orig(client);
-		}
-
-		private static void OnAchievementInitializerLoad(ILContext il)
+		private static void OnAchievementInitializerLoad(object sender, OTAPI.Hooks.Initializers.AchievementInitializerLoadEventArgs args)
 		{
-			// Modify AchievementInitializer.Load to remove the Main.netMode == 2 check (occupies the first 4 IL instructions)
-			for (var i = 0; i < 4; i++)
-				il.Body.Instructions.RemoveAt(0);
+			args.ShouldLoad = true;
 		}
 
 		protected void CrashReporter_HeapshotRequesting(object sender, EventArgs e)
@@ -532,7 +522,7 @@
 				}
 				SaveManager.Instance.Dispose();
 
-				IL.Terraria.Initializers.AchievementInitializer.Load -= OnAchievementInitializerLoad;
+				OTAPI.Hooks.Initializers.AchievementInitializerLoad -= OnAchievementInitializerLoad;
 
 				ModuleManager.Dispose();
 

TShockAPI/TShockAPI.csproj

@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <!-- 
@@ -33,9 +33,9 @@
 
   <ItemGroup>
     <PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
-    <PackageReference Include="GetText.NET" Version="1.7.14" />
-    <PackageReference Include="MySql.Data" Version="8.0.31" />
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.11" />
+    <PackageReference Include="GetText.NET" Version="8.0.5" />
+    <PackageReference Include="MySql.Data" Version="9.1.0" />
+    <PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>

TShockInstaller/Program.cs

@@ -27,11 +27,11 @@
 
 string? url = null;
 if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-	url = $"https://dotnetcli.azureedge.net/dotnet/Runtime/6.0.11/dotnet-runtime-6.0.11-osx-{arch}.tar.gz";
+	url = $"https://dotnetcli.azureedge.net/dotnet/Runtime/9.0.0/dotnet-runtime-9.0.0-osx-{arch}.tar.gz";
 else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-	url = $"https://dotnetcli.azureedge.net/dotnet/Runtime/6.0.11/dotnet-runtime-6.0.11-win-{arch}.zip";
+	url = $"https://dotnetcli.azureedge.net/dotnet/Runtime/9.0.0/dotnet-runtime-9.0.0-win-{arch}.zip";
 else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-	url = $"https://dotnetcli.azureedge.net/dotnet/Runtime/6.0.11/dotnet-runtime-6.0.11-linux-{arch}.tar.gz";
+	url = $"https://dotnetcli.azureedge.net/dotnet/Runtime/9.0.0/dotnet-runtime-9.0.0-linux-{arch}.tar.gz";
 
 if(url is null)
 {

TShockInstaller/TShockInstaller.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Version>5.0.0</Version>

TShockLauncher.Tests/GroupTests.cs

@@ -21,17 +21,17 @@ public void TestPermissions()
 		groups.AddPermissions("test", new() { "abc" });
 
 		var hasperm = groups.GetGroupByName("test").Permissions.Contains("abc");
-		Assert.IsTrue(hasperm);
+		Assert.That(hasperm, Is.True);
 
 		groups.DeletePermissions("test", new() { "abc" });
 
 		hasperm = groups.GetGroupByName("test").Permissions.Contains("abc");
-		Assert.IsFalse(hasperm);
+		Assert.That(hasperm, Is.False);
 
 		groups.DeleteGroup("test");
 
 		var g = groups.GetGroupByName("test");
-		Assert.IsNull(g);
+		Assert.That(g, Is.Null);
 	}
 }
 

TShockLauncher.Tests/ServerInitTests.cs

@@ -14,20 +14,21 @@ public class ServerInitTests
 	public void EnsureBoots()
 	{
 		var are = new AutoResetEvent(false);
-		On.Terraria.Main.hook_DedServ cb = (On.Terraria.Main.orig_DedServ orig, Terraria.Main instance) =>
+		HookEvents.HookDelegate<Terraria.Main, HookEvents.Terraria.Main.DedServEventArgs> cb = (instance, args) =>
 		{
+			args.ContinueExecution = false;
 			are.Set();
 			Debug.WriteLine("Server init process successful");
 		};
-		On.Terraria.Main.DedServ += cb;
+		HookEvents.Terraria.Main.DedServ += cb;
 
-		new Thread(() => TerrariaApi.Server.Program.Main(new string[] { })).Start();
+		new Thread(() => TerrariaApi.Server.Program.Main([])).Start();
 
 		var hit = are.WaitOne(TimeSpan.FromSeconds(10));
 
-		On.Terraria.Main.DedServ -= cb;
+		HookEvents.Terraria.Main.DedServ -= cb;
 
-		Assert.IsTrue(hit);
+		Assert.That(hit, Is.True);
 	}
 }
 

TShockLauncher.Tests/TShockLauncher.Tests.csproj

@@ -1,17 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-    <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Include="NUnit.Analyzers" Version="3.5.0" />
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="NUnit" Version="4.3.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.6.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="6.0.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

TShockLauncher/Program.cs

@@ -27,22 +27,12 @@ You should have received a copy of the GNU General Public License
  */
 
 using System.Reflection;
-using TShockPluginManager;
-
-if (args.Length > 0 && args[0].ToLower() == "plugins")
-{
-	var items = args.ToList();
-	items.RemoveAt(0);
-	await NugetCLI.Main(items);
-	return;
-}
-
 
 Dictionary<string, Assembly> _cache = new Dictionary<string, Assembly>();
 
 System.Runtime.Loader.AssemblyLoadContext.Default.Resolving += Default_Resolving;
 
-Start();
+await StartAsync();
 
 /// <summary>
 /// Resolves a module from the ./bin folder, either with a .dll by preference or .exe
@@ -53,6 +43,7 @@ You should have received a copy of the GNU General Public License
 	if (_cache.TryGetValue(arg2.Name, out Assembly? asm) && asm is not null) return asm;
 
 	var loc = Path.Combine(AppContext.BaseDirectory, "bin", arg2.Name + ".dll");
+
 	if (File.Exists(loc))
 		asm = arg1.LoadFromAssemblyPath(loc);
 
@@ -70,7 +61,15 @@ You should have received a copy of the GNU General Public License
 /// Initiates the TSAPI server.
 /// </summary>
 /// <remarks>This method exists so that the resolver can attach before TSAPI needs its dependencies.</remarks>
-void Start()
+async Task StartAsync()
 {
+	if (args.Length > 0 && args[0].ToLower() == "plugins")
+	{
+		var items = args.ToList();
+		items.RemoveAt(0);
+		await TShockPluginManager.NugetCLI.Main(items);
+		return;
+	}
+
 	TerrariaApi.Server.Program.Main(args);
 }