Merge pull request #75 from CedaryCat/main

Release

Author: CedaryCat

README.md

@@ -1,4 +1,4 @@
-# UnifierTSL
+# UnifierTSL
 
 > Languages: [English](./README.md) | [简体中文](./docs/README.zh-cn.md)
 
@@ -90,16 +90,16 @@ The baseline values below come straight from project files and runtime version h
 |:--|:--|:--|
 | Target framework | `.NET 9.0` | `src/UnifierTSL/*.csproj` |
 | Terraria | `1.4.5.5` | `src/UnifierTSL/VersionHelper.cs` (assembly file version from OTAPI/Terraria runtime) |
-| OTAPI USP | `1.1.0-pre-release-upstream.26` | `src/UnifierTSL/UnifierTSL.csproj` |
+| OTAPI USP | `1.1.0-pre-release-upstream.29` | `src/UnifierTSL/UnifierTSL.csproj` |
 
 <details>
 <summary><strong>TShock and dependency details</strong></summary>
 
 | Item | Value |
 |:--|:--|
-| Bundled TShock version | `6.0.0` |
+| Bundled TShock version | `6.1.0` |
 | Sync branch | `general-devel` |
-| Sync commit | `0dbb07854cf9cb4e47e315d6160d785d51a27788` |
+| Sync commit | `1afaeb514343ca547abceeb357654603d1e2a456` |
 | Source | `src/Plugins/TShockAPI/TShockAPI.csproj` |
 
 Additional dependency baselines:
@@ -536,3 +536,4 @@ This table reflects the currently maintained/documented packaging targets, not e
 <p align="center">
   <sub>Made with ❤️ by the UnifierTSL contributors · Licensed under GPL-3.0</sub>
 </p>
+

docs/README.zh-cn.md

@@ -1,4 +1,4 @@
-# UnifierTSL
+# UnifierTSL
 
 > Languages: [English](../README.md) | [简体中文](./README.zh-cn.md)
 
