[release/3.7] Fix #4720 : 修复 JFXListViewSkin 创建大量平台线程的问题 (#4731 )

https://github.com/HMCL-dev/HMCL/pull/4721
[release/3.7] 将官方群组入口重新移动到主界面 (#4730 )
2025-10-28 20:26:22 +08:00 · 2025-10-28 20:18:34 +08:00 · 2025-10-28 20:16:10 +08:00 · 2025-10-21 15:06:10 +08:00
16 changed files with 291 additions and 166 deletions
@@ -0,0 +1,91 @@
+// Copy from https://github.com/sshahine/JFoenix/blob/d427fd801a338f934307ba41ce604eb5c79f0b20/jfoenix/src/main/java/com/jfoenix/skins/JFXListViewSkin.java
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.jfoenix.skins;
+
+import com.jfoenix.adapters.skins.ListViewSkin;
+import com.jfoenix.controls.JFXListView;
+import com.jfoenix.effects.JFXDepthManager;
+import javafx.scene.control.ListCell;
+import javafx.scene.control.skin.VirtualFlow;
+import javafx.scene.layout.Region;
+
+// https://github.com/HMCL-dev/HMCL/issues/4720
+public class JFXListViewSkin<T> extends ListViewSkin<T> {
+
+    private final VirtualFlow<ListCell<T>> flow;
+
+    @SuppressWarnings("unchecked")
+    public JFXListViewSkin(final JFXListView<T> listView) {
+        super(listView);
+        flow = (VirtualFlow<ListCell<T>>) getChildren().get(0);
+        JFXDepthManager.setDepth(flow, listView.depthProperty().get());
+        listView.depthProperty().addListener((o, oldVal, newVal) -> JFXDepthManager.setDepth(flow, newVal));
+    }
+
+    @Override
+    protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return 200;
+    }
+
+    @Override
+    protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        final int itemsCount = getSkinnable().getItems().size();
+        if (getSkinnable().maxHeightProperty().isBound() || itemsCount <= 0) {
+            return super.computePrefHeight(width, topInset, rightInset, bottomInset, leftInset);
+        }
+
+        final double fixedCellSize = getSkinnable().getFixedCellSize();
+        double computedHeight = fixedCellSize != Region.USE_COMPUTED_SIZE ?
+                fixedCellSize * itemsCount + snapVerticalInsets() : estimateHeight();
+        double height = super.computePrefHeight(width, topInset, rightInset, bottomInset, leftInset);
+        if (height > computedHeight) {
+            height = computedHeight;
+        }
+
+        if (getSkinnable().getMaxHeight() > 0 && computedHeight > getSkinnable().getMaxHeight()) {
+            return getSkinnable().getMaxHeight();
+        }
+
+        return height;
+    }
+
+    private double estimateHeight() {
+        // compute the border/padding for the list
+        double borderWidth = snapVerticalInsets();
+        // compute the gap between list cells
+
+        JFXListView<T> listview = (JFXListView<T>) getSkinnable();
+        double gap = listview.isExpanded() ? ((JFXListView<T>) getSkinnable()).getVerticalGap() * (getSkinnable().getItems()
+                .size()) : 0;
+        // compute the height of each list cell
+        double cellsHeight = 0;
+        for (int i = 0; i < flow.getCellCount(); i++) {
+            ListCell<T> cell = flow.getCell(i);
+            cellsHeight += cell.getHeight();
+        }
+        return cellsHeight + gap + borderWidth;
+    }
+
+    private double snapVerticalInsets() {
+        return getSkinnable().snappedBottomInset() + getSkinnable().snappedTopInset();
+    }
+
+}
@@ -23,7 +23,9 @@ import org.jackhuang.hmcl.task.FileDownloadTask;
 import org.jackhuang.hmcl.terracotta.provider.GeneralProvider;
 import org.jackhuang.hmcl.terracotta.provider.ITerracottaProvider;
 import org.jackhuang.hmcl.terracotta.provider.MacOSProvider;
+import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
+import org.jackhuang.hmcl.util.i18n.LocaleUtils;
 import org.jackhuang.hmcl.util.i18n.LocalizedText;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.io.NetworkUtils;
@@ -42,7 +44,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.regex.Pattern;

 import static org.jackhuang.hmcl.util.logging.Logger.LOG;
