[release/3.7] 优化陶瓦联机 (#4751)

Glavo · burningtnt · Copilot · web-flow · commit 6375558591be · 2025-11-03T20:14:05.000+08:00
#4723 #4750 #4735 --------- Co-authored-by: Burning_TNT <pangyl08@163.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaManager.java b/HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaManager.java
@@ -45,6 +45,7 @@
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.concurrent.CancellationException;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.locks.LockSupport;
@@ -61,22 +62,20 @@ private TerracottaManager() {
     private static final InvocationDispatcher<TerracottaState> STATE_D = InvocationDispatcher.runOn(Platform::runLater, STATE::set);
 
     static {
-        Task.runAsync(() -> {
-            if (TerracottaMetadata.PROVIDER == null) {
-                setState(new TerracottaState.Fatal(TerracottaState.Fatal.Type.OS));
-                LOG.warning("Terracotta hasn't support your OS: " + org.jackhuang.hmcl.util.platform.Platform.SYSTEM_PLATFORM);
-            } else {
+        Schedulers.io().execute(() -> {
+            try {
+                if (TerracottaMetadata.PROVIDER == null)
+                    throw new IOException("Unsupported platform: " + org.jackhuang.hmcl.util.platform.Platform.CURRENT_PLATFORM);
+
                 switch (TerracottaMetadata.PROVIDER.status()) {
                     case NOT_EXIST -> setState(new TerracottaState.Uninitialized(false));
                     case LEGACY_VERSION -> setState(new TerracottaState.Uninitialized(true));
                     case READY -> launch(setState(new TerracottaState.Launching()));
                 }
-            }
-        }).whenComplete(exception -> {
-            if (exception != null) {
+            } catch (Exception e) {
                 compareAndSet(TerracottaState.Bootstrap.INSTANCE, new TerracottaState.Fatal(TerracottaState.Fatal.Type.UNKNOWN));
             }
-        }).start();
+        });
     }
 
     public static ReadOnlyObjectProperty<TerracottaState> stateProperty() {
@@ -143,12 +142,7 @@ public static TerracottaState.Preparing install(@Nullable Path file) {
             return null;
         }
 
-        TerracottaState.Preparing preparing;
-        if (state instanceof TerracottaState.Preparing it) {
-            preparing = it;
-        } else {
-            preparing = new TerracottaState.Preparing(new ReadOnlyDoubleWrapper(-1));
-        }
+        TerracottaState.Preparing preparing = new TerracottaState.Preparing(new ReadOnlyDoubleWrapper(-1));
 
         Task.supplyAsync(Schedulers.io(), () -> {
             return file != null ? TarFileTree.open(file) : null;
@@ -173,6 +167,7 @@ public static TerracottaState.Preparing install(@Nullable Path file) {
                 if (compareAndSet(preparing, launching)) {
                     launch(launching);
                 }
+            } else if (exception instanceof CancellationException) {
             } else if (exception instanceof ITerracottaProvider.ArchiveFileMissingException) {
                 LOG.warning("Cannot install terracotta from local package.", exception);
                 compareAndSet(preparing, new TerracottaState.Fatal(TerracottaState.Fatal.Type.INSTALL));
@@ -183,7 +178,7 @@ public static TerracottaState.Preparing install(@Nullable Path file) {
             }
         }).start();
 
-        return setState(preparing);
+        return compareAndSet(state, preparing) ? preparing : null;
     }
 
     private static ITerracottaProvider getProvider() {
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaMetadata.java b/HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaMetadata.java
@@ -147,7 +147,7 @@ private static ProviderContext locateProvider(Config config) {
         String arch = Architecture.SYSTEM_ARCH.getCheckedName();
         return switch (OperatingSystem.CURRENT_OS) {
             case WINDOWS -> {
-                if (!OperatingSystem.SYSTEM_VERSION.isAtLeast(OSVersion.WINDOWS_8_1))
+                if (!OperatingSystem.SYSTEM_VERSION.isAtLeast(OSVersion.WINDOWS_10))
                     yield null;
 
                 TerracottaNative target = config.of("windows-%s.exe".formatted(arch));
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaState.java b/HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaState.java
@@ -298,7 +298,7 @@ public Type getType() {
         }
 
         public boolean isRecoverable() {
-            return this.type != Type.OS && this.type != Type.UNKNOWN;
+            return this.type != Type.UNKNOWN;
         }
     }
 }
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/terracotta/provider/MacOSProvider.java b/HMCL/src/main/java/org/jackhuang/hmcl/terracotta/provider/MacOSProvider.java
@@ -17,8 +17,10 @@
  */
 package org.jackhuang.hmcl.terracotta.provider;
 
+import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.terracotta.TerracottaNative;
+import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.platform.ManagedProcess;
 import org.jackhuang.hmcl.util.platform.SystemUtils;
 import org.jackhuang.hmcl.util.tree.TarFileTree;
@@ -27,11 +29,13 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
 import java.nio.file.attribute.PosixFilePermission;
 import java.util.List;
 import java.util.Set;
 
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 
 public final class MacOSProvider implements ITerracottaProvider {
     public final TerracottaNative installer, binary;
@@ -62,19 +66,39 @@ public Task<?> install(Context context, @Nullable TarFileTree tree) throws IOExc
 
         return Task.allOf(
                 installerTask.thenComposeAsync(() -> {
+                    Path osascript = SystemUtils.which("osascript");
+                    if (osascript == null) {
+                        throw new IllegalStateException("Cannot locate 'osascript' system executable on MacOS for installing Terracotta.");
+                    }
+
+                    Path pkg = Files.createTempDirectory(Metadata.HMCL_GLOBAL_DIRECTORY, "terracotta-pkg")
+                            .toRealPath()
+                            .resolve(FileUtils.getName(installer.getPath()));
+                    Files.copy(installer.getPath(), pkg, StandardCopyOption.REPLACE_EXISTING);
+
                     ManagedProcess process = new ManagedProcess(new ProcessBuilder(
-                            "osascript",
-                            "-e",
-                            String.format(
-                                    "do shell script \"installer -pkg %s -target /\" with prompt \"%s\" with administrator privileges",
-                                    installer.getPath(),
-                                    i18n("terracotta.sudo_installing")
-                            )
-                    ));
+                            osascript.toString(), "-e", String.format(
+                            "do shell script \"installer -pkg '%s' -target /\" with prompt \"%s\" with administrator privileges",
+                            pkg, i18n("terracotta.sudo_installing")
+                    )));
                     process.pumpInputStream(SystemUtils::onLogLine);
                     process.pumpErrorStream(SystemUtils::onLogLine);
 
-                    return Task.fromCompletableFuture(process.getProcess().onExit());
+                    return Task.fromCompletableFuture(process.getProcess().onExit()).thenRunAsync(() -> {
+                        try {
+                            FileUtils.cleanDirectory(pkg.getParent());
+                        } catch (IOException e) {
+                            LOG.warning("Cannot remove temporary Terracotta package file.", e);
+                        }
+
+                        if (process.getExitCode() != 0) {
+                            throw new IllegalStateException(String.format(
+                                    "Cannot install Terracotta %s: system installer exited with code %d",
+                                    pkg,
+                                    process.getExitCode()
+                            ));
+                        }
+                    });
                 }),
                 binaryTask.thenRunAsync(() -> Files.setPosixFilePermissions(binary.getPath(), Set.of(
                         PosixFilePermission.OWNER_READ,
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/RootPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/RootPage.java
@@ -30,6 +30,7 @@
 import org.jackhuang.hmcl.setting.Profiles;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.terracotta.TerracottaMetadata;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
@@ -49,6 +50,7 @@
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.TaskCancellationAction;
 import org.jackhuang.hmcl.util.io.CompressingUtils;
+import org.jackhuang.hmcl.util.platform.*;
 import org.jackhuang.hmcl.util.versioning.VersionNumber;
 
 import java.nio.file.Files;
@@ -186,7 +188,25 @@ protected Skin(RootPage control) {
             terracottaItem.setLeftGraphic(wrap(SVG.GRAPH2));
             terracottaItem.setActionButtonVisible(false);
             terracottaItem.setTitle(i18n("terracotta"));
-            terracottaItem.setOnAction(e -> Controllers.navigate(Controllers.getTerracottaPage()));
+
+            terracottaItem.setOnAction(e -> {
+                if (TerracottaMetadata.PROVIDER != null) {
+                    Controllers.navigate(Controllers.getTerracottaPage());
+                } else {
+                    String message;
+                    if (Architecture.SYSTEM_ARCH.getBits() == Bits.BIT_32)
+                        message = i18n("terracotta.unsupported.arch.32bit");
+                    else if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS
+                            && !OperatingSystem.SYSTEM_VERSION.isAtLeast(OSVersion.WINDOWS_10))
+                        message = i18n("terracotta.unsupported.os.windows.old");
+                    else if (Platform.SYSTEM_PLATFORM.equals(OperatingSystem.LINUX, Architecture.LOONGARCH64_OW))
+                        message = i18n("terracotta.unsupported.arch.loongarch64_ow");
+                    else
+                        message = i18n("terracotta.unsupported");
+
+                    Controllers.dialog(message, null, MessageDialogPane.MessageType.WARNING);
+                }
+            });
 
             // the left sidebar
             AdvancedListBox sideBar = new AdvancedListBox()
diff --git a/HMCL/src/main/resources/assets/lang/I18N.properties b/HMCL/src/main/resources/assets/lang/I18N.properties
@@ -1477,7 +1477,6 @@ terracotta.status.exception.desc.host_et_crash=Failed to create room: EasyTier c
 terracotta.status.exception.desc.ping_server_rst=Room closed: You exited the game world, room closed automatically
 terracotta.status.exception.desc.scaffolding_invalid_response=Invalid Protocol：Host has sent invalid response, please report this issue to developers
 terracotta.status.fatal.retry=Retry
-terracotta.status.fatal.os=Sorry, HMCL cannot enable Terracotta | Multiplayer on your operating system or architecture. Please use a more modern operating system.
 terracotta.status.fatal.network=Failed to download Multiplayer Core. Please check your network connection and try again.
 terracotta.status.fatal.install=Fatal Error: Unable to install Multiplayer Core.
 terracotta.status.fatal.terracotta=Fatal Error: Unable to connect to Multiplayer Core.
@@ -1487,6 +1486,10 @@ terracotta.player_anonymous=Anonymous Player
 terracotta.player_kind.host=Host
 terracotta.player_kind.local=Yourself
 terracotta.player_kind.guest=Guest
+terracotta.unsupported=Multiplayer is not yet supported on the current platform.
+terracotta.unsupported.os.windows.old=Multiplayer requires Windows 10 or later. Please update your system.
+terracotta.unsupported.arch.32bit=Multiplayer is not supported on 32-bit systems. Please upgrade to a 64-bit system.
+terracotta.unsupported.arch.loongarch64_ow=Multiplayer is not supported on Linux LoongArch64 Old World distributions. Please update to a New World distribution (such as AOSC OS).
 
 unofficial.hint=You are using an unofficial build of HMCL. We cannot guarantee its security.
 
diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh.properties b/HMCL/src/main/resources/assets/lang/I18N_zh.properties
@@ -1265,7 +1265,6 @@ terracotta.status.exception.desc.host_et_crash=建立房間失敗：EasyTier 已
 terracotta.status.exception.desc.ping_server_rst=房間已關閉：您已退出遊戲存檔，房間已自動關閉
 terracotta.status.exception.desc.scaffolding_invalid_response=協議錯誤：房主發送了錯誤的回應資料，請向開發者回報該問題
 terracotta.status.fatal.retry=重試
-terracotta.status.fatal.os=抱歉，HMCL 不能在您的作業系統或架構上啟用多人連線。請使用更主流的作業系統
 terracotta.status.fatal.network=未能下載線上核心。請檢查網路連接，然後再試一次
 terracotta.status.fatal.install=嚴重錯誤：無法安裝線上核心
 terracotta.status.fatal.terracotta=嚴重錯誤：無法與線上核心通訊
@@ -1275,6 +1274,10 @@ terracotta.player_anonymous=匿名玩家
 terracotta.player_kind.host=房主
 terracotta.player_kind.local=你
 terracotta.player_kind.guest=房客
+terracotta.unsupported=多人聯機功能尚未支援目前平台。
+terracotta.unsupported.os.windows.old=多人聯機功能需要 Windows 10 或更高版本。請更新系統。
+terracotta.unsupported.arch.32bit=多人聯機功能不支援 32 位元系統。請更新至 64 位元系統。
+terracotta.unsupported.arch.loongarch64_ow=多人聯機功能不支援 Linux LoongArch64 舊世界發行版，請更新至新世界發行版 (如 AOSC OC)。
 
 unofficial.hint=你正在使用第三方提供的 HMCL。我們無法保證其安全性，請注意甄別。
 
diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties
@@ -1275,7 +1275,6 @@ terracotta.status.exception.desc.host_et_crash=创建房间失败：EasyTier 已
 terracotta.status.exception.desc.ping_server_rst=房间已关闭：您已退出游戏存档，房间已自动关闭
 terracotta.status.exception.desc.scaffolding_invalid_response=协议错误：房主发送了错误的响应数据，请向开发者反馈该问题
 terracotta.status.fatal.retry=重试
-terracotta.status.fatal.os=抱歉，HMCL 不能在您的操作系统或架构上启用多人联机。请使用更主流的操作系统
 terracotta.status.fatal.network=未能下载联机核心。请检查网络连接，然后再试一次
 terracotta.status.fatal.install=严重错误：无法安装联机核心
 terracotta.status.fatal.terracotta=严重错误：无法与联机核心通讯
@@ -1285,6 +1284,10 @@ terracotta.player_anonymous=匿名玩家
 terracotta.player_kind.host=房主
 terracotta.player_kind.local=你
 terracotta.player_kind.guest=房客
+terracotta.unsupported=多人联机功能尚不支持当前平台。
+terracotta.unsupported.os.windows.old=多人联机功能需要 Windows 10 或更高版本。请更新系统。
+terracotta.unsupported.arch.32bit=多人联机功能不支持 32 位系统。请更新至 64 位系统。
+terracotta.unsupported.arch.loongarch64_ow=多人联机功能不支持 Linux LoongArch64 旧世界发行版，请更新至新世界发行版 (如 AOSC OC)。
 
 unofficial.hint=你正在使用非官方构建的 HMCL。我们无法保证其安全性，请注意甄别。
 
diff --git a/HMCL/src/main/resources/assets/terracotta.json b/HMCL/src/main/resources/assets/terracotta.json
@@ -1,20 +1,21 @@
 {
-  "version_legacy": "0\\.3\\.([89]-rc\\.([0-9]|10)|10|11)",
+  "version_legacy": "0\\.3\\.([89]-rc\\.([0-9]|10)|10|11|12)",
   "version_recent": [
-    "0.3.11"
+    "0.3.12"
   ],
-  "version_latest": "0.3.12",
+  "version_latest": "0.3.13",
   "classifiers": {
-    "linux-arm64": "sha256:cb88933f539d287419b9a83960bfdd8252dd2a850cbb39008491916c8a8ee25b",
-    "linux-x86_64": "sha256:b329fed4157999f1be504a63ea2f5c95985d440435fba2f3b4604dced340572a",
-    "linux-loongarch64": "sha256:9e6b1beb90817339ca8b40b3e26bd064505cc789d1c5f7df80659d91971042b6",
-    "linux-riscv64": "sha256:58dde78047e3e0317cc935bfa6db0c2c3f6608fea15f545aa83d78a921805fc4",
-    "macos-arm64": "sha256:282f47dd0e2667da44b0bef74a87d41d9e568c224515d2f230d2ef25edb1f628",
-    "macos-arm64.pkg": "sha256:295974ec16d5a69006126d574efe16e7622ab67e85d35cd03020f38670cf3313",
-    "macos-x86_64": "sha256:8cf097ae87b6f8fdb4a3543176ecc526922201446c18170e779ffff0cc62ec01",
-    "macos-x86_64.pkg": "sha256:bfc1f4c121c107b3371b56e83cad80924be9016db3c3b39a9db7ae579dbaf1e2",
-    "windows-arm64.exe": "sha256:cfa93fbc426002dbd25e376457db2a27be101907f568d91e1f92adfcf1b69cb8",
-    "windows-x86_64.exe": "sha256:2153b676295cf059ca2ac08178e1d3754eb0007c947378cd1ae2ef2b9f7a2a4f"
+    "freebsd-x86_64": "sha256:0713e54ee552496416bda9d9e814e33a8950ca8f321f5b3c6dd2e07e79b0e3af",
+    "linux-arm64": "sha256:61affc46035337c182adeca3671b4cf4cc59c7b4e73039899f35416f7d00ad94",
+    "linux-x86_64": "sha256:9399e1627b77d518950e66d944c9a4b70c20d2e13ca2c0e2fed0ded637e7ae06",
+    "linux-loongarch64": "sha256:f3eb4c40dfccc25b5b355298c776abe3d399afb57a2af38803dd78089f0c182e",
+    "linux-riscv64": "sha256:26f95f8b5f83746c9cf9a8362ce0ef793ede8515897a1ba15e5e6f93c3d39533",
+    "macos-arm64": "sha256:35ba271c7dc924e91c2fdd8c1cabeff2ce3d060836748a7a07162b0a5900e8d5",
+    "macos-arm64.pkg": "sha256:90a613ec69f28713fe06188247c57b7cc91743c95112de5aed85ea252103beaa",
+    "macos-x86_64": "sha256:45b420b15a32d5450794a9776cf45a217871cf4333b29b65a35d7358c806b5b1",
+    "macos-x86_64.pkg": "sha256:587623becb3593ccb5fe542a201a67ab3a4029dfa847fcef758faff7ba6d38d5",
+    "windows-arm64.exe": "sha256:bd4e1acf2f304761cdabddd9ade94d046534f4c024bc3026ac98e6be58c2bc22",
+    "windows-x86_64.exe": "sha256:b89599bbcc92b00222cfc6f2e5ef636b7daf192c96efba1049a892e6cb59ee70"
   },
   "downloads": [
     "https://github.com/burningtnt/Terracotta/releases/download/v${version}/terracotta-${version}-${classifier}"
diff --git a/docs/PLATFORM.md b/docs/PLATFORM.md
diff --git a/docs/PLATFORM_zh.md b/docs/PLATFORM_zh.md
diff --git a/docs/PLATFORM_zh_Hant.md b/docs/PLATFORM_zh_Hant.md

Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,7 @@ public Type getType() {`
`298`	`298`	`}`
`299`	`299`
`300`	`300`	`public boolean isRecoverable() {`
`301`		`- return this.type != Type.OS && this.type != Type.UNKNOWN;`
	`301`	`+ return this.type != Type.UNKNOWN;`
`302`	`302`	`}`
`303`	`303`	`}`
`304`	`304`	`}`