@@ -90,16 +90,16 @@ UnifierTSL 把 [OTAPI Unified Server Process](https://github.com/CedaryCat/OTAPI
 |:--|:--|:--|
 | 目标框架 | `.NET 9.0` | `src/UnifierTSL/*.csproj` |
 | Terraria | `1.4.5.5` | `src/UnifierTSL/VersionHelper.cs`（从 OTAPI/Terraria 运行时程序集文件版本读取） |
-| OTAPI USP | `1.1.0-pre-release-upstream.26` | `src/UnifierTSL/UnifierTSL.csproj` |
+| OTAPI USP | `1.1.0-pre-release-upstream.29` | `src/UnifierTSL/UnifierTSL.csproj` |
 
 <details>
 <summary><strong>TShock 与依赖详情</strong></summary>
 
 | 项目 | 值 |
 |:--|:--|
-| 内置 TShock 版本 | `6.0.0` |
+| 内置 TShock 版本 | `6.1.0` |
 | 同步分支 | `general-devel` |
-| 同步提交 | `0dbb07854cf9cb4e47e315d6160d785d51a27788` |
+| 同步提交 | `1afaeb514343ca547abceeb357654603d1e2a456` |
 | 来源 | `src/Plugins/TShockAPI/TShockAPI.csproj` |
 
 附加依赖版本：
@@ -536,3 +536,4 @@ dotnet run --project src/UnifierTSL.Publisher/UnifierTSL.Publisher.csproj -- \
 <p align="center">
   <sub>Made with ❤️ by the UnifierTSL contributors · Licensed under GPL-3.0</sub>
 </p>
+

src/Plugins/TShockAPI/SaveManager.cs

@@ -33,26 +33,28 @@ static SaveManager() {
             _channel = Channel.CreateUnbounded<SaveTask?>();
             _saveWorkerTask = Task.Run(SaveWorkerAsync);
 
-            On.Terraria.IO.WorldFileSystemContext.SaveWorld_bool_bool += OnSaveWorld;
+            On.Terraria.IO.WorldFileSystemContext._SaveWorld += OnSaveWorld;
             TShock.DisposingEvent += Dispose;
         }
 
-        private static void OnSaveWorld(On.Terraria.IO.WorldFileSystemContext.orig_SaveWorld_bool_bool orig, 
+        private static void OnSaveWorld(On.Terraria.IO.WorldFileSystemContext.orig__SaveWorld orig, 
             Terraria.IO.WorldFileSystemContext self, 
             bool useCloudSaving,
-            bool resetTime) {
+            bool resetTime,
+            bool useTemps,
+            bool canBeSkipped) {
 
             if (self.root is ServerContext server) {
                 OnSaveWorld(server);
             }
-            orig(self, useCloudSaving, resetTime);
+            orig(self, useCloudSaving, resetTime, useTemps, canBeSkipped);
         }
 
         private static void Dispose() {
             _channel.Writer.TryWrite(null); // Signal exit
             _saveWorkerTask.Wait();
 
-            On.Terraria.IO.WorldFileSystemContext.SaveWorld_bool_bool -= OnSaveWorld;
+            On.Terraria.IO.WorldFileSystemContext._SaveWorld -= OnSaveWorld;
         }
 
         public static void OnSaveWorld(ServerContext server) {

src/Plugins/TShockAPI/TShockAPI.csproj

@@ -8,8 +8,8 @@
 		<!-- Parallel mainline sync baseline tracking -->
 		<MainlineSyncRepo>https://github.com/Pryaxis/TShock.git</MainlineSyncRepo>
 		<MainlineSyncBranch>general-devel</MainlineSyncBranch>
-		<MainlineSyncCommit>0dbb07854cf9cb4e47e315d6160d785d51a27788</MainlineSyncCommit>
-		<MainlineVersion>6.0.0</MainlineVersion>
+		<MainlineSyncCommit>1afaeb514343ca547abceeb357654603d1e2a456</MainlineSyncCommit>
+		<MainlineVersion>6.1.0</MainlineVersion>
 
 		<!-- Packaging and identity: this is the UnifierTSL migration package, not upstream's official package -->
 		<GeneratePackageOnBuild>false</GeneratePackageOnBuild>

src/UnifierTSL/SynchronizedGuard.cs

@@ -26,8 +26,8 @@ static SynchronizedGuard() {
             On.Terraria.IO.FavoritesFile.Load
                 += (orig, file, root)
                 => { lock (favoritesFileLock) { orig(file, root); } };
-            On.Terraria.IO.WorldFileSystemContext.SaveWorld_bool_bool
-                += (orig, self, _, resetTime)
+            On.Terraria.IO.WorldFileSystemContext._SaveWorld
+                += (orig, self, _, resetTime, useTemps, canBeSkipped)
                 => {
                     UnifiedServerProcess.RootContext s = self.root;
                     if (s.Main.worldName == "") {
@@ -38,7 +38,7 @@ static SynchronizedGuard() {
                     }
                     using (FileLockManager.Enter(self.root.Main.worldPathName)) {
                         FileUtilities.ProtectedInvoke(delegate {
-                            self.InternalSaveWorld(false, resetTime);
+                            self.InternalSaveWorld(false, resetTime, useTemps);
                         });
                     }
                 };

src/UnifierTSL/UnifierTSL.csproj

@@ -35,7 +35,7 @@
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="OTAPI.USP" Version="1.1.0-pre-release-upstream.26" />
+		<PackageReference Include="OTAPI.USP" Version="1.1.0-pre-release-upstream.29" />
 		<PackageReference Include="ModFramework" Version="1.1.15" />
 		<PackageReference Include="MonoMod.RuntimeDetour" Version="25.2.3" />
 		<PackageReference Include="MonoMod.RuntimeDetour.HookGen" Version="22.7.31.1" />