@@ -61,20 +62,25 @@ public final class TerracottaMetadata {

            @SerializedName("classifiers") Map<String, String> classifiers,
            @SerializedName("downloads") List<String> downloads,
+            @SerializedName("downloads_CN") List<String> downloadsCN,
            @SerializedName("links") List<Link> links
    ) {
-        private TerracottaNative of(String classifier) {
-            List<URI> links = new ArrayList<>(this.downloads.size());
-            for (String download : this.downloads) {
+        private @Nullable TerracottaNative of(String classifier) {
+            String hash = this.classifiers.get(classifier);
+            if (hash == null)
+                return null;
+
+            if (!hash.startsWith("sha256:"))
+                throw new IllegalArgumentException(String.format("Invalid hash value %s for classifier %s.", hash, classifier));
+            hash = hash.substring("sha256:".length());
+
+            List<URI> links = new ArrayList<>(this.downloads.size() + this.downloadsCN.size());
+            for (String download : LocaleUtils.IS_CHINA_MAINLAND
+                    ? Lang.merge(this.downloadsCN, this.downloads)
+                    : Lang.merge(this.downloads, this.downloadsCN)) {
                links.add(URI.create(download.replace("${version}", this.latest).replace("${classifier}", classifier)));
            }

-            String hash = Objects.requireNonNull(this.classifiers.get(classifier), String.format("Classifier %s doesn't exist.", classifier));
-            if (!hash.startsWith("sha256:")) {
-                throw new IllegalArgumentException(String.format("Invalid hash value %s for classifier %s.", hash, classifier));
-            }
-            hash = hash.substring("sha256:".length());
-
            return new TerracottaNative(
                    Collections.unmodifiableList(links),
                    Metadata.DEPENDENCIES_DIRECTORY.resolve(
@@ -138,36 +144,31 @@ public final class TerracottaMetadata {

    @Nullable
    private static ProviderContext locateProvider(Config config) {
-        String architecture = switch (Architecture.SYSTEM_ARCH) {
-            case X86_64 -> "x86_64";
-            case ARM64 -> "arm64";
-            default -> null;
-        };
-        if (architecture == null) {
-            return null;
-        }
-
+        String arch = Architecture.SYSTEM_ARCH.getCheckedName();
        return switch (OperatingSystem.CURRENT_OS) {
            case WINDOWS -> {
-                if (OperatingSystem.SYSTEM_VERSION.isAtLeast(OSVersion.WINDOWS_8_1)) {
-                    yield new ProviderContext(
-                            new GeneralProvider(config.of(String.format("windows-%s.exe", architecture))),
-                            "windows", architecture
-                    );
-                }
-                yield null;
+                if (!OperatingSystem.SYSTEM_VERSION.isAtLeast(OSVersion.WINDOWS_8_1))
+                    yield null;
+
+                TerracottaNative target = config.of("windows-%s.exe".formatted(arch));
+                yield target != null
+                        ? new ProviderContext(new GeneralProvider(target), "windows", arch)
+                        : null;
+            }
+            case LINUX -> {
+                TerracottaNative target = config.of("linux-%s".formatted(arch));
+                yield target != null
+                        ? new ProviderContext(new GeneralProvider(target), "linux", arch)
+                        : null;
+            }
+            case MACOS -> {
+                TerracottaNative installer = config.of("macos-%s.pkg".formatted(arch));
+                TerracottaNative binary = config.of("macos-%s".formatted(arch));
+
+                yield installer != null && binary != null
+                        ? new ProviderContext(new MacOSProvider(installer, binary), "macos", arch)
+                        : null;
            }
-            case LINUX -> new ProviderContext(
-                    new GeneralProvider(config.of(String.format("linux-%s", architecture))),
-                    "linux", architecture
-            );
-            case MACOS -> new ProviderContext(
-                    new MacOSProvider(
-                            config.of(String.format("macos-%s.pkg", architecture)),
-                            config.of(String.format("macos-%s", architecture))
-                    ),
-                    "macos", architecture
-            );
            default -> null;
        };
    }
@@ -64,6 +64,7 @@ import org.jackhuang.hmcl.util.*;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.platform.Architecture;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
+import org.jetbrains.annotations.Nullable;

 import java.nio.file.Path;
 import java.util.List;
@@ -433,26 +434,34 @@ public final class Controllers {
        dialog(new MessageDialogPane.Builder(text, title, type).actionOrCancel(actionButton, cancel).build());
    }

-    public static void confirmActionDanger(String text, String title, Runnable resolve, Runnable cancel) {
-        JFXButton btnYes = new JFXButton(i18n("button.ok"));
-        btnYes.getStyleClass().add("dialog-error");
-        btnYes.setOnAction(e -> resolve.run());
-        btnYes.setDisable(true);
+    public static void confirmWithCountdown(String text, String title, int seconds, MessageType messageType,
+                                            @Nullable Runnable ok, @Nullable Runnable cancel) {
+        if (seconds <= 0)
+            throw new IllegalArgumentException("Seconds must be greater than 0");

-        int countdown = 10;
-        KeyFrame[] keyFrames = new KeyFrame[countdown + 1];
-        for (int i = 0; i < countdown; i++) {
+        JFXButton btnOk = new JFXButton(i18n("button.ok"));
+        btnOk.getStyleClass().add(messageType == MessageType.WARNING || messageType == MessageType.ERROR
+                ? "dialog-error"
+                : "dialog-accept");
+
+        if (ok != null)
+            btnOk.setOnAction(e -> ok.run());
+        btnOk.setDisable(true);
+
+        KeyFrame[] keyFrames = new KeyFrame[seconds + 1];
+        for (int i = 0; i < seconds; i++) {
            keyFrames[i] = new KeyFrame(Duration.seconds(i),
-                    new KeyValue(btnYes.textProperty(), i18n("button.ok.countdown", countdown - i)));
+                    new KeyValue(btnOk.textProperty(), i18n("button.ok.countdown", seconds - i)));
        }
-        keyFrames[countdown] = new KeyFrame(Duration.seconds(countdown),
-                new KeyValue(btnYes.textProperty(), i18n("button.ok")),
-                new KeyValue(btnYes.disableProperty(), false));
+        keyFrames[seconds] = new KeyFrame(Duration.seconds(seconds),
+                new KeyValue(btnOk.textProperty(), i18n("button.ok")),
+                new KeyValue(btnOk.disableProperty(), false));

        Timeline timeline = new Timeline(keyFrames);
-        confirmAction(text, title, MessageType.WARNING, btnYes, () -> {
+        confirmAction(text, title, messageType, btnOk, () -> {
            timeline.stop();
-            cancel.run();
+            if (cancel != null)
+                cancel.run();
        });
        timeline.play();
    }
@@ -1411,12 +1411,16 @@ public final class FXUtils {
    }

    public static void copyText(String text) {
+        copyText(text, i18n("message.copied"));
+    }
+
+    public static void copyText(String text, @Nullable String toastMessage) {
        ClipboardContent content = new ClipboardContent();
        content.putString(text);
        Clipboard.getSystemClipboard().setContent(content);

-        if (!Controllers.isStopped()) {
-            Controllers.showToast(i18n("message.copied"));
+        if (toastMessage != null && !Controllers.isStopped()) {
+            Controllers.showToast(toastMessage);
        }
    }

@@ -69,6 +69,7 @@ public enum SVG {
    FOR_YOU("M12 12Q14.025 12 16.225 11.5875T20 10.5V20.5Q18.5 21.175 16.35 21.5875T12 22Q9.8 22 7.65 21.5875T4 20.5V10.5Q5.575 11.175 7.775 11.5875T12 12ZM18 19V13.25Q16.75 13.6 15.1125 13.8T12 14Q10.525 14 8.8875 13.8T6 13.25V19Q7.25 19.45 8.875 19.725T12 20Q13.5 20 15.125 19.725T18 19ZM12 2Q13.65 2 14.825 3.175T16 6Q16 7.65 14.825 8.825T12 10Q10.35 10 9.175 8.825T8 6Q8 4.35 9.175 3.175T12 2ZM12 8Q12.825 8 13.4125 7.4125T14 6Q14 5.175 13.4125 4.5875T12 4Q11.175 4 10.5875 4.5875T10 6Q10 6.825 10.5875 7.4125T12 8ZM12 6ZM12 16.625Z"),
    GAMEPAD("M12 7.65ZM16.35 12ZM7.65 12ZM12 16.35ZM12 10.5 9 7.5V2H15V7.5L12 10.5ZM16.5 15 13.5 12 16.5 9H22V15H16.5ZM2 15V9H7.5L10.5 12 7.5 15H2ZM9 22V16.5L12 13.5 15 16.5V22H9ZM12 7.65 13 6.65V4H11V6.65L12 7.65ZM4 13H6.65L7.65 12 6.65 11H4V13ZM11 20H13V17.35L12 16.35 11 17.35V20ZM17.35 13H20V11H17.35L16.35 12 17.35 13Z"),
    GLOBE_BOOK("M3.075 13Q3.05 12.75 3.0375 12.5T3.025 12Q3.025 10.125 3.725 8.4875T5.65 5.6375Q6.875 4.425 8.5 3.7125T12 3Q13.875 3 15.5125 3.7125T18.3625 5.6375Q19.575 6.85 20.2875 8.4875T21 12Q21 12.25 20.9875 12.5T20.95 13H18.925Q18.975 12.75 18.9875 12.5T19 12Q19 11.75 18.9875 11.5T18.925 11H15.975Q16 11.25 16 11.5V12.5Q16 12.75 15.975 13H14V12.175Q14 11.875 13.9875 11.575T13.95 11H10.075Q10.05 11.275 10.0375 11.575T10.025 12.175V13H8.05Q8.025 12.75 8.025 12.5V11.5Q8.025 11.25 8.05 11H5.1Q5.05 11.25 5.0375 11.5T5.025 12Q5.025 12.25 5.0375 12.5T5.1 13H3.075ZM5.7 9H8.275Q8.475 7.925 8.775 7.0625T9.425 5.5Q8.225 5.95 7.25 6.8625T5.7 9ZM10.35 9H13.65Q13.4 7.925 13.025 6.9T12 5Q11.35 5.875 10.9625 6.9T10.35 9ZM15.75 9H18.325Q17.75 7.775 16.7625 6.8625T14.575 5.5Q14.925 6.25 15.2375 7.0875T15.75 9ZM11 21V20Q11 18.75 10.125 17.875T8 17H2V15H8Q9.2 15 10.2375 15.525T12 17Q12.725 16.05 13.7625 15.525T16 15H22V17H16Q14.75 17 13.875 17.875T13 20V21H11Z"),
+    GRAPH2("M5 22q-1.25 0-2.125-.875T2 19q0-.975.5625-1.75T4 16.175V14q0-1.25.875-2.125T7 11h4V7.825q-.875-.3-1.4375-1.075T9 5q0-1.25.875-2.125T12 2t2.125.875T15 5q0 .975-.5625 1.75T13 7.825V11h4q1.25 0 2.125.875T20 14v2.175q.875.3 1.4375 1.075T22 19q0 1.25-.875 2.125T19 22t-2.125-.875T16 19q0-.975.5625-1.75T18 16.175V14q0-.425-.2875-.7125T17 13H13v3.175q.875.3 1.4375 1.075T15 19q0 1.25-.875 2.125T12 22t-2.125-.875T9 19q0-.975.5625-1.75T11 16.175V13H7q-.425 0-.7125.2875T6 14v2.175q.875.3 1.4375 1.075T8 19q0 1.25-.875 2.125T5 22Zm0-2q.425 0 .7125-.2875T6 19q0-.425-.2875-.7125T5 18q-.425 0-.7125.2875T4 19q0 .425.2875.7125T5 20Zm7 0q.425 0 .7125-.2875T13 19q0-.425-.2875-.7125T12 18q-.425 0-.7125.2875T11 19q0 .425.2875.7125T12 20Zm7 0q.425 0 .7125-.2875T20 19q0-.425-.2875-.7125T19 18q-.425 0-.7125.2875T18 19q0 .425.2875.7125T19 20ZM12 6q.425 0 .7125-.2875T13 5q0-.425-.2875-.7125T12 4q-.425 0-.7125.2875T11 5q0 .425.2875.7125T12 6Z"),
    HELP("M11.95 18Q12.475 18 12.8375 17.6375T13.2 16.75Q13.2 16.225 12.8375 15.8625T11.95 15.5Q11.425 15.5 11.0625 15.8625T10.7 16.75Q10.7 17.275 11.0625 17.6375T11.95 18ZM11.05 14.15H12.9Q12.9 13.325 13.0875 12.85T14.15 11.55Q14.8 10.9 15.175 10.3125T15.55 8.9Q15.55 7.5 14.525 6.75T12.1 6Q10.675 6 9.7875 6.75T8.55 8.55L10.2 9.2Q10.325 8.75 10.7625 8.225T12.1 7.7Q12.9 7.7 13.3 8.1375T13.7 9.1Q13.7 9.6 13.4 10.0375T12.65 10.85Q11.55 11.825 11.3 12.325T11.05 14.15ZM12 22Q9.925 22 8.1 21.2125T4.925 19.075Q3.575 17.725 2.7875 15.9T2 12Q2 9.925 2.7875 8.1T4.925 4.925Q6.275 3.575 8.1 2.7875T12 2Q14.075 2 15.9 2.7875T19.075 4.925Q20.425 6.275 21.2125 8.1T22 12Q22 14.075 21.2125 15.9T19.075 19.075Q17.725 20.425 15.9 21.2125T12 22ZM12 20Q15.35 20 17.675 17.675T20 12Q20 8.65 17.675 6.325T12 4Q8.65 4 6.325 6.325T4 12Q4 15.35 6.325 17.675T12 20ZM12 12Z"),
    HOME("M6 19H9V13H15V19H18V10L12 5.5 6 10V19ZM4 21V9L12 3 20 9V21H13V15H11V21H4ZM12 12.25Z"),
    HOST("M4 21Q3.175 21 2.5875 20.4125T2 19V5Q2 4.175 2.5875 3.5875T4 3H9Q9.825 3 10.4125 3.5875T11 5V19Q11 19.825 10.4125 20.4125T9 21H4ZM15 21Q14.175 21 13.5875 20.4125T13 19V5Q13 4.175 13.5875 3.5875T15 3H20Q20.825 3 21.4125 3.5875T22 5V19Q22 19.825 21.4125 20.4125T20 21H15ZM4 19H9V5H4V19ZM15 19H20V5H15V19ZM5 15H8V13H5V15ZM16 15H19V13H16V15ZM5 12H8V10H5V12ZM16 12H19V10H16V12ZM5 9H8V7H5V9ZM16 9H19V7H16V9ZM4 19H9 4ZM15 19H20 15Z"),
@@ -19,7 +19,13 @@ package org.jackhuang.hmcl.ui.account;

 import com.jfoenix.controls.JFXButton;
 import javafx.beans.binding.Bindings;
-import javafx.beans.property.*;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ListProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.beans.property.ReadOnlyObjectWrapper;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleListProperty;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
@@ -45,51 +51,23 @@ import org.jackhuang.hmcl.util.i18n.LocaleUtils;
 import org.jackhuang.hmcl.util.io.NetworkUtils;
 import org.jackhuang.hmcl.util.javafx.BindingMapping;
 import org.jackhuang.hmcl.util.javafx.MappedObservableList;
-import org.jackhuang.hmcl.util.platform.NativeUtils;
-import org.jackhuang.hmcl.util.platform.OperatingSystem;
-import org.jackhuang.hmcl.util.platform.windows.Kernel32;
-import org.jackhuang.hmcl.util.platform.windows.WinConstants;

-import java.time.Duration;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
 import java.util.Locale;

 import static org.jackhuang.hmcl.setting.ConfigHolder.globalConfig;
 import static org.jackhuang.hmcl.ui.versions.VersionPage.wrap;
-import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 import static org.jackhuang.hmcl.util.javafx.ExtendedProperties.createSelectedItemPropertyFor;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;

 public final class AccountListPage extends DecoratorAnimatedPage implements DecoratorPage {
    static final BooleanProperty RESTRICTED = new SimpleBooleanProperty(true);

-    private static boolean isExemptedRegion() {
-        if ("Asia/Shanghai".equals(ZoneId.systemDefault().getId()))
-            return true;
-
-        // Check if the time zone is UTC+8
-        if (ZonedDateTime.now().getOffset().getTotalSeconds() == Duration.ofHours(8).toSeconds()) {
-            if ("CN".equals(LocaleUtils.SYSTEM_DEFAULT.getCountry()))
-                return true;
-
-            if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS && NativeUtils.USE_JNA) {
-                Kernel32 kernel32 = Kernel32.INSTANCE;
-
-                // https://learn.microsoft.com/windows/win32/intl/table-of-geographical-locations
-                if (kernel32 != null && kernel32.GetUserGeoID(WinConstants.GEOCLASS_NATION) == 45) // China
-                    return true;
-            }
-        }
-
-        return false;
-    }
-
    static {
        String property = System.getProperty("hmcl.offline.auth.restricted", "auto");

        if ("false".equals(property)
-                || "auto".equals(property) && isExemptedRegion()
+                || "auto".equals(property) && LocaleUtils.IS_CHINA_MAINLAND
                || globalConfig().isEnableOfflineAccount())
            RESTRICTED.set(false);
        else
@@ -264,10 +264,12 @@ public class CreateAccountPane extends JFXDialogLayout implements DialogAware {
        };

        if (factory instanceof OfflineAccountFactory && username != null && (!USERNAME_CHECKER_PATTERN.matcher(username).matches() || username.length() > 16)) {
-            Controllers.confirmActionDanger(i18n("account.methods.offline.name.invalid"), i18n("message.warning"), doCreate, () -> {
-                body.setDisable(false);
-                spinner.hideSpinner();
-            });
+            Controllers.confirmWithCountdown(i18n("account.methods.offline.name.invalid"), i18n("message.warning"), 10,
+                    MessageDialogPane.MessageType.WARNING,
+                    doCreate, () -> {
+                        body.setDisable(false);
+                        spinner.hideSpinner();
+                    });
        } else {
            doCreate.run();
        }
@@ -183,7 +183,7 @@ public class RootPage extends DecoratorAnimatedPage implements DecoratorPage {

            // sixth item in left sidebar
            AdvancedListItem terracottaItem = new AdvancedListItem();
-            terracottaItem.setLeftGraphic(wrap(SVG.HOST));
+            terracottaItem.setLeftGraphic(wrap(SVG.GRAPH2));
            terracottaItem.setActionButtonVisible(false);
            terracottaItem.setTitle(i18n("terracotta"));
            terracottaItem.setOnAction(e -> Controllers.navigate(Controllers.getTerracottaPage()));
@@ -198,7 +198,8 @@ public class RootPage extends DecoratorAnimatedPage implements DecoratorPage {
                    .add(downloadItem)
                    .startCategory(i18n("settings.launcher.general").toUpperCase(Locale.ROOT))
                    .add(launcherSettingsItem)
-                    .add(terracottaItem);
+                    .add(terracottaItem)
+                    .addNavigationDrawerItem(i18n("chat"), SVG.CHAT, () -> FXUtils.openLink(Metadata.GROUPS_URL));

            // the root page, with the sidebar in left, navigator in center.
            setLeft(sideBar);
@@ -34,11 +34,8 @@ import javafx.scene.Cursor;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
-import javafx.scene.control.TextField;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
-import javafx.scene.input.Clipboard;
-import javafx.scene.input.ClipboardContent;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.StackPane;
@@ -138,13 +135,13 @@ public class TerracottaControllerPage extends StackPane {
            TerracottaState state = UI_STATE.get(), next;
            if (state instanceof TerracottaState.Uninitialized || state instanceof TerracottaState.Preparing preparing && preparing.hasInstallFence()) {
                if (state instanceof TerracottaState.Uninitialized uninitialized && !uninitialized.hasLegacy()) {
-                    Controllers.confirmActionDanger(i18n("terracotta.confirm.desc"), i18n("terracotta.confirm.title"), () -> {
-                        TerracottaState.Preparing s = TerracottaManager.install(path);
-                        if (s != null) {
-                            UI_STATE.set(s);
-                        }
-                    }, () -> {
-                    });
+                    Controllers.confirmWithCountdown(i18n("terracotta.confirm.desc"), i18n("terracotta.confirm.title"), 5,
+                            MessageDialogPane.MessageType.INFO, () -> {
+                                TerracottaState.Preparing s = TerracottaManager.install(path);
+                                if (s != null) {
+                                    UI_STATE.set(s);
+                                }
+                            }, null);
                    return;
                }

@@ -202,7 +199,7 @@ public class TerracottaControllerPage extends StackPane {
                            }
                        }
                    } else {
-                        Controllers.confirmActionDanger(i18n("terracotta.confirm.desc"), i18n("terracotta.confirm.title"), () -> {
+                        Controllers.confirmWithCountdown(i18n("terracotta.confirm.desc"), i18n("terracotta.confirm.title"), 5, MessageDialogPane.MessageType.INFO, () -> {
                            globalConfig().setTerracottaAgreementVersion(1);
                            TerracottaState.Preparing s = TerracottaManager.install(null);
                            if (s != null) {
@@ -342,6 +339,7 @@ public class TerracottaControllerPage extends StackPane {
                    return;
                } else {
                    String cs = hostOK.getCode();
+                    copyCode(cs);

                    statusProperty.set(i18n("terracotta.status.host_ok"));
                    progressProperty.set(1);
@@ -350,36 +348,24 @@ public class TerracottaControllerPage extends StackPane {
                    code.setAlignment(Pos.CENTER);
                    {
                        Label desc = new Label(i18n("terracotta.status.host_ok.code"));
-                        {
-                            ClipboardContent cp = new ClipboardContent();
-                            cp.putString(cs);
-                            Clipboard.getSystemClipboard().setContent(cp);
-                        }
+                        desc.setMouseTransparent(true);

-                        // FIXME: The implementation to display Room Code is ambiguous. Consider using a clearer JavaFX Element in the future.
-                        TextField label = new TextField(cs);
-                        label.setEditable(false);
-                        label.setFocusTraversable(false);
+                        Label label = new Label(cs);
+                        label.setMouseTransparent(true);
+                        label.setStyle("-fx-font-size: 24");
                        label.setAlignment(Pos.CENTER);
-                        label.setStyle("-fx-background-color: transparent; -fx-border-color: transparent;");
                        VBox.setMargin(label, new Insets(10, 0, 10, 0));
-                        label.setScaleX(1.8);
-                        label.setScaleY(1.8);
-                        holder.add(FXUtils.onWeakChange(label.selectedTextProperty(), string -> {
-                            if (string != null && !string.isEmpty() && !cs.equals(string)) {
-                                label.selectAll();
-                            }
-                        }));

                        code.getChildren().setAll(desc, label);
                    }
-                    FXUtils.onClicked(code, () -> FXUtils.copyText(cs));
+                    code.setCursor(Cursor.HAND);
+                    FXUtils.onClicked(code, () -> copyCode(cs));

                    LineButton copy = LineButton.of();
                    copy.setLeftIcon(SVG.CONTENT_COPY);
                    copy.setTitle(i18n("terracotta.status.host_ok.code.copy"));
                    copy.setSubtitle(i18n("terracotta.status.host_ok.code.desc"));
-                    FXUtils.onClicked(copy, () -> FXUtils.copyText(cs));
+                    FXUtils.onClicked(copy, () -> copyCode(cs));

                    LineButton back = LineButton.of();
                    back.setLeftIcon(SVG.ARROW_BACK);
@@ -601,6 +587,10 @@ public class TerracottaControllerPage extends StackPane {
        return locals;
    }

+    private void copyCode(String code) {
+        FXUtils.copyText(code, i18n("terracotta.status.host_ok.code.copy.toast"));
+    }
+
    private static final class LineButton extends RipplerContainer {
        private final WeakListenerHolder holder = new WeakListenerHolder();

@@ -19,22 +19,30 @@ package org.jackhuang.hmcl.ui.terracotta;

 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.beans.property.ReadOnlyObjectWrapper;
-import org.jackhuang.hmcl.Metadata;
+import javafx.beans.value.ChangeListener;
+import javafx.geometry.Insets;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.VBox;
+import org.jackhuang.hmcl.game.LauncherHelper;
+import org.jackhuang.hmcl.setting.Profile;
+import org.jackhuang.hmcl.setting.Profiles;
 import org.jackhuang.hmcl.terracotta.TerracottaMetadata;
+import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
 import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
 import org.jackhuang.hmcl.ui.animation.TransitionPane;
 import org.jackhuang.hmcl.ui.construct.AdvancedListBox;
-import org.jackhuang.hmcl.ui.construct.AdvancedListItem;
 import org.jackhuang.hmcl.ui.construct.PageAware;
 import org.jackhuang.hmcl.ui.construct.TabHeader;
 import org.jackhuang.hmcl.ui.decorator.DecoratorAnimatedPage;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
+import org.jackhuang.hmcl.ui.main.MainPage;
+import org.jackhuang.hmcl.ui.versions.Versions;
+import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.StringUtils;

-import java.util.Locale;
-
-import static org.jackhuang.hmcl.ui.versions.VersionPage.wrap;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 public class TerracottaPage extends DecoratorAnimatedPage implements DecoratorPage, PageAware {
@@ -43,6 +51,9 @@ public class TerracottaPage extends DecoratorAnimatedPage implements DecoratorPa
    private final TabHeader.Tab<TerracottaControllerPage> statusPage = new TabHeader.Tab<>("statusPage");
    private final TransitionPane transitionPane = new TransitionPane();

+    @SuppressWarnings("unused")
+    private ChangeListener<String> instanceChangeListenerHolder;
+
    public TerracottaPage() {
        statusPage.setNodeSupplier(TerracottaControllerPage::new);
        tab = new TabHeader(statusPage);
@@ -53,32 +64,34 @@ public class TerracottaPage extends DecoratorAnimatedPage implements DecoratorPa
            transitionPane.setContent(newValue.getNode(), ContainerAnimations.FADE);
        });

-        AdvancedListItem feedback = new AdvancedListItem();
-        feedback.setLeftGraphic(wrap(SVG.FEEDBACK));
-        feedback.setActionButtonVisible(false);
-        feedback.setTitle(i18n("terracotta.feedback.title"));
-        feedback.setOnAction(e -> FXUtils.openLink(TerracottaMetadata.FEEDBACK_LINK));
-
-        AdvancedListItem chatItem = new AdvancedListItem();
-        chatItem.setLeftGraphic(wrap(SVG.CHAT));
-        chatItem.setActionButtonVisible(false);
-        chatItem.setTitle(i18n("chat"));
-        chatItem.setOnAction(e -> FXUtils.openLink(Metadata.GROUPS_URL));
-
-        AdvancedListItem easytierItem = new AdvancedListItem();
-        easytierItem.setLeftGraphic(wrap(SVG.HOST));
-        easytierItem.setActionButtonVisible(false);
-        easytierItem.setTitle(i18n("terracotta.easytier"));
-        easytierItem.setOnAction(e -> FXUtils.openLink("https://easytier.cn/"));
+        BorderPane left = new BorderPane();
+        FXUtils.setLimitWidth(left, 200);
+        VBox.setVgrow(left, Priority.ALWAYS);
+        setLeft(left);

        AdvancedListBox sideBar = new AdvancedListBox()
-                .addNavigationDrawerTab(tab, statusPage, i18n("terracotta.status"), SVG.TUNE)
-                .startCategory(i18n("help").toUpperCase(Locale.ROOT))
-                .add(feedback)
-                .add(chatItem)
-                .add(easytierItem);
-        FXUtils.setLimitWidth(sideBar, 200);
-        setLeft(sideBar);
+                .addNavigationDrawerTab(tab, statusPage, i18n("terracotta.status"), SVG.TUNE);
+        left.setTop(sideBar);
+
+        AdvancedListBox toolbar = new AdvancedListBox()
+                .addNavigationDrawerItem(i18n("version.launch"), SVG.ROCKET_LAUNCH, () -> {
+                    Profile profile = Profiles.getSelectedProfile();
+                    Versions.launch(profile, profile.getSelectedVersion(), LauncherHelper::setKeep);
+                }, item -> {
+                    instanceChangeListenerHolder = FXUtils.onWeakChangeAndOperate(Profiles.selectedVersionProperty(),
+                            instanceName -> item.setSubtitle(StringUtils.isNotBlank(instanceName) ? instanceName : i18n("version.empty"))
+                    );
+
+                    MainPage mainPage = Controllers.getRootPage().getMainPage();
+                    FXUtils.onScroll(item, mainPage.getVersions(), list -> {
+                        String currentId = mainPage.getCurrentGame();
+                        return Lang.indexWhere(list, instance -> instance.getId().equals(currentId));
+                    }, it -> mainPage.getProfile().setSelectedVersion(it.getId()));
+                })
+                .addNavigationDrawerItem(i18n("terracotta.feedback.title"), SVG.FEEDBACK, () -> FXUtils.openLink(TerracottaMetadata.FEEDBACK_LINK))
+                .addNavigationDrawerItem(i18n("terracotta.easytier"), SVG.HOST, () -> FXUtils.openLink("https://easytier.cn/"));
+        BorderPane.setMargin(toolbar, new Insets(0, 0, 12, 0));
+        left.setBottom(toolbar);

        setCenter(transitionPane);
    }
@@ -228,7 +228,7 @@

 .class-title {
    -fx-font-size: 12px;
-    -fx-padding: 16 16 8 16;
+    -fx-padding: 8 16 8 16;
 }

 .advanced-list-box-item {
@@ -1460,6 +1460,7 @@ terracotta.status.host_starting.back=This will stop creating the room.
 terracotta.status.host_ok=Room created
 terracotta.status.host_ok.code=Invitation code (Copied)
 terracotta.status.host_ok.code.copy=Copy invitation code
+terracotta.status.host_ok.code.copy.toast=Invitation code has been copied to clipboard
 terracotta.status.host_ok.code.desc=Please remind your friends to select Guest mode in HMCL - Multiplayer or PCL CE and enter this invitation code.
 terracotta.status.host_ok.back=This will also close the room, other guests will leave and cannot rejoin.
 terracotta.status.guest_starting=Joining room
@@ -1248,6 +1248,7 @@ terracotta.status.host_starting.back=這將會取消建立房間。
 terracotta.status.host_ok=已建立房間
 terracotta.status.host_ok.code=邀請碼 (已自動複製到剪貼簿)
 terracotta.status.host_ok.code.copy=複製邀請碼
+terracotta.status.host_ok.code.copy.toast=已將邀請碼複製到剪貼簿
 terracotta.status.host_ok.code.desc=請提醒您的朋友在 HMCL 或 PCL CE 多人遊戲功能中選擇房客模式，並輸入該邀請碼。
 terracotta.status.host_ok.back=這將同時徹底關閉房間，其他房客將退出並不再能重新加入該房間。
 terracotta.status.guest_starting=正在加入房間
@@ -1258,6 +1258,7 @@ terracotta.status.host_starting.back=这将会取消创建房间。
 terracotta.status.host_ok=已启动房间
 terracotta.status.host_ok.code=邀请码 (已自动复制到剪贴板)
 terracotta.status.host_ok.code.copy=复制邀请码
+terracotta.status.host_ok.code.copy.toast=已将邀请码复制到剪贴板
 terracotta.status.host_ok.code.desc=请提醒您的朋友在 HMCL 或 PCL CE 多人联机功能中选择房客模式，并输入该邀请码。
 terracotta.status.host_ok.back=这将同时彻底关闭房间，其他房客将退出并不再能重新加入该房间。
 terracotta.status.guest_starting=正在加入房间
@@ -1,26 +1,28 @@
 {
-  "version_legacy": "0\\.3\\.[89]-rc\\.([0-9]|10)",
+  "version_legacy": "0\\.3\\.([89]-rc\\.([0-9]|10)|10|11)",
  "version_recent": [
-    "0.3.9-rc.10"
+    "0.3.11"
  ],
-  "version_latest": "0.3.10",
+  "version_latest": "0.3.12",
  "classifiers": {
-    "linux-arm64": "sha256:001b6b1e220e98dffd84198a3e16855644cad27900562c78d610b0bf50138d17",
-    "linux-x86_64": "sha256:b133ddb796ff52879fb0c38e68ef7ea968d3eaec77f27ea274c701888e795782",
-    "macos-arm64": "sha256:4bb2eb432ea0ee3e3dca6b1019d8864aa14bedfe20b3d804865e216e36e856df",
-    "macos-arm64.pkg": "sha256:e4bf3d2014e417565e3ab0df579f4280e0af42bc28516f640067a52dca77098f",
-    "macos-x86_64": "sha256:17a2cc46d884951a88da6f3f0725e38ffca6fdfd1da021807121c29b944bd830",
-    "macos-x86_64.pkg": "sha256:a4f08a706605262485c1889dfae00554fba753141f6d6ada76e29bfc3e0338aa",
-    "windows-arm64.exe": "sha256:245e0faf2ee1cdc5e430b5c18fbab4c4e5e3f333f0de51a621ae772db3a16924",
-    "windows-x86_64.exe": "sha256:ab99ddb729860c939b2085d8852fd62007b86d97568b687cf2a7147718b64eea"
+    "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"
  },
  "downloads": [
-    "https://github.com/burningtnt/Terracotta/releases/download/v${version}/terracotta-${version}-${classifier}",
+    "https://github.com/burningtnt/Terracotta/releases/download/v${version}/terracotta-${version}-${classifier}"
+  ],
+  "downloads_CN": [
    "https://gitee.com/burningtnt/Terracotta/releases/download/v${version}/terracotta-${version}-${classifier}",
-    "https://alist.8mi.tech/d/mirror/HMCL-Terracotta/Auto/v${version}/terracotta-${version}-${classifier}",
-    "https://ghfast.top/https://github.com/burningtnt/Terracotta/releases/download/v${version}/terracotta-${version}-${classifier}",
-    "https://cdn.crashmc.com/https://github.com/burningtnt/Terracotta/releases/download/v${version}/terracotta-${version}-${classifier}",
-    "https://cp.zkitefly.eu.org/https://github.com/burningtnt/Terracotta/releases/download/v${version}/terracotta-${version}-${classifier}"
+    "https://cnb.cool/HMCL-Terracotta/Terracotta/-/releases/download/v${version}/terracotta-${version}-${classifier}",
+    "https://alist.8mi.tech/d/mirror/HMCL-Terracotta/Auto/v${version}/terracotta-${version}-${classifier}"
  ],
  "links": [
    {
@@ -20,6 +20,10 @@ package org.jackhuang.hmcl.util.i18n;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.io.IOUtils;
+import org.jackhuang.hmcl.util.platform.NativeUtils;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;
+import org.jackhuang.hmcl.util.platform.windows.Kernel32;
+import org.jackhuang.hmcl.util.platform.windows.WinConstants;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.Unmodifiable;
@@ -27,6 +31,9 @@ import org.jetbrains.annotations.Unmodifiable;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.time.Duration;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -385,6 +392,29 @@ public final class LocaleUtils {
        return "zh".equals(getRootLanguage(locale));
    }

+    public static final boolean IS_CHINA_MAINLAND = isChinaMainland();
+
+    private static boolean isChinaMainland() {
+        if ("Asia/Shanghai".equals(ZoneId.systemDefault().getId()))
+            return true;
+
+        // Check if the time zone is UTC+8
+        if (ZonedDateTime.now().getOffset().getTotalSeconds() == Duration.ofHours(8).toSeconds()) {
+            if ("CN".equals(LocaleUtils.SYSTEM_DEFAULT.getCountry()))
+                return true;
+
+            if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS && NativeUtils.USE_JNA) {
+                Kernel32 kernel32 = Kernel32.INSTANCE;
+
+                // https://learn.microsoft.com/windows/win32/intl/table-of-geographical-locations
+                if (kernel32 != null && kernel32.GetUserGeoID(WinConstants.GEOCLASS_NATION) == 45) // China
+                    return true;
+            }
+        }
+
+        return false;
+    }
+
    private LocaleUtils() {
    }
 }
Author	SHA1	Message	Date
Glavo	d0145d53d7	[release/3.7] Fix #4720 : 修复 JFXListViewSkin 创建大量平台线程的问题 (#4731 ) https://github.com/HMCL-dev/HMCL/pull/4721	2025-10-28 20:26:22 +08:00
Glavo	ee0ae6e4ec	[release/3.7] 将官方群组入口重新移动到主界面 (#4730 ) https://github.com/HMCL-dev/HMCL/pull/4727	2025-10-28 20:18:34 +08:00
GlavoandBurning_TNT	210ab077cb	[release/3.7] Bump Terracotta to 0.3.12 (#4729 ) https://github.com/HMCL-dev/HMCL/pull/4718 https://github.com/HMCL-dev/HMCL/pull/4724 --------- Co-authored-by: Burning_TNT <pangyl08@163.com>	2025-10-28 20:16:10 +08:00
GlavoandBurning_TNT	341c60b0de	[release/3.7] 优化陶瓦联机 (#4708 ) https://github.com/HMCL-dev/HMCL/pull/4682 https://github.com/HMCL-dev/HMCL/pull/4686 https://github.com/HMCL-dev/HMCL/pull/4687 https://github.com/HMCL-dev/HMCL/pull/4688 https://github.com/HMCL-dev/HMCL/pull/4700 https://github.com/HMCL-dev/HMCL/pull/4705 --------- Co-authored-by: Burning_TNT <pangyl08@163.com>	2025-10-21 15:06:10 +08:00