[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>

HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaMetadata.java

@@ -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;
@@ -61,11 +63,14 @@ 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) {
+            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)));
             }
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountListPage.java

@@ -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

HMCL/src/main/java/org/jackhuang/hmcl/ui/terracotta/TerracottaPage.java

@@ -19,6 +19,7 @@ package org.jackhuang.hmcl.ui.terracotta;
 
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.beans.property.ReadOnlyObjectWrapper;
+import javafx.beans.value.ChangeListener;
 import javafx.geometry.Insets;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.Priority;
@@ -28,6 +29,7 @@ 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;
@@ -37,7 +39,10 @@ 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 static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
@@ -47,6 +52,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);
@@ -70,6 +78,16 @@ public class TerracottaPage extends DecoratorAnimatedPage implements DecoratorPa
                 .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/"))

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionPage.java

@@ -24,6 +24,7 @@ import javafx.beans.property.*;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
+import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
@@ -237,6 +238,10 @@ public class VersionPage extends DecoratorAnimatedPage implements DecoratorPage
             super(control);
 
             {
+                BorderPane left = new BorderPane();
+                FXUtils.setLimitWidth(left, 200);
+                setLeft(left);
+
                 AdvancedListItem versionSettingsItem = new AdvancedListItem();
                 versionSettingsItem.getStyleClass().add("navigation-drawer-item");
                 versionSettingsItem.setTitle(i18n("settings.game"));

HMCL/src/main/resources/assets/terracotta.json

@@ -15,12 +15,12 @@
     "windows-x86_64.exe": "sha256:de518b2b4e60336fd272092326799966efc4e72acd65576d83e61d4d242fd61d"
   },
   "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": [
     {

HMCLCore/src/main/java/org/jackhuang/hmcl/task/CompletableFutureTask.java

@@ -17,10 +17,9 @@
  */
 package org.jackhuang.hmcl.task;
 
-import org.jackhuang.hmcl.util.Lang;
-
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
+import java.util.concurrent.ExecutionException;
 
 public abstract class CompletableFutureTask<T> extends Task<T> {
 
@@ -30,11 +29,18 @@ public abstract class CompletableFutureTask<T> extends Task<T> {
 
     public abstract CompletableFuture<T> getFuture(TaskCompletableFuture executor);
 
+    protected static Throwable resolveException(Throwable e) {
+        if (e instanceof ExecutionException || e instanceof CompletionException)
+            return resolveException(e.getCause());
+        else
+            return e;
+    }
+
     public static class CustomException extends RuntimeException {}
 
     protected static CompletableFuture<Void> breakable(CompletableFuture<?> future) {
         return future.thenApplyAsync(unused1 -> (Void) null).exceptionally(throwable -> {
-            if (Lang.resolveException(throwable) instanceof CustomException) return null;
+            if (resolveException(throwable) instanceof CustomException) return null;
             else throw new CompletionException(throwable);
         });
     }

HMCLCore/src/main/java/org/jackhuang/hmcl/task/Task.java

@@ -345,11 +345,16 @@ public abstract class Task<T> {
     }
 
     private final ReadOnlyStringWrapper message = new ReadOnlyStringWrapper(this, "message", null);
+    private final InvocationDispatcher<String> messageUpdate = InvocationDispatcher.runOn(Platform::runLater, message::set);
 
     public final ReadOnlyStringProperty messageProperty() {
         return message.getReadOnlyProperty();
     }
 
+    protected final void updateMessage(String newMessage) {
+        messageUpdate.accept(newMessage);
+    }
+
     public final T run() throws Exception {
         if (getSignificance().shouldLog())
             LOG.trace("Executing task: " + getName());

HMCLCore/src/main/java/org/jackhuang/hmcl/util/InvocationDispatcher.java

@@ -17,9 +17,8 @@
  */
 package org.jackhuang.hmcl.util;
 
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.VarHandle;
 import java.util.concurrent.Executor;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 
 /// When [#accept(T)] is called, this class invokes the handler on another thread.
@@ -29,16 +28,6 @@ import java.util.function.Consumer;
 /// @author yushijinhun
 public final class InvocationDispatcher<T> implements Consumer<T> {
 
-    private static final VarHandle PENDING_ARG_HANDLE;
-    static {
-        try {
-            PENDING_ARG_HANDLE = MethodHandles.lookup()
-                    .findVarHandle(InvocationDispatcher.class, "pendingArg", Holder.class);
-        } catch (NoSuchFieldException | IllegalAccessException e) {
-            throw new ExceptionInInitializerError(e);
-        }
-    }
-
     /// @param executor The executor must dispatch all tasks to a single thread.
     public static <T> InvocationDispatcher<T> runOn(Executor executor, Consumer<T> action) {
         return new InvocationDispatcher<>(executor, action);
@@ -46,10 +35,7 @@ public final class InvocationDispatcher<T> implements Consumer<T> {
 
     private final Executor executor;
     private final Consumer<T> action;
-
-    /// @see #PENDING_ARG_HANDLE
-    @SuppressWarnings("unused")
-    private volatile Holder<T> pendingArg;
+    private final AtomicReference<Holder<T>> pendingArg = new AtomicReference<>();
 
     private InvocationDispatcher(Executor executor, Consumer<T> action) {
         this.executor = executor;
@@ -58,15 +44,12 @@ public final class InvocationDispatcher<T> implements Consumer<T> {
 
     @Override
     public void accept(T t) {
-        if (PENDING_ARG_HANDLE.getAndSet(this, new Holder<>(t)) == null) {
+        if (pendingArg.getAndSet(new Holder<>(t)) == null) {
             executor.execute(() -> {
-                @SuppressWarnings("unchecked")
-                var holder = (Holder<T>) PENDING_ARG_HANDLE.getAndSet(this, (Holder<T>) null);
-
                 // If the executor supports multiple underlying threads,
                 // we need to add synchronization, but for now we can omit it :)
                 // synchronized (InvocationDispatcher.this)
-                action.accept(holder.value);
+                action.accept(pendingArg.getAndSet(null).value);
             });
         }
     }

HMCLCore/src/main/java/org/jackhuang/hmcl/util/i18n/LocaleUtils.java

@@ -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() {
     }
 }

config/project.properties

@@ -15,4 +15,4 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
-versionRoot=3.8
+versionRoot=3.7