Fix #3539: 安装 MultiMC 整合包后应当设置图标 (#3541)

* Update HMCLauncher.sh

* update

* update

---------

Co-authored-by: Glavo <zjx001202@gmail.com>

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -1,6 +1,6 @@
-name: Bug 反馈 | Bug Feedback
+name: Bug 反馈 | Bug Report
 description: 
-  反馈一个 HMCL 错误。| Bug Feedback.
+  反馈一个 HMCL 错误。| File a bug report for HMCL.
 title: "[Bug] "
 labels: bug
 body:
@@ -8,29 +8,35 @@ body:
     attributes:
       value: |
         提交前请确认：
-        * 该问题确实是 **HMCL 的错误**，而**不是 Minecraft 非正常退出**，如果你的 Minecraft 非正常退出，请前往 [QQ 群](https://docs.hmcl.net/groups.html)/[Discord 频道](https://discord.gg/jVvC7HfM6U) 中获取帮助。
-        * 你的启动器版本是**最新的快照版本**，可以点击 [此处](https://zkitefly.github.io/HMCL-Snapshot-Update/) 下载最新快照版本。
-    
-        如果你的问题并不属于上述两类，你可以选取另一种 Issue 类型，或者直接前往 [QQ 群](https://docs.hmcl.net/groups.html)/[Discord 频道](https://discord.gg/jVvC7HfM6U) 中获取帮助。
-        
+
+        * 该问题确实是 **HMCL 的错误**，而**不是 Minecraft 非正常退出**，如果你的 Minecraft 非正常退出，请前往 [QQ 群](https://docs.hmcl.net/groups.html)/[Discord 服务器](https://discord.gg/jVvC7HfM6U) 获取帮助。
+        * 你的启动器版本是**最新的预览版本**，可以点击 [此处](https://zkitefly.github.io/HMCL-Snapshot-Update/) 下载最新预览版本。
+
+        如果你的问题并不属于上述两类，你可以选取另一种 Issue 类型，或者直接前往 [QQ 群](https://docs.hmcl.net/groups.html)/[Discord 服务器](https://discord.gg/jVvC7HfM6U) 获取帮助。
+
         Before submitting, please confirm:
-        * The issue is indeed **an error of HMCL**, not **Minecraft abnormal exit**. If your Minecraft exits abnormally, please go to the [QQ group](https://docs.hmcl.net/groups.html) or [Discord channel](https://discord.gg/jVvC7HfM6U) for help.
-        * Your launcher version is **the latest snapshot version**. You can click [here](https://github.com/burningtnt/HMCL-Snapshot-Update/raw/master/datas/HMCL-dev.jar) to download the latest snapshot version.
-        
-        If your issue does not fall into the above two categories, you can choose another type of issue or directly go to the [QQ group](https://docs.hmcl.net/groups.html) or [Discord channel](https://discord.gg/jVvC7HfM6U) for help.
+
+        * The issue is indeed **a bug of HMCL**, not **Minecraft abnormal exit**. If your Minecraft exits abnormally, please go to the [QQ group](https://docs.hmcl.net/groups.html) or [Discord server](https://discord.gg/jVvC7HfM6U) for help.
+        * Your launcher is the **latest nightly build**. You can click [here](https://zkitefly.github.io/HMCL-Snapshot-Update/en) to download the latest nightly build.
+
+        If your issue does not fall into the above two categories, you can choose another type of issue or directly go to the [QQ group](https://docs.hmcl.net/groups.html) or [Discord server](https://discord.gg/jVvC7HfM6U) for help.
   - type: input
     id: platform
     attributes:
       label: 平台 | Platform
-      description: 请输入您遇到 BUG 的平台。 Please enter the platform on which you encountered the bug. 
+      description: |
+        请输入你遇到问题的平台。
+        Please enter the platform on which you encountered the bug.
       placeholder: e.g. Windows 11
     validations:
       required: true
   - type: textarea
     id: bug-report
     attributes:
-      label: 问题描述 | Problem Description
-      description: 请尽可能地详细描述你所遇到的问题，并描述如何重新触发这个问题。 Please describe the problem you met in as much detail as possible. Besides, please describe how to trigger this problem again.
+      label: 问题描述 | Bug Description
+      description: |
+        请尽可能地详细描述你所遇到的问题，并描述如何重新触发这个问题。
+        Please describe the bug you met in as much detail as possible. Additionally, describe the steps to reproduce this bug.
       placeholder: |
         1. 点击 HMCL 上的某个按钮 | Click a button named ...
         2. 向下翻页 | Scroll down
@@ -42,12 +48,12 @@ body:
     attributes:
       label: 启动器崩溃报告 / 启动器日志文件 | Launcher Crash Report / Launcher Log File
       description: |
-        如果您的启动器崩溃了，请将崩溃报告填入（或将文件拖入）下方。
-        如果您的启动器没有崩溃，请在遇到问题后不要退出启动器，在启动器的【设置】>【通用】>【调试】一栏中点击“导出启动器日志”，并将导出的日志拖到下方的输入栏中。 
+        如果你的启动器崩溃了，请将崩溃报告填入（或将文件拖入）下方。
+        如果你的启动器没有崩溃，请在遇到问题后**不要退出启动器**，在启动器的 “设置 → 通用 → 调试” 一栏中点击 “导出启动器日志”，并将导出的日志拖到下方的输入栏中。
         **请注意：启动器崩溃报告或日志文件是诊断问题的重要依据，请务必上传！**
         
-        If your launcher crashes, please fill it in (or drag the file in) below.
-        If your launcher doesn't crash, please DO NOT EXIT your launcher, click "Export Launcher Log" in the [Settings] > [General] > [Debug] column of the launcher, and drag the exported log to the input field below.
-        **Attention: The crash report or the log file is the key to solve the problem. Please update it!**
+        If your launcher crashes, please fill in (or drag the file in) the following input field with the crash report.
+        If your launcher does not crash, please DO NOT EXIT your launcher, click "Export Launcher Logs" in the "Settings → General → Debug" of the launcher, and drag the exported log to the following input field.
+        **ATTENTION: The crash report or log file is the key to resolving the bug. Please upload them!**
     validations:
       required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,11 +1,11 @@
 blank_issues_enabled: false
 contact_links:
-  - name: QQ 群 | QQ Groups
+  - name: QQ 群 | QQ Group
     url: https://docs.hmcl.net/groups.html
-    about: Hello Minecraft! Launcher 的官方 QQ 交流群。| The official QQ groups of Hello Minecraft! Laucher.
-  - name: Discord 频道 | Discord Channel
+    about: Hello Minecraft! Launcher 的官方 QQ 交流群。| The official QQ group of Hello Minecraft! Launcher.
+  - name: Discord 服务器 | Discord Server
     url: https://discord.gg/jVvC7HfM6U
-    about: Hello Minecraft! Launcher 的官方 Discord 频道。| The official Discord channel of Hello Minecraft! Launcher.
+    about: Hello Minecraft! Launcher 的官方 Discord 服务器。| The official Discord server of Hello Minecraft! Launcher.
   - name: 其他反馈 | Others
     url: https://github.com/HMCL-dev/HMCL/discussions/new/choose
     about: 通过 Discussions 反馈其他问题。| Report other problems in Discussions.

.github/ISSUE_TEMPLATE/feature.yml

@@ -1,22 +1,28 @@
 name: 新功能 | Feature Request
-description: 为 HMCL 提出新功能 | A new feature for HMCL
+description: 为 HMCL 提出新功能。| Suggest a new feature or enhancement for HMCL.
 title: "[Feature] "
 labels: enhancement
 body:
 - type: markdown
   attributes:
-    value: 请确认 Issues 列表无重复的项目。| Please make sure that no duplicated issues has already been delivered.
+    value: |
+      请确认 Issues 列表无重复的项目。
+      Please make sure that no duplicate issues have already been submitted.
 - type: textarea
   id: description
   attributes:
     label: 描述 | Description
-    description: 请详细描述你想加入的新功能。| Please describe the new feature detaily.
+    description: |
+      请详细描述你想加入的新功能。
+      Please describe the new feature in detail.
   validations:
     required: true
 - type: textarea
   id: reason
   attributes:
     label: 原因 | Reason
-    description: 请描述该功能带来的好处及原因。| Please describe why you want to add the feature into HMCL.
+    description: |
+      请描述该功能带来的好处及原因。
+      Please describe why you want to add the feature or enhancement to HMCL.
   validations:
     required: true

.github/workflows/check-update.yml

@@ -50,16 +50,19 @@ jobs:
         if: ${{ env.continue == 'true' }}
         run: |
           echo "The full changelogs can be found on the website: https://docs.hmcl.net/changelog/dev.html" >> RELEASE_NOTE
-          echo "Notice: changelogs are written in Chinese." >> RELEASE_NOTE
+          echo "" >> RELEASE_NOTE
+          echo "*Notice: changelogs are written in Chinese.*" >> RELEASE_NOTE
           echo "" >> RELEASE_NOTE
           echo "| File Name | SHA-256 Checksum |"  >> RELEASE_NOTE
           echo "| ---  | --- |" >> RELEASE_NOTE
-          echo "| HMCL-$HMCL_VERSION.exe | $(cat HMCL-$HMCL_VERSION.exe.sha256) |" >> RELEASE_NOTE
-          echo "| HMCL-$HMCL_VERSION.jar | $(cat HMCL-$HMCL_VERSION.jar.sha256) |" >> RELEASE_NOTE
-          echo "| HMCL-$HMCL_VERSION.sh  | $(cat HMCL-$HMCL_VERSION.sh.sha256) |"  >> RELEASE_NOTE
+          echo "| [HMCL-$HMCL_VERSION.exe]($GH_DOWNLOAD_BASE_URL/v$HMCL_VERSION/HMCL-$HMCL_VERSION.exe) | \`$(cat HMCL-$HMCL_VERSION.exe.sha256)\` |" >> RELEASE_NOTE
+          echo "| [HMCL-$HMCL_VERSION.jar]($GH_DOWNLOAD_BASE_URL/v$HMCL_VERSION/HMCL-$HMCL_VERSION.jar) | \`$(cat HMCL-$HMCL_VERSION.jar.sha256)\` |" >> RELEASE_NOTE
+          echo "| [HMCL-$HMCL_VERSION.sh]($GH_DOWNLOAD_BASE_URL/v$HMCL_VERSION/HMCL-$HMCL_VERSION.sh)   | \`$(cat HMCL-$HMCL_VERSION.sh.sha256)\` |"  >> RELEASE_NOTE
+        env:
+          GH_DOWNLOAD_BASE_URL: https://github.com/HMCL-dev/HMCL/releases/download
       - name: Create release
         if: ${{ env.continue == 'true' }}
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           body_path: RELEASE_NOTE
           files: |
@@ -69,6 +72,7 @@ jobs:
           target_commitish: ${{ env.HMCL_COMMIT_SHA }}
           name: ${{ env.HMCL_TAG_NAME }}
           tag_name: ${{ env.HMCL_TAG_NAME }}
+          prerelease: true
   stable-check-update:
     if: ${{ github.repository_owner == 'HMCL-dev' }}
     needs: dev-check-update
@@ -114,16 +118,18 @@ jobs:
           echo "" >> RELEASE_NOTE
           echo "The full changelogs can be found on the website: https://docs.hmcl.net/changelog/stable.html" >> RELEASE_NOTE
           echo "" >> RELEASE_NOTE
-          echo "Notice: changelogs are written in Chinese." >> RELEASE_NOTE
+          echo "*Notice: changelogs are written in Chinese.*" >> RELEASE_NOTE
           echo "" >> RELEASE_NOTE
           echo "| File Name | SHA-256 Checksum |"  >> RELEASE_NOTE
           echo "| ---  | --- |" >> RELEASE_NOTE
-          echo "| HMCL-$HMCL_VERSION.exe | $(cat HMCL-$HMCL_VERSION.exe.sha256) |" >> RELEASE_NOTE
-          echo "| HMCL-$HMCL_VERSION.jar | $(cat HMCL-$HMCL_VERSION.jar.sha256) |" >> RELEASE_NOTE
-          echo "| HMCL-$HMCL_VERSION.sh  | $(cat HMCL-$HMCL_VERSION.sh.sha256) |"  >> RELEASE_NOTE
+          echo "| [HMCL-$HMCL_VERSION.exe]($GH_DOWNLOAD_BASE_URL/release-$HMCL_VERSION/HMCL-$HMCL_VERSION.exe) | \`$(cat HMCL-$HMCL_VERSION.exe.sha256)\` |" >> RELEASE_NOTE
+          echo "| [HMCL-$HMCL_VERSION.jar]($GH_DOWNLOAD_BASE_URL/release-$HMCL_VERSION/HMCL-$HMCL_VERSION.jar) | \`$(cat HMCL-$HMCL_VERSION.jar.sha256)\` |" >> RELEASE_NOTE
+          echo "| [HMCL-$HMCL_VERSION.sh]($GH_DOWNLOAD_BASE_URL/release-$HMCL_VERSION/HMCL-$HMCL_VERSION.sh)   | \`$(cat HMCL-$HMCL_VERSION.sh.sha256)\` |"  >> RELEASE_NOTE
+        env:
+          GH_DOWNLOAD_BASE_URL: https://github.com/HMCL-dev/HMCL/releases/download
       - name: Create release
         if: ${{ env.continue == 'true' }}
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           body_path: RELEASE_NOTE
           files: |

HMCL/build.gradle.kts

@@ -25,7 +25,7 @@ val buildNumber = System.getenv("BUILD_NUMBER")?.toInt().let { number ->
         if (!shortCommit.isNullOrEmpty()) "$prefix-$shortCommit" else "SNAPSHOT"
     }
 }
-val versionRoot = System.getenv("VERSION_ROOT") ?: "3.5"
+val versionRoot = System.getenv("VERSION_ROOT") ?: "3.6"
 val versionType = System.getenv("VERSION_TYPE") ?: if (isOfficial) "nightly" else "unofficial"
 
 val microsoftAuthId = System.getenv("MICROSOFT_AUTH_ID") ?: ""
@@ -37,13 +37,13 @@ version = "$versionRoot.$buildNumber"
 dependencies {
     implementation(project(":HMCLCore"))
     implementation("libs:JFoenix")
+    implementation("com.twelvemonkeys.imageio:imageio-webp:3.12.0")
 }
 
 fun digest(algorithm: String, bytes: ByteArray): ByteArray = MessageDigest.getInstance(algorithm).digest(bytes)
 
 fun createChecksum(file: File) {
     val algorithms = linkedMapOf(
-        "MD5" to "md5",
         "SHA-1" to "sha1",
         "SHA-256" to "sha256",
         "SHA-512" to "sha512"
@@ -111,6 +111,9 @@ tasks.getByName<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("sha
     exclude("**/package-info.class")
     exclude("META-INF/maven/**")
 
+    exclude("META-INF/services/javax.imageio.spi.ImageReaderSpi")
+    exclude("META-INF/services/javax.imageio.spi.ImageInputStreamSpi")
+
     minimize {
         exclude(dependency("com.google.code.gson:.*:.*"))
         exclude(dependency("libs:JFoenix:.*"))
@@ -118,7 +121,7 @@ tasks.getByName<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("sha
 
     manifest {
         attributes(
-            "Created-By" to "Copyright(c) 2013-2024 huangyuhui.",
+            "Created-By" to "Copyright(c) 2013-2025 huangyuhui.",
             "Main-Class" to "org.jackhuang.hmcl.Main",
             "Multi-Release" to "true",
             "Implementation-Version" to project.version,
@@ -167,24 +170,6 @@ fun createExecutable(suffix: String, header: String) {
 }
 
 tasks.processResources {
-    fun convertToBSS(resource: String) {
-        doFirst {
-            val cssFile = File(projectDir, "src/main/resources/$resource")
-            val bssFile = File(projectDir, "build/compiled-resources/${resource.substring(0, resource.length - 4)}.bss")
-            bssFile.parentFile.mkdirs()
-            javaexec {
-                classpath = sourceSets["main"].compileClasspath
-                mainClass.set("com.sun.javafx.css.parser.Css2Bin")
-                args(cssFile, bssFile)
-            }
-        }
-    }
-
-    from("build/compiled-resources")
-
-    convertToBSS("assets/css/root.css")
-    convertToBSS("assets/css/blue.css")
-
     into("META-INF/versions/11") {
         from(sourceSets["java11"].output)
     }

HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameRepository.java

@@ -33,19 +33,19 @@ import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.ProxyManager;
 import org.jackhuang.hmcl.setting.VersionIconType;
 import org.jackhuang.hmcl.setting.VersionSetting;
+import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.util.javafx.PropertyUtils;
 import org.jackhuang.hmcl.java.JavaRuntime;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
 import org.jackhuang.hmcl.util.versioning.VersionNumber;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.Instant;
@@ -218,7 +218,7 @@ public class HMCLGameRepository extends DefaultGameRepository {
 
     private VersionSetting initLocalVersionSetting(String id, VersionSetting vs) {
         localVersionSettings.put(id, vs);
-        vs.addPropertyChangedListener(a -> saveVersionSetting(id));
+        vs.addListener(a -> saveVersionSetting(id));
         return vs;
     }
 
@@ -251,7 +251,6 @@ public class HMCLGameRepository extends DefaultGameRepository {
     public VersionSetting getVersionSetting(String id) {
         VersionSetting vs = getLocalVersionSetting(id);
         if (vs == null || vs.isUsesGlobal()) {
-            profile.getGlobal().setGlobal(true); // always keep global.isGlobal = true
             profile.getGlobal().setUsesGlobal(true);
             return profile.getGlobal();
         } else
@@ -261,24 +260,11 @@ public class HMCLGameRepository extends DefaultGameRepository {
     public Optional<File> getVersionIconFile(String id) {
         File root = getVersionRoot(id);
 
-        File iconFile = new File(root, "icon.png");
-        if (iconFile.exists()) {
-            return Optional.of(iconFile);
-        }
-
-        iconFile = new File(root, "icon.jpg");
-        if (iconFile.exists()) {
-            return Optional.of(iconFile);
-        }
-
-        iconFile = new File(root, "icon.bmp");
-        if (iconFile.exists()) {
-            return Optional.of(iconFile);
-        }
-
-        iconFile = new File(root, "icon.gif");
-        if (iconFile.exists()) {
-            return Optional.of(iconFile);
+        for (String extension : FXUtils.IMAGE_EXTENSIONS) {
+            File file = new File(root, "icon." + extension);
+            if (file.exists()) {
+                return Optional.of(file);
+            }
         }
 
         return Optional.empty();
@@ -286,7 +272,7 @@ public class HMCLGameRepository extends DefaultGameRepository {
 
     public void setVersionIconFile(String id, File iconFile) throws IOException {
         String ext = FileUtils.getExtension(iconFile).toLowerCase(Locale.ROOT);
-        if (!ext.equals("png") && !ext.equals("jpg") && !ext.equals("bmp") && !ext.equals("gif")) {
+        if (!FXUtils.IMAGE_EXTENSIONS.contains(ext)) {
             throw new IllegalArgumentException("Unsupported icon file: " + ext);
         }
 
@@ -297,11 +283,9 @@ public class HMCLGameRepository extends DefaultGameRepository {
 
     public void deleteIconFile(String id) {
         File root = getVersionRoot(id);
-
-        new File(root, "icon.png").delete();
-        new File(root, "icon.jpg").delete();
-        new File(root, "icon.bmp").delete();
-        new File(root, "icon.gif").delete();
+        for (String extension : FXUtils.IMAGE_EXTENSIONS) {
+            new File(root, "icon." + extension).delete();
+        }
     }
 
     public Image getVersionIconImage(String id) {
@@ -315,9 +299,9 @@ public class HMCLGameRepository extends DefaultGameRepository {
             Version version = getVersion(id).resolve(this);
             Optional<File> iconFile = getVersionIconFile(id);
             if (iconFile.isPresent()) {
-                try (InputStream inputStream = new FileInputStream(iconFile.get())) {
-                    return new Image(inputStream);
-                } catch (IOException e) {
+                try {
+                    return FXUtils.loadImage(iconFile.get().toPath());
+                } catch (Exception e) {
                     LOG.warning("Failed to load version icon of " + id, e);
                 }
             }
@@ -353,6 +337,8 @@ public class HMCLGameRepository extends DefaultGameRepository {
         if (!FileUtils.makeDirectory(file.getAbsoluteFile().getParentFile()))
             return false;
 
+        LOG.info("Saving version setting: " + id);
+
         try {
             FileUtils.writeText(file, GSON.toJson(localVersionSettings.get(id)));
             return true;
@@ -373,7 +359,12 @@ public class HMCLGameRepository extends DefaultGameRepository {
             vs = createLocalVersionSetting(id);
         if (vs == null)
             return null;
-        vs.setUsesGlobal(false);
+        VersionIconType versionIcon = vs.getVersionIcon();
+        if (vs.isUsesGlobal()) {
+            PropertyUtils.copyProperties(profile.getGlobal(), vs);
+            vs.setUsesGlobal(false);
+        }
+        vs.setVersionIcon(versionIcon); // versionIcon is preserved
         return vs;
     }
 

HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java

@@ -36,10 +36,14 @@ import org.jackhuang.hmcl.mod.ModpackProvider;
 import org.jackhuang.hmcl.setting.*;
 import org.jackhuang.hmcl.task.*;
 import org.jackhuang.hmcl.ui.*;
-import org.jackhuang.hmcl.ui.construct.*;
+import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
+import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
 import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
+import org.jackhuang.hmcl.ui.construct.PromptDialogPane;
+import org.jackhuang.hmcl.ui.construct.TaskExecutorDialogPane;
 import org.jackhuang.hmcl.util.*;
 import org.jackhuang.hmcl.util.i18n.I18n;
+import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.io.ResponseCodeException;
 import org.jackhuang.hmcl.util.platform.*;
 import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
@@ -60,9 +64,10 @@ import static javafx.application.Platform.runLater;
 import static javafx.application.Platform.setImplicitExit;
 import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.Lang.resolveException;
-import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-import static org.jackhuang.hmcl.util.platform.Platform.*;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
+import static org.jackhuang.hmcl.util.platform.Platform.SYSTEM_PLATFORM;
+import static org.jackhuang.hmcl.util.platform.Platform.isCompatibleWithX86Java;
 
 public final class LauncherHelper {
 
@@ -178,6 +183,9 @@ public final class LauncherHelper {
                 .thenComposeAsync(() -> logIn(account).withStage("launch.state.logging_in"))
                 .thenComposeAsync(authInfo -> Task.supplyAsync(() -> {
                     LaunchOptions launchOptions = repository.getLaunchOptions(selectedVersion, javaVersionRef.get(), profile.getGameDir(), javaAgents, scriptFile != null);
+
+                    LOG.info("Here's the structure of game mod directory:\n" + FileUtils.printFileStructure(repository.getModManager(selectedVersion).getModsDirectory(), 10));
+
                     return new HMCLGameLauncher(
                             repository,
                             version.get(),
@@ -522,6 +530,9 @@ public final class LauncherHelper {
                         case MODDED_JAVA_17:
                             suggestions.add(i18n("launch.advice.modded_java", 17, gameVersion));
                             break;
+                        case MODDED_JAVA_21:
+                            suggestions.add(i18n("launch.advice.modded_java", 21, gameVersion));
+                            break;
                         case VANILLA_JAVA_8_51:
                             suggestions.add(i18n("launch.advice.java8_51_1_13"));
                             break;

HMCL/src/main/java/org/jackhuang/hmcl/game/TexturesLoader.java

@@ -87,7 +87,7 @@ public final class TexturesLoader {
     }
 
     private static final ThreadPoolExecutor POOL = threadPool("TexturesDownload", true, 2, 10, TimeUnit.SECONDS);
-    private static final Path TEXTURES_DIR = Metadata.MINECRAFT_DIRECTORY.resolve("assets").resolve("skins");
+    private static final Path TEXTURES_DIR = Metadata.HMCL_DIRECTORY.resolve("skins");
 
     private static Path getTexturePath(Texture texture) {
         String url = texture.getUrl();

HMCL/src/main/java/org/jackhuang/hmcl/setting/Config.java

@@ -47,7 +47,7 @@ import java.net.Proxy;
 import java.util.Map;
 import java.util.TreeMap;
 
-public final class Config implements Cloneable, Observable {
+public final class Config implements Observable {
 
     public static final int CURRENT_UI_VERSION = 0;
 
@@ -223,11 +223,6 @@ public final class Config implements Cloneable, Observable {
         return CONFIG_GSON.toJson(this);
     }
 
-    @Override
-    public Config clone() {
-        return fromJson(this.toJson());
-    }
-
     // Getters & Setters & Properties
     public String getSelectedProfile() {
         return selectedProfile.get();

HMCL/src/main/java/org/jackhuang/hmcl/setting/ConfigHolder.java

@@ -197,7 +197,7 @@ public final class ConfigHolder {
         }
     }
 
-    static void markConfigDirty() {
+    private static void markConfigDirty() {
         configWriter.accept(configInstance.toJson());
     }
 
@@ -241,11 +241,7 @@ public final class ConfigHolder {
         }
     }
 
-    static void markGlobalConfigDirty() {
+    private static void markGlobalConfigDirty() {
         globalConfigWriter.accept(globalConfigInstance.toJson());
     }
-
-    private static void saveGlobalConfigSync() throws IOException {
-        writeToConfig(globalConfigInstance.toJson());
-    }
 }

HMCL/src/main/java/org/jackhuang/hmcl/setting/GlobalConfig.java

@@ -33,7 +33,7 @@ import java.lang.reflect.Type;
 import java.util.*;
 
 @JsonAdapter(GlobalConfig.Serializer.class)
-public final class GlobalConfig implements Cloneable, Observable {
+public final class GlobalConfig implements Observable {
 
     @Nullable
     public static GlobalConfig fromJson(String json) throws JsonParseException {
@@ -79,11 +79,6 @@ public final class GlobalConfig implements Cloneable, Observable {
         return Config.CONFIG_GSON.toJson(this);
     }
 
-    @Override
-    public GlobalConfig clone() {
-        return fromJson(this.toJson());
-    }
-
     public int getAgreementVersion() {
         return agreementVersion.get();
     }

HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java

@@ -188,7 +188,7 @@ public final class Profile implements Observable {
         global.addListener(listener);
         gameDir.addListener(listener);
         useRelativePath.addListener(listener);
-        global.get().addPropertyChangedListener(listener);
+        global.get().addListener(listener);
         selectedVersion.addListener(listener);
     }
 

HMCL/src/main/java/org/jackhuang/hmcl/setting/Theme.java

@@ -24,9 +24,8 @@ import javafx.beans.binding.Bindings;
 import javafx.beans.binding.ObjectBinding;
 import javafx.scene.paint.Color;
 import javafx.scene.text.Font;
-import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
-import org.jackhuang.hmcl.util.io.IOUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -36,11 +35,10 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Base64;
 import java.util.Locale;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 import static org.jackhuang.hmcl.util.logging.Logger.LOG;
@@ -58,34 +56,6 @@ public class Theme {
             Color.web("#B71C1C")  // red
     };
 
-    private static Charset cssCharset;
-
-    private static Charset getCssCharset() {
-        if (cssCharset != null)
-            return cssCharset;
-
-        Charset defaultCharset = Charset.defaultCharset();
-        if (defaultCharset != StandardCharsets.UTF_8) {
-            // https://bugs.openjdk.org/browse/JDK-8279328
-            // For JavaFX 17 or earlier, native encoding should be used
-            String jfxVersion = System.getProperty("javafx.version");
-            if (jfxVersion != null) {
-                Matcher matcher = Pattern.compile("^(?<version>[0-9]+)").matcher(jfxVersion);
-                if (matcher.find()) {
-                    int v = Lang.parseInt(matcher.group(), -1);
-                    if (v >= 18) {
-                        cssCharset = StandardCharsets.UTF_8;
-                    }
-                }
-            }
-        }
-
-        if (cssCharset == null)
-            cssCharset = defaultCharset;
-
-        return cssCharset;
-    }
-
     @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
     private static Optional<Font> font;
 
@@ -145,6 +115,14 @@ public class Theme {
         return isLight() ? Color.BLACK : Color.WHITE;
     }
 
+    private static String rgba(Color color, double opacity) {
+        return String.format("rgba(%d, %d, %d, %.1f)",
+                (int) Math.ceil(color.getRed() * 256),
+                (int) Math.ceil(color.getGreen() * 256),
+                (int) Math.ceil(color.getBlue() * 256),
+                opacity);
+    }
+
     public String[] getStylesheets(String overrideFontFamily) {
         String css = "/assets/css/blue.css";
 
@@ -163,30 +141,44 @@ public class Theme {
 
         if (fontFamily != null || !this.color.equalsIgnoreCase(BLUE.color)) {
             Color textFill = getForegroundColor();
-            String fontCss = "";
-            if (fontFamily != null) {
-                fontCss = "-fx-font-family: \"" + fontFamily + "\";";
-                if (fontStyle != null && !fontStyle.isEmpty())
-                    fontCss += " -fx-font-style: \"" + fontStyle + "\";";
-            }
 
-            try {
-                File temp = File.createTempFile("hmcl", ".css");
-                String themeText = IOUtils.readFullyAsString(Theme.class.getResourceAsStream("/assets/css/custom.css"))
-                        .replace("%base-color%", color)
-                        .replace("%base-red%", Integer.toString((int) Math.ceil(paint.getRed() * 256)))
-                        .replace("%base-green%", Integer.toString((int) Math.ceil(paint.getGreen() * 256)))
-                        .replace("%base-blue%", Integer.toString((int) Math.ceil(paint.getBlue() * 256)))
-                        .replace("%base-rippler-color%", String.format("rgba(%d, %d, %d, 0.3)", (int) Math.ceil(paint.getRed() * 256), (int) Math.ceil(paint.getGreen() * 256), (int) Math.ceil(paint.getBlue() * 256)))
-                        .replace("%disabled-font-color%", String.format("rgba(%d, %d, %d, 0.7)", (int) Math.ceil(textFill.getRed() * 256), (int) Math.ceil(textFill.getGreen() * 256), (int) Math.ceil(textFill.getBlue() * 256)))
-                        .replace("%font-color%", getColorDisplayName(getForegroundColor()))
-                        .replace("%font%", fontCss);
-                FileUtils.writeText(temp, themeText, getCssCharset());
-                temp.deleteOnExit();
-                css = temp.toURI().toString();
-            } catch (IOException | NullPointerException e) {
-                LOG.error("Unable to create theme stylesheet. Fallback to blue theme.", e);
-            }
+            StringBuilder themeBuilder = new StringBuilder(512);
+            themeBuilder.append(".root {")
+                    .append("-fx-base-color:").append(color).append(';')
+                    .append("-fx-base-darker-color: derive(-fx-base-color, -10%);")
+                    .append("-fx-base-check-color: derive(-fx-base-color, 30%);")
+                    .append("-fx-rippler-color:").append(rgba(paint, 0.3)).append(';')
+                    .append("-fx-base-rippler-color: derive(").append(rgba(paint, 0.3)).append(", 100%);")
+                    .append("-fx-base-disabled-text-fill:").append(rgba(textFill, 0.7)).append(";")
+                    .append("-fx-base-text-fill:").append(getColorDisplayName(getForegroundColor())).append(";")
+                    .append("-theme-thumb:").append(rgba(paint, 0.7)).append(";");
+
+            if (fontFamily == null)
+                // https://github.com/HMCL-dev/HMCL/pull/3423
+                themeBuilder.append("-fx-font-family: -fx-base-font-family;");
+            else
+                themeBuilder.append("-fx-font-family:\"").append(fontFamily).append("\";");
+
+            if (fontStyle != null && !fontStyle.isEmpty())
+                themeBuilder.append("-fx-font-style:\"").append(fontStyle).append("\";");
+
+            themeBuilder.append('}');
+
+            if (FXUtils.JAVAFX_MAJOR_VERSION >= 17)
+                // JavaFX 17+ support loading stylesheets from data URIs
+                // https://bugs.openjdk.org/browse/JDK-8267554
+                css = "data:text/css;charset=UTF-8;base64," + Base64.getEncoder().encodeToString(themeBuilder.toString().getBytes(StandardCharsets.UTF_8));
+            else
+                try {
+                    File temp = File.createTempFile("hmcl", ".css");
+                    // For JavaFX 17 or earlier, CssParser uses the default charset
+                    // https://bugs.openjdk.org/browse/JDK-8279328
+                    FileUtils.writeText(temp, themeBuilder.toString(), Charset.defaultCharset());
+                    temp.deleteOnExit();
+                    css = temp.toURI().toString();
+                } catch (IOException | NullPointerException e) {
+                    LOG.error("Unable to create theme stylesheet. Fallback to blue theme.", e);
+                }
         }
 
         return new String[]{css, "/assets/css/root.css"};
@@ -235,7 +227,7 @@ public class Theme {
     }
 
     public static String getColorDisplayName(Color c) {
-        return c != null ? String.format("#%02x%02x%02x", Math.round(c.getRed() * 255.0D), Math.round(c.getGreen() * 255.0D), Math.round(c.getBlue() * 255.0D)).toUpperCase(Locale.ROOT) : null;
+        return c != null ? String.format("#%02X%02X%02X", Math.round(c.getRed() * 255.0D), Math.round(c.getGreen() * 255.0D), Math.round(c.getBlue() * 255.0D)) : null;
     }
 
     private static ObjectBinding<Color> FOREGROUND_FILL;

HMCL/src/main/java/org/jackhuang/hmcl/setting/VersionSetting.java

@@ -20,11 +20,14 @@ package org.jackhuang.hmcl.setting;
 import com.google.gson.*;
 import com.google.gson.annotations.JsonAdapter;
 import javafx.beans.InvalidationListener;
+import javafx.beans.Observable;
 import javafx.beans.property.*;
 import org.jackhuang.hmcl.game.*;
 import org.jackhuang.hmcl.java.JavaManager;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.javafx.ObservableHelper;
+import org.jackhuang.hmcl.util.javafx.PropertyUtils;
 import org.jackhuang.hmcl.java.JavaRuntime;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
 import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
@@ -42,16 +45,12 @@ import static org.jackhuang.hmcl.util.logging.Logger.LOG;
  * @author huangyuhui
  */
 @JsonAdapter(VersionSetting.Serializer.class)
-public final class VersionSetting implements Cloneable {
+public final class VersionSetting implements Cloneable, Observable {
 
-    private boolean global = false;
+    private transient ObservableHelper helper = new ObservableHelper(this);
 
-    public boolean isGlobal() {
-        return global;
-    }
-
-    public void setGlobal(boolean global) {
-        this.global = global;
+    public VersionSetting() {
+        PropertyUtils.attachListener(this, helper);
     }
 
     private final BooleanProperty usesGlobalProperty = new SimpleBooleanProperty(this, "usesGlobal", true);
@@ -708,79 +707,21 @@ public final class VersionSetting implements Cloneable {
         }
     }
 
-    public void addPropertyChangedListener(InvalidationListener listener) {
-        usesGlobalProperty.addListener(listener);
-        javaVersionProperty.addListener(listener);
-        javaDirProperty.addListener(listener);
-        wrapperProperty.addListener(listener);
-        permSizeProperty.addListener(listener);
-        maxMemoryProperty.addListener(listener);
-        minMemoryProperty.addListener(listener);
-        autoMemory.addListener(listener);
-        preLaunchCommandProperty.addListener(listener);
-        postExitCommand.addListener(listener);
-        javaArgsProperty.addListener(listener);
-        minecraftArgsProperty.addListener(listener);
-        environmentVariablesProperty.addListener(listener);
-        noJVMArgsProperty.addListener(listener);
-        notCheckGameProperty.addListener(listener);
-        notCheckJVMProperty.addListener(listener);
-        notPatchNativesProperty.addListener(listener);
-        showLogsProperty.addListener(listener);
-        serverIpProperty.addListener(listener);
-        fullscreenProperty.addListener(listener);
-        widthProperty.addListener(listener);
-        heightProperty.addListener(listener);
-        gameDirTypeProperty.addListener(listener);
-        gameDirProperty.addListener(listener);
-        processPriorityProperty.addListener(listener);
-        rendererProperty.addListener(listener);
-        useNativeGLFW.addListener(listener);
-        useNativeOpenAL.addListener(listener);
-        launcherVisibilityProperty.addListener(listener);
-        defaultJavaPathProperty.addListener(listener);
-        nativesDirProperty.addListener(listener);
-        nativesDirTypeProperty.addListener(listener);
-        versionIcon.addListener(listener);
+    @Override
+    public void addListener(InvalidationListener listener) {
+        helper.addListener(listener);
+    }
+
+    @Override
+    public void removeListener(InvalidationListener listener) {
+        helper.removeListener(listener);
     }
 
     @Override
     public VersionSetting clone() {
-        VersionSetting versionSetting = new VersionSetting();
-        versionSetting.setUsesGlobal(isUsesGlobal());
-        versionSetting.setJavaVersionType(getJavaVersionType());
-        versionSetting.setJavaVersion(getJavaVersion());
-        versionSetting.setDefaultJavaPath(getDefaultJavaPath());
-        versionSetting.setJavaDir(getJavaDir());
-        versionSetting.setWrapper(getWrapper());
-        versionSetting.setPermSize(getPermSize());
-        versionSetting.setMaxMemory(getMaxMemory());
-        versionSetting.setMinMemory(getMinMemory());
-        versionSetting.setAutoMemory(isAutoMemory());
-        versionSetting.setPreLaunchCommand(getPreLaunchCommand());
-        versionSetting.setPostExitCommand(getPostExitCommand());
-        versionSetting.setJavaArgs(getJavaArgs());
-        versionSetting.setMinecraftArgs(getMinecraftArgs());
-        versionSetting.setEnvironmentVariables(getEnvironmentVariables());
-        versionSetting.setNoJVMArgs(isNoJVMArgs());
-        versionSetting.setNotCheckGame(isNotCheckGame());
-        versionSetting.setNotCheckJVM(isNotCheckJVM());
-        versionSetting.setNotPatchNatives(isNotPatchNatives());
-        versionSetting.setShowLogs(isShowLogs());
-        versionSetting.setServerIp(getServerIp());
-        versionSetting.setFullscreen(isFullscreen());
-        versionSetting.setWidth(getWidth());
-        versionSetting.setHeight(getHeight());
-        versionSetting.setGameDirType(getGameDirType());
-        versionSetting.setGameDir(getGameDir());
-        versionSetting.setProcessPriority(getProcessPriority());
-        versionSetting.setRenderer(getRenderer());
-        versionSetting.setUseNativeGLFW(isUseNativeGLFW());
-        versionSetting.setUseNativeOpenAL(isUseNativeOpenAL());
-        versionSetting.setLauncherVisibility(getLauncherVisibility());
-        versionSetting.setNativesDir(getNativesDir());
-        versionSetting.setVersionIcon(getVersionIcon());
-        return versionSetting;
+        VersionSetting cloned = new VersionSetting();
+        PropertyUtils.copyProperties(this, cloned);
+        return cloned;
     }
 
     public static class Serializer implements JsonSerializer<VersionSetting>, JsonDeserializer<VersionSetting> {

HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java

@@ -391,9 +391,6 @@ public final class Controllers {
                     Controllers.getSettingsPage().showFeedback();
                     Controllers.navigate(Controllers.getSettingsPage());
                     break;
-                case "hmcl://hide-announcement":
-                    Controllers.getRootPage().getMainPage().hideAnnouncementPane();
-                    break;
             }
         } else {
             FXUtils.openLink(href);

HMCL/src/main/java/org/jackhuang/hmcl/ui/CrashWindow.java

@@ -53,7 +53,7 @@ public class CrashWindow extends Stage {
 
         Button btnContact = new Button();
         btnContact.setText(i18n("launcher.contact"));
-        btnContact.setOnMouseClicked(event -> FXUtils.openLink(Metadata.CONTACT_URL));
+        btnContact.setOnAction(event -> FXUtils.openLink(Metadata.CONTACT_URL));
         HBox box = new HBox();
         box.setStyle("-fx-padding: 8px;");
         box.getChildren().add(btnContact);

HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java

@@ -18,6 +18,7 @@
 package org.jackhuang.hmcl.ui;
 
 import com.jfoenix.controls.*;
+import com.twelvemonkeys.imageio.plugins.webp.WebPImageReaderSpi;
 import javafx.animation.*;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
@@ -26,10 +27,14 @@ import javafx.beans.WeakInvalidationListener;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.Property;
 import javafx.beans.value.*;
+import javafx.event.Event;
+import javafx.event.EventDispatcher;
+import javafx.event.EventType;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Cursor;
 import javafx.scene.Node;
+import javafx.scene.Scene;
 import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.*;
@@ -44,6 +49,7 @@ import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
 import javafx.scene.text.Text;
 import javafx.scene.text.TextFlow;
+import javafx.stage.FileChooser;
 import javafx.stage.Stage;
 import javafx.util.Callback;
 import javafx.util.Duration;
@@ -53,10 +59,9 @@ import org.glavo.png.PNGWriter;
 import org.glavo.png.javafx.PNGJavaFXUtils;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.animation.AnimationUtils;
-import org.jackhuang.hmcl.util.Holder;
-import org.jackhuang.hmcl.util.ResourceNotFoundError;
-import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.*;
 import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.util.io.NetworkUtils;
 import org.jackhuang.hmcl.util.javafx.ExtendedProperties;
 import org.jackhuang.hmcl.util.javafx.SafeStringConverter;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
@@ -67,15 +72,14 @@ import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
+import javax.imageio.ImageIO;
+import javax.imageio.ImageReader;
+import javax.imageio.stream.ImageInputStream;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import java.io.*;
-import java.lang.ref.WeakReference;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.net.URI;
-import java.net.URISyntaxException;
+import java.net.*;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -85,6 +89,9 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BooleanSupplier;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import static org.jackhuang.hmcl.util.Lang.thread;
@@ -96,8 +103,26 @@ public final class FXUtils {
     private FXUtils() {
     }
 
+    public static final int JAVAFX_MAJOR_VERSION;
+
+    static {
+        String jfxVersion = System.getProperty("javafx.version");
+        int majorVersion = -1;
+        if (jfxVersion != null) {
+            Matcher matcher = Pattern.compile("^(?<version>[0-9]+)").matcher(jfxVersion);
+            if (matcher.find()) {
+                majorVersion = Lang.parseInt(matcher.group(), -1);
+            }
+        }
+        JAVAFX_MAJOR_VERSION = majorVersion;
+    }
+
     public static final String DEFAULT_MONOSPACE_FONT = OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS ? "Consolas" : "Monospace";
 
+    public static final List<String> IMAGE_EXTENSIONS = Lang.immutableListOf(
+            "png", "jpg", "jpeg", "bmp", "gif", "webp"
+    );
+
     private static final Map<String, Image> builtinImageCache = new ConcurrentHashMap<>();
     private static final Map<String, Path> remoteImageCache = new ConcurrentHashMap<>();
 
@@ -213,6 +238,21 @@ public final class FXUtils {
                 });
     }
 
+    @SuppressWarnings("unchecked")
+    public static <T extends Event> void ignoreEvent(Node node, EventType<T> type, Predicate<? super T> filter) {
+        EventDispatcher oldDispatcher = node.getEventDispatcher();
+        node.setEventDispatcher((event, tail) -> {
+            EventType<?> t = event.getEventType();
+            while (t != null && t != type)
+                t = t.getSuperType();
+            if (t == type && filter.test((T) event)) {
+                return tail.dispatchEvent(event);
+            } else {
+                return oldDispatcher.dispatchEvent(event, tail);
+            }
+        });
+    }
+
     public static <K, T> void setupCellValueFactory(JFXTreeTableColumn<K, T> column, Function<K, ObservableValue<T>> mapper) {
         column.setCellValueFactory(param -> {
             if (column.validateValue(param))
@@ -298,8 +338,12 @@ public final class FXUtils {
             ScrollUtils.addSmoothScrolling(scrollPane);
     }
 
+    private static final Duration TOOLTIP_FAST_SHOW_DELAY = Duration.millis(50);
+    private static final Duration TOOLTIP_SLOW_SHOW_DELAY = Duration.millis(500);
+    private static final Duration TOOLTIP_SHOW_DURATION = Duration.millis(5000);
+
     public static void installFastTooltip(Node node, Tooltip tooltip) {
-        installTooltip(node, 50, 5000, 0, tooltip);
+        runInFX(() -> TooltipInstaller.INSTALLER.installTooltip(node, TOOLTIP_FAST_SHOW_DELAY, TOOLTIP_SHOW_DURATION, Duration.ZERO, tooltip));
     }
 
     public static void installFastTooltip(Node node, String tooltip) {
@@ -307,39 +351,13 @@ public final class FXUtils {
     }
 
     public static void installSlowTooltip(Node node, Tooltip tooltip) {
-        installTooltip(node, 500, 5000, 0, tooltip);
+        runInFX(() -> TooltipInstaller.INSTALLER.installTooltip(node, TOOLTIP_SLOW_SHOW_DELAY, TOOLTIP_SHOW_DURATION, Duration.ZERO, tooltip));
     }
 
     public static void installSlowTooltip(Node node, String tooltip) {
         installSlowTooltip(node, new Tooltip(tooltip));
     }
 
-    public static void installTooltip(Node node, double openDelay, double visibleDelay, double closeDelay, Tooltip tooltip) {
-        runInFX(() -> {
-            try {
-                // Java 8
-                Class<?> behaviorClass = Class.forName("javafx.scene.control.Tooltip$TooltipBehavior");
-                Constructor<?> behaviorConstructor = behaviorClass.getDeclaredConstructor(Duration.class, Duration.class, Duration.class, boolean.class);
-                behaviorConstructor.setAccessible(true);
-                Object behavior = behaviorConstructor.newInstance(new Duration(openDelay), new Duration(visibleDelay), new Duration(closeDelay), false);
-                Method installMethod = behaviorClass.getDeclaredMethod("install", Node.class, Tooltip.class);
-                installMethod.setAccessible(true);
-                installMethod.invoke(behavior, node, tooltip);
-            } catch (ReflectiveOperationException e) {
-                try {
-                    // Java 9
-                    Tooltip.class.getMethod("setShowDelay", Duration.class).invoke(tooltip, new Duration(openDelay));
-                    Tooltip.class.getMethod("setShowDuration", Duration.class).invoke(tooltip, new Duration(visibleDelay));
-                    Tooltip.class.getMethod("setHideDelay", Duration.class).invoke(tooltip, new Duration(closeDelay));
-                } catch (ReflectiveOperationException e2) {
-                    e.addSuppressed(e2);
-                    LOG.error("Cannot install tooltip", e);
-                }
-                Tooltip.install(node, tooltip);
-            }
-        });
-    }
-
     public static void playAnimation(Node node, String animationKey, Timeline timeline) {
         animationKey = "FXUTILS.ANIMATION." + animationKey;
         Object oldTimeline = node.getProperties().get(animationKey);
@@ -522,10 +540,12 @@ public final class FXUtils {
     }
 
     public static <T> void bind(JFXTextField textField, Property<T> property, StringConverter<T> converter) {
-        textField.setText(converter == null ? (String) property.getValue() : converter.toString(property.getValue()));
-        TextFieldBindingListener<T> listener = new TextFieldBindingListener<>(textField, property, converter);
-        textField.focusedProperty().addListener((ChangeListener<Boolean>) listener);
-        property.addListener(listener);
+        TextFieldBinding<T> binding = new TextFieldBinding<>(textField, property, converter);
+        binding.updateTextField();
+        textField.getProperties().put("FXUtils.bind.binding", binding);
+        textField.focusedProperty().addListener(binding.focusedListener);
+        textField.sceneProperty().addListener(binding.sceneListener);
+        property.addListener(binding.propertyListener);
     }
 
     public static void bindInt(JFXTextField textField, Property<Number> property) {
@@ -537,68 +557,66 @@ public final class FXUtils {
     }
 
     public static void unbind(JFXTextField textField, Property<?> property) {
-        TextFieldBindingListener<?> listener = new TextFieldBindingListener<>(textField, property, null);
-        textField.focusedProperty().removeListener((ChangeListener<Boolean>) listener);
-        property.removeListener(listener);
+        TextFieldBinding<?> binding = (TextFieldBinding<?>) textField.getProperties().remove("FXUtils.bind.binding");
+        if (binding != null) {
+            textField.focusedProperty().removeListener(binding.focusedListener);
+            textField.sceneProperty().removeListener(binding.sceneListener);
+            property.removeListener(binding.propertyListener);
+        }
     }
 
-    private static final class TextFieldBindingListener<T> implements ChangeListener<Boolean>, InvalidationListener {
-        private final int hashCode;
-        private final WeakReference<JFXTextField> textFieldRef;
-        private final WeakReference<Property<T>> propertyRef;
+    private static final class TextFieldBinding<T> {
+        private final JFXTextField textField;
+        private final Property<T> property;
         private final StringConverter<T> converter;
 
-        TextFieldBindingListener(JFXTextField textField, Property<T> property, StringConverter<T> converter) {
-            this.textFieldRef = new WeakReference<>(textField);
-            this.propertyRef = new WeakReference<>(property);
+        public final ChangeListener<Boolean> focusedListener;
+        public final ChangeListener<Scene> sceneListener;
+        public final InvalidationListener propertyListener;
+
+        public TextFieldBinding(JFXTextField textField, Property<T> property, StringConverter<T> converter) {
+            this.textField = textField;
+            this.property = property;
             this.converter = converter;
-            this.hashCode = System.identityHashCode(textField) ^ System.identityHashCode(property);
-        }
 
-        @Override
-        public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean focused) { // On TextField changed
-            JFXTextField textField = textFieldRef.get();
-            Property<T> property = this.propertyRef.get();
-
-            if (textField != null && property != null && oldValue == Boolean.TRUE && focused == Boolean.FALSE) {
-                if (textField.validate()) {
-                    String newText = textField.getText();
-                    @SuppressWarnings("unchecked")
-                    T newValue = converter == null ? (T) newText : converter.fromString(newText);
-
-                    if (!Objects.equals(newValue, property.getValue()))
-                        property.setValue(newValue);
-                } else {
-                    // Rollback to old value
-                    invalidated(null);
+            focusedListener = (observable, oldFocused, newFocused) -> {
+                if (oldFocused && !newFocused) {
+                    if (textField.validate()) {
+                        uppdateProperty();
+                    } else {
+                        // Rollback to old value
+                        updateTextField();
+                    }
                 }
+            };
+
+            sceneListener = (observable, oldScene, newScene) -> {
+                if (oldScene != null && newScene == null) {
+                    // Component is being removed from scene
+                    if (textField.validate()) {
+                        uppdateProperty();
+                    }
+                }
+            };
+
+            propertyListener = observable -> {
+                updateTextField();
+            };
+        }
+
+        public void uppdateProperty() {
+            String newText = textField.getText();
+            @SuppressWarnings("unchecked")
+            T newValue = converter == null ? (T) newText : converter.fromString(newText);
+
+            if (!Objects.equals(newValue, property.getValue())) {
+                property.setValue(newValue);
             }
         }
 
-        @Override
-        public void invalidated(Observable observable) { // On property change
-            JFXTextField textField = textFieldRef.get();
-            Property<T> property = this.propertyRef.get();
-
-            if (textField != null && property != null) {
-                T value = property.getValue();
-                textField.setText(converter == null ? (String) value : converter.toString(value));
-            }
-        }
-
-        @Override
-        public int hashCode() {
-            return hashCode;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (!(obj instanceof TextFieldBindingListener))
-                return false;
-            TextFieldBindingListener<?> other = (TextFieldBindingListener<?>) obj;
-            return this.hashCode == other.hashCode
-                    && this.textFieldRef.get() == other.textFieldRef.get()
-                    && this.propertyRef.get() == other.propertyRef.get();
+        public void updateTextField() {
+            T value = property.getValue();
+            textField.setText(converter == null ? (String) value : converter.toString(value));
         }
     }
 
@@ -720,6 +738,50 @@ public final class FXUtils {
         stage.getIcons().add(newBuiltinImage(icon));
     }
 
+    private static Image loadWebPImage(InputStream input) throws IOException {
+        WebPImageReaderSpi spi = new WebPImageReaderSpi();
+        ImageReader reader = spi.createReaderInstance(null);
+
+        try (ImageInputStream imageInput = ImageIO.createImageInputStream(input)) {
+            reader.setInput(imageInput, true, true);
+            return SwingFXUtils.toFXImage(reader.read(0, reader.getDefaultReadParam()), null);
+        } finally {
+            reader.dispose();
+        }
+    }
+
+    public static Image loadImage(Path path) throws Exception {
+        try (InputStream input = Files.newInputStream(path)) {
+            if ("webp".equalsIgnoreCase(FileUtils.getExtension(path)))
+                return loadWebPImage(input);
+            else {
+                Image image = new Image(input);
+                if (image.isError())
+                    throw image.getException();
+                return image;
+            }
+        }
+    }
+
+    public static Image loadImage(URL url) throws Exception {
+        URLConnection connection = NetworkUtils.createConnection(url);
+        if (connection instanceof HttpURLConnection) {
+            connection = NetworkUtils.resolveConnection((HttpURLConnection) connection);
+        }
+
+        try (InputStream input = connection.getInputStream()) {
+            String path = url.getPath();
+            if (path != null && "webp".equalsIgnoreCase(StringUtils.substringAfterLast(path, '.')))
+                return loadWebPImage(input);
+            else {
+                Image image = new Image(input);
+                if (image.isError())
+                    throw image.getException();
+                return image;
+            }
+        }
+    }
+
     /**
      * Suppress IllegalArgumentException since the url is supposed to be correct definitely.
      *
@@ -957,6 +1019,15 @@ public final class FXUtils {
         });
     }
 
+    public static void onClicked(Node node, Runnable action) {
+        node.addEventHandler(MouseEvent.MOUSE_CLICKED, e -> {
+            if (e.getButton() == MouseButton.PRIMARY && e.getClickCount() == 1) {
+                action.run();
+                e.consume();
+            }
+        });
+    }
+
     public static void copyText(String text) {
         ClipboardContent content = new ClipboardContent();
         content.putString(text);
@@ -987,7 +1058,7 @@ public final class FXUtils {
                     if ("a".equals(element.getTagName())) {
                         String href = element.getAttribute("href");
                         Text text = new Text(element.getTextContent());
-                        text.setOnMouseClicked(e -> {
+                        onClicked(text, () -> {
                             String link = href;
                             try {
                                 link = new URI(href).toASCIIString();
@@ -996,8 +1067,8 @@ public final class FXUtils {
                             hyperlinkAction.accept(link);
                         });
                         text.setCursor(Cursor.HAND);
+                        text.setFill(Color.web("#0070E0"));
                         text.setUnderline(true);
-                        text.setFill(Color.web("#283593"));
                         texts.add(text);
                     } else if ("b".equals(element.getTagName())) {
                         Text text = new Text(element.getTextContent());
@@ -1032,4 +1103,9 @@ public final class FXUtils {
 
         return String.format("#%02x%02x%02x", r, g, b);
     }
+
+    public static FileChooser.ExtensionFilter getImageExtensionFilter() {
+        return new FileChooser.ExtensionFilter(i18n("extension.png"),
+                IMAGE_EXTENSIONS.stream().map(ext -> "*." + ext).toArray(String[]::new));
+    }
 }

HMCL/src/main/java/org/jackhuang/hmcl/ui/GameCrashWindow.java

@@ -65,7 +65,6 @@ import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
-import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 import static org.jackhuang.hmcl.util.Pair.pair;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
@@ -387,13 +386,13 @@ public class GameCrashWindow extends Stage {
                 gameDir.getStyleClass().setAll("two-line-item-second-large");
                 gameDir.setTitle(i18n("game.directory"));
                 gameDir.setSubtitle(launchOptions.getGameDir().getAbsolutePath());
-                runInFX(() -> FXUtils.installFastTooltip(gameDir, i18n("game.directory")));
+                FXUtils.installFastTooltip(gameDir, i18n("game.directory"));
 
                 TwoLineListItem javaDir = new TwoLineListItem();
                 javaDir.getStyleClass().setAll("two-line-item-second-large");
                 javaDir.setTitle(i18n("settings.game.java_directory"));
                 javaDir.setSubtitle(launchOptions.getJava().getBinary().toAbsolutePath().toString());
-                runInFX(() -> FXUtils.installFastTooltip(javaDir, i18n("settings.game.java_directory")));
+                FXUtils.installFastTooltip(javaDir, i18n("settings.game.java_directory"));
 
                 Label reasonTitle = new Label(i18n("game.crash.reason"));
                 reasonTitle.getStyleClass().add("two-line-item-second-large-title");
@@ -417,14 +416,14 @@ public class GameCrashWindow extends Stage {
             HBox toolBar = new HBox();
             {
                 JFXButton exportGameCrashInfoButton = FXUtils.newRaisedButton(i18n("logwindow.export_game_crash_logs"));
-                exportGameCrashInfoButton.setOnMouseClicked(e -> exportGameCrashInfo());
+                exportGameCrashInfoButton.setOnAction(e -> exportGameCrashInfo());
 
                 JFXButton logButton = FXUtils.newRaisedButton(i18n("logwindow.title"));
-                logButton.setOnMouseClicked(e -> showLogWindow());
+                logButton.setOnAction(e -> showLogWindow());
 
                 JFXButton helpButton = FXUtils.newRaisedButton(i18n("help"));
                 helpButton.setOnAction(e -> FXUtils.openLink("https://docs.hmcl.net/help.html"));
-                runInFX(() -> FXUtils.installFastTooltip(helpButton, i18n("logwindow.help")));
+                FXUtils.installFastTooltip(helpButton, i18n("logwindow.help"));
 
 
                 toolBar.setPadding(new Insets(8));

HMCL/src/main/java/org/jackhuang/hmcl/ui/HTMLRenderer.java

@@ -123,7 +123,7 @@ public final class HTMLRenderer {
         if (hyperlink != null) {
             URI target = resolveLink(hyperlink);
             if (target != null) {
-                text.setOnMouseClicked(event -> onClickHyperlink.accept(target));
+                FXUtils.onClicked(text, () -> onClickHyperlink.accept(target));
                 text.setCursor(Cursor.HAND);
             }
             text.getStyleClass().add("html-hyperlink");
@@ -192,7 +192,7 @@ public final class HTMLRenderer {
                 if (hyperlink != null) {
                     URI target = resolveLink(hyperlink);
                     if (target != null) {
-                        imageView.setOnMouseClicked(event -> onClickHyperlink.accept(target));
+                        FXUtils.onClicked(imageView, () -> onClickHyperlink.accept(target));
                         imageView.setCursor(Cursor.HAND);
                     }
                 }

HMCL/src/main/java/org/jackhuang/hmcl/ui/InstallerItem.java

@@ -23,7 +23,6 @@ import javafx.beans.binding.Bindings;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.css.PseudoClass;
-import javafx.event.EventHandler;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Cursor;
@@ -33,7 +32,7 @@ import javafx.scene.control.Label;
 import javafx.scene.control.Skin;
 import javafx.scene.control.SkinBase;
 import javafx.scene.image.ImageView;
-import javafx.scene.input.MouseEvent;
+import javafx.scene.input.MouseButton;
 import javafx.scene.layout.*;
 import org.jackhuang.hmcl.download.LibraryAnalyzer;
 import org.jackhuang.hmcl.setting.Theme;
@@ -60,8 +59,8 @@ public class InstallerItem extends Control {
     private final ObjectProperty<InstalledState> versionProperty = new SimpleObjectProperty<>(this, "version", null);
     private final ObjectProperty<State> resolvedStateProperty = new SimpleObjectProperty<>(this, "resolvedState", InstallableState.INSTANCE);
 
-    private final ObjectProperty<EventHandler<? super MouseEvent>> installActionProperty = new SimpleObjectProperty<>(this, "installAction");
-    private final ObjectProperty<EventHandler<? super MouseEvent>> removeActionProperty = new SimpleObjectProperty<>(this, "removeAction");
+    private final ObjectProperty<Runnable> onInstall = new SimpleObjectProperty<>(this, "onInstall");
+    private final ObjectProperty<Runnable> onRemove = new SimpleObjectProperty<>(this, "onRemove");
 
     public interface State {
     }
@@ -170,12 +169,28 @@ public class InstallerItem extends Control {
         return resolvedStateProperty;
     }
 
-    public ObjectProperty<EventHandler<? super MouseEvent>> installActionProperty() {
-        return installActionProperty;
+    public ObjectProperty<Runnable> onInstallProperty() {
+        return onInstall;
     }
 
-    public ObjectProperty<EventHandler<? super MouseEvent>> removeActionProperty() {
-        return removeActionProperty;
+    public Runnable getOnInstall() {
+        return onInstall.get();
+    }
+
+    public void setOnInstall(Runnable onInstall) {
+        this.onInstall.set(onInstall);
+    }
+
+    public ObjectProperty<Runnable> onRemoveProperty() {
+        return onRemove;
+    }
+
+    public Runnable getOnRemove() {
+        return onRemove.get();
+    }
+
+    public void setOnRemove(Runnable onRemove) {
+        this.onRemove.set(onRemove);
     }
 
     @Override
@@ -371,7 +386,11 @@ public class InstallerItem extends Control {
                 removeButton.visibleProperty().bind(Bindings.createBooleanBinding(() -> control.resolvedStateProperty.get() instanceof InstalledState, control.resolvedStateProperty));
             }
             removeButton.managedProperty().bind(removeButton.visibleProperty());
-            removeButton.onMouseClickedProperty().bind(control.removeActionProperty);
+            removeButton.setOnAction(e -> {
+                Runnable onRemove = control.getOnRemove();
+                if (onRemove != null)
+                    onRemove.run();
+            });
             buttonsContainer.getChildren().add(removeButton);
 
             JFXButton installButton = new JFXButton();
@@ -383,7 +402,7 @@ public class InstallerItem extends Control {
             ));
             installButton.getStyleClass().add("toggle-icon4");
             installButton.visibleProperty().bind(Bindings.createBooleanBinding(() -> {
-                if (control.installActionProperty.get() == null) {
+                if (control.getOnInstall() == null) {
                     return false;
                 }
 
@@ -396,18 +415,27 @@ public class InstallerItem extends Control {
                 }
 
                 return false;
-            }, control.resolvedStateProperty, control.installActionProperty));
+            }, control.resolvedStateProperty, control.onInstall));
             installButton.managedProperty().bind(installButton.visibleProperty());
-            installButton.onMouseClickedProperty().bind(control.installActionProperty);
+            installButton.setOnAction(e -> {
+                Runnable onInstall = control.getOnInstall();
+                if (onInstall != null)
+                    onInstall.run();
+            });
             buttonsContainer.getChildren().add(installButton);
 
             FXUtils.onChangeAndOperate(installButton.visibleProperty(), clickable -> {
                 if (clickable) {
-                    container.onMouseClickedProperty().bind(control.installActionProperty);
+                    container.setOnMouseClicked(event -> {
+                        Runnable onInstall = control.getOnInstall();
+                        if (onInstall != null && event.getButton() == MouseButton.PRIMARY && event.getClickCount() == 1) {
+                            onInstall.run();
+                            event.consume();
+                        }
+                    });
                     pane.setCursor(Cursor.HAND);
                 } else {
-                    container.onMouseClickedProperty().unbind();
-                    container.onMouseClickedProperty().set(null);
+                    container.setOnMouseClicked(null);
                     pane.setCursor(Cursor.DEFAULT);
                 }
             });

HMCL/src/main/java/org/jackhuang/hmcl/ui/ListPageSkin.java

@@ -70,7 +70,7 @@ public class ListPageSkin extends SkinBase<ListPage<?>> {
                 btnAdd.getStyleClass().add("jfx-button-raised-round");
                 btnAdd.setButtonType(JFXButton.ButtonType.RAISED);
                 btnAdd.setGraphic(SVG.PLUS.createIcon(Theme.whiteFill(), -1, -1));
-                btnAdd.setOnMouseClicked(e -> skinnable.add());
+                btnAdd.setOnAction(e -> skinnable.add());
 
                 JFXButton btnRefresh = new JFXButton();
                 FXUtils.setLimitWidth(btnRefresh, 40);
@@ -78,7 +78,7 @@ public class ListPageSkin extends SkinBase<ListPage<?>> {
                 btnRefresh.getStyleClass().add("jfx-button-raised-round");
                 btnRefresh.setButtonType(JFXButton.ButtonType.RAISED);
                 btnRefresh.setGraphic(SVG.REFRESH.createIcon(Theme.whiteFill(), -1, -1));
-                btnRefresh.setOnMouseClicked(e -> skinnable.refresh());
+                btnRefresh.setOnAction(e -> skinnable.refresh());
 
                 vBox.getChildren().setAll(btnAdd);
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/LogWindow.java

@@ -34,6 +34,7 @@ import javafx.scene.Scene;
 import javafx.scene.control.Label;
 import javafx.scene.control.*;
 import javafx.scene.input.KeyCode;
+import javafx.scene.input.MouseButton;
 import javafx.scene.layout.*;
 import javafx.stage.Stage;
 import org.jackhuang.hmcl.game.GameDumpGenerator;
@@ -322,6 +323,9 @@ public final class LogWindow extends Stage {
                         setGraphic(null);
 
                         setOnMouseClicked(event -> {
+                            if (event.getButton() != MouseButton.PRIMARY)
+                                return;
+
                             if (!event.isControlDown()) {
                                 for (ListCell<Log> logListCell : selected) {
                                     if (logListCell != this) {
@@ -340,6 +344,8 @@ public final class LogWindow extends Stage {
                             if (getItem() != null) {
                                 getItem().setSelected(true);
                             }
+
+                            event.consume();
                         });
                     }
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/SVG.java

@@ -32,7 +32,7 @@ public enum SVG {
     CANCEL("M12 2C17.5 2 22 6.5 22 12S17.5 22 12 22 2 17.5 2 12 6.5 2 12 2M12 4C10.1 4 8.4 4.6 7.1 5.7L18.3 16.9C19.3 15.5 20 13.8 20 12C20 7.6 16.4 4 12 4M16.9 18.3L5.7 7.1C4.6 8.4 4 10.1 4 12C4 16.4 7.6 20 12 20C13.9 20 15.6 19.4 16.9 18.3Z"),
     CHAT("M20,2A2,2 0 0,1 22,4V16A2,2 0 0,1 20,18H6L2,22V4C2,2.89 2.9,2 4,2H20M4,4V17.17L5.17,16H20V4H4M6,7H18V9H6V7M6,11H15V13H6V11Z"),
     CLOSE("M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z"),
-    COPY("M19,21H8V7H19M19,5H8A2,2 0 0,0 6,7V21A2,2 0 0,0 8,23H19A2,2 0 0,0 21,21V7A2,2 0 0,0 19,5M16,1H4A2,2 0 0,0 2,3V17H4V3H16V1Z"),
+    COPY("M15 16H7V6h8m.4-2H6.6A1.6 1.6 90 005 5.6V16.4a1.6 1.6 90 001.6 1.6h8.8A1.6 1.6 90 0017 16.4V5.6A1.6 1.6 90 0015.4 4M13 1H3.6A1.6 1.6 90 002 2.6V13h2V3H13V1Z"),
     DOTS_VERTICAL("M12,16A2,2 0 0,1 14,18A2,2 0 0,1 12,20A2,2 0 0,1 10,18A2,2 0 0,1 12,16M12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12A2,2 0 0,1 12,10M12,4A2,2 0 0,1 14,6A2,2 0 0,1 12,8A2,2 0 0,1 10,6A2,2 0 0,1 12,4Z"),
     DOTS_HORIZONTAL("M16,12A2,2 0 0,1 18,10A2,2 0 0,1 20,12A2,2 0 0,1 18,14A2,2 0 0,1 16,12M10,12A2,2 0 0,1 12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12M4,12A2,2 0 0,1 6,10A2,2 0 0,1 8,12A2,2 0 0,1 6,14A2,2 0 0,1 4,12Z"),
     DELETE("M19,4H15.5L14.5,3H9.5L8.5,4H5V6H19M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19Z"),
@@ -59,6 +59,7 @@ public enum SVG {
     ALERT_OUTLINE("M12,2L1,21H23M12,6L19.53,19H4.47M11,10V14H13V10M11,16V18H13V16"),
     PLUS("M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z"),
     PLUS_CIRCLE_OUTLINE("M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M13,7H11V11H7V13H11V17H13V13H17V11H13V7Z"),
+    MINUS("M19 13H5V11H19V13Z"),
     IMPORT_ICON("M14,12L10,8V11H2V13H10V16M20,18V6C20,4.89 19.1,4 18,4H6A2,2 0 0,0 4,6V9H6V6H18V18H6V15H4V18A2,2 0 0,0 6,20H18A2,2 0 0,0 20,18Z"),
     EXPORT("M23,12L19,8V11H10V13H19V16M1,18V6C1,4.89 1.9,4 3,4H15A2,2 0 0,1 17,6V9H15V6H3V18H15V15H17V18A2,2 0 0,1 15,20H3A2,2 0 0,1 1,18Z"),
     OPEN_IN_NEW("M14,3V5H17.59L7.76,14.83L9.17,16.24L19,6.41V10H21V3M19,19H5V5H12V3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V12H19V19Z"),

HMCL/src/main/java/org/jackhuang/hmcl/ui/ToolbarListPageSkin.java

@@ -91,7 +91,7 @@ public abstract class ToolbarListPageSkin<T extends ListPageBase<? extends Node>
         ret.textFillProperty().bind(Theme.foregroundFillBinding());
         ret.setGraphic(wrap(svg.createIcon(Theme.foregroundFillBinding(), -1, -1)));
         ret.setText(text);
-        ret.setOnMouseClicked(e -> onClick.run());
+        ret.setOnAction(e -> onClick.run());
         return ret;
     }
 
@@ -100,7 +100,7 @@ public abstract class ToolbarListPageSkin<T extends ListPageBase<? extends Node>
         ret.getStyleClass().add("jfx-tool-bar-button");
         ret.setGraphic(wrap(svg.createIcon(Theme.blackFill(), -1, -1)));
         ret.setText(text);
-        ret.setOnMouseClicked(e -> onClick.run());
+        ret.setOnAction(e -> onClick.run());
         return ret;
     }
 
@@ -110,7 +110,7 @@ public abstract class ToolbarListPageSkin<T extends ListPageBase<? extends Node>
         ret.textFillProperty().bind(Theme.foregroundFillBinding());
         ret.setGraphic(wrap(svg.createIcon(Theme.foregroundFillBinding(), -1, -1)));
         FXUtils.installFastTooltip(ret, tooltip);
-        ret.setOnMouseClicked(e -> onClick.run());
+        ret.setOnAction(e -> onClick.run());
         return ret;
     }
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/TooltipInstaller.java

@@ -0,0 +1,123 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2024 huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui;
+
+import javafx.scene.Node;
+import javafx.scene.control.Tooltip;
+import javafx.util.Duration;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
+
+/**
+ * @author Glavo
+ */
+public class TooltipInstaller {
+    public static final TooltipInstaller INSTALLER;
+
+    static {
+        TooltipInstaller installer = null;
+
+        try {
+            installer = new NewInstaller();
+        } catch (Throwable e) {
+            try {
+                installer = new OldInstaller();
+            } catch (Throwable e2) {
+                e2.addSuppressed(e);
+                LOG.warning("Failed to initialize TooltipInstaller", e2);
+            }
+        }
+
+        INSTALLER = installer != null ? installer : new TooltipInstaller();
+    }
+
+    TooltipInstaller() {
+    }
+
+    public void installTooltip(Node node, Duration showDelay, Duration showDuration, Duration hideDelay, Tooltip tooltip) {
+        Tooltip.install(node, tooltip);
+    }
+
+    // For Java 8
+    private static final class OldInstaller extends TooltipInstaller {
+        private static final Constructor<?> createTooltipBehavior;
+        private static final Method installTooltipBehavior;
+
+        static {
+            try {
+                Class<?> behaviorClass = Class.forName("javafx.scene.control.Tooltip$TooltipBehavior");
+                createTooltipBehavior = behaviorClass.getDeclaredConstructor(Duration.class, Duration.class, Duration.class, boolean.class);
+                createTooltipBehavior.setAccessible(true);
+                installTooltipBehavior = behaviorClass.getDeclaredMethod("install", Node.class, Tooltip.class);
+                installTooltipBehavior.setAccessible(true);
+            } catch (Exception e) {
+                throw new ExceptionInInitializerError(e);
+            }
+        }
+
+        @Override
+        public void installTooltip(Node node, Duration showDelay, Duration showDuration, Duration hideDelay, Tooltip tooltip) {
+            try {
+                Object behavior = createTooltipBehavior.newInstance(showDelay, showDuration, hideDelay, false);
+                installTooltipBehavior.invoke(behavior, node, tooltip);
+            } catch (ReflectiveOperationException e) {
+                LOG.warning("Failed to set tooltip show delay", e);
+                Tooltip.install(node, tooltip);
+            }
+        }
+    }
+
+    // For Java 9+
+    private static final class NewInstaller extends TooltipInstaller {
+        private static final MethodHandle setTooltipShowDelay;
+        private static final MethodHandle setTooltipShowDuration;
+        private static final MethodHandle setTooltipHideDelay;
+
+        static {
+            try {
+                MethodHandles.Lookup lookup = MethodHandles.publicLookup();
+                MethodType methodType = MethodType.methodType(void.class, Duration.class);
+
+                setTooltipShowDelay = lookup.findVirtual(Tooltip.class, "setShowDelay", methodType);
+                setTooltipShowDuration = lookup.findVirtual(Tooltip.class, "setShowDuration", methodType);
+                setTooltipHideDelay = lookup.findVirtual(Tooltip.class, "setHideDelay", methodType);
+            } catch (Exception e) {
+                throw new ExceptionInInitializerError(e);
+            }
+        }
+
+        @Override
+        public void installTooltip(Node node, Duration showDelay, Duration showDuration, Duration hideDelay, Tooltip tooltip) {
+            try {
+                setTooltipShowDelay.invokeExact(tooltip, showDelay);
+                setTooltipShowDuration.invokeExact(tooltip, showDuration);
+                setTooltipHideDelay.invokeExact(tooltip, hideDelay);
+            } catch (Throwable e) {
+                LOG.warning("Failed to set tooltip show delay", e);
+            }
+
+            Tooltip.install(node, tooltip);
+        }
+    }
+}

HMCL/src/main/java/org/jackhuang/hmcl/ui/UpgradeDialog.java

@@ -41,6 +41,9 @@ import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 
 public final class UpgradeDialog extends JFXDialogLayout {
     public UpgradeDialog(RemoteVersion remoteVersion, Runnable updateRunnable) {
+        maxWidthProperty().bind(Controllers.getScene().widthProperty().multiply(0.7));
+        maxHeightProperty().bind(Controllers.getScene().heightProperty().multiply(0.7));
+
         setHeading(new Label(i18n("update.changelog")));
         setBody(new ProgressIndicator());
 

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

@@ -42,10 +42,9 @@ import org.jackhuang.hmcl.ui.SVG;
 import org.jackhuang.hmcl.ui.construct.SpinnerPane;
 import org.jackhuang.hmcl.util.javafx.BindingMapping;
 
-import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
-public class AccountListItemSkin extends SkinBase<AccountListItem> {
+public final class AccountListItemSkin extends SkinBase<AccountListItem> {
 
     public AccountListItemSkin(AccountListItem skinnable) {
         super(skinnable);
@@ -94,7 +93,7 @@ public class AccountListItemSkin extends SkinBase<AccountListItem> {
         JFXButton btnMove = new JFXButton();
         SpinnerPane spinnerMove = new SpinnerPane();
         spinnerMove.getStyleClass().add("small-spinner-pane");
-        btnMove.setOnMouseClicked(e -> {
+        btnMove.setOnAction(e -> {
             Account account = skinnable.getAccount();
             Accounts.getAccounts().remove(account);
             if (account.isPortable()) {
@@ -118,10 +117,10 @@ public class AccountListItemSkin extends SkinBase<AccountListItem> {
         btnMove.getStyleClass().add("toggle-icon4");
         if (skinnable.getAccount().isPortable()) {
             btnMove.setGraphic(SVG.EARTH.createIcon(Theme.blackFill(), -1, -1));
-            runInFX(() -> FXUtils.installFastTooltip(btnMove, i18n("account.move_to_global")));
+            FXUtils.installFastTooltip(btnMove, i18n("account.move_to_global"));
         } else {
             btnMove.setGraphic(SVG.EXPORT.createIcon(Theme.blackFill(), -1, -1));
-            runInFX(() -> FXUtils.installFastTooltip(btnMove, i18n("account.move_to_portable")));
+            FXUtils.installFastTooltip(btnMove, i18n("account.move_to_portable"));
         }
         spinnerMove.setContent(btnMove);
         right.getChildren().add(spinnerMove);
@@ -129,7 +128,7 @@ public class AccountListItemSkin extends SkinBase<AccountListItem> {
         JFXButton btnRefresh = new JFXButton();
         SpinnerPane spinnerRefresh = new SpinnerPane();
         spinnerRefresh.getStyleClass().setAll("small-spinner-pane");
-        btnRefresh.setOnMouseClicked(e -> {
+        btnRefresh.setOnAction(e -> {
             spinnerRefresh.showSpinner();
             skinnable.refreshAsync()
                     .whenComplete(Schedulers.javafx(), ex -> {
@@ -143,13 +142,13 @@ public class AccountListItemSkin extends SkinBase<AccountListItem> {
         });
         btnRefresh.getStyleClass().add("toggle-icon4");
         btnRefresh.setGraphic(SVG.REFRESH.createIcon(Theme.blackFill(), -1, -1));
-        runInFX(() -> FXUtils.installFastTooltip(btnRefresh, i18n("button.refresh")));
+        FXUtils.installFastTooltip(btnRefresh, i18n("button.refresh"));
         spinnerRefresh.setContent(btnRefresh);
         right.getChildren().add(spinnerRefresh);
 
         JFXButton btnUpload = new JFXButton();
         SpinnerPane spinnerUpload = new SpinnerPane();
-        btnUpload.setOnMouseClicked(e -> {
+        btnUpload.setOnAction(e -> {
             Task<?> uploadTask = skinnable.uploadSkin();
             if (uploadTask != null) {
                 spinnerUpload.showSpinner();
@@ -160,7 +159,7 @@ public class AccountListItemSkin extends SkinBase<AccountListItem> {
         });
         btnUpload.getStyleClass().add("toggle-icon4");
         btnUpload.setGraphic(SVG.HANGER.createIcon(Theme.blackFill(), -1, -1));
-        runInFX(() -> FXUtils.installFastTooltip(btnUpload, i18n("account.skin.upload")));
+        FXUtils.installFastTooltip(btnUpload, i18n("account.skin.upload"));
         spinnerUpload.managedProperty().bind(spinnerUpload.visibleProperty());
         spinnerUpload.visibleProperty().bind(skinnable.canUploadSkin());
         spinnerUpload.setContent(btnUpload);
@@ -170,18 +169,19 @@ public class AccountListItemSkin extends SkinBase<AccountListItem> {
         JFXButton btnCopyUUID = new JFXButton();
         SpinnerPane spinnerCopyUUID = new SpinnerPane();
         spinnerCopyUUID.getStyleClass().add("small-spinner-pane");
-        btnCopyUUID.setOnMouseClicked(e -> FXUtils.copyText(skinnable.getAccount().getUUID().toString()));
+        btnUpload.getStyleClass().add("toggle-icon4");
+        btnCopyUUID.setOnAction(e -> FXUtils.copyText(skinnable.getAccount().getUUID().toString()));
         btnCopyUUID.setGraphic(SVG.COPY.createIcon(Theme.blackFill(), -1, -1));
-        runInFX(() -> FXUtils.installFastTooltip(btnCopyUUID, i18n("account.copy_uuid")));
+        FXUtils.installFastTooltip(btnCopyUUID, i18n("account.copy_uuid"));
         spinnerCopyUUID.setContent(btnCopyUUID);
         right.getChildren().add(spinnerCopyUUID);
 
         JFXButton btnRemove = new JFXButton();
-        btnRemove.setOnMouseClicked(e -> Controllers.confirm(i18n("button.remove.confirm"), i18n("button.remove"), skinnable::remove, null));
+        btnRemove.setOnAction(e -> Controllers.confirm(i18n("button.remove.confirm"), i18n("button.remove"), skinnable::remove, null));
         btnRemove.getStyleClass().add("toggle-icon4");
         BorderPane.setAlignment(btnRemove, Pos.CENTER);
-        btnRemove.setGraphic(SVG.DELETE.createIcon(Theme.blackFill(), -1, -1));
-        runInFX(() -> FXUtils.installFastTooltip(btnRemove, i18n("button.delete")));
+        btnRemove.setGraphic(SVG.DELETE_OUTLINE.createIcon(Theme.blackFill(), -1, -1));
+        FXUtils.installFastTooltip(btnRemove, i18n("button.delete"));
         right.getChildren().add(btnRemove);
         root.setRight(right);
 

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

@@ -147,7 +147,7 @@ public final class AddAuthlibInjectorServerPane extends TransitionPane implement
             confirmServerPane.setActions(prevButton, cancelButton, finishButton);
         }
 
-        this.setContent(addServerPane, ContainerAnimations.NONE.getAnimationProducer());
+        this.setContent(addServerPane, ContainerAnimations.NONE);
 
         lblCreationWarning.maxWidthProperty().bind(((FlowPane) lblCreationWarning.getParent()).widthProperty());
         btnAddNext.disableProperty().bind(txtServerUrl.textProperty().isEmpty());
@@ -198,7 +198,7 @@ public final class AddAuthlibInjectorServerPane extends TransitionPane implement
 
                 lblServerWarning.setVisible("http".equals(NetworkUtils.toURL(serverBeingAdded.getUrl()).getProtocol()));
 
-                this.setContent(confirmServerPane, ContainerAnimations.SWIPE_LEFT.getAnimationProducer());
+                this.setContent(confirmServerPane, ContainerAnimations.SWIPE_LEFT);
             } else {
                 LOG.warning("Failed to resolve auth server: " + url, exception);
                 lblCreationWarning.setText(resolveFetchExceptionMessage(exception));
@@ -208,7 +208,7 @@ public final class AddAuthlibInjectorServerPane extends TransitionPane implement
     }
 
     private void onAddPrev() {
-        this.setContent(addServerPane, ContainerAnimations.SWIPE_RIGHT.getAnimationProducer());
+        this.setContent(addServerPane, ContainerAnimations.SWIPE_RIGHT);
     }
 
     private void onAddFinish() {

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

@@ -297,7 +297,7 @@ public class CreateAccountPane extends JFXDialogLayout implements DialogAware {
                         hintPane.setSegment(i18n("account.methods.microsoft.hint"));
                     }
                 });
-                hintPane.setOnMouseClicked(e -> {
+                FXUtils.onClicked(hintPane, () -> {
                     if (deviceCode.get() != null) {
                         FXUtils.copyText(deviceCode.get().getUserCode());
                     }
@@ -317,7 +317,7 @@ public class CreateAccountPane extends JFXDialogLayout implements DialogAware {
                 JFXHyperlink deauthorizeLink = new JFXHyperlink(i18n("account.methods.microsoft.deauthorize"));
                 deauthorizeLink.setExternalLink("https://account.live.com/consent/Edit?client_id=000000004C794E0A");
                 JFXHyperlink forgotpasswordLink = new JFXHyperlink(i18n("account.methods.forgot_password"));
-                forgotpasswordLink.setExternalLink("https://www.minecraft.net/password/forgot");
+                forgotpasswordLink.setExternalLink("https://account.live.com/ResetPassword.aspx");
                 JFXHyperlink createProfileLink = new JFXHyperlink(i18n("account.methods.microsoft.makegameidsettings"));
                 createProfileLink.setExternalLink("https://www.minecraft.net/msaprofile/mygames/editprofile");
                 box.getChildren().setAll(profileLink, birthLink, purchaseLink, deauthorizeLink, forgotpasswordLink, createProfileLink);
@@ -510,7 +510,7 @@ public class CreateAccountPane extends JFXDialogLayout implements DialogAware {
 
             if (factory instanceof OfflineAccountFactory) {
                 txtUsername.setPromptText(i18n("account.methods.offline.name.special_characters"));
-                runInFX(() -> FXUtils.installFastTooltip(txtUsername, i18n("account.methods.offline.name.special_characters")));
+                FXUtils.installFastTooltip(txtUsername, i18n("account.methods.offline.name.special_characters"));
 
                 JFXHyperlink purchaseLink = new JFXHyperlink(i18n("account.methods.microsoft.purchase"));
                 purchaseLink.setExternalLink(YggdrasilService.PURCHASE_URL);
@@ -658,7 +658,7 @@ public class CreateAccountPane extends JFXDialogLayout implements DialogAware {
                     TexturesLoader.bindAvatar(portraitCanvas, service, profile.getId());
 
                     IconedItem accountItem = new IconedItem(portraitCanvas, profile.getName());
-                    accountItem.setOnMouseClicked(e -> {
+                    FXUtils.onClicked(accountItem, () -> {
                         selectedProfile = profile;
                         latch.countDown();
                     });

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

@@ -58,7 +58,7 @@ public class OAuthAccountLoginDialog extends DialogPane {
                 );
             }
         });
-        hintPane.setOnMouseClicked(e -> {
+        FXUtils.onClicked(hintPane, () -> {
             if (deviceCode.get() != null) {
                 FXUtils.copyText(deviceCode.get().getUserCode());
             }

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

@@ -28,9 +28,9 @@ import javafx.scene.control.Label;
 import javafx.scene.input.DragEvent;
 import javafx.scene.input.TransferMode;
 import javafx.scene.layout.*;
-import moe.mickey.minecraft.skin.fx.SkinCanvas;
-import moe.mickey.minecraft.skin.fx.animation.SkinAniRunning;
-import moe.mickey.minecraft.skin.fx.animation.SkinAniWavingArms;
+import org.jackhuang.hmcl.ui.skin.SkinCanvas;
+import org.jackhuang.hmcl.ui.skin.animation.SkinAniRunning;
+import org.jackhuang.hmcl.ui.skin.animation.SkinAniWavingArms;
 import org.jackhuang.hmcl.auth.offline.OfflineAccount;
 import org.jackhuang.hmcl.auth.offline.Skin;
 import org.jackhuang.hmcl.auth.yggdrasil.TextureModel;

HMCL/src/main/java/org/jackhuang/hmcl/ui/animation/ContainerAnimations.java

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2020 huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,165 +27,225 @@ import org.jetbrains.annotations.Nullable;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.function.Consumer;
-import java.util.function.Function;
 
-public enum ContainerAnimations {
-    NONE(c -> {
-        c.getPreviousNode().setTranslateX(0);
-        c.getPreviousNode().setTranslateY(0);
-        c.getPreviousNode().setScaleX(1);
-        c.getPreviousNode().setScaleY(1);
-        c.getPreviousNode().setOpacity(1);
-        c.getCurrentNode().setTranslateX(0);
-        c.getCurrentNode().setTranslateY(0);
-        c.getCurrentNode().setScaleX(1);
-        c.getCurrentNode().setScaleY(1);
-        c.getCurrentNode().setOpacity(1);
-    }, c -> Collections.emptyList()),
+public enum ContainerAnimations implements AnimationProducer {
+    NONE {
+        @Override
+        public void init(AnimationHandler c) {
+            c.getPreviousNode().setTranslateX(0);
+            c.getPreviousNode().setTranslateY(0);
+            c.getPreviousNode().setScaleX(1);
+            c.getPreviousNode().setScaleY(1);
+            c.getPreviousNode().setOpacity(1);
+            c.getCurrentNode().setTranslateX(0);
+            c.getCurrentNode().setTranslateY(0);
+            c.getCurrentNode().setScaleX(1);
+            c.getCurrentNode().setScaleY(1);
+            c.getCurrentNode().setOpacity(1);
+        }
+
+        @Override
+        public List<KeyFrame> animate(AnimationHandler c) {
+            return Collections.emptyList();
+        }
+    },
 
     /**
      * A fade between the old and new view
      */
-    FADE(c -> {
-        c.getPreviousNode().setTranslateX(0);
-        c.getPreviousNode().setTranslateY(0);
-        c.getPreviousNode().setScaleX(1);
-        c.getPreviousNode().setScaleY(1);
-        c.getPreviousNode().setOpacity(1);
-        c.getCurrentNode().setTranslateX(0);
-        c.getCurrentNode().setTranslateY(0);
-        c.getCurrentNode().setScaleX(1);
-        c.getCurrentNode().setScaleY(1);
-        c.getCurrentNode().setOpacity(0);
-    }, c ->
-            Arrays.asList(new KeyFrame(Duration.ZERO,
+    FADE {
+        @Override
+        public void init(AnimationHandler c) {
+            c.getPreviousNode().setTranslateX(0);
+            c.getPreviousNode().setTranslateY(0);
+            c.getPreviousNode().setScaleX(1);
+            c.getPreviousNode().setScaleY(1);
+            c.getPreviousNode().setOpacity(1);
+            c.getCurrentNode().setTranslateX(0);
+            c.getCurrentNode().setTranslateY(0);
+            c.getCurrentNode().setScaleX(1);
+            c.getCurrentNode().setScaleY(1);
+            c.getCurrentNode().setOpacity(0);
+        }
+
+        @Override
+        public List<KeyFrame> animate(AnimationHandler c) {
+            return Arrays.asList(new KeyFrame(Duration.ZERO,
                             new KeyValue(c.getPreviousNode().opacityProperty(), 1, Interpolator.EASE_BOTH),
                             new KeyValue(c.getCurrentNode().opacityProperty(), 0, Interpolator.EASE_BOTH)),
                     new KeyFrame(c.getDuration(),
                             new KeyValue(c.getPreviousNode().opacityProperty(), 0, Interpolator.EASE_BOTH),
-                            new KeyValue(c.getCurrentNode().opacityProperty(), 1, Interpolator.EASE_BOTH)))),
+                            new KeyValue(c.getCurrentNode().opacityProperty(), 1, Interpolator.EASE_BOTH)));
+        }
+    },
 
     /**
      * A fade between the old and new view
      */
-    FADE_IN(c -> {
-        c.getCurrentNode().setTranslateX(0);
-        c.getCurrentNode().setTranslateY(0);
-        c.getCurrentNode().setScaleX(1);
-        c.getCurrentNode().setScaleY(1);
-        c.getCurrentNode().setOpacity(0);
-    }, c ->
-            Arrays.asList(new KeyFrame(Duration.ZERO,
+    FADE_IN {
+        @Override
+        public void init(AnimationHandler c) {
+            c.getCurrentNode().setTranslateX(0);
+            c.getCurrentNode().setTranslateY(0);
+            c.getCurrentNode().setScaleX(1);
+            c.getCurrentNode().setScaleY(1);
+            c.getCurrentNode().setOpacity(0);
+        }
+
+        @Override
+        public List<KeyFrame> animate(AnimationHandler c) {
+            return Arrays.asList(new KeyFrame(Duration.ZERO,
                             new KeyValue(c.getCurrentNode().opacityProperty(), 0, FXUtils.SINE)),
                     new KeyFrame(c.getDuration(),
-                            new KeyValue(c.getCurrentNode().opacityProperty(), 1, FXUtils.SINE)))),
+                            new KeyValue(c.getCurrentNode().opacityProperty(), 1, FXUtils.SINE)));
+        }
+    },
 
     /**
      * A fade between the old and new view
      */
-    FADE_OUT(c -> {
-        c.getCurrentNode().setTranslateX(0);
-        c.getCurrentNode().setTranslateY(0);
-        c.getCurrentNode().setScaleX(1);
-        c.getCurrentNode().setScaleY(1);
-        c.getCurrentNode().setOpacity(1);
-    }, c ->
-            Arrays.asList(new KeyFrame(Duration.ZERO,
+    FADE_OUT {
+        @Override
+        public void init(AnimationHandler c) {
+            c.getCurrentNode().setTranslateX(0);
+            c.getCurrentNode().setTranslateY(0);
+            c.getCurrentNode().setScaleX(1);
+            c.getCurrentNode().setScaleY(1);
+            c.getCurrentNode().setOpacity(1);
+        }
+
+        @Override
+        public List<KeyFrame> animate(AnimationHandler c) {
+            return Arrays.asList(new KeyFrame(Duration.ZERO,
                             new KeyValue(c.getCurrentNode().opacityProperty(), 1, FXUtils.SINE)),
                     new KeyFrame(c.getDuration(),
-                            new KeyValue(c.getCurrentNode().opacityProperty(), 0, FXUtils.SINE)))),
+                            new KeyValue(c.getCurrentNode().opacityProperty(), 0, FXUtils.SINE)));
+        }
+    },
     /**
      * A zoom effect
      */
-    ZOOM_IN(c -> {
-        c.getPreviousNode().setTranslateX(0);
-        c.getPreviousNode().setTranslateY(0);
-        c.getPreviousNode().setScaleX(1);
-        c.getPreviousNode().setScaleY(1);
-        c.getPreviousNode().setOpacity(1);
-        c.getCurrentNode().setTranslateX(0);
-        c.getCurrentNode().setTranslateY(0);
-    }, c ->
-            Arrays.asList(new KeyFrame(Duration.ZERO,
+    ZOOM_IN {
+        @Override
+        public void init(AnimationHandler c) {
+            c.getPreviousNode().setTranslateX(0);
+            c.getPreviousNode().setTranslateY(0);
+            c.getPreviousNode().setScaleX(1);
+            c.getPreviousNode().setScaleY(1);
+            c.getPreviousNode().setOpacity(1);
+            c.getCurrentNode().setTranslateX(0);
+            c.getCurrentNode().setTranslateY(0);
+        }
+
+        @Override
+        public List<KeyFrame> animate(AnimationHandler c) {
+            return Arrays.asList(new KeyFrame(Duration.ZERO,
                             new KeyValue(c.getPreviousNode().scaleXProperty(), 1, Interpolator.EASE_BOTH),
                             new KeyValue(c.getPreviousNode().scaleYProperty(), 1, Interpolator.EASE_BOTH),
                             new KeyValue(c.getPreviousNode().opacityProperty(), 1, Interpolator.EASE_BOTH)),
                     new KeyFrame(c.getDuration(),
                             new KeyValue(c.getPreviousNode().scaleXProperty(), 4, Interpolator.EASE_BOTH),
                             new KeyValue(c.getPreviousNode().scaleYProperty(), 4, Interpolator.EASE_BOTH),
-                            new KeyValue(c.getPreviousNode().opacityProperty(), 0, Interpolator.EASE_BOTH)))),
+                            new KeyValue(c.getPreviousNode().opacityProperty(), 0, Interpolator.EASE_BOTH)));
+        }
+    },
     /**
      * A zoom effect
      */
-    ZOOM_OUT(c -> {
-        c.getPreviousNode().setTranslateX(0);
-        c.getPreviousNode().setTranslateY(0);
-        c.getPreviousNode().setScaleX(1);
-        c.getPreviousNode().setScaleY(1);
-        c.getPreviousNode().setOpacity(1);
-        c.getCurrentNode().setTranslateX(0);
-        c.getCurrentNode().setTranslateY(0);
-    }, c ->
-            (Arrays.asList(new KeyFrame(Duration.ZERO,
+    ZOOM_OUT {
+        @Override
+        public void init(AnimationHandler c) {
+            c.getPreviousNode().setTranslateX(0);
+            c.getPreviousNode().setTranslateY(0);
+            c.getPreviousNode().setScaleX(1);
+            c.getPreviousNode().setScaleY(1);
+            c.getPreviousNode().setOpacity(1);
+            c.getCurrentNode().setTranslateX(0);
+            c.getCurrentNode().setTranslateY(0);
+        }
+
+        @Override
+        public List<KeyFrame> animate(AnimationHandler c) {
+            return Arrays.asList(new KeyFrame(Duration.ZERO,
                             new KeyValue(c.getPreviousNode().scaleXProperty(), 1, Interpolator.EASE_BOTH),
                             new KeyValue(c.getPreviousNode().scaleYProperty(), 1, Interpolator.EASE_BOTH),
                             new KeyValue(c.getPreviousNode().opacityProperty(), 1, Interpolator.EASE_BOTH)),
                     new KeyFrame(c.getDuration(),
                             new KeyValue(c.getPreviousNode().scaleXProperty(), 0, Interpolator.EASE_BOTH),
                             new KeyValue(c.getPreviousNode().scaleYProperty(), 0, Interpolator.EASE_BOTH),
-                            new KeyValue(c.getPreviousNode().opacityProperty(), 0, Interpolator.EASE_BOTH))))),
+                            new KeyValue(c.getPreviousNode().opacityProperty(), 0, Interpolator.EASE_BOTH)));
+        }
+    },
     /**
      * A swipe effect
      */
-    SWIPE_LEFT(c -> {
-        c.getPreviousNode().setScaleX(1);
-        c.getPreviousNode().setScaleY(1);
-        c.getPreviousNode().setOpacity(0);
-        c.getPreviousNode().setTranslateX(0);
-        c.getCurrentNode().setScaleX(1);
-        c.getCurrentNode().setScaleY(1);
-        c.getCurrentNode().setOpacity(1);
-        c.getCurrentNode().setTranslateX(c.getCurrentRoot().getWidth());
-    }, c ->
-            Arrays.asList(new KeyFrame(Duration.ZERO,
+    SWIPE_LEFT {
+        @Override
+        public void init(AnimationHandler c) {
+            c.getPreviousNode().setScaleX(1);
+            c.getPreviousNode().setScaleY(1);
+            c.getPreviousNode().setOpacity(0);
+            c.getPreviousNode().setTranslateX(0);
+            c.getCurrentNode().setScaleX(1);
+            c.getCurrentNode().setScaleY(1);
+            c.getCurrentNode().setOpacity(1);
+            c.getCurrentNode().setTranslateX(c.getCurrentRoot().getWidth());
+        }
+
+        @Override
+        public List<KeyFrame> animate(AnimationHandler c) {
+            return Arrays.asList(new KeyFrame(Duration.ZERO,
                             new KeyValue(c.getCurrentNode().translateXProperty(), c.getCurrentRoot().getWidth(), Interpolator.EASE_BOTH),
                             new KeyValue(c.getPreviousNode().translateXProperty(), 0, Interpolator.EASE_BOTH)),
                     new KeyFrame(c.getDuration(),
                             new KeyValue(c.getCurrentNode().translateXProperty(), 0, Interpolator.EASE_BOTH),
-                            new KeyValue(c.getPreviousNode().translateXProperty(), -c.getCurrentRoot().getWidth(), Interpolator.EASE_BOTH)))),
+                            new KeyValue(c.getPreviousNode().translateXProperty(), -c.getCurrentRoot().getWidth(), Interpolator.EASE_BOTH)));
+        }
+    },
 
     /**
      * A swipe effect
      */
-    SWIPE_RIGHT(c -> {
-        c.getPreviousNode().setScaleX(1);
-        c.getPreviousNode().setScaleY(1);
-        c.getPreviousNode().setOpacity(0);
-        c.getPreviousNode().setTranslateX(0);
-        c.getCurrentNode().setScaleX(1);
-        c.getCurrentNode().setScaleY(1);
-        c.getCurrentNode().setOpacity(1);
-        c.getCurrentNode().setTranslateX(-c.getCurrentRoot().getWidth());
-    }, c ->
-            Arrays.asList(new KeyFrame(Duration.ZERO,
+    SWIPE_RIGHT {
+        @Override
+        public void init(AnimationHandler c) {
+            c.getPreviousNode().setScaleX(1);
+            c.getPreviousNode().setScaleY(1);
+            c.getPreviousNode().setOpacity(0);
+            c.getPreviousNode().setTranslateX(0);
+            c.getCurrentNode().setScaleX(1);
+            c.getCurrentNode().setScaleY(1);
+            c.getCurrentNode().setOpacity(1);
+            c.getCurrentNode().setTranslateX(-c.getCurrentRoot().getWidth());
+        }
+
+        @Override
+        public List<KeyFrame> animate(AnimationHandler c) {
+            return Arrays.asList(new KeyFrame(Duration.ZERO,
                             new KeyValue(c.getCurrentNode().translateXProperty(), -c.getCurrentRoot().getWidth(), Interpolator.EASE_BOTH),
                             new KeyValue(c.getPreviousNode().translateXProperty(), 0, Interpolator.EASE_BOTH)),
                     new KeyFrame(c.getDuration(),
                             new KeyValue(c.getCurrentNode().translateXProperty(), 0, Interpolator.EASE_BOTH),
-                            new KeyValue(c.getPreviousNode().translateXProperty(), c.getCurrentRoot().getWidth(), Interpolator.EASE_BOTH)))),
+                            new KeyValue(c.getPreviousNode().translateXProperty(), c.getCurrentRoot().getWidth(), Interpolator.EASE_BOTH)));
+        }
+    },
 
-    SWIPE_LEFT_FADE_SHORT(c -> {
-        c.getPreviousNode().setScaleX(1);
-        c.getPreviousNode().setScaleY(1);
-        c.getPreviousNode().setOpacity(0);
-        c.getPreviousNode().setTranslateX(0);
-        c.getCurrentNode().setScaleX(1);
-        c.getCurrentNode().setScaleY(1);
-        c.getCurrentNode().setOpacity(1);
-        c.getCurrentNode().setTranslateX(c.getCurrentRoot().getWidth());
-    }, c ->
-            Arrays.asList(new KeyFrame(Duration.ZERO,
+    SWIPE_LEFT_FADE_SHORT {
+        @Override
+        public void init(AnimationHandler c) {
+            c.getPreviousNode().setScaleX(1);
+            c.getPreviousNode().setScaleY(1);
+            c.getPreviousNode().setOpacity(0);
+            c.getPreviousNode().setTranslateX(0);
+            c.getCurrentNode().setScaleX(1);
+            c.getCurrentNode().setScaleY(1);
+            c.getCurrentNode().setOpacity(1);
+            c.getCurrentNode().setTranslateX(c.getCurrentRoot().getWidth());
+        }
+
+        @Override
+        public List<KeyFrame> animate(AnimationHandler c) {
+            return Arrays.asList(new KeyFrame(Duration.ZERO,
                             new KeyValue(c.getCurrentNode().translateXProperty(), 50, Interpolator.EASE_BOTH),
                             new KeyValue(c.getPreviousNode().translateXProperty(), 0, Interpolator.EASE_BOTH),
                             new KeyValue(c.getCurrentNode().opacityProperty(), 0, Interpolator.EASE_BOTH),
@@ -194,19 +254,26 @@ public enum ContainerAnimations {
                             new KeyValue(c.getCurrentNode().translateXProperty(), 0, Interpolator.EASE_BOTH),
                             new KeyValue(c.getPreviousNode().translateXProperty(), -50, Interpolator.EASE_BOTH),
                             new KeyValue(c.getCurrentNode().opacityProperty(), 1, Interpolator.EASE_BOTH),
-                            new KeyValue(c.getPreviousNode().opacityProperty(), 0, Interpolator.EASE_BOTH)))),
+                            new KeyValue(c.getPreviousNode().opacityProperty(), 0, Interpolator.EASE_BOTH)));
+        }
+    },
 
-    SWIPE_RIGHT_FADE_SHORT(c -> {
-        c.getPreviousNode().setScaleX(1);
-        c.getPreviousNode().setScaleY(1);
-        c.getPreviousNode().setOpacity(0);
-        c.getPreviousNode().setTranslateX(0);
-        c.getCurrentNode().setScaleX(1);
-        c.getCurrentNode().setScaleY(1);
-        c.getCurrentNode().setOpacity(1);
-        c.getCurrentNode().setTranslateX(c.getCurrentRoot().getWidth());
-    }, c ->
-            Arrays.asList(new KeyFrame(Duration.ZERO,
+    SWIPE_RIGHT_FADE_SHORT {
+        @Override
+        public void init(AnimationHandler c) {
+            c.getPreviousNode().setScaleX(1);
+            c.getPreviousNode().setScaleY(1);
+            c.getPreviousNode().setOpacity(0);
+            c.getPreviousNode().setTranslateX(0);
+            c.getCurrentNode().setScaleX(1);
+            c.getCurrentNode().setScaleY(1);
+            c.getCurrentNode().setOpacity(1);
+            c.getCurrentNode().setTranslateX(c.getCurrentRoot().getWidth());
+        }
+
+        @Override
+        public List<KeyFrame> animate(AnimationHandler c) {
+            return Arrays.asList(new KeyFrame(Duration.ZERO,
                             new KeyValue(c.getCurrentNode().translateXProperty(), -50, Interpolator.EASE_BOTH),
                             new KeyValue(c.getPreviousNode().translateXProperty(), 0, Interpolator.EASE_BOTH),
                             new KeyValue(c.getCurrentNode().opacityProperty(), 0, Interpolator.EASE_BOTH),
@@ -215,38 +282,12 @@ public enum ContainerAnimations {
                             new KeyValue(c.getCurrentNode().translateXProperty(), 0, Interpolator.EASE_BOTH),
                             new KeyValue(c.getPreviousNode().translateXProperty(), 50, Interpolator.EASE_BOTH),
                             new KeyValue(c.getCurrentNode().opacityProperty(), 1, Interpolator.EASE_BOTH),
-                            new KeyValue(c.getPreviousNode().opacityProperty(), 0, Interpolator.EASE_BOTH))));
+                            new KeyValue(c.getPreviousNode().opacityProperty(), 0, Interpolator.EASE_BOTH)));
+        }
+    };
 
-    private final AnimationProducer animationProducer;
     private ContainerAnimations opposite;
 
-    ContainerAnimations(Consumer<AnimationHandler> init, Function<AnimationHandler, List<KeyFrame>> animationProducer) {
-        this.animationProducer = new AnimationProducer() {
-            @Override
-            public void init(AnimationHandler handler) {
-                init.accept(handler);
-            }
-
-            @Override
-            public List<KeyFrame> animate(AnimationHandler handler) {
-                return animationProducer.apply(handler);
-            }
-
-            @Override
-            public @Nullable AnimationProducer opposite() {
-                return opposite != null ? opposite.getAnimationProducer() : null;
-            }
-        };
-    }
-
-    public AnimationProducer getAnimationProducer() {
-        return animationProducer;
-    }
-
-    public ContainerAnimations getOpposite() {
-        return opposite;
-    }
-
     static {
         NONE.opposite = NONE;
         FADE.opposite = FADE;
@@ -257,4 +298,15 @@ public enum ContainerAnimations {
         ZOOM_IN.opposite = ZOOM_OUT;
         ZOOM_OUT.opposite = ZOOM_IN;
     }
+
+    @Override
+    public abstract void init(AnimationHandler handler);
+
+    @Override
+    public abstract List<KeyFrame> animate(AnimationHandler handler);
+
+    @Override
+    public @Nullable ContainerAnimations opposite() {
+        return opposite;
+    }
 }

HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/AdvancedListItem.java

@@ -25,7 +25,6 @@ import javafx.scene.control.Control;
 import javafx.scene.control.Skin;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
-import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.util.Pair;
@@ -42,7 +41,7 @@ public class AdvancedListItem extends Control {
 
     public AdvancedListItem() {
         getStyleClass().add("advanced-list-item");
-        addEventHandler(MouseEvent.MOUSE_CLICKED, e -> fireEvent(new ActionEvent()));
+        FXUtils.onClicked(this, () -> fireEvent(new ActionEvent()));
     }
 
     public Node getLeftGraphic() {

HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/AnnouncementCard.java

@@ -17,21 +17,36 @@
  */
 package org.jackhuang.hmcl.ui.construct;
 
+import javafx.scene.Cursor;
+import javafx.scene.Node;
 import javafx.scene.control.Label;
+import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.TextFlow;
+import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.SVG;
 
-public class AnnouncementCard extends VBox {
+public final class AnnouncementCard extends VBox {
 
-    public AnnouncementCard(String title, String content) {
-        TextFlow tf = FXUtils.segmentToTextFlow(content, Controllers::onHyperlinkAction);
+    public AnnouncementCard(String title, String content, Runnable onClose) {
+        TextFlow body = FXUtils.segmentToTextFlow(content, Controllers::onHyperlinkAction);
+        body.setLineSpacing(4);
 
-        Label label = new Label(title);
-        label.getStyleClass().add("title");
-        getChildren().setAll(label, tf);
-        setSpacing(14);
+        BorderPane titleBar = new BorderPane();
+        titleBar.getStyleClass().add("title");
+        titleBar.setLeft(new Label(title));
+
+        if (onClose != null) {
+            Node hideNode = SVG.CLOSE.createIcon(Theme.blackFill(), 20, 20);
+            hideNode.setOnMouseClicked(e -> onClose.run());
+            hideNode.setCursor(Cursor.HAND);
+            titleBar.setRight(hideNode);
+        }
+
+        getChildren().setAll(titleBar, body);
+        setSpacing(16);
         getStyleClass().addAll("card", "announcement");
     }
 }

HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/ComponentListCell.java

@@ -25,9 +25,6 @@ import javafx.animation.Timeline;
 import javafx.application.Platform;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
-import javafx.event.ActionEvent;
-import javafx.event.Event;
-import javafx.event.EventHandler;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
@@ -139,7 +136,7 @@ final class ComponentListCell extends StackPane {
             container.getChildren().setAll(content);
             groupNode.getChildren().add(container);
 
-            EventHandler<Event> onExpand = e -> {
+            Runnable onExpand = () -> {
                 if (expandAnimation != null && expandAnimation.getStatus() == Animation.Status.RUNNING) {
                     expandAnimation.stop();
                 }
@@ -182,8 +179,8 @@ final class ComponentListCell extends StackPane {
                 });
             };
 
-            headerRippler.setOnMouseClicked(onExpand);
-            expandButton.setOnAction((EventHandler<ActionEvent>) (Object) onExpand);
+            FXUtils.onClicked(headerRippler, onExpand);
+            expandButton.setOnAction(e -> onExpand.run());
 
             expandedProperty().addListener((a, b, newValue) -> expandIcon.setRotate(newValue ? 180 : 0));
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/FileItem.java

@@ -60,7 +60,7 @@ public class FileItem extends BorderPane {
         JFXButton right = new JFXButton();
         right.setGraphic(SVG.PENCIL.createIcon(Theme.blackFill(), 15, 15));
         right.getStyleClass().add("toggle-icon4");
-        right.setOnMouseClicked(e -> onExplore());
+        right.setOnAction(e -> onExplore());
         FXUtils.installFastTooltip(right, i18n("button.edit"));
         setRight(right);
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/FontComboBox.java

@@ -21,6 +21,7 @@ import static javafx.collections.FXCollections.emptyObservableList;
 import static javafx.collections.FXCollections.observableList;
 import static javafx.collections.FXCollections.singletonObservableList;
 
+import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.util.javafx.BindingMapping;
 
 import com.jfoenix.controls.JFXComboBox;
@@ -34,6 +35,8 @@ public class FontComboBox extends JFXComboBox<String> {
     private boolean loaded = false;
 
     public FontComboBox() {
+        setMinWidth(260);
+
         styleProperty().bind(Bindings.concat("-fx-font-family: \"", valueProperty(), "\""));
 
         setCellFactory(listView -> new JFXListCell<String>() {
@@ -51,7 +54,7 @@ public class FontComboBox extends JFXComboBox<String> {
         itemsProperty().bind(BindingMapping.of(valueProperty())
                         .map(value -> value == null ? emptyObservableList() : singletonObservableList(value)));
 
-        setOnMouseClicked(e -> {
+        FXUtils.onClicked(this, () -> {
             if (loaded)
                 return;
             itemsProperty().unbind();

HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/IconedMenuItem.java

@@ -30,9 +30,9 @@ public class IconedMenuItem extends IconedItem {
         getStyleClass().setAll("iconed-menu-item");
 
         if (popup == null) {
-            setOnMouseClicked(e -> action.run());
+            FXUtils.onClicked(this, action);
         } else {
-            setOnMouseClicked(e -> {
+            FXUtils.onClicked(this, () -> {
                 action.run();
                 popup.hide();
             });

HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/IconedTwoLineListItem.java

@@ -17,7 +17,6 @@ import javafx.scene.layout.Priority;
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
-import org.jackhuang.hmcl.util.Lazy;
 import org.jackhuang.hmcl.util.StringUtils;
 
 public class IconedTwoLineListItem extends HBox {
@@ -29,13 +28,8 @@ public class IconedTwoLineListItem extends HBox {
 
     private final ImageView imageView = new ImageView();
     private final TwoLineListItem twoLineListItem = new TwoLineListItem();
-    private final Lazy<JFXButton> externalLinkButton = new Lazy<>(() -> {
-        JFXButton button = new JFXButton();
-        button.getStyleClass().add("toggle-icon4");
-        button.setGraphic(SVG.OPEN_IN_NEW.createIcon(Theme.blackFill(), -1, -1));
-        button.setOnAction(e -> FXUtils.openLink(externalLink.get()));
-        return button;
-    });
+    private JFXButton externalLinkButton;
+
     @SuppressWarnings("FieldCanBeLocal")
     private final InvalidationListener observer;
 
@@ -52,7 +46,7 @@ public class IconedTwoLineListItem extends HBox {
             getChildren().clear();
             if (image.get() != null) getChildren().add(imageView);
             getChildren().add(twoLineListItem);
-            if (StringUtils.isNotBlank(externalLink.get())) getChildren().add(externalLinkButton.get());
+            if (StringUtils.isNotBlank(externalLink.get())) getChildren().add(getExternalLinkButton());
         }, image, externalLink);
     }
 
@@ -111,4 +105,14 @@ public class IconedTwoLineListItem extends HBox {
     public ImageView getImageView() {
         return imageView;
     }
+
+    public JFXButton getExternalLinkButton() {
+        if (externalLinkButton == null) {
+            externalLinkButton = new JFXButton();
+            externalLinkButton.getStyleClass().add("toggle-icon4");
+            externalLinkButton.setGraphic(SVG.OPEN_IN_NEW.createIcon(Theme.blackFill(), -1, -1));
+            externalLinkButton.setOnAction(e -> FXUtils.openLink(externalLink.get()));
+        }
+        return externalLinkButton;
+    }
 }

HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/ImagePickerItem.java

@@ -23,12 +23,12 @@ import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
+import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.geometry.Pos;
 import javafx.scene.control.Label;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
-import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
@@ -44,8 +44,8 @@ public final class ImagePickerItem extends BorderPane {
     private final ImageView imageView;
 
     private final StringProperty title = new SimpleStringProperty(this, "title");
-    private final ObjectProperty<EventHandler<? super MouseEvent>> onSelectButtonClicked = new SimpleObjectProperty<>(this, "onSelectButtonClicked");
-    private final ObjectProperty<EventHandler<? super MouseEvent>> onDeleteButtonClicked = new SimpleObjectProperty<>(this, "onDeleteButtonClicked");
+    private final ObjectProperty<EventHandler<ActionEvent>> onSelectButtonClicked = new SimpleObjectProperty<>(this, "onSelectButtonClicked");
+    private final ObjectProperty<EventHandler<ActionEvent>> onDeleteButtonClicked = new SimpleObjectProperty<>(this, "onDeleteButtonClicked");
     private final ObjectProperty<Image> image = new SimpleObjectProperty<>(this, "image");
 
     public ImagePickerItem() {
@@ -55,12 +55,12 @@ public final class ImagePickerItem extends BorderPane {
 
         JFXButton selectButton = new JFXButton();
         selectButton.setGraphic(SVG.PENCIL.createIcon(Theme.blackFill(), 20, 20));
-        selectButton.onMouseClickedProperty().bind(onSelectButtonClicked);
+        selectButton.onActionProperty().bind(onSelectButtonClicked);
         selectButton.getStyleClass().add("toggle-icon4");
 
         JFXButton deleteButton = new JFXButton();
         deleteButton.setGraphic(SVG.CLOSE.createIcon(Theme.blackFill(), 20, 20));
-        deleteButton.onMouseClickedProperty().bind(onDeleteButtonClicked);
+        deleteButton.onActionProperty().bind(onDeleteButtonClicked);
         deleteButton.getStyleClass().add("toggle-icon4");
 
         FXUtils.installFastTooltip(selectButton, i18n("button.edit"));
@@ -93,27 +93,27 @@ public final class ImagePickerItem extends BorderPane {
         this.title.set(title);
     }
 
-    public EventHandler<? super MouseEvent> getOnSelectButtonClicked() {
+    public EventHandler<ActionEvent> getOnSelectButtonClicked() {
         return onSelectButtonClicked.get();
     }
 
-    public ObjectProperty<EventHandler<? super MouseEvent>> onSelectButtonClickedProperty() {
+    public ObjectProperty<EventHandler<ActionEvent>> onSelectButtonClickedProperty() {
         return onSelectButtonClicked;
     }
 
-    public void setOnSelectButtonClicked(EventHandler<? super MouseEvent> onSelectButtonClicked) {
+    public void setOnSelectButtonClicked(EventHandler<ActionEvent> onSelectButtonClicked) {
         this.onSelectButtonClicked.set(onSelectButtonClicked);
     }
 
-    public EventHandler<? super MouseEvent> getOnDeleteButtonClicked() {
+    public EventHandler<ActionEvent> getOnDeleteButtonClicked() {
         return onDeleteButtonClicked.get();
     }
 
-    public ObjectProperty<EventHandler<? super MouseEvent>> onDeleteButtonClickedProperty() {
+    public ObjectProperty<EventHandler<ActionEvent>> onDeleteButtonClickedProperty() {
         return onDeleteButtonClicked;
     }
 
-    public void setOnDeleteButtonClicked(EventHandler<? super MouseEvent> onDeleteButtonClicked) {
+    public void setOnDeleteButtonClicked(EventHandler<ActionEvent> onDeleteButtonClicked) {
         this.onDeleteButtonClicked.set(onDeleteButtonClicked);
     }
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/InputDialogPane.java

@@ -27,6 +27,7 @@ import org.jackhuang.hmcl.util.FutureCallback;
 
 import java.util.concurrent.CompletableFuture;
 
+import static org.jackhuang.hmcl.ui.FXUtils.onEscPressed;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public class InputDialogPane extends JFXDialogLayout {
@@ -68,6 +69,8 @@ public class InputDialogPane extends JFXDialogLayout {
                 lblCreationWarning.setText(msg);
             });
         });
+
+        onEscPressed(this, cancelButton::fire);
     }
 
     public CompletableFuture<String> getCompletableFuture() {

HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MDListCell.java

@@ -18,6 +18,7 @@
 package org.jackhuang.hmcl.ui.construct;
 
 import com.jfoenix.controls.JFXListView;
+import javafx.beans.binding.DoubleBinding;
 import javafx.css.PseudoClass;
 import javafx.scene.control.ListCell;
 import javafx.scene.layout.Region;
@@ -45,9 +46,11 @@ public abstract class MDListCell<T> extends ListCell<T> {
         Region clippedContainer = (Region) listView.lookup(".clipped-container");
         setPrefWidth(0);
         if (clippedContainer != null) {
-            maxWidthProperty().bind(clippedContainer.widthProperty());
-            prefWidthProperty().bind(clippedContainer.widthProperty());
-            minWidthProperty().bind(clippedContainer.widthProperty());
+            DoubleBinding converted = clippedContainer.widthProperty().subtract(1);
+
+            maxWidthProperty().bind(converted);
+            prefWidthProperty().bind(converted);
+            minWidthProperty().bind(converted);
         }
     }
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MultiFileItem.java

@@ -21,7 +21,6 @@ import com.jfoenix.controls.JFXRadioButton;
 import com.jfoenix.controls.JFXTextField;
 import com.jfoenix.validation.base.ValidatorBase;
 import javafx.beans.property.*;
-import javafx.collections.ObservableList;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
@@ -114,6 +113,7 @@ public final class MultiFileItem<T> extends VBox {
     public static class Option<T> {
         protected final String title;
         protected String subtitle;
+        protected String tooltip;
         protected final T data;
         protected final BooleanProperty selected = new SimpleBooleanProperty();
         protected final JFXRadioButton left = new JFXRadioButton();
@@ -140,6 +140,11 @@ public final class MultiFileItem<T> extends VBox {
             return this;
         }
 
+        public Option<T> setTooltip(String tooltip) {
+            this.tooltip = tooltip;
+            return this;
+        }
+
         public boolean isSelected() {
             return left.isSelected();
         }
@@ -161,6 +166,8 @@ public final class MultiFileItem<T> extends VBox {
             BorderPane.setAlignment(left, Pos.CENTER_LEFT);
             left.setToggleGroup(group);
             left.setUserData(data);
+            if (StringUtils.isNotBlank(tooltip))
+                FXUtils.installFastTooltip(left, tooltip);
             pane.setLeft(left);
 
             if (StringUtils.isNotBlank(subtitle)) {
@@ -268,8 +275,9 @@ public final class MultiFileItem<T> extends VBox {
             return this;
         }
 
-        public ObservableList<FileChooser.ExtensionFilter> getExtensionFilters() {
-            return selector.getExtensionFilters();
+        public FileOption<T> addExtensionFilter(FileChooser.ExtensionFilter filter) {
+            selector.getExtensionFilters().add(filter);
+            return this;
         }
 
         @Override

HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/Navigator.java

@@ -126,7 +126,7 @@ public class Navigator extends TransitionPane {
         if (obj instanceof AnimationProducer) {
             setContent(node, (AnimationProducer) obj);
         } else {
-            setContent(node, ContainerAnimations.NONE.getAnimationProducer());
+            setContent(node, ContainerAnimations.NONE);
         }
 
         NavigationEvent navigated = new NavigationEvent(this, node, Navigation.NavigationDirection.PREVIOUS, NavigationEvent.NAVIGATED);

HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/OptionToggleButton.java

@@ -61,9 +61,7 @@ public class OptionToggleButton extends StackPane {
         toggleButton.setSize(8);
         FXUtils.setLimitHeight(toggleButton, 30);
 
-        container.setOnMouseClicked(e -> {
-            toggleButton.setSelected(!toggleButton.isSelected());
-        });
+        FXUtils.onClicked(container, () -> toggleButton.setSelected(!toggleButton.isSelected()));
 
         FXUtils.onChangeAndOperate(subtitleProperty(), subtitle -> {
             if (StringUtils.isNotBlank(subtitle)) {

HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/SpinnerPane.java

@@ -32,7 +32,6 @@ import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
 import org.jackhuang.hmcl.ui.animation.TransitionPane;
-import org.jackhuang.hmcl.util.javafx.BindingMapping;
 
 @DefaultProperty("content")
 public class SpinnerPane extends Control {
@@ -101,18 +100,19 @@ public class SpinnerPane extends Control {
         return onFailedActionProperty().get();
     }
 
-    private ObjectProperty<EventHandler<Event>> onFailedAction = new SimpleObjectProperty<EventHandler<Event>>(this, "onFailedAction") {
+    private final ObjectProperty<EventHandler<Event>> onFailedAction = new SimpleObjectProperty<EventHandler<Event>>(this, "onFailedAction") {
         @Override
         protected void invalidated() {
             setEventHandler(FAILED_ACTION, get());
         }
     };
+
     @Override
-    protected Skin createDefaultSkin() {
+    protected SkinBase<SpinnerPane> createDefaultSkin() {
         return new Skin(this);
     }
 
-    private static class Skin extends SkinBase<SpinnerPane> {
+    private static final class Skin extends SkinBase<SpinnerPane> {
         private final JFXSpinner spinner = new JFXSpinner();
         private final StackPane contentPane = new StackPane();
         private final StackPane topPane = new StackPane();
@@ -122,20 +122,18 @@ public class SpinnerPane extends Control {
         @SuppressWarnings("FieldCanBeLocal") // prevent from gc.
         private final InvalidationListener observer;
 
-        protected Skin(SpinnerPane control) {
+        Skin(SpinnerPane control) {
             super(control);
 
             topPane.getChildren().setAll(spinner);
             topPane.getStyleClass().add("notice-pane");
             failedPane.getStyleClass().add("notice-pane");
             failedPane.getChildren().setAll(failedReasonLabel);
-            failedPane.onMouseClickedProperty().bind(
-                    BindingMapping.of(control.onFailedAction)
-                            .map(actionHandler -> (e -> {
-                                if (actionHandler != null) {
-                                    actionHandler.handle(new Event(FAILED_ACTION));
-                                }
-                            })));
+            FXUtils.onClicked(failedPane, () -> {
+                EventHandler<Event> action = control.getOnFailedAction();
+                if (action != null)
+                    action.handle(new Event(FAILED_ACTION));
+            });
 
             FXUtils.onChangeAndOperate(getSkinnable().content, newValue -> {
                 if (newValue == null) {
@@ -148,12 +146,12 @@ public class SpinnerPane extends Control {
 
             observer = FXUtils.observeWeak(() -> {
                 if (getSkinnable().getFailedReason() != null) {
-                    root.setContent(failedPane, ContainerAnimations.FADE.getAnimationProducer());
+                    root.setContent(failedPane, ContainerAnimations.FADE);
                     failedReasonLabel.setText(getSkinnable().getFailedReason());
                 } else if (getSkinnable().isLoading()) {
-                    root.setContent(topPane, ContainerAnimations.FADE.getAnimationProducer());
+                    root.setContent(topPane, ContainerAnimations.FADE);
                 } else {
-                    root.setContent(contentPane, ContainerAnimations.FADE.getAnimationProducer());
+                    root.setContent(contentPane, ContainerAnimations.FADE);
                 }
             }, getSkinnable().loadingProperty(), getSkinnable().failedReasonProperty());
         }

HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TabHeader.java

@@ -30,7 +30,6 @@ import javafx.geometry.Insets;
 import javafx.geometry.Side;
 import javafx.scene.Node;
 import javafx.scene.control.*;
-import javafx.scene.input.MouseButton;
 import javafx.scene.layout.*;
 import javafx.scene.paint.Color;
 import javafx.scene.transform.Rotate;
@@ -594,11 +593,9 @@ public class TabHeader extends Control implements TabControl, PageAware {
 
                 FXUtils.onChangeAndOperate(tab.selectedProperty(), selected -> inner.pseudoClassStateChanged(SELECTED_PSEUDOCLASS_STATE, selected));
 
-                this.setOnMouseClicked(event -> {
-                    if (event.getButton() == MouseButton.PRIMARY) {
-                        this.setOpacity(1);
-                        getSkinnable().getSelectionModel().select(tab);
-                    }
+                FXUtils.onClicked(this, () -> {
+                    this.setOpacity(1);
+                    getSkinnable().getSelectionModel().select(tab);
                 });
             }
         }

HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorController.java

@@ -30,6 +30,8 @@ import javafx.scene.Node;
 import javafx.scene.image.Image;
 import javafx.scene.input.DragEvent;
 import javafx.scene.input.KeyEvent;
+import javafx.scene.input.MouseButton;
+import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.*;
 import javafx.scene.paint.Color;
 import javafx.stage.Stage;
@@ -47,13 +49,10 @@ import org.jackhuang.hmcl.ui.construct.Navigator;
 import org.jackhuang.hmcl.ui.construct.StackContainerPane;
 import org.jackhuang.hmcl.ui.wizard.Refreshable;
 import org.jackhuang.hmcl.ui.wizard.WizardProvider;
-import org.jackhuang.hmcl.util.io.NetworkUtils;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
 import java.net.URL;
-import java.net.URLConnection;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -144,6 +143,18 @@ public class DecoratorController {
 
         // press ESC to go back
         onEscPressed(navigator, this::back);
+
+        try {
+            // For JavaFX 12+
+            MouseButton button = MouseButton.valueOf("BACK");
+            navigator.addEventFilter(MouseEvent.MOUSE_CLICKED, e -> {
+                if (e.getButton() == button) {
+                    back();
+                    e.consume();
+                }
+            });
+        } catch (IllegalArgumentException ignored) {
+        }
     }
 
     public Decorator getDecorator() {
@@ -166,23 +177,13 @@ public class DecoratorController {
             case CUSTOM:
                 String backgroundImage = config().getBackgroundImage();
                 if (backgroundImage != null)
-                    image = tryLoadImage(Paths.get(backgroundImage)).orElse(null);
+                    image = tryLoadImage(Paths.get(backgroundImage));
                 break;
             case NETWORK:
                 String backgroundImageUrl = config().getBackgroundImageUrl();
                 if (backgroundImageUrl != null) {
                     try {
-                        URLConnection connection = NetworkUtils.createConnection(new URL(backgroundImageUrl));
-                        if (connection instanceof HttpURLConnection) {
-                            connection = NetworkUtils.resolveConnection((HttpURLConnection) connection);
-                        }
-
-                        try (InputStream input = connection.getInputStream()) {
-                            image = new Image(input);
-                            if (image.isError()) {
-                                throw image.getException();
-                            }
-                        }
+                        image = FXUtils.loadImage(new URL(backgroundImageUrl));
                     } catch (Exception e) {
                         LOG.warning("Couldn't load background image", e);
                     }
@@ -204,73 +205,57 @@ public class DecoratorController {
      * Load background image from bg/, background.png, background.jpg, background.gif
      */
     private Image loadDefaultBackgroundImage() {
-        Optional<Image> image = randomImageIn(Paths.get("bg"));
-        if (!image.isPresent()) {
-            image = tryLoadImage(Paths.get("background.png"));
+        Image image = randomImageIn(Paths.get("bg"));
+        if (image != null)
+            return image;
+
+        for (String extension : FXUtils.IMAGE_EXTENSIONS) {
+            image = tryLoadImage(Paths.get("background." + extension));
+            if (image != null)
+                return image;
         }
-        if (!image.isPresent()) {
-            image = tryLoadImage(Paths.get("background.jpg"));
-        }
-        if (!image.isPresent()) {
-            image = tryLoadImage(Paths.get("background.gif"));
-        }
-        return image.orElseGet(() -> newBuiltinImage("/assets/img/background.jpg"));
+
+        return newBuiltinImage("/assets/img/background.jpg");
     }
 
-    private Optional<Image> randomImageIn(Path imageDir) {
+    private @Nullable Image randomImageIn(Path imageDir) {
         if (!Files.isDirectory(imageDir)) {
-            return Optional.empty();
+            return null;
         }
 
         List<Path> candidates;
         try (Stream<Path> stream = Files.list(imageDir)) {
             candidates = stream
+                    .filter(it -> FXUtils.IMAGE_EXTENSIONS.contains(getExtension(it).toLowerCase(Locale.ROOT)))
                     .filter(Files::isReadable)
-                    .filter(it -> {
-                        String ext = getExtension(it).toLowerCase(Locale.ROOT);
-                        return ext.equals("png") || ext.equals("jpg") || ext.equals("gif");
-                    })
                     .collect(toList());
         } catch (IOException e) {
             LOG.warning("Failed to list files in ./bg", e);
-            return Optional.empty();
+            return null;
         }
 
         Random rnd = new Random();
-        while (candidates.size() > 0) {
+        while (!candidates.isEmpty()) {
             int selected = rnd.nextInt(candidates.size());
-            Optional<Image> loaded = tryLoadImage(candidates.get(selected));
-            if (loaded.isPresent()) {
+            Image loaded = tryLoadImage(candidates.get(selected));
+            if (loaded != null)
                 return loaded;
-            } else {
+            else
                 candidates.remove(selected);
-            }
         }
-        return Optional.empty();
+        return null;
     }
 
-    private Optional<Image> tryLoadImage(Path path) {
+    private @Nullable Image tryLoadImage(Path path) {
         if (!Files.isReadable(path))
-            return Optional.empty();
+            return null;
 
-        return tryLoadImage(path.toAbsolutePath().toUri().toString());
-    }
-
-    private Optional<Image> tryLoadImage(String url) {
-        Image img;
         try {
-            img = new Image(url);
-        } catch (IllegalArgumentException e) {
+            return FXUtils.loadImage(path);
+        } catch (Exception e) {
             LOG.warning("Couldn't load background image", e);
-            return Optional.empty();
+            return null;
         }
-
-        if (img.getException() != null) {
-            LOG.warning("Couldn't load background image", img.getException());
-            return Optional.empty();
-        }
-
-        return Optional.of(img);
     }
 
     // ==== Navigation ====
@@ -443,7 +428,7 @@ public class DecoratorController {
     public void startWizard(WizardProvider wizardProvider, String category) {
         FXUtils.checkFxUserThread();
 
-        navigator.navigate(new DecoratorWizardDisplayer(wizardProvider, category), ContainerAnimations.FADE.getAnimationProducer());
+        navigator.navigate(new DecoratorWizardDisplayer(wizardProvider, category), ContainerAnimations.FADE);
     }
 
     // ==== Authlib Injector DnD ====

HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorSkin.java

@@ -18,10 +18,8 @@
 package org.jackhuang.hmcl.ui.decorator;
 
 import com.jfoenix.controls.JFXButton;
-import com.jfoenix.svg.SVGGlyph;
 import javafx.beans.binding.Bindings;
 import javafx.collections.ListChangeListener;
-import javafx.css.PseudoClass;
 import javafx.geometry.Bounds;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
@@ -29,11 +27,10 @@ import javafx.scene.Cursor;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.control.SkinBase;
+import javafx.scene.effect.BlurType;
+import javafx.scene.effect.DropShadow;
 import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.AnchorPane;
-import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.StackPane;
+import javafx.scene.layout.*;
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
@@ -44,20 +41,14 @@ import org.jackhuang.hmcl.ui.animation.AnimationProducer;
 import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
 import org.jackhuang.hmcl.ui.animation.TransitionPane;
 import org.jackhuang.hmcl.ui.wizard.Navigation;
-import org.jackhuang.hmcl.util.Lang;
 
 public class DecoratorSkin extends SkinBase<Decorator> {
-    private static final PseudoClass TRANSPARENT = PseudoClass.getPseudoClass("transparent");
-    private static final SVGGlyph minus = Lang.apply(new SVGGlyph(0, "MINUS", "M804.571 420.571v109.714q0 22.857-16 38.857t-38.857 16h-694.857q-22.857 0-38.857-16t-16-38.857v-109.714q0-22.857 16-38.857t38.857-16h694.857q22.857 0 38.857 16t16 38.857z", Color.WHITE),
-        glyph -> { glyph.setSize(12, 2); glyph.setTranslateY(4); });
-
     private final StackPane root, parent;
     private final StackPane titleContainer;
     private final Stage primaryStage;
     private final TransitionPane navBarPane;
 
-    private double xOffset, yOffset, newX, newY, initX, initY;
-    private boolean titleBarTransparent = true;
+    private double mouseInitX, mouseInitY, stageInitX, stageInitY, stageInitWidth, stageInitHeight;
 
     /**
      * Constructor for all SkinBase instances.
@@ -69,14 +60,13 @@ public class DecoratorSkin extends SkinBase<Decorator> {
 
         primaryStage = control.getPrimaryStage();
 
-        minus.fillProperty().bind(Theme.foregroundFillBinding());
-
         Decorator skinnable = getSkinnable();
         root = new StackPane();
         root.getStyleClass().add("window");
 
         StackPane shadowContainer = new StackPane();
         shadowContainer.getStyleClass().add("body");
+        shadowContainer.setEffect(new DropShadow(BlurType.ONE_PASS_BOX, Color.rgb(0, 0, 0, 0.4), 10, 0.3, 0.0, 0.0));
 
         parent = new StackPane();
         Rectangle clip = new Rectangle();
@@ -174,11 +164,11 @@ public class DecoratorSkin extends SkinBase<Decorator> {
                 if (s.isAnimate()) {
                     AnimationProducer animation;
                     if (skinnable.getNavigationDirection() == Navigation.NavigationDirection.NEXT) {
-                        animation = ContainerAnimations.SWIPE_LEFT_FADE_SHORT.getAnimationProducer();
+                        animation = ContainerAnimations.SWIPE_LEFT_FADE_SHORT;
                     } else if (skinnable.getNavigationDirection() == Navigation.NavigationDirection.PREVIOUS) {
-                        animation = ContainerAnimations.SWIPE_RIGHT_FADE_SHORT.getAnimationProducer();
+                        animation = ContainerAnimations.SWIPE_RIGHT_FADE_SHORT;
                     } else {
-                        animation = ContainerAnimations.FADE.getAnimationProducer();
+                        animation = ContainerAnimations.FADE;
                     }
                     skinnable.setNavigationDirection(Navigation.NavigationDirection.START);
                     navBarPane.setContent(node, animation);
@@ -202,9 +192,7 @@ public class DecoratorSkin extends SkinBase<Decorator> {
                 btnHelp.setOnAction(e -> FXUtils.openLink("https://docs.hmcl.net/help.html"));
 
                 JFXButton btnMin = new JFXButton();
-                StackPane pane = new StackPane(minus);
-                pane.setAlignment(Pos.CENTER);
-                btnMin.setGraphic(pane);
+                btnMin.setGraphic(SVG.MINUS.createIcon(Theme.foregroundFillBinding(), -1, -1));
                 btnMin.getStyleClass().add("jfx-decorator-button");
                 btnMin.setOnAction(e -> skinnable.minimize());
 
@@ -310,13 +298,6 @@ public class DecoratorSkin extends SkinBase<Decorator> {
         return navBar;
     }
 
-    private void updateInitMouseValues(MouseEvent mouseEvent) {
-        initX = mouseEvent.getScreenX();
-        initY = mouseEvent.getScreenY();
-        xOffset = mouseEvent.getSceneX();
-        yOffset = mouseEvent.getSceneY();
-    }
-
     private boolean isRightEdge(double x, double y, Bounds boundsInParent) {
         return x < root.getWidth() && x >= root.getWidth() - root.snappedLeftInset();
     }
@@ -333,146 +314,139 @@ public class DecoratorSkin extends SkinBase<Decorator> {
         return x >= 0 && x <= root.snappedLeftInset();
     }
 
-    private boolean setStageWidth(double width) {
-        if (width >= primaryStage.getMinWidth() && width >= titleContainer.getMinWidth()) {
-            primaryStage.setWidth(width);
-            initX = newX;
-            return true;
-        } else {
-            if (width >= primaryStage.getMinWidth() && width <= titleContainer.getMinWidth())
-                primaryStage.setWidth(titleContainer.getMinWidth());
+    private void resizeStage(double newWidth, double newHeight) {
+        if (newWidth < 0)
+            newWidth = primaryStage.getWidth();
+        if (newWidth < primaryStage.getMinWidth())
+            newWidth = primaryStage.getMinWidth();
+        if (newWidth < titleContainer.getMinWidth())
+            newWidth = titleContainer.getMinWidth();
 
-            return false;
-        }
+        if (newHeight < 0)
+            newHeight = primaryStage.getHeight();
+        if (newHeight < primaryStage.getMinHeight())
+            newHeight = primaryStage.getMinHeight();
+        if (newHeight < titleContainer.getMinHeight())
+            newHeight = titleContainer.getMinHeight();
+
+        // Width and height must be set simultaneously to avoid JDK-8344372 (https://github.com/openjdk/jfx/pull/1654)
+        primaryStage.setWidth(newWidth);
+        primaryStage.setHeight(newHeight);
     }
 
-    private boolean setStageHeight(double height) {
-        if (height >= primaryStage.getMinHeight() && height >= titleContainer.getHeight()) {
-            primaryStage.setHeight(height);
-            initY = newY;
-            return true;
-        } else {
-            if (height >= primaryStage.getMinHeight() && height <= titleContainer.getHeight())
-                primaryStage.setHeight(titleContainer.getHeight());
-
-            return false;
-        }
-    }
-
-    // ====
-
-    protected void onMouseMoved(MouseEvent mouseEvent) {
-        if (!primaryStage.isFullScreen()) {
-            updateInitMouseValues(mouseEvent);
-            if (primaryStage.isResizable()) {
-                double x = mouseEvent.getX(), y = mouseEvent.getY();
-                Bounds boundsInParent = root.getBoundsInParent();
-                double diagonalSize = root.snappedLeftInset() + 10;
-                if (this.isRightEdge(x, y, boundsInParent)) {
-                    if (y < diagonalSize) {
-                        root.setCursor(Cursor.NE_RESIZE);
-                    } else if (y > root.getHeight() - diagonalSize) {
-                        root.setCursor(Cursor.SE_RESIZE);
-                    } else {
-                        root.setCursor(Cursor.E_RESIZE);
-                    }
-                } else if (this.isLeftEdge(x, y, boundsInParent)) {
-                    if (y < diagonalSize) {
-                        root.setCursor(Cursor.NW_RESIZE);
-                    } else if (y > root.getHeight() - diagonalSize) {
-                        root.setCursor(Cursor.SW_RESIZE);
-                    } else {
-                        root.setCursor(Cursor.W_RESIZE);
-                    }
-                } else if (this.isTopEdge(x, y, boundsInParent)) {
-                    if (x < diagonalSize) {
-                        root.setCursor(Cursor.NW_RESIZE);
-                    } else if (x > root.getWidth() - diagonalSize) {
-                        root.setCursor(Cursor.NE_RESIZE);
-                    } else {
-                        root.setCursor(Cursor.N_RESIZE);
-                    }
-                } else if (this.isBottomEdge(x, y, boundsInParent)) {
-                    if (x < diagonalSize) {
-                        root.setCursor(Cursor.SW_RESIZE);
-                    } else if (x > root.getWidth() - diagonalSize) {
-                        root.setCursor(Cursor.SE_RESIZE);
-                    } else {
-                        root.setCursor(Cursor.S_RESIZE);
-                    }
+    private void onMouseMoved(MouseEvent mouseEvent) {
+        if (!primaryStage.isFullScreen() && primaryStage.isResizable()) {
+            double x = mouseEvent.getX(), y = mouseEvent.getY();
+            Bounds boundsInParent = root.getBoundsInParent();
+            double diagonalSize = root.snappedLeftInset() + 10;
+            if (this.isRightEdge(x, y, boundsInParent)) {
+                if (y < diagonalSize) {
+                    root.setCursor(Cursor.NE_RESIZE);
+                } else if (y > root.getHeight() - diagonalSize) {
+                    root.setCursor(Cursor.SE_RESIZE);
                 } else {
-                    root.setCursor(Cursor.DEFAULT);
+                    root.setCursor(Cursor.E_RESIZE);
                 }
+            } else if (this.isLeftEdge(x, y, boundsInParent)) {
+                if (y < diagonalSize) {
+                    root.setCursor(Cursor.NW_RESIZE);
+                } else if (y > root.getHeight() - diagonalSize) {
+                    root.setCursor(Cursor.SW_RESIZE);
+                } else {
+                    root.setCursor(Cursor.W_RESIZE);
+                }
+            } else if (this.isTopEdge(x, y, boundsInParent)) {
+                if (x < diagonalSize) {
+                    root.setCursor(Cursor.NW_RESIZE);
+                } else if (x > root.getWidth() - diagonalSize) {
+                    root.setCursor(Cursor.NE_RESIZE);
+                } else {
+                    root.setCursor(Cursor.N_RESIZE);
+                }
+            } else if (this.isBottomEdge(x, y, boundsInParent)) {
+                if (x < diagonalSize) {
+                    root.setCursor(Cursor.SW_RESIZE);
+                } else if (x > root.getWidth() - diagonalSize) {
+                    root.setCursor(Cursor.SE_RESIZE);
+                } else {
+                    root.setCursor(Cursor.S_RESIZE);
+                }
+            } else {
+                root.setCursor(Cursor.DEFAULT);
             }
         } else {
             root.setCursor(Cursor.DEFAULT);
         }
     }
 
-    protected void onMouseReleased(MouseEvent mouseEvent) {
+    private void onMouseReleased(MouseEvent mouseEvent) {
         getSkinnable().setDragging(false);
     }
 
-    protected void onMouseDragged(MouseEvent mouseEvent) {
-        getSkinnable().setDragging(true);
-        if (mouseEvent.isPrimaryButtonDown() && (this.xOffset != -1.0 || this.yOffset != -1.0)) {
-            if (!this.primaryStage.isFullScreen() && !mouseEvent.isStillSincePress()) {
-                this.newX = mouseEvent.getScreenX();
-                this.newY = mouseEvent.getScreenY();
-                double deltaX = this.newX - this.initX;
-                double deltaY = this.newY - this.initY;
-                Cursor cursor = root.getCursor();
-                if (Cursor.E_RESIZE == cursor) {
-                    this.setStageWidth(this.primaryStage.getWidth() + deltaX);
-                    mouseEvent.consume();
-                } else if (Cursor.NE_RESIZE == cursor) {
-                    if (this.setStageHeight(this.primaryStage.getHeight() - deltaY)) {
-                        this.primaryStage.setY(this.primaryStage.getY() + deltaY);
-                    }
+    private void onMouseDragged(MouseEvent mouseEvent) {
+        if (!getSkinnable().isDragging()) {
+            getSkinnable().setDragging(true);
+            mouseInitX = mouseEvent.getScreenX();
+            mouseInitY = mouseEvent.getScreenY();
+            stageInitX = primaryStage.getX();
+            stageInitY = primaryStage.getY();
+            stageInitWidth = primaryStage.getWidth();
+            stageInitHeight = primaryStage.getHeight();
+        }
 
-                    this.setStageWidth(this.primaryStage.getWidth() + deltaX);
-                    mouseEvent.consume();
-                } else if (Cursor.SE_RESIZE == cursor) {
-                    this.setStageWidth(this.primaryStage.getWidth() + deltaX);
-                    this.setStageHeight(this.primaryStage.getHeight() + deltaY);
-                    mouseEvent.consume();
-                } else if (Cursor.S_RESIZE == cursor) {
-                    this.setStageHeight(this.primaryStage.getHeight() + deltaY);
-                    mouseEvent.consume();
-                } else if (Cursor.W_RESIZE == cursor) {
-                    if (this.setStageWidth(this.primaryStage.getWidth() - deltaX)) {
-                        this.primaryStage.setX(this.primaryStage.getX() + deltaX);
-                    }
+        if (primaryStage.isFullScreen() || !mouseEvent.isPrimaryButtonDown() || mouseEvent.isStillSincePress())
+            return;
 
-                    mouseEvent.consume();
-                } else if (Cursor.SW_RESIZE == cursor) {
-                    if (this.setStageWidth(this.primaryStage.getWidth() - deltaX)) {
-                        this.primaryStage.setX(this.primaryStage.getX() + deltaX);
-                    }
+        double dx = mouseEvent.getScreenX() - mouseInitX;
+        double dy = mouseEvent.getScreenY() - mouseInitY;
 
-                    this.setStageHeight(this.primaryStage.getHeight() + deltaY);
-                    mouseEvent.consume();
-                } else if (Cursor.NW_RESIZE == cursor) {
-                    if (this.setStageWidth(this.primaryStage.getWidth() - deltaX)) {
-                        this.primaryStage.setX(this.primaryStage.getX() + deltaX);
-                    }
+        Cursor cursor = root.getCursor();
+        if (getSkinnable().isAllowMove()) {
+            if (cursor == Cursor.DEFAULT) {
+                primaryStage.setX(stageInitX + dx);
+                primaryStage.setY(stageInitY + dy);
+                mouseEvent.consume();
+            }
+        }
 
-                    if (this.setStageHeight(this.primaryStage.getHeight() - deltaY)) {
-                        this.primaryStage.setY(this.primaryStage.getY() + deltaY);
-                    }
+        if (getSkinnable().isResizable()) {
+            if (cursor == Cursor.E_RESIZE) {
+                resizeStage(stageInitWidth + dx, -1);
+                mouseEvent.consume();
 
-                    mouseEvent.consume();
-                } else if (Cursor.N_RESIZE == cursor) {
-                    if (this.setStageHeight(this.primaryStage.getHeight() - deltaY)) {
-                        this.primaryStage.setY(this.primaryStage.getY() + deltaY);
-                    }
+            } else if (cursor == Cursor.S_RESIZE) {
+                resizeStage(-1, stageInitHeight + dy);
+                mouseEvent.consume();
 
-                    mouseEvent.consume();
-                } else if (getSkinnable().isAllowMove()) {
-                    this.primaryStage.setX(mouseEvent.getScreenX() - this.xOffset);
-                    this.primaryStage.setY(mouseEvent.getScreenY() - this.yOffset);
-                    mouseEvent.consume();
-                }
+            } else if (cursor == Cursor.W_RESIZE) {
+                resizeStage(stageInitWidth - dx, -1);
+                primaryStage.setX(stageInitX + stageInitWidth - primaryStage.getWidth());
+                mouseEvent.consume();
+
+            } else if (cursor == Cursor.N_RESIZE) {
+                resizeStage(-1, stageInitHeight - dy);
+                primaryStage.setY(stageInitY + stageInitHeight - primaryStage.getHeight());
+                mouseEvent.consume();
+
+            } else if (cursor == Cursor.SE_RESIZE) {
+                resizeStage(stageInitWidth + dx, stageInitHeight + dy);
+                mouseEvent.consume();
+
+            } else if (cursor == Cursor.SW_RESIZE) {
+                resizeStage(stageInitWidth - dx, stageInitHeight + dy);
+                primaryStage.setX(stageInitX + stageInitWidth - primaryStage.getWidth());
+                mouseEvent.consume();
+
+            } else if (cursor == Cursor.NW_RESIZE) {
+                resizeStage(stageInitWidth - dx, stageInitHeight - dy);
+                primaryStage.setX(stageInitX + stageInitWidth - primaryStage.getWidth());
+                primaryStage.setY(stageInitY + stageInitHeight - primaryStage.getHeight());
+                mouseEvent.consume();
+
+            } else if (cursor == Cursor.NE_RESIZE) {
+                resizeStage(stageInitWidth + dx, stageInitHeight - dy);
+                primaryStage.setY(stageInitY + stageInitHeight - primaryStage.getHeight());
+                mouseEvent.consume();
             }
         }
     }

HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorTabPage.java

@@ -36,7 +36,7 @@ public abstract class DecoratorTabPage extends DecoratorTransitionPage implement
             if (newValue.getNode() != null) {
                 onNavigating(getCurrentPage());
                 if (getCurrentPage() != null) getCurrentPage().fireEvent(new Navigator.NavigationEvent(null, getCurrentPage(), Navigation.NavigationDirection.NEXT, Navigator.NavigationEvent.NAVIGATING));
-                navigate(newValue.getNode(), ContainerAnimations.FADE.getAnimationProducer());
+                navigate(newValue.getNode(), ContainerAnimations.FADE);
                 onNavigated(getCurrentPage());
                 if (getCurrentPage() != null) getCurrentPage().fireEvent(new Navigator.NavigationEvent(null, getCurrentPage(), Navigation.NavigationDirection.NEXT, Navigator.NavigationEvent.NAVIGATED));
             }

HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorWizardDisplayer.java

@@ -74,7 +74,7 @@ public class DecoratorWizardDisplayer extends DecoratorTransitionPage implements
     @Override
     public void navigateTo(Node page, Navigation.NavigationDirection nav) {
         displayer.navigateTo(page, nav);
-        navigate(page, nav.getAnimation().getAnimationProducer());
+        navigate(page, nav.getAnimation());
 
         String prefix = category == null ? "" : category + " - ";
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/download/AdditionalInstallersPage.java

@@ -59,7 +59,7 @@ class AdditionalInstallersPage extends InstallersPage {
         for (InstallerItem library : group.getLibraries()) {
             String libraryId = library.getLibraryId();
             if (libraryId.equals("game")) continue;
-            library.removeActionProperty().set(e -> {
+            library.setOnRemove(() -> {
                 controller.getSettings().put(libraryId, new UpdateInstallerWizardProvider.RemoveVersionAction(libraryId));
                 reload();
             });

HMCL/src/main/java/org/jackhuang/hmcl/ui/download/DownloadPage.java

@@ -97,7 +97,7 @@ public class DownloadPage extends DecoratorAnimatedPage implements DecoratorPage
 
         tab.select(newGameTab);
         FXUtils.onChangeAndOperate(tab.getSelectionModel().selectedItemProperty(), newValue -> {
-            transitionPane.setContent(newValue.getNode(), ContainerAnimations.FADE.getAnimationProducer());
+            transitionPane.setContent(newValue.getNode(), ContainerAnimations.FADE);
         });
 
         {

HMCL/src/main/java/org/jackhuang/hmcl/ui/download/InstallersPage.java

@@ -40,6 +40,7 @@ import org.jackhuang.hmcl.ui.construct.Validator;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
 import org.jackhuang.hmcl.ui.wizard.WizardPage;
 
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
 import static javafx.beans.binding.Bindings.createBooleanBinding;
@@ -69,7 +70,7 @@ public class InstallersPage extends Control implements WizardPage {
         for (InstallerItem library : group.getLibraries()) {
             String libraryId = library.getLibraryId();
             if (libraryId.equals(LibraryAnalyzer.LibraryType.MINECRAFT.getPatchId())) continue;
-            library.installActionProperty().set(e -> {
+            library.setOnInstall(() -> {
                 if (LibraryAnalyzer.LibraryType.FABRIC_API.getPatchId().equals(libraryId)) {
                     Controllers.dialog(i18n("install.installer.fabric-api.warning"), i18n("message.warning"), MessageDialogPane.MessageType.WARNING);
                 }
@@ -77,7 +78,7 @@ public class InstallersPage extends Control implements WizardPage {
                 if (!(library.resolvedStateProperty().get() instanceof InstallerItem.IncompatibleState))
                     controller.onNext(new VersionsPage(controller, i18n("install.installer.choose", i18n("install.installer." + libraryId)), gameVersion, downloadProvider, libraryId, () -> controller.onPrev(false)));
             });
-            library.removeActionProperty().set(e -> {
+            library.setOnRemove(() -> {
                 controller.getSettings().remove(libraryId);
                 reload();
             });
@@ -121,8 +122,25 @@ public class InstallersPage extends Control implements WizardPage {
     }
 
     protected void onInstall() {
-        controller.getSettings().put("name", txtName.getText());
-        controller.onFinish();
+        String name = txtName.getText();
+
+        // Check for non-ASCII characters.
+        if (!StandardCharsets.US_ASCII.newEncoder().canEncode(name)) {
+            Controllers.dialog(new MessageDialogPane.Builder(
+                    i18n("install.name.invalid"),
+                    i18n("message.warning"),
+                    MessageDialogPane.MessageType.QUESTION)
+                    .yesOrNo(() -> {
+                        controller.getSettings().put("name", name);
+                        controller.onFinish();
+                    }, () -> {
+                        // The user selects Cancel and does nothing.
+                    })
+                    .build());
+        } else {
+            controller.getSettings().put("name", name);
+            controller.onFinish();
+        }
     }
 
     @Override
@@ -222,7 +240,7 @@ public class InstallersPage extends Control implements WizardPage {
                 installButton.disableProperty().bind(control.installable.not());
                 installButton.setPrefWidth(100);
                 installButton.setPrefHeight(40);
-                installButton.setOnMouseClicked(e -> control.onInstall());
+                installButton.setOnAction(e -> control.onInstall());
                 BorderPane.setAlignment(installButton, Pos.CENTER_RIGHT);
                 root.setBottom(installButton);
             }

HMCL/src/main/java/org/jackhuang/hmcl/ui/download/LocalModpackPage.java

@@ -42,6 +42,7 @@ import org.jackhuang.hmcl.util.io.FileUtils;
 
 import java.io.File;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 import java.util.Optional;
 
@@ -149,10 +150,27 @@ public final class LocalModpackPage extends ModpackPage {
     }
 
     protected void onInstall() {
-        if (!txtModpackName.validate()) return;
-        controller.getSettings().put(MODPACK_NAME, txtModpackName.getText());
-        controller.getSettings().put(MODPACK_CHARSET, charset);
-        controller.onFinish();
+        String name = txtModpackName.getText();
+
+        // Check for non-ASCII characters.
+        if (!StandardCharsets.US_ASCII.newEncoder().canEncode(name)) {
+            Controllers.dialog(new MessageDialogPane.Builder(
+                    i18n("install.name.invalid"),
+                    i18n("message.warning"),
+                    MessageDialogPane.MessageType.QUESTION)
+                    .yesOrNo(() -> {
+                        controller.getSettings().put(MODPACK_NAME, name);
+                        controller.getSettings().put(MODPACK_CHARSET, charset);
+                        controller.onFinish();
+                    }, () -> {
+                        // The user selects Cancel and does nothing.
+                    })
+                    .build());
+        } else {
+            controller.getSettings().put(MODPACK_NAME, name);
+            controller.getSettings().put(MODPACK_CHARSET, charset);
+            controller.onFinish();
+        }
     }
 
     protected void onDescribe() {

HMCL/src/main/java/org/jackhuang/hmcl/ui/download/VersionsPage.java

@@ -21,12 +21,18 @@ import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXCheckBox;
 import com.jfoenix.controls.JFXListView;
 import com.jfoenix.controls.JFXSpinner;
+import com.jfoenix.controls.JFXTextField;
+import javafx.animation.PauseTransition;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.geometry.Insets;
+import javafx.geometry.Pos;
 import javafx.scene.control.Label;
 import javafx.scene.control.ListCell;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.*;
+import javafx.util.Duration;
 import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.download.RemoteVersion;
 import org.jackhuang.hmcl.download.VersionList;
@@ -55,14 +61,20 @@ import org.jackhuang.hmcl.ui.wizard.WizardPage;
 import org.jackhuang.hmcl.util.Holder;
 
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import static org.jackhuang.hmcl.ui.FXUtils.ignoreEvent;
+import static org.jackhuang.hmcl.ui.FXUtils.onEscPressed;
 import static org.jackhuang.hmcl.ui.ToolbarListPageSkin.wrap;
 import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 import static org.jackhuang.hmcl.util.i18n.I18n.formatDateTime;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+import static org.jackhuang.hmcl.util.StringUtils.isBlank;
 
 public final class VersionsPage extends BorderPane implements WizardPage, Refreshable {
     private final String gameVersion;
@@ -86,6 +98,11 @@ public final class VersionsPage extends BorderPane implements WizardPage, Refres
     private final VersionList<?> versionList;
     private CompletableFuture<?> executor;
 
+    private final TransitionPane toolbarPane;
+    private final HBox searchBar;
+    private final JFXTextField searchField;
+    private boolean isSearching = false;
+
     public VersionsPage(Navigation navigation, String title, String gameVersion, DownloadProvider downloadProvider, String libraryId, Runnable callback) {
         this.title = title;
         this.gameVersion = gameVersion;
@@ -95,7 +112,7 @@ public final class VersionsPage extends BorderPane implements WizardPage, Refres
         HintPane hintPane = new HintPane();
         hintPane.setText(i18n("sponsor.bmclapi"));
         hintPane.getStyleClass().add("sponsor-pane");
-        hintPane.setOnMouseClicked(e -> onSponsor());
+        FXUtils.onClicked(hintPane, this::onSponsor);
         BorderPane.setMargin(hintPane, new Insets(10, 10, 0, 10));
         this.setTop(hintPane);
 
@@ -136,6 +153,9 @@ public final class VersionsPage extends BorderPane implements WizardPage, Refres
                     list.getStyleClass().add("jfx-list-view-float");
                     VBox.setVgrow(list, Priority.ALWAYS);
 
+                    // ListViewBehavior would consume ESC pressed event, preventing us from handling it, so we ignore it here
+                    ignoreEvent(list, KeyEvent.KEY_PRESSED, e -> e.getCode() == KeyCode.ESCAPE);
+
                     centrePane.getContent().setAll(checkPane, list);
                 }
 
@@ -146,7 +166,7 @@ public final class VersionsPage extends BorderPane implements WizardPage, Refres
             failedPane.getStyleClass().add("notice-pane");
             {
                 Label label = new Label(i18n("download.failed.refresh"));
-                label.setOnMouseClicked(e -> onRefresh());
+                FXUtils.onClicked(label, this::onRefresh);
 
                 failedPane.getChildren().setAll(label);
             }
@@ -155,7 +175,7 @@ public final class VersionsPage extends BorderPane implements WizardPage, Refres
             emptyPane.getStyleClass().add("notice-pane");
             {
                 Label label = new Label(i18n("download.failed.empty"));
-                label.setOnMouseClicked(e -> onBack());
+                FXUtils.onClicked(label, this::onBack);
 
                 emptyPane.getChildren().setAll(label);
             }
@@ -163,7 +183,15 @@ public final class VersionsPage extends BorderPane implements WizardPage, Refres
         this.setCenter(root);
 
         versionList = downloadProvider.getVersionListById(libraryId);
-        if (versionList.hasType()) {
+        boolean hasType = versionList.hasType();
+        chkRelease.setManaged(hasType);
+        chkRelease.setVisible(hasType);
+        chkSnapshot.setManaged(hasType);
+        chkSnapshot.setVisible(hasType);
+        chkOld.setManaged(hasType);
+        chkOld.setVisible(hasType);
+
+        if (hasType) {
             centrePane.getContent().setAll(checkPane, list);
         } else {
             centrePane.getContent().setAll(list);
@@ -178,15 +206,59 @@ public final class VersionsPage extends BorderPane implements WizardPage, Refres
         btnRefresh.setGraphic(wrap(SVG.REFRESH.createIcon(Theme.blackFill(), -1, -1)));
 
         Holder<RemoteVersionListCell> lastCell = new Holder<>();
-        list.setCellFactory(listView -> new RemoteVersionListCell(lastCell));
+        list.setCellFactory(listView -> new RemoteVersionListCell(lastCell, libraryId));
 
-        list.setOnMouseClicked(e -> {
+        FXUtils.onClicked(list, () -> {
             if (list.getSelectionModel().getSelectedIndex() < 0)
                 return;
             navigation.getSettings().put(libraryId, list.getSelectionModel().getSelectedItem());
             callback.run();
         });
 
+        {
+            toolbarPane = new TransitionPane();
+            searchBar = new HBox();
+            searchBar.setAlignment(Pos.CENTER);
+            searchBar.setPadding(new Insets(0, 5, 0, 5));
+            searchField = new JFXTextField();
+            searchField.setPromptText(i18n("search"));
+            HBox.setHgrow(searchField, Priority.ALWAYS);
+
+            JFXButton closeSearchBar = new JFXButton();
+            closeSearchBar.getStyleClass().add("jfx-tool-bar-button");
+            closeSearchBar.setGraphic(wrap(SVG.CLOSE.createIcon(Theme.blackFill(), -1, -1)));
+            closeSearchBar.setOnAction(e -> {
+                toolbarPane.setContent(checkPane, ContainerAnimations.FADE);
+                isSearching = false;
+                searchField.clear();
+                list.getItems().setAll(loadVersions());
+            });
+            onEscPressed(searchField, closeSearchBar::fire);
+
+            searchBar.getChildren().setAll(searchField, closeSearchBar);
+
+            JFXButton searchButton = new JFXButton(i18n("search"));
+            searchButton.getStyleClass().add("jfx-tool-bar-button");
+            searchButton.setGraphic(wrap(SVG.MAGNIFY.createIcon(Theme.blackFill(), -1, -1)));
+            searchButton.setOnAction(e -> {
+                toolbarPane.setContent(searchBar, ContainerAnimations.FADE);
+                searchField.requestFocus();
+            });
+
+            checkPane.getChildren().add(checkPane.getChildren().size() - 1, searchButton);
+            
+            centrePane.getContent().remove(checkPane);
+            toolbarPane.setContent(checkPane, ContainerAnimations.FADE);
+            centrePane.getContent().add(0, toolbarPane);
+
+            PauseTransition pause = new PauseTransition(Duration.millis(100));
+            pause.setOnFinished(e -> search());
+            searchField.textProperty().addListener((observable, oldValue, newValue) -> {
+                pause.setRate(1);
+                pause.playFromStart();
+            });
+        }
+
         refresh();
     }
 
@@ -210,7 +282,7 @@ public final class VersionsPage extends BorderPane implements WizardPage, Refres
     @Override
     public void refresh() {
         VersionList<?> currentVersionList = versionList;
-        root.setContent(spinner, ContainerAnimations.FADE.getAnimationProducer());
+        root.setContent(spinner, ContainerAnimations.FADE);
         executor = currentVersionList.refreshAsync(gameVersion).whenComplete((result, exception) -> {
             if (exception == null) {
                 List<RemoteVersion> items = loadVersions();
@@ -218,7 +290,7 @@ public final class VersionsPage extends BorderPane implements WizardPage, Refres
                 Platform.runLater(() -> {
                     if (versionList != currentVersionList) return;
                     if (currentVersionList.getVersions(gameVersion).isEmpty()) {
-                        root.setContent(emptyPane, ContainerAnimations.FADE.getAnimationProducer());
+                        root.setContent(emptyPane, ContainerAnimations.FADE);
                     } else {
                         if (items.isEmpty()) {
                             chkRelease.setSelected(true);
@@ -227,14 +299,14 @@ public final class VersionsPage extends BorderPane implements WizardPage, Refres
                         } else {
                             list.getItems().setAll(items);
                         }
-                        root.setContent(center, ContainerAnimations.FADE.getAnimationProducer());
+                        root.setContent(center, ContainerAnimations.FADE);
                     }
                 });
             } else {
                 LOG.warning("Failed to fetch versions list", exception);
                 Platform.runLater(() -> {
                     if (versionList != currentVersionList) return;
-                    root.setContent(failedPane, ContainerAnimations.FADE.getAnimationProducer());
+                    root.setContent(failedPane, ContainerAnimations.FADE);
                 });
             }
 
@@ -265,6 +337,37 @@ public final class VersionsPage extends BorderPane implements WizardPage, Refres
         FXUtils.openLink("https://bmclapidoc.bangbang93.com");
     }
 
+    private void search() {
+        isSearching = true;
+        String queryString = searchField.getText(); 
+        
+        if (isBlank(queryString)) {
+            list.getItems().setAll(loadVersions());
+        } else {
+            list.getItems().clear();
+            
+            Predicate<String> predicate;
+            if (queryString.startsWith("regex:")) {
+                try {
+                    Pattern pattern = Pattern.compile(queryString.substring("regex:".length()));
+                    predicate = s -> pattern.matcher(s).find();
+                } catch (Throwable e) {
+                    LOG.warning("Illegal regular expression", e);
+                    return;
+                }
+            } else {
+                String lowerQueryString = queryString.toLowerCase(Locale.ROOT);
+                predicate = s -> s.toLowerCase(Locale.ROOT).contains(lowerQueryString);
+            }
+
+            for (RemoteVersion version : loadVersions()) {
+                if (predicate.test(version.getSelfVersion())) {
+                    list.getItems().add(version);
+                }
+            }
+        }
+    }
+
     private static class RemoteVersionListCell extends ListCell<RemoteVersion> {
         final IconedTwoLineListItem content = new IconedTwoLineListItem();
         final RipplerContainer ripplerContainer = new RipplerContainer(content);
@@ -272,8 +375,12 @@ public final class VersionsPage extends BorderPane implements WizardPage, Refres
 
         private final Holder<RemoteVersionListCell> lastCell;
 
-        RemoteVersionListCell(Holder<RemoteVersionListCell> lastCell) {
+        RemoteVersionListCell(Holder<RemoteVersionListCell> lastCell, String libraryId) {
             this.lastCell = lastCell;
+            if ("game".equals(libraryId)) {
+                content.getExternalLinkButton().setGraphic(SVG.EARTH.createIcon(Theme.blackFill(), -1, -1));
+                FXUtils.installFastTooltip(content.getExternalLinkButton(), i18n("wiki.tooltip"));
+            }
 
             pane.getStyleClass().add("md-list-cell");
             StackPane.setMargin(content, new Insets(10, 16, 10, 16));
@@ -307,14 +414,19 @@ public final class VersionsPage extends BorderPane implements WizardPage, Refres
                     case RELEASE:
                         content.getTags().setAll(i18n("version.game.release"));
                         content.setImage(VersionIconType.GRASS.getIcon());
+                        content.setExternalLink(i18n("wiki.version.game.release", remoteVersion.getGameVersion()));
                         break;
                     case SNAPSHOT:
                         content.getTags().setAll(i18n("version.game.snapshot"));
                         content.setImage(VersionIconType.COMMAND.getIcon());
+
+
+                        content.setExternalLink(i18n("wiki.version.game.snapshot", remoteVersion.getGameVersion()));
                         break;
                     default:
                         content.getTags().setAll(i18n("version.game.old"));
                         content.setImage(VersionIconType.CRAFT_TABLE.getIcon());
+                        content.setExternalLink(null);
                         break;
                 }
             } else {
@@ -339,6 +451,7 @@ public final class VersionsPage extends BorderPane implements WizardPage, Refres
                     content.setSubtitle(remoteVersion.getGameVersion());
                 else
                     content.getTags().setAll(remoteVersion.getGameVersion());
+                content.setExternalLink(null);
             }
         }
     }

HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ExportWizardProvider.java

@@ -29,6 +29,7 @@ import org.jackhuang.hmcl.setting.ConfigHolder;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.VersionSetting;
 import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
 import org.jackhuang.hmcl.ui.wizard.WizardProvider;
 import org.jackhuang.hmcl.util.Lang;
@@ -129,17 +130,13 @@ public final class ExportWizardProvider implements WizardProvider {
                     if (bg.isDirectory())
                         zip.putDirectory(bg.toPath(), "bg");
 
-                    File background_png = new File("background.png").getAbsoluteFile();
-                    if (background_png.isFile())
-                        zip.putFile(background_png, "background.png");
+                    for (String extension : FXUtils.IMAGE_EXTENSIONS) {
+                        String fileName = "background." + extension;
 
-                    File background_jpg = new File("background.jpg").getAbsoluteFile();
-                    if (background_jpg.isFile())
-                        zip.putFile(background_jpg, "background.jpg");
-
-                    File background_gif = new File("background.gif").getAbsoluteFile();
-                    if (background_gif.isFile())
-                        zip.putFile(background_gif, "background.gif");
+                        File background = new File(fileName).getAbsoluteFile();
+                        if (background.isFile())
+                            zip.putFile(background, "background.png");
+                    }
 
                     zip.putFile(launcherJar, launcherJar.getFileName().toString());
                 }
@@ -195,7 +192,8 @@ public final class ExportWizardProvider implements WizardProvider {
                                 /* overrideJavaArgs */ true,
                                 /* overrideConsole */ true,
                                 /* overrideCommands */ true,
-                                /* overrideWindow */ true
+                                /* overrideWindow */ true,
+                                /* iconKey */ null // TODO
                         ), modpackFile);
             }
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ModpackInfoPage.java

@@ -21,12 +21,10 @@ import com.jfoenix.controls.*;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.*;
 import javafx.collections.ObservableList;
-import javafx.event.EventHandler;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.*;
-import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.*;
 import javafx.stage.FileChooser;
 import org.jackhuang.hmcl.auth.Account;
@@ -78,7 +76,6 @@ public final class ModpackInfoPage extends Control implements WizardPage {
     private final SimpleStringProperty authlibInjectorServer = new SimpleStringProperty();
     private final SimpleStringProperty launchArguments = new SimpleStringProperty("");
     private final SimpleStringProperty javaArguments = new SimpleStringProperty("");
-    private final ObjectProperty<EventHandler<? super MouseEvent>> next = new SimpleObjectProperty<>();
     private final SimpleStringProperty mcbbsThreadId = new SimpleStringProperty("");
 
     public ModpackInfoPage(WizardController controller, HMCLGameRepository gameRepository, String version) {
@@ -97,8 +94,6 @@ public final class ModpackInfoPage extends Control implements WizardPage {
         javaArguments.set(versionSetting.getJavaArgs());
 
         canIncludeLauncher = JarUtils.thisJarPath() != null;
-
-        next.set(e -> onNext());
     }
 
     private void onNext() {
@@ -178,9 +173,7 @@ public final class ModpackInfoPage extends Control implements WizardPage {
 
                 if (skinnable.controller.getSettings().get(MODPACK_TYPE) == MODPACK_TYPE_SERVER) {
                     Hyperlink hyperlink = new Hyperlink(i18n("modpack.wizard.step.initialization.server"));
-                    hyperlink.setOnMouseClicked(e -> {
-                        FXUtils.openLink("https://docs.hmcl.net/modpack/serverpack.html");
-                    });
+                    hyperlink.setOnAction(e -> FXUtils.openLink("https://docs.hmcl.net/modpack/serverpack.html"));
                     borderPane.setTop(hyperlink);
                 } else {
                     HintPane pane = new HintPane(MessageDialogPane.MessageType.INFO);
@@ -378,7 +371,7 @@ public final class ModpackInfoPage extends Control implements WizardPage {
                     borderPane.setBottom(hbox);
 
                     JFXButton nextButton = FXUtils.newRaisedButton(i18n("wizard.next"));
-                    nextButton.onMouseClickedProperty().bind(skinnable.next);
+                    nextButton.setOnAction(e -> skinnable.onNext());
                     nextButton.setPrefWidth(100);
                     nextButton.setPrefHeight(40);
                     nextButton.disableProperty().bind(

HMCL/src/main/java/org/jackhuang/hmcl/ui/main/AboutPage.java

@@ -36,6 +36,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.nio.charset.StandardCharsets;
 
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 import static org.jackhuang.hmcl.util.logging.Logger.LOG;
@@ -116,7 +117,7 @@ public final class AboutPage extends StackPane {
             return componentList;
         }
 
-        try (Reader reader = new InputStreamReader(input)) {
+        try (Reader reader = new InputStreamReader(input, StandardCharsets.UTF_8)) {
             JsonArray array = JsonUtils.GSON.fromJson(reader, JsonArray.class);
 
             for (JsonElement element : array) {

HMCL/src/main/java/org/jackhuang/hmcl/ui/main/JavaDownloadDialog.java

@@ -48,6 +48,8 @@ import org.jackhuang.hmcl.ui.wizard.SinglePageWizardProvider;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.TaskCancellationAction;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
+import org.jackhuang.hmcl.util.platform.Architecture;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;
 import org.jackhuang.hmcl.util.platform.Platform;
 
 import java.io.File;
@@ -289,6 +291,11 @@ public final class JavaDownloadDialog extends StackPane {
             setHeading(new Label(i18n("java.download")));
             setBody(body);
             setActions(warningLabel, downloadButtonPane, cancelButton);
+            if (platform.getOperatingSystem() == OperatingSystem.LINUX && platform.getArchitecture() == Architecture.RISCV64) {
+                JFXHyperlink hyperlink = new JFXHyperlink(i18n("java.download.banshanjdk-8"));
+                hyperlink.setExternalLink("https://www.zthread.cn/#product");
+                getActions().add(0, hyperlink);
+            }
         }
 
         private void onDownload() {

HMCL/src/main/java/org/jackhuang/hmcl/ui/main/LauncherSettingsPage.java

@@ -36,7 +36,6 @@ import org.jackhuang.hmcl.ui.versions.VersionSettingsPage;
 import java.util.Locale;
 
 import static org.jackhuang.hmcl.ui.versions.VersionPage.wrap;
-import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public class LauncherSettingsPage extends DecoratorAnimatedPage implements DecoratorPage, PageAware {
@@ -67,7 +66,7 @@ public class LauncherSettingsPage extends DecoratorAnimatedPage implements Decor
         gameTab.initializeIfNeeded();
         gameTab.getNode().loadVersion(Profiles.getSelectedProfile(), null);
         FXUtils.onChangeAndOperate(tab.getSelectionModel().selectedItemProperty(), newValue -> {
-            transitionPane.setContent(newValue.getNode(), ContainerAnimations.FADE.getAnimationProducer());
+            transitionPane.setContent(newValue.getNode(), ContainerAnimations.FADE);
         });
 
         {
@@ -76,7 +75,6 @@ public class LauncherSettingsPage extends DecoratorAnimatedPage implements Decor
                         settingsItem.setTitle(i18n("settings.type.global.manage"));
                         settingsItem.setLeftGraphic(wrap(SVG.GAMEPAD));
                         settingsItem.activeProperty().bind(tab.getSelectionModel().selectedItemProperty().isEqualTo(gameTab));
-                        runInFX(() -> FXUtils.installFastTooltip(settingsItem, i18n("settings.type.global.manage")));
                         settingsItem.setOnAction(e -> tab.select(gameTab));
                     })
                     .addNavigationDrawerItem(javaItem -> {

HMCL/src/main/java/org/jackhuang/hmcl/ui/main/MainPage.java

@@ -32,7 +32,6 @@ import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.HBox;
-import javafx.scene.layout.Pane;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import javafx.scene.shape.Rectangle;
@@ -46,6 +45,8 @@ import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
 import org.jackhuang.hmcl.ui.animation.AnimationUtils;
+import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
+import org.jackhuang.hmcl.ui.animation.TransitionPane;
 import org.jackhuang.hmcl.ui.construct.AnnouncementCard;
 import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
 import org.jackhuang.hmcl.ui.construct.PopupMenu;
@@ -65,7 +66,6 @@ import java.util.stream.IntStream;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 import static org.jackhuang.hmcl.ui.FXUtils.SINE;
-import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class MainPage extends StackPane implements DecoratorPage {
@@ -83,7 +83,7 @@ public final class MainPage extends StackPane implements DecoratorPage {
     private final ObservableList<Node> versionNodes;
     private Profile profile;
 
-    private VBox announcementPane;
+    private TransitionPane announcementPane;
     private final StackPane updatePane;
     private final JFXButton menuButton;
 
@@ -102,13 +102,23 @@ public final class MainPage extends StackPane implements DecoratorPage {
         setPadding(new Insets(20));
 
         if (Metadata.isNightly() || (Metadata.isDev() && !Objects.equals(Metadata.VERSION, config().getShownTips().get(ANNOUNCEMENT)))) {
-            announcementPane = new VBox(16);
+            AnnouncementCard announcementCard = null;
+
             if (Metadata.isNightly()) {
-                announcementPane.getChildren().add(new AnnouncementCard(i18n("update.channel.nightly.title"), i18n("update.channel.nightly.hint")));
+                announcementCard = new AnnouncementCard(i18n("update.channel.nightly.title"), i18n("update.channel.nightly.hint"), null);
             } else if (Metadata.isDev()) {
-                announcementPane.getChildren().add(new AnnouncementCard(i18n("update.channel.dev.title"), i18n("update.channel.dev.hint")));
+                announcementCard = new AnnouncementCard(i18n("update.channel.dev.title"), i18n("update.channel.dev.hint"), this::hideAnnouncementPane);
+            }
+
+            if (announcementCard != null) {
+                VBox announcementBox = new VBox(16);
+                announcementBox.getChildren().add(announcementCard);
+
+                announcementPane = new TransitionPane();
+                announcementPane.setContent(announcementBox, ContainerAnimations.NONE);
+
+                getChildren().add(announcementPane);
             }
-            getChildren().add(announcementPane);
         }
 
         updatePane = new StackPane();
@@ -117,7 +127,7 @@ public final class MainPage extends StackPane implements DecoratorPage {
         FXUtils.setLimitWidth(updatePane, 230);
         FXUtils.setLimitHeight(updatePane, 55);
         StackPane.setAlignment(updatePane, Pos.TOP_RIGHT);
-        updatePane.setOnMouseClicked(e -> onUpgrade());
+        FXUtils.onClicked(updatePane, this::onUpgrade);
         FXUtils.onChange(showUpdateProperty(), this::showUpdate);
 
         {
@@ -144,7 +154,7 @@ public final class MainPage extends StackPane implements DecoratorPage {
             StackPane.setAlignment(closeUpdateButton, Pos.TOP_RIGHT);
             closeUpdateButton.getStyleClass().add("toggle-icon-tiny");
             StackPane.setMargin(closeUpdateButton, new Insets(5));
-            closeUpdateButton.setOnMouseClicked(e -> closeUpdateBubble());
+            closeUpdateButton.setOnAction(e -> closeUpdateBubble());
 
             updatePane.getChildren().setAll(hBox, closeUpdateButton);
         }
@@ -206,14 +216,14 @@ public final class MainPage extends StackPane implements DecoratorPage {
             menuButton.setPrefWidth(230);
             //menuButton.setButtonType(JFXButton.ButtonType.RAISED);
             menuButton.setStyle("-fx-font-size: 15px;");
-            menuButton.setOnMouseClicked(e -> onMenu());
+            menuButton.setOnAction(e -> onMenu());
             menuButton.setClip(new Rectangle(211, -100, 100, 200));
             StackPane graphic = new StackPane();
             Node svg = SVG.TRIANGLE.createIcon(Theme.foregroundFillBinding(), 10, 10);
             StackPane.setAlignment(svg, Pos.CENTER_RIGHT);
             graphic.getChildren().setAll(svg);
             graphic.setTranslateX(12);
-            runInFX(() -> FXUtils.installFastTooltip(menuButton, i18n("version.switch")));
+            FXUtils.installFastTooltip(menuButton, i18n("version.switch"));
             menuButton.setGraphic(graphic);
 
             launchPane.getChildren().setAll(launchButton, separator, menuButton);
@@ -224,10 +234,10 @@ public final class MainPage extends StackPane implements DecoratorPage {
         menu.setMaxHeight(365);
         menu.setMaxWidth(545);
         menu.setAlwaysShowingVBar(true);
-        menu.setOnMouseClicked(e -> popup.hide());
+        FXUtils.onClicked(menu, popup::hide);
         versionNodes = MappedObservableList.create(versions, version -> {
             Node node = PopupMenu.wrapPopupMenuItem(new GameItem(profile, version.getId()));
-            node.setOnMouseClicked(e -> profile.setSelectedVersion(version.getId()));
+            FXUtils.onClicked(node, () -> profile.setSelectedVersion(version.getId()));
             return node;
         });
         Bindings.bindContent(menu.getContent(), versionNodes);
@@ -290,10 +300,7 @@ public final class MainPage extends StackPane implements DecoratorPage {
     public void hideAnnouncementPane() {
         if (announcementPane != null) {
             config().getShownTips().put(ANNOUNCEMENT, Metadata.VERSION);
-            Pane parent = (Pane) announcementPane.getParent();
-            if (parent != null)
-                parent.getChildren().remove(announcementPane);
-            announcementPane = null;
+            announcementPane.setContent(new StackPane(), ContainerAnimations.FADE);
         }
     }
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/main/PersonalizationPage.java

@@ -106,11 +106,13 @@ public class PersonalizationPage extends StackPane {
             backgroundSublist.setHasSubtitle(true);
 
             backgroundItem.loadChildren(Arrays.asList(
-                    new MultiFileItem.Option<>(i18n("launcher.background.default"), EnumBackgroundImage.DEFAULT),
+                    new MultiFileItem.Option<>(i18n("launcher.background.default"), EnumBackgroundImage.DEFAULT)
+                            .setTooltip(i18n("launcher.background.default.tooltip")),
                     new MultiFileItem.Option<>(i18n("launcher.background.classic"), EnumBackgroundImage.CLASSIC),
                     new MultiFileItem.Option<>(i18n("launcher.background.translucent"), EnumBackgroundImage.TRANSLUCENT),
                     new MultiFileItem.FileOption<>(i18n("settings.custom"), EnumBackgroundImage.CUSTOM)
                             .setChooserTitle(i18n("launcher.background.choose"))
+                            .addExtensionFilter(FXUtils.getImageExtensionFilter())
                             .bindBidirectional(config().backgroundImageProperty()),
                     new MultiFileItem.StringOption<>(i18n("launcher.background.network"), EnumBackgroundImage.NETWORK)
                             .setValidators(new URLValidator(true))

HMCL/src/main/java/org/jackhuang/hmcl/ui/main/RootPage.java

@@ -165,7 +165,7 @@ public class RootPage extends DecoratorAnimatedPage implements DecoratorPage {
             downloadItem.setActionButtonVisible(false);
             downloadItem.setTitle(i18n("download"));
             downloadItem.setOnAction(e -> Controllers.navigate(Controllers.getDownloadPage()));
-            runInFX(() -> FXUtils.installFastTooltip(downloadItem, i18n("download.hint")));
+            FXUtils.installFastTooltip(downloadItem, i18n("download.hint"));
 
             // fifth item in left sidebar
             AdvancedListItem launcherSettingsItem = new AdvancedListItem();

HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsView.java

@@ -73,7 +73,7 @@ public abstract class SettingsView extends StackPane {
                     {
                         StackPane sponsorPane = new StackPane();
                         sponsorPane.setCursor(Cursor.HAND);
-                        sponsorPane.setOnMouseClicked(e -> onSponsor());
+                        FXUtils.onClicked(sponsorPane, this::onSponsor);
                         sponsorPane.setPadding(new Insets(8, 0, 8, 0));
 
                         GridPane gridPane = new GridPane();
@@ -121,7 +121,7 @@ public abstract class SettingsView extends StackPane {
 
                     {
                         btnUpdate = new JFXButton();
-                        btnUpdate.setOnMouseClicked(e -> onUpdate());
+                        btnUpdate.setOnAction(e -> onUpdate());
                         btnUpdate.getStyleClass().add("toggle-icon4");
                         btnUpdate.setGraphic(SVG.UPDATE.createIcon(Theme.blackFill(), 20, 20));
 
@@ -161,7 +161,7 @@ public abstract class SettingsView extends StackPane {
 
                     {
                         JFXButton cleanButton = new JFXButton(i18n("launcher.cache_directory.clean"));
-                        cleanButton.setOnMouseClicked(e -> clearCacheDirectory());
+                        cleanButton.setOnAction(e -> clearCacheDirectory());
                         cleanButton.getStyleClass().add("jfx-button-border");
 
                         fileCommonLocationSublist.setHeaderRight(cleanButton);
@@ -193,11 +193,11 @@ public abstract class SettingsView extends StackPane {
                     debugPane.setLeft(left);
 
                     JFXButton openLogFolderButton = new JFXButton(i18n("settings.launcher.launcher_log.reveal"));
-                    openLogFolderButton.setOnMouseClicked(e -> openLogFolder());
+                    openLogFolderButton.setOnAction(e -> openLogFolder());
                     openLogFolderButton.getStyleClass().add("jfx-button-border");
 
                     JFXButton logButton = new JFXButton(i18n("settings.launcher.launcher_log.export"));
-                    logButton.setOnMouseClicked(e -> onExportLogs());
+                    logButton.setOnAction(e -> onExportLogs());
                     logButton.getStyleClass().add("jfx-button-border");
 
                     HBox buttonBox = new HBox();

HMCL/src/main/java/org/jackhuang/hmcl/ui/profile/ProfileListItemSkin.java

@@ -22,7 +22,6 @@ import javafx.css.PseudoClass;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.SkinBase;
-import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import org.jackhuang.hmcl.setting.Theme;
@@ -47,9 +46,7 @@ public class ProfileListItemSkin extends SkinBase<ProfileListItem> {
             skinnable.pseudoClassStateChanged(SELECTED, active);
         });
 
-        getSkinnable().addEventHandler(MouseEvent.MOUSE_CLICKED, e -> {
-            getSkinnable().setSelected(true);
-        });
+        FXUtils.onClicked(getSkinnable(), () -> getSkinnable().setSelected(true));
 
         Node left = VersionPage.wrap(SVG.FOLDER_OUTLINE);
         root.setLeft(left);
@@ -64,7 +61,7 @@ public class ProfileListItemSkin extends SkinBase<ProfileListItem> {
         right.setAlignment(Pos.CENTER_RIGHT);
 
         JFXButton btnRemove = new JFXButton();
-        btnRemove.setOnMouseClicked(e -> skinnable.remove());
+        btnRemove.setOnAction(e -> skinnable.remove());
         btnRemove.getStyleClass().add("toggle-icon4");
         BorderPane.setAlignment(btnRemove, Pos.CENTER);
         btnRemove.setGraphic(SVG.CLOSE.createIcon(Theme.blackFill(), 14, 14));

HMCL/src/main/java/org/jackhuang/hmcl/ui/skin/FunctionHelper.java

@@ -1,4 +1,4 @@
-package moe.mickey.minecraft.skin.fx;
+package org.jackhuang.hmcl.ui.skin;
 
 import javafx.event.Event;
 import javafx.event.EventHandler;

HMCL/src/main/java/org/jackhuang/hmcl/ui/skin/SkinAnimation.java

@@ -1,4 +1,4 @@
-package moe.mickey.minecraft.skin.fx;
+package org.jackhuang.hmcl.ui.skin;
 
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;

HMCL/src/main/java/org/jackhuang/hmcl/ui/skin/SkinAnimationPlayer.java

@@ -1,4 +1,4 @@
-package moe.mickey.minecraft.skin.fx;
+package org.jackhuang.hmcl.ui.skin;
 
 import javafx.animation.AnimationTimer;
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/skin/SkinCanvas.java

@@ -1,4 +1,4 @@
-package moe.mickey.minecraft.skin.fx;
+package org.jackhuang.hmcl.ui.skin;
 
 import javafx.scene.*;
 import javafx.scene.image.Image;

HMCL/src/main/java/org/jackhuang/hmcl/ui/skin/SkinCube.java

@@ -1,4 +1,4 @@
-package moe.mickey.minecraft.skin.fx;
+package org.jackhuang.hmcl.ui.skin;
 
 import javafx.scene.shape.Mesh;
 import javafx.scene.shape.MeshView;

HMCL/src/main/java/org/jackhuang/hmcl/ui/skin/SkinGroup.java

@@ -1,4 +1,4 @@
-package moe.mickey.minecraft.skin.fx;
+package org.jackhuang.hmcl.ui.skin;
 
 import javafx.scene.Group;
 import javafx.scene.Node;

HMCL/src/main/java/org/jackhuang/hmcl/ui/skin/SkinHelper.java

@@ -1,4 +1,4 @@
-package moe.mickey.minecraft.skin.fx;
+package org.jackhuang.hmcl.ui.skin;
 
 import javafx.scene.image.Image;
 import javafx.scene.image.PixelReader;

HMCL/src/main/java/org/jackhuang/hmcl/ui/skin/SkinMultipleCubes.java

@@ -1,4 +1,4 @@
-package moe.mickey.minecraft.skin.fx;
+package org.jackhuang.hmcl.ui.skin;
 
 import javafx.geometry.Point2D;
 import javafx.scene.Group;

HMCL/src/main/java/org/jackhuang/hmcl/ui/skin/SkinTransition.java

@@ -1,4 +1,4 @@
-package moe.mickey.minecraft.skin.fx;
+package org.jackhuang.hmcl.ui.skin;
 
 import javafx.animation.Transition;
 import javafx.beans.value.WritableValue;

HMCL/src/main/java/org/jackhuang/hmcl/ui/skin/animation/SkinAniRunning.java

@@ -1,10 +1,10 @@
-package moe.mickey.minecraft.skin.fx.animation;
+package org.jackhuang.hmcl.ui.skin.animation;
 
 import javafx.util.Duration;
-import moe.mickey.minecraft.skin.fx.FunctionHelper;
-import moe.mickey.minecraft.skin.fx.SkinAnimation;
-import moe.mickey.minecraft.skin.fx.SkinCanvas;
-import moe.mickey.minecraft.skin.fx.SkinTransition;
+import org.jackhuang.hmcl.ui.skin.FunctionHelper;
+import org.jackhuang.hmcl.ui.skin.SkinAnimation;
+import org.jackhuang.hmcl.ui.skin.SkinCanvas;
+import org.jackhuang.hmcl.ui.skin.SkinTransition;
 
 public final class SkinAniRunning extends SkinAnimation {
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/skin/animation/SkinAniWavingArms.java

@@ -1,10 +1,10 @@
-package moe.mickey.minecraft.skin.fx.animation;
+package org.jackhuang.hmcl.ui.skin.animation;
 
 import javafx.util.Duration;
-import moe.mickey.minecraft.skin.fx.FunctionHelper;
-import moe.mickey.minecraft.skin.fx.SkinAnimation;
-import moe.mickey.minecraft.skin.fx.SkinCanvas;
-import moe.mickey.minecraft.skin.fx.SkinTransition;
+import org.jackhuang.hmcl.ui.skin.FunctionHelper;
+import org.jackhuang.hmcl.ui.skin.SkinAnimation;
+import org.jackhuang.hmcl.ui.skin.SkinCanvas;
+import org.jackhuang.hmcl.ui.skin.SkinTransition;
 
 public final class SkinAniWavingArms extends SkinAnimation {
 

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

@@ -27,6 +27,8 @@ import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.control.SelectionMode;
 import javafx.scene.control.SkinBase;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Region;
@@ -38,6 +40,7 @@ import org.jackhuang.hmcl.ui.construct.SpinnerPane;
 import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
 import org.jackhuang.hmcl.util.StringUtils;
 
+import static org.jackhuang.hmcl.ui.FXUtils.ignoreEvent;
 import static org.jackhuang.hmcl.ui.ToolbarListPageSkin.createToolbarButton;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
@@ -110,6 +113,9 @@ class DatapackListPageSkin extends SkinBase<DatapackListPage> {
             listView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
             Bindings.bindContent(listView.getItems(), skinnable.getItems());
 
+            // ListViewBehavior would consume ESC pressed event, preventing us from handling it, so we ignore it here
+            ignoreEvent(listView, KeyEvent.KEY_PRESSED, e -> e.getCode() == KeyCode.ESCAPE);
+
             center.setContent(listView);
             root.setCenter(center);
         }

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

@@ -36,6 +36,8 @@ import javafx.scene.control.Label;
 import javafx.scene.control.Skin;
 import javafx.scene.control.SkinBase;
 import javafx.scene.image.ImageView;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.*;
 import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.mod.RemoteMod;
@@ -64,7 +66,7 @@ import java.util.Locale;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
+import static org.jackhuang.hmcl.ui.FXUtils.ignoreEvent;
 import static org.jackhuang.hmcl.ui.FXUtils.stringConverter;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 import static org.jackhuang.hmcl.util.javafx.ExtendedProperties.selectedItemPropertyFor;
@@ -302,7 +304,7 @@ public class DownloadListPage extends Control implements DecoratorPage, VersionP
                 lblGameVersion.visibleProperty().bind(hasVersion);
                 gameVersionField.managedProperty().bind(hasVersion);
                 gameVersionField.visibleProperty().bind(hasVersion);
-                runInFX(() -> FXUtils.installFastTooltip(gameVersionField, i18n("search.enter")));
+                FXUtils.installFastTooltip(gameVersionField, i18n("search.enter"));
 
                 FXUtils.onChangeAndOperate(getSkinnable().version, version -> {
                     if (StringUtils.isNotBlank(version.getVersion())) {
@@ -488,12 +490,15 @@ public class DownloadListPage extends Control implements DecoratorPage, VersionP
                 JFXListView<RemoteMod> listView = new JFXListView<>();
                 spinnerPane.setContent(listView);
                 Bindings.bindContent(listView.getItems(), getSkinnable().items);
-                listView.setOnMouseClicked(e -> {
+                FXUtils.onClicked(listView, () -> {
                     if (listView.getSelectionModel().getSelectedIndex() < 0)
                         return;
                     RemoteMod selectedItem = listView.getSelectionModel().getSelectedItem();
                     Controllers.navigate(new DownloadPage(getSkinnable(), selectedItem, getSkinnable().getProfileVersion(), getSkinnable().callback));
                 });
+
+                // ListViewBehavior would consume ESC pressed event, preventing us from handling it, so we ignore it here
+                ignoreEvent(listView, KeyEvent.KEY_PRESSED, e -> e.getCode() == KeyCode.ESCAPE);
                 listView.setCellFactory(x -> new FloatListCell<RemoteMod>(listView) {
                     TwoLineListItem content = new TwoLineListItem();
                     ImageView imageView = new ImageView();

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

@@ -62,7 +62,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
+import static org.jackhuang.hmcl.ui.FXUtils.onEscPressed;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public class DownloadPage extends Control implements DecoratorPage {
@@ -241,14 +241,14 @@ public class DownloadPage extends Control implements DecoratorPage {
                     openMcmodButton.setExternalLink(getSkinnable().translations.getMcmodUrl(getSkinnable().mod));
                     descriptionPane.getChildren().add(openMcmodButton);
                     openMcmodButton.setMinWidth(Region.USE_PREF_SIZE);
-                    runInFX(() -> FXUtils.installFastTooltip(openMcmodButton, i18n("mods.mcmod")));
+                    FXUtils.installFastTooltip(openMcmodButton, i18n("mods.mcmod"));
                 }
 
                 JFXHyperlink openUrlButton = new JFXHyperlink(control.page.getLocalizedOfficialPage());
                 openUrlButton.setExternalLink(getSkinnable().addon.getPageUrl());
                 descriptionPane.getChildren().add(openUrlButton);
                 openUrlButton.setMinWidth(Region.USE_PREF_SIZE);
-                runInFX(() -> FXUtils.installFastTooltip(openUrlButton, control.page.getLocalizedOfficialPage()));
+                FXUtils.installFastTooltip(openUrlButton, control.page.getLocalizedOfficialPage());
             }
 
             SpinnerPane spinnerPane = new SpinnerPane();
@@ -346,7 +346,10 @@ public class DownloadPage extends Control implements DecoratorPage {
             pane.getChildren().setAll(FXUtils.limitingSize(imageView, 40, 40), content);
 
             RipplerContainer container = new RipplerContainer(pane);
-            container.setOnMouseClicked(e -> Controllers.navigate(new DownloadPage(page, addon, version, callback)));
+            FXUtils.onClicked(container, () -> {
+                fireEvent(new DialogCloseEvent());
+                Controllers.navigate(new DownloadPage(page, addon, version, callback));
+            });
             getChildren().setAll(container);
 
             if (addon != RemoteMod.BROKEN) {
@@ -378,6 +381,7 @@ public class DownloadPage extends Control implements DecoratorPage {
                 HBox descPane = new HBox(8);
                 descPane.setPadding(new Insets(0, 8, 0, 8));
                 descPane.setAlignment(Pos.CENTER_LEFT);
+                descPane.setMouseTransparent(true);
 
                 {
                     StackPane graphicPane = new StackPane();
@@ -428,7 +432,7 @@ public class DownloadPage extends Control implements DecoratorPage {
             }
 
             RipplerContainer container = new RipplerContainer(pane);
-            container.setOnMouseClicked(e -> Controllers.dialog(new ModVersion(dataItem, selfPage)));
+            FXUtils.onClicked(container, () -> Controllers.dialog(new ModVersion(dataItem, selfPage)));
             getChildren().setAll(container);
 
             // Workaround for https://github.com/HMCL-dev/HMCL/issues/2129
@@ -443,7 +447,7 @@ public class DownloadPage extends Control implements DecoratorPage {
             VBox box = new VBox(8);
             box.setPadding(new Insets(8));
             ModItem modItem = new ModItem(version, selfPage);
-            modItem.setOnMouseClicked(e -> fireEvent(new DialogCloseEvent()));
+            modItem.setMouseTransparent(true); // Item is displayed for info, clicking shouldn't open the dialog again
             box.getChildren().setAll(modItem);
             SpinnerPane spinnerPane = new SpinnerPane();
             ScrollPane scrollPane = new ScrollPane();
@@ -486,6 +490,8 @@ public class DownloadPage extends Control implements DecoratorPage {
 
             this.prefWidthProperty().bind(BindingMapping.of(Controllers.getStage().widthProperty()).map(w -> w.doubleValue() * 0.7));
             this.prefHeightProperty().bind(BindingMapping.of(Controllers.getStage().heightProperty()).map(w -> w.doubleValue() * 0.7));
+
+            onEscPressed(this, cancelButton::fire);
         }
 
         private void loadDependencies(RemoteMod.Version version, DownloadPage selfPage, SpinnerPane spinnerPane, ComponentList dependenciesList) {
@@ -505,7 +511,6 @@ public class DownloadPage extends Control implements DecoratorPage {
                         dependencies.put(dependency.getType(), list);
                     }
                     DependencyModItem dependencyModItem = new DependencyModItem(selfPage.page, dependency.load(), selfPage.version, selfPage.callback);
-                    dependencyModItem.setOnMouseClicked(e -> fireEvent(new DialogCloseEvent()));
                     dependencies.get(dependency.getType()).add(dependencyModItem);
                 }
 

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

@@ -18,7 +18,6 @@
 package org.jackhuang.hmcl.ui.versions;
 
 import javafx.scene.Node;
-import javafx.scene.control.Tooltip;
 import javafx.scene.image.ImageView;
 import org.jackhuang.hmcl.event.Event;
 import org.jackhuang.hmcl.setting.Profile;
@@ -34,15 +33,13 @@ import java.util.function.Consumer;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public class GameAdvancedListItem extends AdvancedListItem {
-    private final Tooltip tooltip;
     private final ImageView imageView;
     private final WeakListenerHolder holder = new WeakListenerHolder();
     private Profile profile;
+    @SuppressWarnings("unused")
     private Consumer<Event> onVersionIconChangedListener;
 
     public GameAdvancedListItem() {
-        tooltip = new Tooltip();
-
         Pair<Node, ImageView> view = createImageView(null);
         setLeftGraphic(view.getKey());
         imageView = view.getValue();
@@ -63,17 +60,13 @@ public class GameAdvancedListItem extends AdvancedListItem {
         }
         if (version != null && Profiles.getSelectedProfile() != null &&
                 Profiles.getSelectedProfile().getRepository().hasVersion(version)) {
-            FXUtils.installFastTooltip(this, tooltip);
-            setTitle(version);
-            setSubtitle(null);
+            setTitle(i18n("version.manage.manage"));
+            setSubtitle(version);
             imageView.setImage(Profiles.getSelectedProfile().getRepository().getVersionIconImage(version));
-            tooltip.setText(version);
         } else {
-            Tooltip.uninstall(this,tooltip);
             setTitle(i18n("version.empty"));
             setSubtitle(i18n("version.empty.add"));
             imageView.setImage(VersionIconType.DEFAULT.getIcon());
-            tooltip.setText("");
         }
     }
 }

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

@@ -35,7 +35,6 @@ import org.jackhuang.hmcl.ui.construct.PopupMenu;
 import org.jackhuang.hmcl.ui.construct.RipplerContainer;
 import org.jackhuang.hmcl.util.Lazy;
 
-import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public class GameListItemSkin extends SkinBase<GameListItem> {
@@ -79,33 +78,33 @@ public class GameListItemSkin extends SkinBase<GameListItem> {
         right.setAlignment(Pos.CENTER_RIGHT);
         if (skinnable.canUpdate()) {
             JFXButton btnUpgrade = new JFXButton();
-            btnUpgrade.setOnMouseClicked(e -> skinnable.update());
+            btnUpgrade.setOnAction(e -> skinnable.update());
             btnUpgrade.getStyleClass().add("toggle-icon4");
             btnUpgrade.setGraphic(FXUtils.limitingSize(SVG.UPDATE.createIcon(Theme.blackFill(), 24, 24), 24, 24));
-            runInFX(() -> FXUtils.installFastTooltip(btnUpgrade, i18n("version.update")));
+            FXUtils.installFastTooltip(btnUpgrade, i18n("version.update"));
             right.getChildren().add(btnUpgrade);
         }
 
         {
             JFXButton btnLaunch = new JFXButton();
-            btnLaunch.setOnMouseClicked(e -> skinnable.launch());
+            btnLaunch.setOnAction(e -> skinnable.launch());
             btnLaunch.getStyleClass().add("toggle-icon4");
             BorderPane.setAlignment(btnLaunch, Pos.CENTER);
             btnLaunch.setGraphic(FXUtils.limitingSize(SVG.ROCKET_LAUNCH_OUTLINE.createIcon(Theme.blackFill(), 24, 24), 24, 24));
-            runInFX(() -> FXUtils.installFastTooltip(btnLaunch, i18n("version.launch.test")));
+            FXUtils.installFastTooltip(btnLaunch, i18n("version.launch.test"));
             right.getChildren().add(btnLaunch);
         }
 
         {
             JFXButton btnManage = new JFXButton();
-            btnManage.setOnMouseClicked(e -> {
+            btnManage.setOnAction(e -> {
                 currentSkinnable = skinnable;
                 popup.get().show(root, JFXPopup.PopupVPosition.TOP, JFXPopup.PopupHPosition.RIGHT, 0, root.getHeight());
             });
             btnManage.getStyleClass().add("toggle-icon4");
             BorderPane.setAlignment(btnManage, Pos.CENTER);
             btnManage.setGraphic(FXUtils.limitingSize(SVG.DOTS_VERTICAL.createIcon(Theme.blackFill(), 24, 24), 24, 24));
-            runInFX(() -> FXUtils.installFastTooltip(btnManage, i18n("settings.game.management")));
+            FXUtils.installFastTooltip(btnManage, i18n("settings.game.management"));
             right.getChildren().add(btnManage);
         }
 

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

@@ -91,13 +91,11 @@ public class GameListPage extends DecoratorAnimatedPage implements DecoratorPage
                         installNewGameItem.setTitle(i18n("install.new_game"));
                         installNewGameItem.setLeftGraphic(VersionPage.wrap(SVG.PLUS_CIRCLE_OUTLINE));
                         installNewGameItem.setOnAction(e -> Versions.addNewGame());
-                        runInFX(() -> FXUtils.installFastTooltip(installNewGameItem, i18n("install.new_game")));
                     })
                     .addNavigationDrawerItem(installModpackItem -> {
                         installModpackItem.setTitle(i18n("install.modpack"));
                         installModpackItem.setLeftGraphic(VersionPage.wrap(SVG.PACK));
                         installModpackItem.setOnAction(e -> Versions.importModpack());
-                        runInFX(() -> FXUtils.installFastTooltip(installModpackItem, i18n("install.modpack")));
                     })
                     .addNavigationDrawerItem(refreshItem -> {
                         refreshItem.setTitle(i18n("button.refresh"));
@@ -108,7 +106,6 @@ public class GameListPage extends DecoratorAnimatedPage implements DecoratorPage
                         globalManageItem.setTitle(i18n("settings.type.global.manage"));
                         globalManageItem.setLeftGraphic(VersionPage.wrap(SVG.GEAR_OUTLINE));
                         globalManageItem.setOnAction(e -> modifyGlobalGameSettings());
-                        runInFX(() -> FXUtils.installFastTooltip(globalManageItem, i18n("settings.type.global.manage")));
                     });
             FXUtils.setLimitHeight(bottomLeftCornerList, 40 * 4 + 12 * 2);
             setLeft(pane, bottomLeftCornerList);

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

@@ -97,11 +97,11 @@ public class InstallerListPage extends ListPageBase<InstallerItem> implements Ve
                     item.versionProperty().set(null);
                 }
 
-                item.installActionProperty().set(e -> {
+                item.setOnInstall(() -> {
                     Controllers.getDecorator().startWizard(new UpdateInstallerWizardProvider(profile, gameVersion, version, libraryId, libraryVersion));
                 });
 
-                item.removeActionProperty().set(e -> profile.getDependency().removeLibraryAsync(version, libraryId)
+                item.setOnRemove(() -> profile.getDependency().removeLibraryAsync(version, libraryId)
                         .thenComposeAsync(profile.getRepository()::saveAsync)
                         .withComposeAsync(profile.getRepository().refreshVersionsAsync())
                         .withRunAsync(Schedulers.javafx(), () -> loadVersion(this.profile, this.versionId))
@@ -121,7 +121,7 @@ public class InstallerListPage extends ListPageBase<InstallerItem> implements Ve
 
                 InstallerItem installerItem = new InstallerItem(libraryId, InstallerItem.Style.LIST_ITEM);
                 installerItem.versionProperty().set(new InstallerItem.InstalledState(libraryVersion, false, false));
-                installerItem.removeActionProperty().set(e -> profile.getDependency().removeLibraryAsync(version, libraryId)
+                installerItem.setOnRemove(() -> profile.getDependency().removeLibraryAsync(version, libraryId)
                         .thenComposeAsync(profile.getRepository()::saveAsync)
                         .withComposeAsync(profile.getRepository().refreshVersionsAsync())
                         .withRunAsync(Schedulers.javafx(), () -> loadVersion(this.profile, this.versionId))

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

@@ -192,7 +192,7 @@ public final class ModListPage extends ListPageBase<ModListPageSkin.ModInfoObjec
                         })
                         .whenComplete(Schedulers.javafx(), (result, exception) -> {
                             if (exception != null || result == null) {
-                                Controllers.dialog("Failed to check updates", "failed", MessageDialogPane.MessageType.ERROR);
+                                Controllers.dialog(i18n("mods.check_updates.failed_check"), i18n("message.failed"), MessageDialogPane.MessageType.ERROR);
                             } else if (result.isEmpty()) {
                                 Controllers.dialog(i18n("mods.check_updates.empty"));
                             } else {

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

@@ -31,6 +31,8 @@ import javafx.scene.control.SelectionMode;
 import javafx.scene.control.SkinBase;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.StackPane;
@@ -70,6 +72,7 @@ import java.util.function.Predicate;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import static org.jackhuang.hmcl.ui.FXUtils.ignoreEvent;
 import static org.jackhuang.hmcl.ui.FXUtils.onEscPressed;
 import static org.jackhuang.hmcl.ui.ToolbarListPageSkin.createToolbarButton2;
 import static org.jackhuang.hmcl.util.Lang.mapOf;
@@ -131,6 +134,8 @@ class ModListPageSkin extends SkinBase<ModListPage> {
                         Bindings.bindContent(listView.getItems(), getSkinnable().getItems());
                     });
 
+            onEscPressed(searchField, closeSearchBar::fire);
+
             searchBar.getChildren().setAll(searchField, closeSearchBar);
 
             // Toolbar Normal
@@ -168,6 +173,16 @@ class ModListPageSkin extends SkinBase<ModListPage> {
                             changeToolbar(toolbarSelecting);
                     });
             root.getContent().add(toolbarPane);
+
+            // Clear selection when pressing ESC
+            root.addEventHandler(KeyEvent.KEY_PRESSED, e -> {
+                if (e.getCode() == KeyCode.ESCAPE) {
+                    if (listView.getSelectionModel().getSelectedItem() != null) {
+                        listView.getSelectionModel().clearSelection();
+                        e.consume();
+                    }
+                }
+            });
         }
 
         {
@@ -186,6 +201,18 @@ class ModListPageSkin extends SkinBase<ModListPage> {
                 }
             });
 
+            listView.setOnContextMenuRequested(event -> {
+                ModInfoObject selectedItem = listView.getSelectionModel().getSelectedItem();
+                if (selectedItem != null && listView.getSelectionModel().getSelectedItems().size() == 1) {
+                    listView.getSelectionModel().clearSelection();
+                    Controllers.dialog(new ModInfoDialog(selectedItem));
+                }
+            });
+
+            // ListViewBehavior would consume ESC pressed event, preventing us from handling it
+            // So we ignore it here
+            ignoreEvent(listView, KeyEvent.KEY_PRESSED, e -> e.getCode() == KeyCode.ESCAPE);
+
             center.setContent(listView);
             root.getContent().add(center);
         }
@@ -204,7 +231,7 @@ class ModListPageSkin extends SkinBase<ModListPage> {
     private void changeToolbar(HBox newToolbar) {
         Node oldToolbar = toolbarPane.getCurrentNode();
         if (newToolbar != oldToolbar) {
-            toolbarPane.setContent(newToolbar, ContainerAnimations.FADE.getAnimationProducer());
+            toolbarPane.setContent(newToolbar, ContainerAnimations.FADE);
             if (newToolbar == searchBar) {
                 searchField.requestFocus();
             }
@@ -539,7 +566,7 @@ class ModListPageSkin extends SkinBase<ModListPage> {
             }
             checkBox.selectedProperty().bindBidirectional(booleanProperty = dataItem.active);
             restoreButton.setVisible(!dataItem.getModInfo().getMod().getOldFiles().isEmpty());
-            restoreButton.setOnMouseClicked(e -> {
+            restoreButton.setOnAction(e -> {
                 menu.get().getContent().setAll(dataItem.getModInfo().getMod().getOldFiles().stream()
                         .map(localModFile -> new IconedMenuItem(null, localModFile.getVersion(),
                                 () -> getSkinnable().rollback(dataItem.getModInfo(), localModFile),
@@ -549,12 +576,8 @@ class ModListPageSkin extends SkinBase<ModListPage> {
 
                 popup.get().show(restoreButton, JFXPopup.PopupVPosition.TOP, JFXPopup.PopupHPosition.RIGHT, 0, restoreButton.getHeight());
             });
-            revealButton.setOnMouseClicked(e -> {
-                FXUtils.showFileInExplorer(dataItem.getModInfo().getFile());
-            });
-            infoButton.setOnMouseClicked(e -> {
-                Controllers.dialog(new ModInfoDialog(dataItem));
-            });
+            revealButton.setOnAction(e -> FXUtils.showFileInExplorer(dataItem.getModInfo().getFile()));
+            infoButton.setOnAction(e -> Controllers.dialog(new ModInfoDialog(dataItem)));
         }
     }
 }

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

@@ -139,7 +139,7 @@ public class ModUpdatesPage extends BorderPane implements DecoratorPage {
                 task.whenComplete(Schedulers.javafx(), exception -> {
                     fireEvent(new PageCloseEvent());
                     if (!task.getFailedMods().isEmpty()) {
-                        Controllers.dialog(i18n("mods.check_updates.failed") + "\n" +
+                        Controllers.dialog(i18n("mods.check_updates.failed_download") + "\n" +
                                         task.getFailedMods().stream().map(LocalModFile::getFileName).collect(Collectors.joining("\n")),
                                 i18n("install.failed"),
                                 MessageDialogPane.MessageType.ERROR);

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

@@ -72,7 +72,7 @@ public class VersionIconDialog extends DialogPane {
 
     private void exploreIcon() {
         FileChooser chooser = new FileChooser();
-        chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(i18n("extension.png"), "*.png", "*.jpg", "*.bmp", "*.gif"));
+        chooser.getExtensionFilters().add(FXUtils.getImageExtensionFilter());
         File selectedFile = chooser.showOpenDialog(Controllers.getStage());
         if (selectedFile != null) {
             try {
@@ -95,9 +95,7 @@ public class VersionIconDialog extends DialogPane {
         RipplerContainer container = new RipplerContainer(shape);
         FXUtils.setLimitWidth(container, 36);
         FXUtils.setLimitHeight(container, 36);
-        container.setOnMouseClicked(e -> {
-            exploreIcon();
-        });
+        FXUtils.onClicked(container, this::exploreIcon);
         return container;
     }
 
@@ -107,7 +105,7 @@ public class VersionIconDialog extends DialogPane {
         RipplerContainer container = new RipplerContainer(imageView);
         FXUtils.setLimitWidth(container, 36);
         FXUtils.setLimitHeight(container, 36);
-        container.setOnMouseClicked(e -> {
+        FXUtils.onClicked(container, () -> {
             if (vs != null) {
                 vs.setVersionIcon(type);
                 onAccept();

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

@@ -78,7 +78,7 @@ public class VersionPage extends DecoratorAnimatedPage implements DecoratorPage
 
         tab.select(versionSettingsTab);
         FXUtils.onChangeAndOperate(tab.getSelectionModel().selectedItemProperty(), newValue -> {
-            transitionPane.setContent(newValue.getNode(), ContainerAnimations.FADE.getAnimationProducer());
+            transitionPane.setContent(newValue.getNode(), ContainerAnimations.FADE);
         });
 
         listenerHolder.add(EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).registerWeak(event -> checkSelectedVersion(), EventPriority.HIGHEST));
@@ -244,7 +244,6 @@ public class VersionPage extends DecoratorAnimatedPage implements DecoratorPage
                 versionSettingsItem.setLeftGraphic(wrap(SVG.GEAR_OUTLINE));
                 versionSettingsItem.setActionButtonVisible(false);
                 versionSettingsItem.activeProperty().bind(control.tab.getSelectionModel().selectedItemProperty().isEqualTo(control.versionSettingsTab));
-                runInFX(() -> FXUtils.installFastTooltip(versionSettingsItem, i18n("settings.game")));
                 versionSettingsItem.setOnAction(e -> control.tab.select(control.versionSettingsTab));
 
                 AdvancedListItem installerListItem = new AdvancedListItem();
@@ -253,7 +252,6 @@ public class VersionPage extends DecoratorAnimatedPage implements DecoratorPage
                 installerListItem.setLeftGraphic(wrap(SVG.CUBE));
                 installerListItem.setActionButtonVisible(false);
                 installerListItem.activeProperty().bind(control.tab.getSelectionModel().selectedItemProperty().isEqualTo(control.installerListTab));
-                runInFX(() -> FXUtils.installFastTooltip(installerListItem, i18n("settings.tabs.installers")));
                 installerListItem.setOnAction(e -> control.tab.select(control.installerListTab));
 
                 AdvancedListItem modListItem = new AdvancedListItem();
@@ -262,7 +260,6 @@ public class VersionPage extends DecoratorAnimatedPage implements DecoratorPage
                 modListItem.setLeftGraphic(wrap(SVG.PUZZLE));
                 modListItem.setActionButtonVisible(false);
                 modListItem.activeProperty().bind(control.tab.getSelectionModel().selectedItemProperty().isEqualTo(control.modListTab));
-                runInFX(() -> FXUtils.installFastTooltip(modListItem, i18n("mods.manage")));
                 modListItem.setOnAction(e -> control.tab.select(control.modListTab));
 
                 AdvancedListItem worldListItem = new AdvancedListItem();
@@ -271,7 +268,6 @@ public class VersionPage extends DecoratorAnimatedPage implements DecoratorPage
                 worldListItem.setLeftGraphic(wrap(SVG.EARTH));
                 worldListItem.setActionButtonVisible(false);
                 worldListItem.activeProperty().bind(control.tab.getSelectionModel().selectedItemProperty().isEqualTo(control.worldListTab));
-                runInFX(() -> FXUtils.installFastTooltip(worldListItem, i18n("world.manage")));
                 worldListItem.setOnAction(e -> control.tab.select(control.worldListTab));
 
                 AdvancedListBox sideBar = new AdvancedListBox()

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

@@ -57,10 +57,27 @@ import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import static org.jackhuang.hmcl.ui.FXUtils.stringConverter;
+import static org.jackhuang.hmcl.util.Lang.getTimer;
 import static org.jackhuang.hmcl.util.Pair.pair;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class VersionSettingsPage extends StackPane implements DecoratorPage, VersionPage.VersionLoadable, PageAware {
+
+    private static final ObjectProperty<OperatingSystem.PhysicalMemoryStatus> memoryStatus = new SimpleObjectProperty<>(OperatingSystem.PhysicalMemoryStatus.INVALID);
+    private static TimerTask memoryStatusUpdateTask;
+    private static void initMemoryStatusUpdateTask() {
+        FXUtils.checkFxUserThread();
+        if (memoryStatusUpdateTask != null)
+            return;
+        memoryStatusUpdateTask = new TimerTask() {
+            @Override
+            public void run() {
+                Platform.runLater(() -> memoryStatus.set(OperatingSystem.getPhysicalMemoryStatus()));
+            }
+        };
+        getTimer().scheduleAtFixedRate(memoryStatusUpdateTask, 0, 1000);
+    }
+
     private final ReadOnlyObjectWrapper<State> state = new ReadOnlyObjectWrapper<>(new State("", null, false, false, false));
 
     private AdvancedVersionSettingPage advancedVersionSettingPage;
@@ -92,7 +109,8 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
     private final ImagePickerItem iconPickerItem;
 
     private final ChangeListener<Collection<JavaRuntime>> javaListChangeListener;
-    private final InvalidationListener specificSettingsListener;
+    private final InvalidationListener usesGlobalListener;
+    private final ChangeListener<Boolean> specificSettingsListener;
     private final InvalidationListener javaListener = any -> initJavaSubtitle();
     private boolean updatingJavaSetting = false;
     private boolean updatingSelectedJava = false;
@@ -101,7 +119,6 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
     private final BooleanProperty navigateToSpecificSettings = new SimpleBooleanProperty(false);
     private final BooleanProperty enableSpecificSettings = new SimpleBooleanProperty(false);
     private final IntegerProperty maxMemory = new SimpleIntegerProperty();
-    private final ObjectProperty<OperatingSystem.PhysicalMemoryStatus> memoryStatus = new SimpleObjectProperty<>(OperatingSystem.PhysicalMemoryStatus.INVALID);
     private final BooleanProperty modpack = new SimpleBooleanProperty();
 
     public VersionSettingsPage(boolean globalSetting) {
@@ -185,7 +202,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
             javaCustomOption = new MultiFileItem.FileOption<Pair<JavaVersionType, JavaRuntime>>(i18n("settings.custom"), pair(JavaVersionType.CUSTOM, null))
                     .setChooserTitle(i18n("settings.game.java_directory.choose"));
             if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS)
-                javaCustomOption.getExtensionFilters().add(new FileChooser.ExtensionFilter("Java", "java.exe"));
+                javaCustomOption.addExtensionFilter(new FileChooser.ExtensionFilter("Java", "java.exe"));
 
             javaListChangeListener = FXUtils.onWeakChangeAndOperate(JavaManager.getAllJavaProperty(), allJava -> {
                 List<MultiFileItem.Option<Pair<JavaVersionType, JavaRuntime>>> options = new ArrayList<>();
@@ -235,6 +252,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
                 VBox.setMargin(chkAutoAllocate, new Insets(0, 0, 8, 5));
 
                 HBox lowerBoundPane = new HBox(8);
+                lowerBoundPane.setStyle("-fx-view-order: -1;"); // prevent the indicator from being covered by the progress bar
                 lowerBoundPane.setAlignment(Pos.CENTER);
                 VBox.setMargin(lowerBoundPane, new Insets(0, 0, 0, 16));
                 {
@@ -443,22 +461,8 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
 
         rootPane.getChildren().add(componentList);
 
-        initialize();
-
-        specificSettingsListener = any -> enableSpecificSettings.set(!lastVersionSetting.isUsesGlobal());
-
-        addEventHandler(Navigator.NavigationEvent.NAVIGATED, this::onDecoratorPageNavigating);
-
-        cboLauncherVisibility.getItems().setAll(LauncherVisibility.values());
-        cboLauncherVisibility.setConverter(stringConverter(e -> i18n("settings.advanced.launcher_visibility." + e.name().toLowerCase(Locale.ROOT))));
-
-        cboProcessPriority.getItems().setAll(ProcessPriority.values());
-        cboProcessPriority.setConverter(stringConverter(e -> i18n("settings.advanced.process_priority." + e.name().toLowerCase(Locale.ROOT))));
-    }
-
-    private void initialize() {
-        memoryStatus.set(OperatingSystem.getPhysicalMemoryStatus());
-        enableSpecificSettings.addListener((a, b, newValue) -> {
+        usesGlobalListener = any -> enableSpecificSettings.set(!lastVersionSetting.isUsesGlobal());
+        specificSettingsListener = (a, b, newValue) -> {
             if (versionId == null) return;
 
             // do not call versionSettings.setUsesGlobal(true/false)
@@ -470,9 +474,20 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
                 profile.getRepository().globalizeVersionSetting(versionId);
 
             Platform.runLater(() -> loadVersion(profile, versionId));
-        });
+        };
 
+        addEventHandler(Navigator.NavigationEvent.NAVIGATED, this::onDecoratorPageNavigating);
+
+        cboLauncherVisibility.getItems().setAll(LauncherVisibility.values());
+        cboLauncherVisibility.setConverter(stringConverter(e -> i18n("settings.advanced.launcher_visibility." + e.name().toLowerCase(Locale.ROOT))));
+
+        cboProcessPriority.getItems().setAll(ProcessPriority.values());
+        cboProcessPriority.setConverter(stringConverter(e -> i18n("settings.advanced.process_priority." + e.name().toLowerCase(Locale.ROOT))));
+
+        memoryStatus.set(OperatingSystem.getPhysicalMemoryStatus());
         componentList.disableProperty().bind(enableSpecificSettings.not());
+
+        initMemoryStatusUpdateTask();
     }
 
     @Override
@@ -519,7 +534,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
             FXUtils.unbindEnum(cboLauncherVisibility);
             FXUtils.unbindEnum(cboProcessPriority);
 
-            lastVersionSetting.usesGlobalProperty().removeListener(specificSettingsListener);
+            lastVersionSetting.usesGlobalProperty().removeListener(usesGlobalListener);
             lastVersionSetting.javaVersionTypeProperty().removeListener(javaListener);
             lastVersionSetting.javaDirProperty().removeListener(javaListener);
             lastVersionSetting.defaultJavaPathPropertyProperty().removeListener(javaListener);
@@ -528,6 +543,8 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
             gameDirItem.selectedDataProperty().unbindBidirectional(lastVersionSetting.gameDirTypeProperty());
             gameDirSublist.subtitleProperty().unbind();
 
+            enableSpecificSettings.removeListener(specificSettingsListener);
+
             if (advancedVersionSettingPage != null) {
                 advancedVersionSettingPage.unbindProperties();
                 advancedVersionSettingPage = null;
@@ -552,9 +569,10 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
         FXUtils.bindEnum(cboLauncherVisibility, versionSetting.launcherVisibilityProperty());
         FXUtils.bindEnum(cboProcessPriority, versionSetting.processPriorityProperty());
 
-        versionSetting.usesGlobalProperty().addListener(specificSettingsListener);
         if (versionId != null)
             enableSpecificSettings.set(!versionSetting.isUsesGlobal());
+        versionSetting.usesGlobalProperty().addListener(usesGlobalListener);
+        enableSpecificSettings.addListener(specificSettingsListener);
 
         javaItem.setToggleSelectedListener(newValue -> {
             if (javaItem.getSelectedData() == null || updatingSelectedJava)
@@ -685,7 +703,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
                 version = null;
             } else {
                 gameVersionNumber = GameVersionNumber.asGameVersion(repository.getGameVersion(versionId));
-                version = repository.getVersion(versionId);
+                version = repository.getResolvedVersion(versionId);
             }
 
             try {

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

@@ -83,7 +83,7 @@ public final class Versions {
         } catch (IOException e) {
             Controllers.dialog(
                     i18n("install.failed.downloading.detail", file.getFile().getUrl()) + "\n" + StringUtils.getStackTrace(e),
-                    i18n("download.failed.no_code", file.getFile().getUrl()), MessageDialogPane.MessageType.ERROR);
+                    i18n("download.failed.no_code"), MessageDialogPane.MessageType.ERROR);
             return;
         }
         Controllers.taskDialog(
@@ -96,7 +96,7 @@ public final class Versions {
                             } else {
                                 Controllers.dialog(
                                         i18n("install.failed.downloading.detail", file.getFile().getUrl()) + "\n" + StringUtils.getStackTrace(e),
-                                        i18n("download.failed.no_code", file.getFile().getUrl()), MessageDialogPane.MessageType.ERROR);
+                                        i18n("download.failed.no_code"), MessageDialogPane.MessageType.ERROR);
                             }
                         }).executor(true),
                 i18n("message.downloading"),

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

@@ -83,7 +83,7 @@ public class WorldExportPageSkin extends SkinBase<WorldExportPage> {
         JFXButton btnExport = FXUtils.newRaisedButton(i18n("button.export"));
         btnExport.disableProperty().bind(Bindings.createBooleanBinding(() -> txtWorldName.getText().isEmpty() || Files.exists(Paths.get(fileItem.getPath())),
                 txtWorldName.textProperty().isEmpty(), fileItem.pathProperty()));
-        btnExport.setOnMouseClicked(e -> skinnable.export());
+        btnExport.setOnAction(e -> skinnable.export());
         HBox bottom = new HBox();
         bottom.setAlignment(Pos.CENTER_RIGHT);
         bottom.getChildren().setAll(btnExport);

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

@@ -51,7 +51,7 @@ public class WorldListItem extends Control {
 
         subtitle.set(i18n("world.description", world.getFileName(), formatDateTime(Instant.ofEpochMilli(world.getLastPlayed())), world.getGameVersion() == null ? i18n("message.unknown") : world.getGameVersion()));
 
-        setOnMouseClicked(event -> showInfo());
+        FXUtils.onClicked(this, this::showInfo);
     }
 
     @Override

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

@@ -76,9 +76,7 @@ public class WorldListItemSkin extends SkinBase<WorldListItem> {
         right.setAlignment(Pos.CENTER_RIGHT);
 
         JFXButton btnManage = new JFXButton();
-        btnManage.setOnMouseClicked(e -> {
-            popup.show(root, JFXPopup.PopupVPosition.TOP, JFXPopup.PopupHPosition.RIGHT, 0, root.getHeight());
-        });
+        btnManage.setOnAction(e -> popup.show(root, JFXPopup.PopupVPosition.TOP, JFXPopup.PopupHPosition.RIGHT, 0, root.getHeight()));
         btnManage.getStyleClass().add("toggle-icon4");
         BorderPane.setAlignment(btnManage, Pos.CENTER);
         btnManage.setGraphic(SVG.DOTS_VERTICAL.createIcon(Theme.blackFill(), -1, -1));

HMCL/src/main/java/org/jackhuang/hmcl/util/NativePatcher.java

@@ -153,6 +153,6 @@ public final class NativePatcher {
     }
 
     public static Library getMesaLoader(JavaRuntime javaVersion, Renderer renderer) {
-        return getNatives(javaVersion.getPlatform()).get(renderer == Renderer.LLVMPIPE ? "software-renderer-loader" : "mesa-loader");
+        return getNatives(javaVersion.getPlatform()).get("mesa-loader");
     }
 }

HMCL/src/main/java/org/jackhuang/hmcl/util/SwingFXUtils.java

@@ -0,0 +1,124 @@
+// Copy from javafx.swing
+/*
+ * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.jackhuang.hmcl.util;
+
+import javafx.scene.image.*;
+import javafx.scene.image.Image;
+
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.awt.image.DataBufferInt;
+import java.awt.image.SampleModel;
+import java.awt.image.SinglePixelPackedSampleModel;
+import java.nio.IntBuffer;
+
+/**
+ * This class provides utility methods for converting data types between
+ * Swing/AWT and JavaFX formats.
+ *
+ * @since JavaFX 2.2
+ */
+public final class SwingFXUtils {
+    private SwingFXUtils() {
+    }
+
+    /**
+     * Snapshots the specified {@link BufferedImage} and stores a copy of
+     * its pixels into a JavaFX {@link Image} object, creating a new
+     * object if needed.
+     * The returned {@code Image} will be a static snapshot of the state
+     * of the pixels in the {@code BufferedImage} at the time the method
+     * completes.  Further changes to the {@code BufferedImage} will not
+     * be reflected in the {@code Image}.
+     * <p>
+     * The optional JavaFX {@link WritableImage} parameter may be reused
+     * to store the copy of the pixels.
+     * A new {@code Image} will be created if the supplied object is null,
+     * is too small or of a type which the image pixels cannot be easily
+     * converted into.
+     *
+     * @param bimg the {@code BufferedImage} object to be converted
+     * @param wimg an optional {@code WritableImage} object that can be
+     *             used to store the returned pixel data
+     * @return an {@code Image} object representing a snapshot of the
+     * current pixels in the {@code BufferedImage}.
+     * @since JavaFX 2.2
+     */
+    public static WritableImage toFXImage(BufferedImage bimg, WritableImage wimg) {
+        int bw = bimg.getWidth();
+        int bh = bimg.getHeight();
+        switch (bimg.getType()) {
+            case BufferedImage.TYPE_INT_ARGB:
+            case BufferedImage.TYPE_INT_ARGB_PRE:
+                break;
+            default:
+                BufferedImage converted =
+                        new BufferedImage(bw, bh, BufferedImage.TYPE_INT_ARGB_PRE);
+                Graphics2D g2d = converted.createGraphics();
+                g2d.drawImage(bimg, 0, 0, null);
+                g2d.dispose();
+                bimg = converted;
+                break;
+        }
+        // assert(bimg.getType == TYPE_INT_ARGB[_PRE]);
+        if (wimg != null) {
+            int iw = (int) wimg.getWidth();
+            int ih = (int) wimg.getHeight();
+            if (iw < bw || ih < bh) {
+                wimg = null;
+            } else if (bw < iw || bh < ih) {
+                int[] empty = new int[iw];
+                PixelWriter pw = wimg.getPixelWriter();
+                PixelFormat<IntBuffer> pf = PixelFormat.getIntArgbPreInstance();
+                if (bw < iw) {
+                    pw.setPixels(bw, 0, iw - bw, bh, pf, empty, 0, 0);
+                }
+                if (bh < ih) {
+                    pw.setPixels(0, bh, iw, ih - bh, pf, empty, 0, 0);
+                }
+            }
+        }
+        if (wimg == null) {
+            wimg = new WritableImage(bw, bh);
+        }
+        PixelWriter pw = wimg.getPixelWriter();
+        DataBufferInt db = (DataBufferInt) bimg.getRaster().getDataBuffer();
+        int[] data = db.getData();
+        int offset = bimg.getRaster().getDataBuffer().getOffset();
+        int scan = 0;
+        SampleModel sm = bimg.getRaster().getSampleModel();
+        if (sm instanceof SinglePixelPackedSampleModel) {
+            scan = ((SinglePixelPackedSampleModel) sm).getScanlineStride();
+        }
+
+        PixelFormat<IntBuffer> pf = (bimg.isAlphaPremultiplied() ?
+                PixelFormat.getIntArgbPreInstance() :
+                PixelFormat.getIntArgbInstance());
+        pw.setPixels(0, 0, bw, bh, pf, data, offset, scan);
+        return wimg;
+    }
+}
+

HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/Locales.java

@@ -39,16 +39,6 @@ public final class Locales {
      */
     public static final SupportedLocale EN = new SupportedLocale(Locale.ROOT);
 
-    /**
-     * Traditional Chinese
-     */
-    public static final SupportedLocale ZH = new SupportedLocale(Locale.TRADITIONAL_CHINESE);
-
-    /**
-     * Simplified Chinese
-     */
-    public static final SupportedLocale ZH_CN = new SupportedLocale(Locale.SIMPLIFIED_CHINESE);
-
     /**
      * Spanish
      */
@@ -64,23 +54,33 @@ public final class Locales {
      */
     public static final SupportedLocale JA = new SupportedLocale(Locale.JAPANESE);
 
-    public static final List<SupportedLocale> LOCALES = Lang.immutableListOf(DEFAULT, EN, ZH_CN, ZH, ES, RU, JA);
+    /**
+     * Traditional Chinese
+     */
+    public static final SupportedLocale ZH = new SupportedLocale(Locale.TRADITIONAL_CHINESE);
+
+    /**
+     * Simplified Chinese
+     */
+    public static final SupportedLocale ZH_CN = new SupportedLocale(Locale.SIMPLIFIED_CHINESE);
+
+    public static final List<SupportedLocale> LOCALES = Lang.immutableListOf(DEFAULT, EN, ES, JA, RU, ZH_CN, ZH);
 
     public static SupportedLocale getLocaleByName(String name) {
         if (name == null) return DEFAULT;
         switch (name.toLowerCase(Locale.ROOT)) {
             case "en":
                 return EN;
+            case "es":
+                return ES;
+            case "ja":
+                return JA;
+            case "ru":
+                return RU;
             case "zh":
                 return ZH;
             case "zh_cn":
                 return ZH_CN;
-            case "es":
-                return ES;
-            case "ru":
-                return RU;
-            case "ja":
-                return JA;
             default:
                 return DEFAULT;
         }
@@ -88,11 +88,11 @@ public final class Locales {
 
     public static String getNameByLocale(SupportedLocale locale) {
         if (locale == EN) return "en";
-        else if (locale == ZH) return "zh";
-        else if (locale == ZH_CN) return "zh_CN";
         else if (locale == ES) return "es";
         else if (locale == RU) return "ru";
         else if (locale == JA) return "ja";
+        else if (locale == ZH) return "zh";
+        else if (locale == ZH_CN) return "zh_CN";
         else if (locale == DEFAULT) return "def";
         else throw new IllegalArgumentException("Unknown locale: " + locale);
     }

HMCL/src/main/resources/assets/HMCLauncher.sh

@@ -33,6 +33,8 @@ case "$(uname -m)" in
     _HMCL_ARCH="arm64";;
   arm|arm32|aarch32|armv7*)
     _HMCL_ARCH="arm32";;
+  riscv64)
+    _HMCL_ARCH="riscv64";;
   loongarch64)
     _HMCL_ARCH="loongarch64";;
   *)
@@ -56,17 +58,42 @@ else
   _HMCL_VM_OPTIONS="-XX:MinHeapFreeRatio=5 -XX:MaxHeapFreeRatio=15"
 fi
 
+function show_warning_console() {
+    echo -e "\033[1;31m$1\033[0m" >&2
+}
+
+function show_warning_dialog() {
+  if [ -n "$3" ]; then
+    if [ -n "$(command -v xdg-open)" ]; then
+      if [ -n "$(command -v zenity)" ]; then
+        zenity --question --title="$1" --text="$2" && xdg-open "$3"
+      elif [ -n "$(command -v kdialog)" ]; then
+        kdialog --title "$1" --warningyesno "$2" && xdg-open "$3"
+      fi
+    fi
+  else
+    if [ -n "$(command -v zenity)" ]; then
+      zenity --info --title="$1" --text="$2"
+    elif [ -n "$(command -v kdialog)" ]; then
+      kdialog --title "$1" --msgbox "$2"
+    fi
+  fi
+}
+
+function show_warning() {
+    show_warning_console "$1: $2"
+    show_warning_dialog "$1" "$2"
+}
+
 # First, find Java in HMCL_JAVA_HOME
 if [ -n "${HMCL_JAVA_HOME+x}" ]; then
   if [ -x "$HMCL_JAVA_HOME/bin/$_HMCL_JAVA_EXE_NAME" ]; then
     exec "$HMCL_JAVA_HOME/bin/$_HMCL_JAVA_EXE_NAME" $_HMCL_VM_OPTIONS -jar "$_HMCL_PATH"
   else
     if [ "$_HMCL_USE_CHINESE" == true ]; then
-      echo "环境变量 HMCL_JAVA_HOME 的值无效，请设置为合法的 Java 路径。" 1>&2
-      echo "你可以访问 https://docs.hmcl.net/help.html 页面寻求帮助。" 1>&2
+      show_warning "错误" "环境变量 HMCL_JAVA_HOME 的值无效，请设置为合法的 Java 路径。\n你可以访问 https://docs.hmcl.net/help.html 页面寻求帮助。"
     else
-      echo "The value of the environment variable HMCL_JAVA_HOME is invalid, please set it to a valid Java path." 1>&2
-      echo "You can visit the https://docs.hmcl.net/help.html page for help." 1>&2
+      show_warning "Error" "The value of the environment variable HMCL_JAVA_HOME is invalid, please set it to a valid Java path.\nYou can visit the https://docs.hmcl.net/help.html page for help."
     fi
     exit 1
   fi
@@ -97,6 +124,11 @@ case "$_HMCL_ARCH" in
       exec "$_HMCL_DIR/jre-arm32/bin/$_HMCL_JAVA_EXE_NAME" $_HMCL_VM_OPTIONS -jar "$_HMCL_PATH"
     fi
     ;;
+  riscv64)
+    if [ -x "$_HMCL_DIR/jre-riscv64/bin/$_HMCL_JAVA_EXE_NAME" ]; then
+      exec "$_HMCL_DIR/jre-riscv64/bin/$_HMCL_JAVA_EXE_NAME" $_HMCL_VM_OPTIONS -jar "$_HMCL_PATH"
+    fi
+    ;;
   loongarch64)
     if [ -x "$_HMCL_DIR/jre-loongarch64/bin/$_HMCL_JAVA_EXE_NAME" ]; then
       exec "$_HMCL_DIR/jre-loongarch64/bin/$_HMCL_JAVA_EXE_NAME" $_HMCL_VM_OPTIONS -jar "$_HMCL_PATH"
@@ -114,6 +146,10 @@ if [ -x "$(command -v $_HMCL_JAVA_EXE_NAME)" ]; then
   exec $_HMCL_JAVA_EXE_NAME $_HMCL_VM_OPTIONS -jar "$_HMCL_PATH"
 fi
 
+if [ "$_HMCL_OS" == "freebsd" ] && [ -x "$(command -v javavm)" ]; then
+  exec javavm $_HMCL_VM_OPTIONS -jar "$_HMCL_PATH"
+fi
+
 # Java not found
 
 if [ "$_HMCL_OS" == "osx" ]; then
@@ -123,28 +159,28 @@ else
 fi
 
 case "$_HMCL_OS-$_HMCL_ARCH" in
-  windows-x86|windows-x86_64|windows-arm64|linux-x86|linux-x86_64|linux-arm32|linux-arm64|linux-loongarch64|macos-x86_64|macos-arm64)
-    if [ "$_HMCL_USE_CHINESE" == true ]; then
-      echo "运行 HMCL 需要 Java 运行时环境，请安装 Java 并设置环境变量后重试。" 1>&2
-      echo "https://docs.hmcl.net/downloads/$_HMCL_DOWNLOAD_PAGE_OS/$_HMCL_HMCL_ARCH.html" 1>&2
-      echo "你可以访问 https://docs.hmcl.net/help.html 页面寻求帮助。" 1>&2
-    else
-      echo "The Java runtime environment is required to run HMCL. " 1>&2
-      echo "Please install Java and set the environment variables and try again." 1>&2
-      echo "https://docs.hmcl.net/downloads/$_HMCL_DOWNLOAD_PAGE_OS/$_HMCL_HMCL_ARCH.html" 1>&2
-      echo "You can visit the https://docs.hmcl.net/help.html page for help." 1>&2
-    fi
-    ;;
-  *)
-    if [ "$_HMCL_USE_CHINESE" == true ]; then
-      echo "运行 HMCL 需要 Java 运行时环境，请安装 Java 并设置环境变量后重试。" 1>&2
-      echo "你可以访问 https://docs.hmcl.net/help.html 页面寻求帮助。" 1>&2
-    else
-      echo "The Java runtime environment is required to run HMCL. " 1>&2
-      echo "Please install Java and set the environment variables and try again." 1>&2
-      echo "You can visit the https://docs.hmcl.net/help.html page for help." 1>&2
-    fi
+  windows-x86|windows-x86_64|windows-arm64|linux-x86|linux-x86_64|linux-arm32|linux-arm64|linux-riscv64|linux-loongarch64|macos-x86_64|macos-arm64)
+    _HMCL_JAVA_DOWNLOAD_PAGE="https://docs.hmcl.net/downloads/$_HMCL_DOWNLOAD_PAGE_OS/$_HMCL_ARCH.html"
     ;;
 esac
 
+if [ "$_HMCL_USE_CHINESE" == true ]; then
+  _HMCL_WARNING_MESSAGE="运行 HMCL 需要 Java 运行时环境，请安装 Java 并设置环境变量后重试。"
+
+  if [ -n "$_HMCL_JAVA_DOWNLOAD_PAGE" ]; then
+    show_warning_console "错误: $_HMCL_WARNING_MESSAGE\n你可以前往此处下载:\n$_HMCL_JAVA_DOWNLOAD_PAGE"
+    show_warning_dialog  "错误" "$_HMCL_WARNING_MESSAGE\n\n是否要前往 Java 下载页面？" "$_HMCL_JAVA_DOWNLOAD_PAGE"
+  else
+    show_warning "错误" "$_HMCL_WARNING_MESSAGE\n你可以访问 https://docs.hmcl.net/help.html 页面寻求帮助。"
+  fi
+else
+  _HMCL_WARNING_MESSAGE="The Java runtime environment is required to run HMCL.\nPlease install Java and set the environment variables and try again."
+  if [ -n "$_HMCL_JAVA_DOWNLOAD_PAGE" ]; then
+    show_warning_console "Error: $_HMCL_WARNING_MESSAGE\nYou can download it from here:\n$_HMCL_JAVA_DOWNLOAD_PAGE"
+    show_warning_dialog  "Error" "$_HMCL_WARNING_MESSAGE\n\nDo you want to go to the Java download page?" "$_HMCL_JAVA_DOWNLOAD_PAGE"
+  else
+    show_warning "Error" "$_HMCL_WARNING_MESSAGE\nYou can visit the https://docs.hmcl.net/help.html page for help."
+  fi
+fi
+
 exit 1

HMCL/src/main/resources/assets/css/blue.css

@@ -24,5 +24,8 @@
     -fx-base-disabled-text-fill: rgba(256, 256, 256, 0.7);
     -fx-base-text-fill: white;
 
+    /* https://github.com/HMCL-dev/HMCL/pull/3423 */
+    -fx-font-family: -fx-base-font-family;
+
     -theme-thumb: rgba(92, 107, 192, 0.7);
 }