[release/3.15] 从 CurseForge 下载文件时传递 API Key (#6364 )

https://github.com/HMCL-dev/HMCL/pull/6169 https://github.com/HMCL-dev/HMCL/pull/6297 --------- Co-authored-by: ToobLac <tooblac39@gmail.com>
[release/3.15] chore: update versions.txt to 26.2 (#6218 )
2026-07-10 21:28:22 +08:00 · 2026-06-25 20:15:39 +08:00 · 2026-06-25 18:48:14 +08:00 · 2026-06-02 21:11:37 +08:00 · 2026-05-30 11:50:55 +08:00 · 2026-05-29 21:08:05 +08:00
515 changed files with 36601 additions and 14372 deletions
@@ -0,0 +1,3 @@
+code_review:
+  pull_request_opened:
+    code_review: false
@@ -0,0 +1,65 @@
+# Default: normalize all text files to LF in the repository and on checkout.
+# Git auto-detects binary files and leaves them untouched.
+* text=auto eol=lf
+
+# ─── Explicitly text – source & build ────────────────────────────────────────
+*.java        text eol=lf
+*.kt          text eol=lf
+*.kts         text eol=lf
+*.groovy      text eol=lf
+*.gradle      text eol=lf
+
+# ─── Configuration & data ─────────────────────────────────────────────────────
+*.properties  text eol=lf
+*.toml        text eol=lf
+*.xml         text eol=lf
+*.json        text eol=lf
+*.yaml        text eol=lf
+*.yml         text eol=lf
+*.csv         text eol=lf
+*.html        text eol=lf
+*.css         text eol=lf
+*.txt         text eol=lf
+*.md          text eol=lf
+*.svg         text eol=lf
+*.MF          text eol=lf
+
+# Gradle dependency-lock files
+*.lockfile    text eol=lf
+
+# ─── Scripts ──────────────────────────────────────────────────────────────────
+# Unix shell scripts must always use LF so they stay executable on Linux/macOS.
+*.sh          text eol=lf
+gradlew       text eol=lf
+
+# CI pipeline scripts
+Jenkinsfile   text eol=lf
+
+# Windows batch files must keep CRLF so cmd.exe can parse them.
+*.bat         text eol=crlf
+
+# ─── Binary files ─────────────────────────────────────────────────────────────
+# Raster / animated images
+*.png         binary
+*.apng        binary
+*.jpg         binary
+*.jpeg        binary
+*.webp        binary
+*.gif         binary
+*.ico         binary
+
+# Archives & compiled artifacts
+*.jar         binary
+*.zip         binary
+*.class       binary
+
+# Cryptographic / certificate files
+*.der         binary
+
+# Minecraft schematic
+*.litematic   binary
+
+# Compiled / intermediate build artefacts
+*.bin         binary
+*.probe       binary
+
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: QQ 群
+    url: https://docs.hmcl.net/groups.html
+    about: Hello Minecraft! Launcher 的官方 QQ 交流群。
@@ -9,15 +9,15 @@ body:
      value: |
        提交前请确认：

-        * 该问题确实是 **HMCL 的错误**，而**不是 Minecraft 非正常退出**，如果你的 Minecraft 非正常退出，请前往 [QQ 群](https://docs.hmcl.net/groups.html)/[Discord 服务器](https://discord.gg/jVvC7HfM6U) 获取帮助。
-        * 你的启动器版本是**最新的预览版本**，可以点击 [此处](https://zkitefly.github.io/HMCL-Snapshot-Update/) 下载最新预览版本。
+        * 该问题确实是 **HMCL 的错误**，而**不是 Minecraft 非正常退出**。如果你的 Minecraft 非正常退出，请前往 [QQ 群](https://docs.hmcl.net/groups.html)/[Discord 服务器](https://discord.gg/jVvC7HfM6U) 获取帮助。
+        * 你的启动器版本是**最新的预览版本**。你可以从 [GitHub Actions](https://github.com/HMCL-dev/HMCL/actions/workflows/gradle.yml?query=branch%3Amain+event%3Apush) 或 [nightly.link](https://nightly.link/HMCL-dev/HMCL/workflows/gradle/main) 下载最新预览版本。

        如果你的问题并不属于上述两类，你可以选取另一种 Issue 类型，或者直接前往 [QQ 群](https://docs.hmcl.net/groups.html)/[Discord 服务器](https://discord.gg/jVvC7HfM6U) 获取帮助。

        Before submitting, please confirm:

        * 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.
+        * Your launcher is the **latest nightly build**. You can download the latest nightly build from [GitHub Actions](https://github.com/HMCL-dev/HMCL/actions/workflows/gradle.yml?query=branch%3Amain+event%3Apush) or [nightly.link](https://nightly.link/HMCL-dev/HMCL/workflows/gradle/main).

        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: textarea
@@ -38,7 +38,7 @@ body:
    attributes:
      label: 启动器崩溃报告 / 启动器日志文件 | Launcher Crash Report / Launcher Log File
      description: |
-        如果你的启动器崩溃了，请将崩溃报告填入（或将文件拖入）下方。
+        如果你的启动器崩溃了，请将崩溃报告填入 (或将文件拖入) 下方。
        如果你的启动器没有崩溃，请在遇到问题后**不要退出启动器**，在启动器的 “设置 → 通用 → 调试” 一栏中点击 “导出启动器日志”，并将导出的日志拖到下方的输入栏中。
        **请注意：启动器崩溃报告或日志文件是诊断问题的重要依据，请务必上传！**
        
@@ -14,9 +14,9 @@ jobs:
  build:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
      - name: Set up JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'zulu'
          java-version: '17'
@@ -12,9 +12,9 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
    - name: Set up JDK 17
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
      with:
        distribution: 'zulu'
        java-version: '17'
@@ -27,28 +27,30 @@ jobs:
      run: ./gradlew build --no-daemon --parallel
      env:
        MICROSOFT_AUTH_ID: ${{ secrets.MICROSOFT_AUTH_ID }}
-        MICROSOFT_AUTH_SECRET: ${{ secrets.MICROSOFT_AUTH_SECRET }}
        CURSEFORGE_API_KEY: ${{ secrets.CURSEFORGE_API_KEY }}
    - name: Get short SHA
      run: echo "SHORT_SHA=${GITHUB_SHA::7}" >> $GITHUB_ENV
    - name: Upload JAR
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
      with:
        name: HMCL-${{ env.SHORT_SHA }}-jar
-        path: |
-          HMCL/build/libs/HMCL-*.jar
-          HMCL/build/libs/HMCL-*.jar.sha256
+        path: HMCL/build/libs/HMCL-*.jar
+        archive: false
    - name: Upload EXE
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
      with:
        name: HMCL-${{ env.SHORT_SHA }}-exe
-        path: |
-          HMCL/build/libs/HMCL-*.exe
-          HMCL/build/libs/HMCL-*.exe.sha256
+        path: HMCL/build/libs/HMCL-*.exe
+        archive: false
    - name: Upload SH
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
      with:
        name: HMCL-${{ env.SHORT_SHA }}-sh
-        path: |
-          HMCL/build/libs/HMCL-*.sh
-          HMCL/build/libs/HMCL-*.sh.sha256
+        path: HMCL/build/libs/HMCL-*.sh
+        archive: false
+    - name: Upload DEB
+      uses: actions/upload-artifact@v7
+      with:
+        name: HMCL-${{ env.SHORT_SHA }}-deb
+        path: HMCL/build/libs/HMCL-*.deb
+        archive: false
@@ -11,8 +11,9 @@ concurrency:
 jobs:
  mirror:
    strategy:
+      fail-fast: false
      matrix:
-        target:
+        include:
          - name: Gitee
            repo: gitee.com/huanghongxun/HMCL
            user: 'hmcl-sync'
@@ -21,12 +22,12 @@ jobs:
            repo: cnb.cool/HMCL-dev/HMCL
            user: 'cnb'
            token: 'CNB_SYNC_TOKEN'
-    name: Mirror to ${{ matrix.target.name }}
+    name: Mirror to ${{ matrix.name }}
    if: ${{ github.repository == 'HMCL-dev/HMCL' }}
    runs-on: ubuntu-latest
    steps:
-      - name: Mirror GitHub to ${{ matrix.target.name }}
+      - name: Mirror GitHub to ${{ matrix.name }}
        run: |
-          git clone --mirror "https://github.com/$GITHUB_REPOSITORY.git" -- repo
+          git clone --mirror "https://github.com/${{ github.repository }}.git" -- repo
          cd repo
-          git push -f --prune "https://${{ matrix.target.user }}:${{ secrets[matrix.target.token] }}@${{ matrix.target.repo }}.git" "refs/heads/*:refs/heads/*" "refs/tags/*:refs/tags/*"
+          git push -f --prune "https://${{ matrix.user }}:${{ secrets[matrix.token] }}@${{ matrix.repo }}.git" "refs/heads/*:refs/heads/*" "refs/tags/*:refs/tags/*"
@@ -46,16 +46,20 @@ jobs:
          wget "$HMCL_CI_DOWNLOAD_BASE_URI/HMCL-$HMCL_VERSION.jar.sha256"
          wget "$HMCL_CI_DOWNLOAD_BASE_URI/HMCL-$HMCL_VERSION.sh"
          wget "$HMCL_CI_DOWNLOAD_BASE_URI/HMCL-$HMCL_VERSION.sh.sha256"
+          wget "$HMCL_CI_DOWNLOAD_BASE_URI/HMCL-$HMCL_VERSION.deb"
+          wget "$HMCL_CI_DOWNLOAD_BASE_URI/HMCL-$HMCL_VERSION.deb.sha256"
      - name: Verify artifacts
        if: ${{ env.continue == 'true' }}
        run: |
          export JAR_SHA256=$(cat HMCL-$HMCL_VERSION.jar.sha256 | tr -d '\n')
          export EXE_SHA256=$(cat HMCL-$HMCL_VERSION.exe.sha256 | tr -d '\n')
          export SH_SHA256=$(cat HMCL-$HMCL_VERSION.sh.sha256 | tr -d '\n')
+          export DEB_SHA256=$(cat HMCL-$HMCL_VERSION.deb.sha256 | tr -d '\n')
          
          echo "$JAR_SHA256  HMCL-$HMCL_VERSION.jar" | sha256sum -c
          echo "$EXE_SHA256  HMCL-$HMCL_VERSION.exe" | sha256sum -c
          echo "$SH_SHA256  HMCL-$HMCL_VERSION.sh" | sha256sum -c
+          echo "$DEB_SHA256  HMCL-$HMCL_VERSION.deb" | sha256sum -c
      - name: Generate release note
        if: ${{ env.continue == 'true' }}
        run: |
@@ -67,6 +71,7 @@ jobs:
          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
+          echo "| [HMCL-$HMCL_VERSION.deb]($GH_DOWNLOAD_BASE_URL/v$HMCL_VERSION/HMCL-$HMCL_VERSION.deb) | \`$(cat HMCL-$HMCL_VERSION.deb.sha256)\` |"  >> RELEASE_NOTE
          
          # CNB Release Note
          echo "[更新日志](https://docs.hmcl.net/changelog/${{ matrix.channel }}.html#HMCL-$HMCL_VERSION)" >> CNB_RELEASE_NOTE
@@ -76,6 +81,8 @@ jobs:
          echo "| [HMCL-$HMCL_VERSION.exe]($CNB_DOWNLOAD_BASE_URL/v$HMCL_VERSION/HMCL-$HMCL_VERSION.exe) | \`$(cat HMCL-$HMCL_VERSION.exe.sha256)\` |" >> CNB_RELEASE_NOTE
          echo "| [HMCL-$HMCL_VERSION.jar]($CNB_DOWNLOAD_BASE_URL/v$HMCL_VERSION/HMCL-$HMCL_VERSION.jar) | \`$(cat HMCL-$HMCL_VERSION.jar.sha256)\` |" >> CNB_RELEASE_NOTE
          echo "| [HMCL-$HMCL_VERSION.sh]($CNB_DOWNLOAD_BASE_URL/v$HMCL_VERSION/HMCL-$HMCL_VERSION.sh)   | \`$(cat HMCL-$HMCL_VERSION.sh.sha256)\` |"  >> CNB_RELEASE_NOTE
+          echo "| [HMCL-$HMCL_VERSION.deb]($CNB_DOWNLOAD_BASE_URL/v$HMCL_VERSION/HMCL-$HMCL_VERSION.deb) | \`$(cat HMCL-$HMCL_VERSION.deb.sha256)\` |"  >> CNB_RELEASE_NOTE
+
        env:
          GH_DOWNLOAD_BASE_URL: https://github.com/${{ github.repository }}/releases/download
          CNB_DOWNLOAD_BASE_URL: https://cnb.cool/HMCL-dev/HMCL/-/releases/download
@@ -86,6 +93,7 @@ jobs:
            "HMCL-${{ env.HMCL_VERSION }}.exe" \
            "HMCL-${{ env.HMCL_VERSION }}.jar" \
            "HMCL-${{ env.HMCL_VERSION }}.sh" \
+            "HMCL-${{ env.HMCL_VERSION }}.deb" \
            --target "${{ env.HMCL_COMMIT_SHA }}" \
            --title "${{ env.HMCL_TAG_NAME }}" \
            --notes-file RELEASE_NOTE \
@@ -120,6 +128,9 @@ jobs:

           echo "Uploading HMCL-$HMCL_VERSION.sh"
           ~/go/bin/git-cnb release asset-upload --repo="$CNB_REPO" --tag-name "$HMCL_TAG_NAME" --file-name "HMCL-$HMCL_VERSION.sh"
+          
+          echo "Uploading HMCL-$HMCL_VERSION.deb"
+           ~/go/bin/git-cnb release asset-upload --repo="$CNB_REPO" --tag-name "$HMCL_TAG_NAME" --file-name "HMCL-$HMCL_VERSION.deb"
        env:
          CNB_TOKEN: ${{ secrets.CNB_SYNC_TOKEN }}
          CNB_REPO: HMCL-dev/HMCL
@@ -5,6 +5,7 @@ hs_err_pid*
 *.hprof

 .gradle
+gradle.properties

 *.lck
 *.1
@@ -15,6 +16,7 @@ hs_err_pid*
 NVIDIA
 minecraft-exported-crash-info*
 hmcl-exported-logs-*
+terracotta-log-*
 /.java/
 /.local/
 /.cache/
@@ -63,4 +65,10 @@ language-subtag-registry
 # test
 /hmcl.json
 /.hmcl.json
-/.hmcl/
+/.hmcl/
+
+# AI
+/.gemini/
+!/.gemini/config.yaml
+.codex
+/.gradle-*/
@@ -0,0 +1,6 @@
+<component name="CopyrightManager">
+  <copyright>
+    <option name="notice" value="Hello Minecraft! Launcher&#10;Copyright (C) &amp;#36;today.year huangyuhui &lt;huanghongxun2008@126.com&gt; and contributors&#10;&#10;This program is free software: you can redistribute it and/or modify&#10;it under the terms of the GNU General Public License as published by&#10;the Free Software Foundation, either version 3 of the License, or&#10;(at your option) any later version.&#10;&#10;This program is distributed in the hope that it will be useful,&#10;but WITHOUT ANY WARRANTY; without even the implied warranty of&#10;MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the&#10;GNU General Public License for more details.&#10;&#10;You should have received a copy of the GNU General Public License&#10;along with this program.  If not, see &lt;https://www.gnu.org/licenses/&gt;." />
+    <option name="myName" value="HMCL" />
+  </copyright>
+</component>
@@ -0,0 +1,8 @@
+<component name="CopyrightManager">
+  <settings default="HMCL">
+    <LanguageOptions name="JAVA">
+      <option name="fileTypeOverride" value="3" />
+      <option name="addBlankAfter" value="false" />
+    </LanguageOptions>
+  </settings>
+</component>
@@ -0,0 +1,21 @@
+# Java Code Style Requirements
+
+These rules apply to all Java code written or modified in this repository.
+
+## Nullability
+
+- Annotate every class with JetBrains Annotations `@NotNullByDefault`.
+- Any type, field, parameter, return value, local variable, or generic type argument that may be `null` must be explicitly annotated with `@Nullable`.
+- Nullability must never be implicit.
+
+## Immutability
+
+- Immutable arrays and collections must be explicitly annotated with JetBrains Annotations `@Unmodifiable` or `@UnmodifiableView` as appropriate.
+- For arrays, use type-use syntax such as `String @Unmodifiable []`.
+
+## Documentation
+
+- Every class, field, and method must have documentation.
+- Documentation must use `///` Markdown-style Javadoc comments.
+- Keep documentation accurate and specific to the actual behavior, constraints, and side effects.
+- Add concise implementation comments inside complex logic whenever they materially improve readability or explain non-obvious behavior.
@@ -1,3 +1,4 @@
+import org.jackhuang.hmcl.gradle.TerracottaConfigUpgradeTask
 import org.jackhuang.hmcl.gradle.ci.GitHubActionUtils
 import org.jackhuang.hmcl.gradle.ci.JenkinsUtils
 import org.jackhuang.hmcl.gradle.l10n.CheckTranslations
@@ -5,6 +6,8 @@ import org.jackhuang.hmcl.gradle.l10n.CreateLanguageList
 import org.jackhuang.hmcl.gradle.l10n.CreateLocaleNamesResourceBundle
 import org.jackhuang.hmcl.gradle.l10n.UpsideDownTranslate
 import org.jackhuang.hmcl.gradle.mod.ParseModDataTask
+import org.jackhuang.hmcl.gradle.pack.CreateDeb
+import org.jackhuang.hmcl.gradle.pack.ReleaseType
 import org.jackhuang.hmcl.gradle.utils.PropertiesUtils
 import java.net.URI
 import java.nio.file.FileSystems
@@ -27,7 +30,6 @@ val versionType = System.getenv("VERSION_TYPE") ?: if (isOfficial) "nightly" els
 val versionRoot = System.getenv("VERSION_ROOT") ?: projectConfig.getProperty("versionRoot") ?: "3"

 val microsoftAuthId = System.getenv("MICROSOFT_AUTH_ID") ?: ""
-val microsoftAuthSecret = System.getenv("MICROSOFT_AUTH_SECRET") ?: ""
 val curseForgeApiKey = System.getenv("CURSEFORGE_API_KEY") ?: ""

 val launcherExe = System.getenv("HMCL_LAUNCHER_EXE") ?: ""
@@ -56,15 +58,18 @@ dependencies {
    implementation(project(":HMCLCore"))
    implementation(project(":HMCLBoot"))
    implementation("libs:JFoenix")
-    implementation(libs.twelvemonkeys.imageio.webp)
+    implementation(libs.jwebp)
+    implementation(libs.fxsvgimage)
    implementation(libs.java.info)
    implementation(libs.monet.fx)
+    implementation(libs.nayuki.qrcodegen)

    if (launcherExe.isBlank()) {
        implementation(libs.hmclauncher)
    }

    embedResources(libs.authlib.injector)
+    embedResources(libs.lwjgl.unsafe.agent)
 }

 fun digest(algorithm: String, bytes: ByteArray): ByteArray = MessageDigest.getInstance(algorithm).digest(bytes)
@@ -128,6 +133,7 @@ val addOpens = listOf(
    "javafx.base/javafx.beans.property",
    "javafx.graphics/javafx.css",
    "javafx.graphics/javafx.stage",
+    "javafx.graphics/javafx.scene",
    "javafx.graphics/com.sun.glass.ui",
    "javafx.graphics/com.sun.javafx.stage",
    "javafx.graphics/com.sun.javafx.util",
@@ -151,9 +157,9 @@ val hmclProperties = buildList {
    }
    add("hmcl.version.type" to versionType)
    add("hmcl.microsoft.auth.id" to microsoftAuthId)
-    add("hmcl.microsoft.auth.secret" to microsoftAuthSecret)
    add("hmcl.curseforge.apikey" to curseForgeApiKey)
    add("hmcl.authlib-injector.version" to libs.authlib.injector.get().version!!)
+    add("hmcl.lwjgl-unsafe-agent.version" to libs.lwjgl.unsafe.agent.get().version!!)
 }

 val hmclPropertiesFile = layout.buildDirectory.file("hmcl.properties")
@@ -191,7 +197,7 @@ tasks.shadowJar {
    exclude("META-INF/services/javax.imageio.spi.ImageInputStreamSpi")

    listOf(
-        "aix-*", "sunos-*", "openbsd-*", "dragonflybsd-*", "freebsd-*", "linux-*", "darwin-*",
+        "aix-*", "sunos-*", "openbsd-*", "dragonflybsd-*", "freebsd-*", "linux-*",
        "*-ppc", "*-ppc64le", "*-s390x", "*-armel",
    ).forEach { exclude("com/sun/jna/$it/**") }

@@ -240,22 +246,29 @@ tasks.processResources {
        from(upsideDownTranslate.map { it.outputFile })
        from(createLocaleNamesResourceBundle.map { it.outputDirectory })
    }
+
+    inputs.property("terracotta_version", libs.versions.terracotta)
+    doLast {
+        upgradeTerracottaConfig.get().checkValid()
+    }
 }

+fun artifactFile(ext: String) = jarPath.resolveSibling(jarPath.nameWithoutExtension + '.' + ext)
+
 val makeExecutables by tasks.registering {
    val extensions = listOf("exe", "sh")

    dependsOn(tasks.jar)

    inputs.file(jarPath)
-    outputs.files(extensions.map { File(jarPath.parentFile, jarPath.nameWithoutExtension + '.' + it) })
+    outputs.files(extensions.map { artifactFile(it) })

    doLast {
        val jarContent = jarPath.readBytes()

        ZipFile(jarPath).use { zipFile ->
            for (extension in extensions) {
-                val output = File(jarPath.parentFile, jarPath.nameWithoutExtension + '.' + extension)
+                val output = artifactFile(extension)
                val entry = zipFile.getEntry("assets/HMCLauncher.$extension")
                    ?: throw GradleException("HMCLauncher.$extension not found")

@@ -270,8 +283,31 @@ val makeExecutables by tasks.registering {
    }
 }

+val makeDeb by tasks.registering(CreateDeb::class) {
+    dependsOn(makeExecutables)
+
+    val debFile = layout.file(provider { artifactFile("deb") })
+
+    val debChannel = when (versionType) {
+        "stable" -> ReleaseType.STABLE
+        "dev" -> ReleaseType.DEVELOPMENT
+        else -> ReleaseType.NIGHTLY
+    }
+
+    version.set(project.version.toString())
+    releaseType.set(debChannel)
+    appShFile.set(layout.file(provider { artifactFile("sh") }))
+    iconFile.set(layout.projectDirectory.file("image/hmcl.png"))
+    outputFile.set(debFile)
+
+    doLast {
+        createChecksum(debFile.get().asFile)
+    }
+}
+
 tasks.build {
    dependsOn(makeExecutables)
+    dependsOn(makeDeb)
 }

 fun parseToolOptions(options: String?): MutableList<String> {
@@ -362,6 +398,28 @@ tasks.register<JavaExec>("run") {
    }
 }

+// terracotta
+
+val upgradeTerracottaConfig = tasks.register<TerracottaConfigUpgradeTask>("upgradeTerracottaConfig") {
+    val destination = layout.projectDirectory.file("src/main/resources/assets/terracotta.json")
+    val source = layout.projectDirectory.file("terracotta-template.json");
+
+    classifiers.set(
+        listOf(
+            "windows-x86_64", "windows-arm64",
+            "macos-x86_64", "macos-arm64",
+            "linux-x86_64", "linux-arm64", "linux-loongarch64", "linux-riscv64",
+            "freebsd-x86_64"
+        )
+    )
+
+    version.set(libs.versions.terracotta)
+    downloadURL.set($$"https://github.com/burningtnt/Terracotta/releases/download/v${version}/terracotta-${version}-${classifier}-pkg.tar.gz")
+
+    templateFile.set(source)
+    outputFile.set(destination)
+}
+
 // Check Translations

 tasks.register<CheckTranslations>("checkTranslations") {
@@ -0,0 +1,129 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by Fernflower decompiler)
+//
+
+package com.jfoenix.controls;
+
+import com.jfoenix.converters.ButtonTypeConverter;
+import com.jfoenix.skins.JFXButtonSkin;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.css.CssMetaData;
+import javafx.css.SimpleStyleableObjectProperty;
+import javafx.css.Styleable;
+import javafx.css.StyleableObjectProperty;
+import javafx.css.StyleableProperty;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+import javafx.scene.control.Control;
+import javafx.scene.control.Labeled;
+import javafx.scene.control.Skin;
+import javafx.scene.paint.Paint;
+
+public class JFXButton extends Button {
+    private static final String DEFAULT_STYLE_CLASS = "jfx-button";
+
+    private List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
+
+    public JFXButton() {
+        this.initialize();
+    }
+
+    public JFXButton(String text) {
+        super(text);
+        this.initialize();
+    }
+
+    public JFXButton(String text, Node graphic) {
+        super(text, graphic);
+        this.initialize();
+    }
+
+    private void initialize() {
+        this.getStyleClass().add(DEFAULT_STYLE_CLASS);
+    }
+
+    protected Skin<?> createDefaultSkin() {
+        return new JFXButtonSkin(this);
+    }
+
+    private final ObjectProperty<Paint> ripplerFill = new SimpleObjectProperty<>(this, "ripplerFill", null);
+
+    public final ObjectProperty<Paint> ripplerFillProperty() {
+        return this.ripplerFill;
+    }
+
+    public final Paint getRipplerFill() {
+        return this.ripplerFillProperty().get();
+    }
+
+    public final void setRipplerFill(Paint ripplerFill) {
+        this.ripplerFillProperty().set(ripplerFill);
+    }
+
+    private final StyleableObjectProperty<ButtonType> buttonType = new SimpleStyleableObjectProperty<>(
+            JFXButton.StyleableProperties.BUTTON_TYPE, this, "buttonType", JFXButton.ButtonType.FLAT);
+
+    public ButtonType getButtonType() {
+        return this.buttonType == null ? JFXButton.ButtonType.FLAT : this.buttonType.get();
+    }
+
+    public StyleableObjectProperty<ButtonType> buttonTypeProperty() {
+        return this.buttonType;
+    }
+
+    public void setButtonType(ButtonType type) {
+        this.buttonType.set(type);
+    }
+
+    public List<CssMetaData<? extends Styleable, ?>> getControlCssMetaData() {
+        if (this.STYLEABLES == null) {
+            List<CssMetaData<? extends Styleable, ?>> styleables = new ArrayList<>(Control.getClassCssMetaData());
+            styleables.addAll(getClassCssMetaData());
+            styleables.addAll(Labeled.getClassCssMetaData());
+            this.STYLEABLES = List.copyOf(styleables);
+        }
+
+        return this.STYLEABLES;
+    }
+
+    public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
+        return JFXButton.StyleableProperties.CHILD_STYLEABLES;
+    }
+
+    protected void layoutChildren() {
+        super.layoutChildren();
+        this.setNeedsLayout(false);
+    }
+
+    public enum ButtonType {
+        FLAT,
+        RAISED;
+    }
+
+    private static final class StyleableProperties {
+        private static final CssMetaData<JFXButton, ButtonType> BUTTON_TYPE;
+        private static final List<CssMetaData<? extends Styleable, ?>> CHILD_STYLEABLES;
+
+        static {
+            BUTTON_TYPE = new CssMetaData<>("-jfx-button-type", ButtonTypeConverter.getInstance(), JFXButton.ButtonType.FLAT) {
+                public boolean isSettable(JFXButton control) {
+                    return control.buttonType == null || !control.buttonType.isBound();
+                }
+
+                public StyleableProperty<ButtonType> getStyleableProperty(JFXButton control) {
+                    return control.buttonTypeProperty();
+                }
+            };
+            List<CssMetaData<? extends Styleable, ?>> styleables = new ArrayList<>(Control.getClassCssMetaData());
+            Collections.addAll(styleables, BUTTON_TYPE);
+            CHILD_STYLEABLES = List.copyOf(styleables);
+        }
+    }
+}
@@ -0,0 +1,169 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.jfoenix.controls;
+
+import com.jfoenix.skins.JFXCheckBoxSkin;
+import javafx.css.*;
+import javafx.css.converter.PaintConverter;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.Skin;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.Paint;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/// JFXCheckBox is the material design implementation of a checkbox.
+/// it shows ripple effect and a custom selection animation.
+///
+/// @author Shadi Shaheen
+/// @version 1.0
+/// @since 2016-03-09
+public class JFXCheckBox extends CheckBox {
+
+    public JFXCheckBox(String text) {
+        super(text);
+        initialize();
+    }
+
+    public JFXCheckBox() {
+        initialize();
+    }
+
+    private void initialize() {
+        this.getStyleClass().add(DEFAULT_STYLE_CLASS);
+    }
+
+    @Override
+    protected Skin<?> createDefaultSkin() {
+        return new JFXCheckBoxSkin(this);
+    }
+
+    /***************************************************************************
+     *                                                                         *
+     * Stylesheet Handling                                                     *
+     *                                                                         *
+     **************************************************************************/
+
+    /// Initialize the style class to 'jfx-check-box'.
+    ///
+    /// This is the selector class from which CSS can be used to style
+    /// this control.
+    private static final String DEFAULT_STYLE_CLASS = "jfx-check-box";
+
+    /// checkbox color property when selected
+    private StyleableObjectProperty<Paint> checkedColor;
+
+    private static final Color DEFAULT_CHECKED_COLOR = Color.valueOf("#0F9D58");
+
+    public StyleableObjectProperty<Paint> checkedColorProperty() {
+        if (checkedColor == null) {
+            checkedColor = new SimpleStyleableObjectProperty<>(StyleableProperties.CHECKED_COLOR,
+                    JFXCheckBox.this,
+                    "checkedColor",
+                    DEFAULT_CHECKED_COLOR);
+        }
+        return this.checkedColor;
+    }
+
+    public Paint getCheckedColor() {
+        return checkedColor == null ? DEFAULT_CHECKED_COLOR : checkedColor.get();
+    }
+
+    public void setCheckedColor(Paint color) {
+        this.checkedColor.set(color);
+    }
+
+    /**
+     * checkbox color property when not selected
+     */
+    private StyleableObjectProperty<Paint> unCheckedColor;
+
+    private static final Color DEFAULT_UNCHECKED_COLOR = Color.valueOf("#5A5A5A");
+
+    public StyleableObjectProperty<Paint> unCheckedColorProperty() {
+        if (unCheckedColor == null) {
+            unCheckedColor = new SimpleStyleableObjectProperty<>(StyleableProperties.UNCHECKED_COLOR,
+                    JFXCheckBox.this,
+                    "unCheckedColor",
+                    DEFAULT_UNCHECKED_COLOR);
+        }
+        return this.unCheckedColor;
+    }
+
+    public Paint getUnCheckedColor() {
+        return unCheckedColor == null ? DEFAULT_UNCHECKED_COLOR : unCheckedColor.get();
+    }
+
+    public void setUnCheckedColor(Paint color) {
+        this.unCheckedColor.set(color);
+    }
+
+    private static final class StyleableProperties {
+        private static final CssMetaData<JFXCheckBox, Paint> CHECKED_COLOR =
+                new CssMetaData<>("-jfx-checked-color",
+                        PaintConverter.getInstance(), DEFAULT_CHECKED_COLOR) {
+                    @Override
+                    public boolean isSettable(JFXCheckBox control) {
+                        return control.checkedColor == null || !control.checkedColor.isBound();
+                    }
+
+                    @Override
+                    public StyleableProperty<Paint> getStyleableProperty(JFXCheckBox control) {
+                        return control.checkedColorProperty();
+                    }
+                };
+        private static final CssMetaData<JFXCheckBox, Paint> UNCHECKED_COLOR =
+                new CssMetaData<>("-jfx-unchecked-color",
+                        PaintConverter.getInstance(), DEFAULT_UNCHECKED_COLOR) {
+                    @Override
+                    public boolean isSettable(JFXCheckBox control) {
+                        return control.unCheckedColor == null || !control.unCheckedColor.isBound();
+                    }
+
+                    @Override
+                    public StyleableProperty<Paint> getStyleableProperty(JFXCheckBox control) {
+                        return control.unCheckedColorProperty();
+                    }
+                };
+        private static final List<CssMetaData<? extends Styleable, ?>> CHILD_STYLEABLES;
+
+        static {
+            final List<CssMetaData<? extends Styleable, ?>> styleables =
+                    new ArrayList<>(CheckBox.getClassCssMetaData());
+            Collections.addAll(styleables,
+                    CHECKED_COLOR,
+                    UNCHECKED_COLOR
+            );
+            CHILD_STYLEABLES = List.copyOf(styleables);
+        }
+    }
+
+    @Override
+    public List<CssMetaData<? extends Styleable, ?>> getControlCssMetaData() {
+        return getClassCssMetaData();
+    }
+
+    public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
+        return StyleableProperties.CHILD_STYLEABLES;
+    }
+
+}
@@ -0,0 +1,357 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.jfoenix.controls;
+
+import com.jfoenix.converters.base.NodeConverter;
+import com.jfoenix.skins.JFXComboBoxListViewSkin;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.collections.ObservableList;
+import javafx.css.*;
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.PaintConverter;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.*;
+import javafx.scene.layout.Background;
+import javafx.scene.layout.BackgroundFill;
+import javafx.scene.layout.StackPane;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.Paint;
+import javafx.util.StringConverter;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import static org.jackhuang.hmcl.ui.FXUtils.useJFXContextMenu;
+
+/**
+ * JFXComboBox is the material design implementation of a combobox.
+ *
+ * @author Shadi Shaheen
+ * @version 1.0
+ * @since 2016-03-09
+ */
+public class JFXComboBox<T> extends ComboBox<T> {
+
+    /**
+     * {@inheritDoc}
+     */
+    public JFXComboBox() {
+        initialize();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public JFXComboBox(ObservableList<T> items) {
+        super(items);
+        initialize();
+    }
+
+    private void initialize() {
+        getStyleClass().add(DEFAULT_STYLE_CLASS);
+        this.setCellFactory(listView -> new JFXListCell<T>() {
+            @Override
+            public void updateItem(T item, boolean empty) {
+                super.updateItem(item, empty);
+                updateDisplayText(this, item, empty);
+            }
+        });
+
+        // had to refactor the code out of the skin class to allow
+        // customization of the button cell
+        this.setButtonCell(new ListCell<T>() {
+            {
+                // fixed clearing the combo box value is causing
+                // java prompt text to be shown because the button cell is not updated
+                JFXComboBox.this.valueProperty().addListener(observable -> {
+                    if (JFXComboBox.this.getValue() == null) {
+                        updateItem(null, true);
+                    }
+                });
+            }
+
+            @Override
+            protected void updateItem(T item, boolean empty) {
+                updateDisplayText(this, item, empty);
+                this.setVisible(item != null || !empty);
+            }
+
+        });
+
+        useJFXContextMenu(editorProperty().get());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected Skin<?> createDefaultSkin() {
+        return new JFXComboBoxListViewSkin<T>(this);
+    }
+
+    /**
+     * Initialize the style class to 'jfx-combo-box'.
+     * <p>
+     * This is the selector class from which CSS can be used to style
+     * this control.
+     */
+    private static final String DEFAULT_STYLE_CLASS = "jfx-combo-box";
+
+    /***************************************************************************
+     *                                                                         *
+     * Node Converter Property                                                 *
+     *                                                                         *
+     **************************************************************************/
+    /**
+     * Converts the user-typed input (when the ComboBox is
+     * {@link #editableProperty() editable}) to an object of type T, such that
+     * the input may be retrieved via the  {@link #valueProperty() value} property.
+     */
+    public ObjectProperty<NodeConverter<T>> nodeConverterProperty() {
+        return nodeConverter;
+    }
+
+    private ObjectProperty<NodeConverter<T>> nodeConverter = new SimpleObjectProperty<>(this, "nodeConverter",
+            JFXComboBox.<T>defaultNodeConverter());
+
+    public final void setNodeConverter(NodeConverter<T> value) {
+        nodeConverterProperty().set(value);
+    }
+
+    public final NodeConverter<T> getNodeConverter() {
+        return nodeConverterProperty().get();
+    }
+
+    private static <T> NodeConverter<T> defaultNodeConverter() {
+        return new NodeConverter<T>() {
+            @Override
+            public Node toNode(T object) {
+                if (object == null) {
+                    return null;
+                }
+                StackPane selectedValueContainer = new StackPane();
+                selectedValueContainer.getStyleClass().add("combo-box-selected-value-container");
+                selectedValueContainer.setBackground(new Background(new BackgroundFill(Color.TRANSPARENT, null, null)));
+                Label selectedValueLabel = object instanceof Label ? new Label(((Label) object).getText()) : new Label(
+                        object.toString());
+                selectedValueLabel.setTextFill(Color.BLACK);
+                selectedValueContainer.getChildren().add(selectedValueLabel);
+                StackPane.setAlignment(selectedValueLabel, Pos.CENTER_LEFT);
+                StackPane.setMargin(selectedValueLabel, new Insets(0, 0, 0, 5));
+                return selectedValueContainer;
+            }
+
+            @SuppressWarnings("unchecked")
+            @Override
+            public T fromNode(Node node) {
+                return (T) node;
+            }
+
+            @Override
+            public String toString(T object) {
+                if (object == null) {
+                    return null;
+                }
+                if (object instanceof Label) {
+                    return ((Label) object).getText();
+                }
+                return object.toString();
+            }
+        };
+    }
+
+    private boolean updateDisplayText(ListCell<T> cell, T item, boolean empty) {
+        if (empty) {
+            // create empty cell
+            if (cell == null) {
+                return true;
+            }
+            cell.setGraphic(null);
+            cell.setText(null);
+            return true;
+        } else if (item instanceof Node) {
+            Node currentNode = cell.getGraphic();
+            Node newNode = (Node) item;
+            //  create a node from the selected node of the listview
+            //  using JFXComboBox {@link #nodeConverterProperty() NodeConverter})
+            NodeConverter<T> nc = this.getNodeConverter();
+            Node node = nc == null ? null : nc.toNode(item);
+            if (currentNode == null || !currentNode.equals(newNode)) {
+                cell.setText(null);
+                cell.setGraphic(node == null ? newNode : node);
+            }
+            return node == null;
+        } else {
+            // run item through StringConverter if it isn't null
+            StringConverter<T> c = this.getConverter();
+            String s = item == null ? this.getPromptText() : (c == null ? item.toString() : c.toString(item));
+            cell.setText(s);
+            cell.setGraphic(null);
+            return s == null || s.isEmpty();
+        }
+    }
+
+    /***************************************************************************
+     *                                                                         *
+     * styleable Properties                                                    *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * set true to show a float the prompt text when focusing the field
+     */
+    private StyleableBooleanProperty labelFloat = new SimpleStyleableBooleanProperty(StyleableProperties.LABEL_FLOAT,
+            JFXComboBox.this,
+            "lableFloat",
+            false);
+
+    public final StyleableBooleanProperty labelFloatProperty() {
+        return this.labelFloat;
+    }
+
+    public final boolean isLabelFloat() {
+        return this.labelFloatProperty().get();
+    }
+
+    public final void setLabelFloat(final boolean labelFloat) {
+        this.labelFloatProperty().set(labelFloat);
+    }
+
+    /**
+     * default color used when the field is unfocused
+     */
+    private StyleableObjectProperty<Paint> unFocusColor = new SimpleStyleableObjectProperty<>(StyleableProperties.UNFOCUS_COLOR,
+            JFXComboBox.this,
+            "unFocusColor",
+            Color.rgb(77,
+                    77,
+                    77));
+
+    public Paint getUnFocusColor() {
+        return unFocusColor == null ? Color.rgb(77, 77, 77) : unFocusColor.get();
+    }
+
+    public StyleableObjectProperty<Paint> unFocusColorProperty() {
+        return this.unFocusColor;
+    }
+
+    public void setUnFocusColor(Paint color) {
+        this.unFocusColor.set(color);
+    }
+
+    /**
+     * default color used when the field is focused
+     */
+    private StyleableObjectProperty<Paint> focusColor = new SimpleStyleableObjectProperty<>(StyleableProperties.FOCUS_COLOR,
+            JFXComboBox.this,
+            "focusColor",
+            Color.valueOf("#4059A9"));
+
+    public Paint getFocusColor() {
+        return focusColor == null ? Color.valueOf("#4059A9") : focusColor.get();
+    }
+
+    public StyleableObjectProperty<Paint> focusColorProperty() {
+        return this.focusColor;
+    }
+
+    public void setFocusColor(Paint color) {
+        this.focusColor.set(color);
+    }
+
+    private final static class StyleableProperties {
+        private static final CssMetaData<JFXComboBox<?>, Paint> UNFOCUS_COLOR = new CssMetaData<JFXComboBox<?>, Paint>(
+                "-jfx-unfocus-color",
+                PaintConverter.getInstance(),
+                Color.valueOf("#A6A6A6")) {
+            @Override
+            public boolean isSettable(JFXComboBox<?> control) {
+                return control.unFocusColor == null || !control.unFocusColor.isBound();
+            }
+
+            @Override
+            public StyleableProperty<Paint> getStyleableProperty(JFXComboBox<?> control) {
+                return control.unFocusColorProperty();
+            }
+        };
+        private static final CssMetaData<JFXComboBox<?>, Paint> FOCUS_COLOR = new CssMetaData<JFXComboBox<?>, Paint>(
+                "-jfx-focus-color",
+                PaintConverter.getInstance(),
+                Color.valueOf("#3f51b5")) {
+            @Override
+            public boolean isSettable(JFXComboBox<?> control) {
+                return control.focusColor == null || !control.focusColor.isBound();
+            }
+
+            @Override
+            public StyleableProperty<Paint> getStyleableProperty(JFXComboBox<?> control) {
+                return control.focusColorProperty();
+            }
+        };
+        private static final CssMetaData<JFXComboBox<?>, Boolean> LABEL_FLOAT = new CssMetaData<JFXComboBox<?>, Boolean>(
+                "-jfx-label-float",
+                BooleanConverter.getInstance(),
+                false) {
+            @Override
+            public boolean isSettable(JFXComboBox<?> control) {
+                return control.labelFloat == null || !control.labelFloat.isBound();
+            }
+
+            @Override
+            public StyleableBooleanProperty getStyleableProperty(JFXComboBox<?> control) {
+                return control.labelFloatProperty();
+            }
+        };
+
+
+        private static final List<CssMetaData<? extends Styleable, ?>> CHILD_STYLEABLES;
+
+        static {
+            final List<CssMetaData<? extends Styleable, ?>> styleables = new ArrayList<>(
+                    Control.getClassCssMetaData());
+            Collections.addAll(styleables, UNFOCUS_COLOR, FOCUS_COLOR, LABEL_FLOAT);
+            CHILD_STYLEABLES = Collections.unmodifiableList(styleables);
+        }
+    }
+
+    // inherit the styleable properties from parent
+    private List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
+
+    @Override
+    public List<CssMetaData<? extends Styleable, ?>> getControlCssMetaData() {
+        if (STYLEABLES == null) {
+            final List<CssMetaData<? extends Styleable, ?>> styleables = new ArrayList<>(
+                    Control.getClassCssMetaData());
+            styleables.addAll(getClassCssMetaData());
+            styleables.addAll(Control.getClassCssMetaData());
+            STYLEABLES = Collections.unmodifiableList(styleables);
+        }
+        return STYLEABLES;
+    }
+
+    public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
+        return StyleableProperties.CHILD_STYLEABLES;
+    }
+}
+
@@ -23,21 +23,13 @@ import com.jfoenix.controls.events.JFXDialogEvent;
 import com.jfoenix.converters.DialogTransitionConverter;
 import com.jfoenix.effects.JFXDepthManager;
 import com.jfoenix.transitions.CachedTransition;
-import javafx.animation.Interpolator;
-import javafx.animation.KeyFrame;
-import javafx.animation.KeyValue;
-import javafx.animation.Timeline;
-import javafx.animation.Transition;
+import javafx.animation.*;
 import javafx.beans.DefaultProperty;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ObjectPropertyBase;
 import javafx.beans.property.SimpleBooleanProperty;
-import javafx.css.CssMetaData;
-import javafx.css.SimpleStyleableObjectProperty;
-import javafx.css.Styleable;
-import javafx.css.StyleableObjectProperty;
-import javafx.css.StyleableProperty;
+import javafx.css.*;
 import javafx.event.Event;
 import javafx.event.EventHandler;
 import javafx.geometry.Pos;
@@ -49,7 +41,6 @@ import javafx.scene.image.WritableImage;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.Background;
 import javafx.scene.layout.BackgroundFill;
-import javafx.scene.layout.CornerRadii;
 import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Color;
@@ -155,7 +146,6 @@ public class JFXDialog extends StackPane {
        });

        contentHolder = new StackPane();
-        contentHolder.setBackground(new Background(new BackgroundFill(Color.WHITE, new CornerRadii(2), null)));
        JFXDepthManager.setDepth(contentHolder, 4);
        contentHolder.setPickOnBounds(false);
        // ensure stackpane is never resized beyond it's preferred size
@@ -381,6 +371,14 @@ public class JFXDialog extends StackPane {
            setCycleDuration(Duration.seconds(0.4));
            setDelay(Duration.ZERO);
        }
+
+        @Override
+        protected void starting() {
+        }
+
+        @Override
+        protected void stopping() {
+        }
    }

    /***************************************************************************
@@ -0,0 +1,104 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by Fernflower decompiler)
+//
+
+package com.jfoenix.controls;
+
+import java.util.List;
+
+import javafx.collections.ObservableList;
+import javafx.geometry.Insets;
+import javafx.geometry.Orientation;
+import javafx.scene.Node;
+import javafx.scene.layout.FlowPane;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
+
+public class JFXDialogLayout extends StackPane {
+    private final StackPane heading = new StackPane();
+    private final StackPane body = new StackPane();
+    private final FlowPane actions = new FlowPane() {
+        protected double computeMinWidth(double height) {
+            if (this.getContentBias() == Orientation.HORIZONTAL) {
+                double maxPref = 0.0;
+                for (Node child : this.getChildren()) {
+                    if (child.isManaged()) {
+                        maxPref = Math.max(maxPref, child.minWidth(-1.0));
+                    }
+                }
+
+                Insets insets = this.getInsets();
+                return insets.getLeft() + this.snapSizeX(maxPref) + insets.getRight();
+            } else {
+                return this.computePrefWidth(height);
+            }
+        }
+
+        protected double computeMinHeight(double width) {
+            if (this.getContentBias() == Orientation.VERTICAL) {
+                double maxPref = 0.0;
+
+                for (Node child : this.getChildren()) {
+                    if (child.isManaged()) {
+                        maxPref = Math.max(maxPref, child.minHeight(-1.0));
+                    }
+                }
+
+                Insets insets = this.getInsets();
+                return insets.getTop() + this.snapSizeY(maxPref) + insets.getBottom();
+            } else {
+                return this.computePrefHeight(width);
+            }
+        }
+    };
+    private static final String DEFAULT_STYLE_CLASS = "jfx-dialog-layout";
+
+    public JFXDialogLayout() {
+        this.getStyleClass().add(DEFAULT_STYLE_CLASS);
+
+        VBox layout = new VBox();
+
+        this.heading.getStyleClass().add("jfx-layout-heading");
+        this.heading.getStyleClass().add("title");
+
+        this.body.getStyleClass().add("jfx-layout-body");
+        this.body.prefHeightProperty().bind(this.prefHeightProperty());
+        this.body.prefWidthProperty().bind(this.prefWidthProperty());
+
+        this.actions.getStyleClass().add("jfx-layout-actions");
+
+        layout.getChildren().setAll(this.heading, this.body, this.actions);
+
+        this.getChildren().add(layout);
+    }
+
+    public ObservableList<Node> getHeading() {
+        return this.heading.getChildren();
+    }
+
+    public void setHeading(Node... titleContent) {
+        this.heading.getChildren().setAll(titleContent);
+    }
+
+    public ObservableList<Node> getBody() {
+        return this.body.getChildren();
+    }
+
+    public void setBody(Node... body) {
+        this.body.getChildren().setAll(body);
+    }
+
+    public ObservableList<Node> getActions() {
+        return this.actions.getChildren();
+    }
+
+    public void setActions(Node... actions) {
+        this.actions.getChildren().setAll(actions);
+    }
+
+    public void setActions(List<? extends Node> actions) {
+        this.actions.getChildren().setAll(actions);
+    }
+
+}
@@ -0,0 +1,271 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.jfoenix.controls;
+
+import com.jfoenix.utils.JFXNodeUtils;
+import javafx.animation.Interpolator;
+import javafx.animation.KeyFrame;
+import javafx.animation.KeyValue;
+import javafx.animation.Timeline;
+import javafx.application.Platform;
+import javafx.geometry.Insets;
+import javafx.scene.Node;
+import javafx.scene.control.Label;
+import javafx.scene.control.ListCell;
+import javafx.scene.control.Tooltip;
+import javafx.scene.layout.Region;
+import javafx.scene.shape.Rectangle;
+import javafx.scene.shape.Shape;
+import javafx.util.Duration;
+
+import java.util.Set;
+
+/// material design implementation of ListCell
+///
+/// By default, JFXListCell will try to create a graphic node for the cell,
+/// to override it you need to set graphic to null in [#updateItem(Object, boolean)] method.
+///
+/// NOTE: passive nodes (Labels and Shapes) will be set to mouse transparent in order to
+/// show the ripple effect upon clicking , to change this behavior you can override the
+/// method {[#makeChildrenTransparent()]
+///
+/// @author Shadi Shaheen
+/// @version 1.0
+/// @since 2016-03-09
+public class JFXListCell<T> extends ListCell<T> {
+
+    protected JFXRippler cellRippler = new JFXRippler(this) {
+        @Override
+        protected Node getMask() {
+            Region clip = new Region();
+            JFXNodeUtils.updateBackground(JFXListCell.this.getBackground(), clip);
+            double width = control.getLayoutBounds().getWidth();
+            double height = control.getLayoutBounds().getHeight();
+            clip.resize(width, height);
+            return clip;
+        }
+
+        @Override
+        protected void positionControl(Node control) {
+            // do nothing
+        }
+    };
+
+    protected Node cellContent;
+    private Rectangle clip;
+
+    private Timeline gapAnimation;
+    private boolean playExpandAnimation = false;
+    private boolean selectionChanged = false;
+
+    /**
+     * {@inheritDoc}
+     */
+    public JFXListCell() {
+        initialize();
+        initListeners();
+    }
+
+    /**
+     * init listeners to update the vertical gap / selection animation
+     */
+    private void initListeners() {
+        listViewProperty().addListener((listObj, oldList, newList) -> {
+            if (newList instanceof JFXListView<?> listView) {
+                listView.currentVerticalGapProperty().addListener((o, oldVal, newVal) -> {
+                    cellRippler.rippler.setClip(null);
+                    if (newVal.doubleValue() != 0) {
+                        playExpandAnimation = true;
+                        getListView().requestLayout();
+                    } else {
+                        // fake expand state
+                        double gap = clip.getY() * 2;
+                        gapAnimation = new Timeline(
+                                new KeyFrame(Duration.millis(240),
+                                        new KeyValue(this.translateYProperty(),
+                                                -gap / 2 - (gap * (getIndex())),
+                                                Interpolator.EASE_BOTH)
+                                ));
+                        gapAnimation.play();
+                        gapAnimation.setOnFinished((finish) -> {
+                            requestLayout();
+                            Platform.runLater(() -> getListView().requestLayout());
+                        });
+                    }
+                });
+
+                selectedProperty().addListener((o, oldVal, newVal) -> {
+                    if (newVal) {
+                        selectionChanged = true;
+                    }
+                });
+            }
+        });
+    }
+
+    @Override
+    protected void layoutChildren() {
+        super.layoutChildren();
+        cellRippler.resizeRelocate(0, 0, getWidth(), getHeight());
+        double gap = getGap();
+
+        if (clip == null) {
+            clip = new Rectangle(0, gap / 2, getWidth(), getHeight() - gap);
+            setClip(clip);
+        } else {
+            if (gap != 0) {
+                if (playExpandAnimation || selectionChanged) {
+                    // fake list collapse state
+                    if (playExpandAnimation) {
+                        this.setTranslateY(-gap / 2 + (-gap * (getIndex())));
+                        clip.setY(gap / 2);
+                        clip.setHeight(getHeight() - gap);
+                        gapAnimation = new Timeline(new KeyFrame(Duration.millis(240),
+                                new KeyValue(this.translateYProperty(),
+                                        0,
+                                        Interpolator.EASE_BOTH)));
+                        playExpandAnimation = false;
+                    } else if (selectionChanged) {
+                        clip.setY(0);
+                        clip.setHeight(getHeight());
+                        gapAnimation = new Timeline(
+                                new KeyFrame(Duration.millis(240),
+                                        new KeyValue(clip.yProperty(), gap / 2, Interpolator.EASE_BOTH),
+                                        new KeyValue(clip.heightProperty(), getHeight() - gap, Interpolator.EASE_BOTH)
+                                ));
+                    }
+                    playExpandAnimation = false;
+                    selectionChanged = false;
+                    gapAnimation.play();
+                } else {
+                    if (gapAnimation != null) {
+                        gapAnimation.stop();
+                    }
+                    this.setTranslateY(0);
+                    clip.setY(gap / 2);
+                    clip.setHeight(getHeight() - gap);
+                }
+            } else {
+                this.setTranslateY(0);
+                clip.setY(0);
+                clip.setHeight(getHeight());
+            }
+            clip.setX(0);
+            clip.setWidth(getWidth());
+        }
+        if (!getChildren().contains(cellRippler)) {
+            makeChildrenTransparent();
+            getChildren().add(0, cellRippler);
+            cellRippler.rippler.clear();
+        }
+    }
+
+    /**
+     * this method is used to set some nodes in cell content as mouse transparent nodes
+     * so clicking on them will trigger the ripple effect.
+     */
+    protected void makeChildrenTransparent() {
+        for (Node child : getChildren()) {
+            if (child instanceof Label) {
+                Set<Node> texts = child.lookupAll("Text");
+                for (Node text : texts) {
+                    text.setMouseTransparent(true);
+                }
+            } else if (child instanceof Shape) {
+                child.setMouseTransparent(true);
+            }
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void updateItem(T item, boolean empty) {
+        super.updateItem(item, empty);
+        if (empty) {
+            setText(null);
+            setGraphic(null);
+            // remove empty (Trailing cells)
+            setMouseTransparent(true);
+            setStyle("-fx-background-color:TRANSPARENT;");
+        } else {
+            setMouseTransparent(false);
+            setStyle(null);
+            if (item instanceof Node newNode) {
+                setText(null);
+                Node currentNode = getGraphic();
+                if (currentNode == null || !currentNode.equals(newNode)) {
+                    cellContent = newNode;
+                    cellRippler.rippler.cacheRippleClip(false);
+                    // build the Cell node
+                    // RIPPLER ITEM : in case if the list item has its own rippler bind the list rippler and item rippler properties
+                    if (newNode instanceof JFXRippler newRippler) {
+                        // build cell container from exisiting rippler
+                        cellRippler.ripplerFillProperty().bind(newRippler.ripplerFillProperty());
+                        cellRippler.maskTypeProperty().bind(newRippler.maskTypeProperty());
+                        cellRippler.positionProperty().bind(newRippler.positionProperty());
+                        cellContent = newRippler.getControl();
+                    }
+                    ((Region) cellContent).setMaxHeight(cellContent.prefHeight(-1));
+                    setGraphic(cellContent);
+                }
+            } else {
+                setText(item == null ? "null" : item.toString());
+                setGraphic(null);
+            }
+            // show cell tooltip if it's toggled in JFXListView
+            if (getListView() instanceof JFXListView<?> listView && listView.isShowTooltip()) {
+                if (item instanceof Label label) {
+                    setTooltip(new Tooltip(label.getText()));
+                } else if (getText() != null) {
+                    setTooltip(new Tooltip(getText()));
+                }
+            }
+        }
+    }
+
+    // Stylesheet Handling                                                     *
+
+    /**
+     * Initialize the style class to 'jfx-list-cell'.
+     * <p>
+     * This is the selector class from which CSS can be used to style
+     * this control.
+     */
+    private static final String DEFAULT_STYLE_CLASS = "jfx-list-cell";
+
+    private void initialize() {
+        this.getStyleClass().add(DEFAULT_STYLE_CLASS);
+        this.setPadding(new Insets(8, 12, 8, 12));
+    }
+
+    @Override
+    protected double computePrefHeight(double width) {
+        double gap = getGap();
+        return super.computePrefHeight(width) + gap;
+    }
+
+    private double getGap() {
+        return (getListView() instanceof JFXListView<?> listView)
+                ? (listView.isExpanded() ? listView.currentVerticalGapProperty().get() : 0)
+                : 0;
+    }
+}
@@ -0,0 +1,258 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.jfoenix.controls;
+
+import com.jfoenix.skins.JFXListViewSkin;
+import javafx.beans.property.*;
+import javafx.css.*;
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.SizeConverter;
+import javafx.scene.control.ListView;
+import javafx.scene.control.Skin;
+import javafx.scene.input.MouseEvent;
+
+import java.util.*;
+
+/// Material design implementation of List View
+///
+/// @author Shadi Shaheen
+/// @version 1.0
+/// @since 2016-03-09
+public class JFXListView<T> extends ListView<T> {
+
+    /**
+     * {@inheritDoc}
+     */
+    public JFXListView() {
+        this.setCellFactory(listView -> new JFXListCell<>());
+        initialize();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected Skin<?> createDefaultSkin() {
+        return new JFXListViewSkin<>(this);
+    }
+
+    private IntegerProperty depth;
+
+    public IntegerProperty depthProperty() {
+        if (depth == null) {
+            depth = new SimpleIntegerProperty(this, "depth", 0);
+        }
+        return depth;
+    }
+
+    public int getDepth() {
+        return depth != null ? depth.get() : 0;
+    }
+
+    public void setDepth(int depth) {
+        depthProperty().set(depth);
+    }
+
+    private DoubleProperty currentVerticalGap;
+
+    DoubleProperty currentVerticalGapProperty() {
+        if (currentVerticalGap == null) {
+            currentVerticalGap = new SimpleDoubleProperty(this, "currentVerticalGap");
+        }
+        return currentVerticalGap;
+    }
+
+    private void updateVerticalGap() {
+        if (isExpanded()) {
+            currentVerticalGapProperty().set(verticalGap.get());
+        } else {
+            currentVerticalGapProperty().set(0);
+        }
+    }
+
+    /*
+     * this only works if the items were labels / strings
+     */
+    private BooleanProperty showTooltip;
+
+    public final BooleanProperty showTooltipProperty() {
+        if (showTooltip == null) {
+            showTooltip = new SimpleBooleanProperty(this, "showTooltip", false);
+        }
+        return this.showTooltip;
+    }
+
+    public final boolean isShowTooltip() {
+        return showTooltip != null && showTooltip.get();
+    }
+
+    public final void setShowTooltip(final boolean showTooltip) {
+        this.showTooltipProperty().set(showTooltip);
+    }
+
+    /***************************************************************************
+     *                                                                         *
+     * Stylesheet Handling                                                     *
+     *                                                                         *
+     **************************************************************************/
+
+    /// Initialize the style class to 'jfx-list-view'.
+    ///
+    /// This is the selector class from which CSS can be used to style
+    /// this control.
+    private static final String DEFAULT_STYLE_CLASS = "jfx-list-view";
+
+    private void initialize() {
+        this.getStyleClass().add(DEFAULT_STYLE_CLASS);
+    }
+
+    /**
+     * propagate mouse events to the parent node ( e.g. to allow dragging while clicking on the list)
+     */
+    public void propagateMouseEventsToParent() {
+        this.addEventHandler(MouseEvent.ANY, e -> {
+            e.consume();
+            this.getParent().fireEvent(e);
+        });
+    }
+
+    private StyleableDoubleProperty verticalGap;
+
+    public StyleableDoubleProperty verticalGapProperty() {
+        if (this.verticalGap == null) {
+            this.verticalGap = new StyleableDoubleProperty(0.0) {
+                @Override
+                public Object getBean() {
+                    return JFXListView.this;
+                }
+
+                @Override
+                public String getName() {
+                    return "verticalGap";
+                }
+
+                @Override
+                public CssMetaData<? extends Styleable, Number> getCssMetaData() {
+                    return StyleableProperties.VERTICAL_GAP;
+                }
+
+                @Override
+                protected void invalidated() {
+                    updateVerticalGap();
+                }
+            };
+        }
+        return this.verticalGap;
+    }
+
+    public Double getVerticalGap() {
+        return verticalGap == null ? 0.0 : verticalGap.get();
+    }
+
+    public void setVerticalGap(Double gap) {
+        verticalGapProperty().set(gap);
+    }
+
+    private StyleableBooleanProperty expanded;
+
+    public StyleableBooleanProperty expandedProperty() {
+        if (expanded == null) {
+            expanded = new StyleableBooleanProperty(false) {
+                @Override
+                public Object getBean() {
+                    return JFXListView.this;
+                }
+
+                @Override
+                public String getName() {
+                    return "expanded";
+                }
+
+                @Override
+                public CssMetaData<? extends Styleable, Boolean> getCssMetaData() {
+                    return StyleableProperties.EXPANDED;
+                }
+
+                @Override
+                protected void invalidated() {
+                    updateVerticalGap();
+                }
+            };
+        }
+
+        return this.expanded;
+    }
+
+    public Boolean isExpanded() {
+        return expanded != null && expanded.get();
+    }
+
+    public void setExpanded(Boolean expanded) {
+        expandedProperty().set(expanded);
+    }
+
+    private static final class StyleableProperties {
+        private static final CssMetaData<JFXListView<?>, Number> VERTICAL_GAP =
+                new CssMetaData<>("-jfx-vertical-gap",
+                        SizeConverter.getInstance(), 0) {
+                    @Override
+                    public boolean isSettable(JFXListView<?> control) {
+                        return control.verticalGap == null || !control.verticalGap.isBound();
+                    }
+
+                    @Override
+                    public StyleableDoubleProperty getStyleableProperty(JFXListView<?> control) {
+                        return control.verticalGapProperty();
+                    }
+                };
+        private static final CssMetaData<JFXListView<?>, Boolean> EXPANDED =
+                new CssMetaData<>("-jfx-expanded",
+                        BooleanConverter.getInstance(), false) {
+                    @Override
+                    public boolean isSettable(JFXListView<?> control) {
+                        // it's only settable if the List is not shown yet
+                        return control.getHeight() == 0 && (control.expanded == null || !control.expanded.isBound());
+                    }
+
+                    @Override
+                    public StyleableBooleanProperty getStyleableProperty(JFXListView<?> control) {
+                        return control.expandedProperty();
+                    }
+                };
+        private static final List<CssMetaData<? extends Styleable, ?>> CHILD_STYLEABLES;
+
+        static {
+            final List<CssMetaData<? extends Styleable, ?>> styleables =
+                    new ArrayList<>(ListView.getClassCssMetaData());
+            Collections.addAll(styleables, VERTICAL_GAP, EXPANDED);
+            CHILD_STYLEABLES = List.copyOf(styleables);
+        }
+    }
+
+    @Override
+    public List<CssMetaData<? extends Styleable, ?>> getControlCssMetaData() {
+        return getClassCssMetaData();
+    }
+
+    public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
+        return StyleableProperties.CHILD_STYLEABLES;
+    }
+
+}
@@ -0,0 +1,297 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.jfoenix.controls;
+
+import com.jfoenix.skins.JFXPasswordFieldSkin;
+import com.jfoenix.validation.base.ValidatorBase;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.beans.property.ReadOnlyObjectWrapper;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.css.*;
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.PaintConverter;
+import javafx.scene.control.Control;
+import javafx.scene.control.PasswordField;
+import javafx.scene.control.Skin;
+import javafx.scene.control.TextField;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.Paint;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+
+import static org.jackhuang.hmcl.ui.FXUtils.useJFXContextMenu;
+
+/**
+ * JFXPasswordField is the material design implementation of a password Field.
+ *
+ * @author Shadi Shaheen
+ * @version 1.0
+ * @since 2016-03-09
+ */
+public class JFXPasswordField extends PasswordField {
+
+    /**
+     * {@inheritDoc}
+     */
+    public JFXPasswordField() {
+        initialize();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected Skin<?> createDefaultSkin() {
+        return new JFXPasswordFieldSkin(this);
+    }
+
+    private void initialize() {
+        this.getStyleClass().add(DEFAULT_STYLE_CLASS);
+        if ("dalvik".equals(System.getProperty("java.vm.name").toLowerCase(Locale.ROOT))) {
+            this.setStyle("-fx-skin: \"com.jfoenix.android.skins.JFXPasswordFieldSkinAndroid\";");
+        }
+
+
+        useJFXContextMenu(this);
+    }
+
+    /**
+     * Initialize the style class to 'jfx-password-field'.
+     * <p>
+     * This is the selector class from which CSS can be used to style
+     * this control.
+     */
+    private static final String DEFAULT_STYLE_CLASS = "jfx-password-field";
+
+    /***************************************************************************
+     *                                                                         *
+     * Properties                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * holds the current active validator on the password field in case of validation error
+     */
+    private ReadOnlyObjectWrapper<ValidatorBase> activeValidator = new ReadOnlyObjectWrapper<>();
+
+    public ValidatorBase getActiveValidator() {
+        return activeValidator == null ? null : activeValidator.get();
+    }
+
+    public ReadOnlyObjectProperty<ValidatorBase> activeValidatorProperty() {
+        return this.activeValidator.getReadOnlyProperty();
+    }
+
+    /**
+     * list of validators that will validate the password value upon calling
+     * {{@link #validate()}
+     */
+    private ObservableList<ValidatorBase> validators = FXCollections.observableArrayList();
+
+    public ObservableList<ValidatorBase> getValidators() {
+        return validators;
+    }
+
+    public void setValidators(ValidatorBase... validators) {
+        this.validators.addAll(validators);
+    }
+
+    /**
+     * validates the password value using the list of validators provided by the user
+     * {{@link #setValidators(ValidatorBase...)}
+     *
+     * @return true if the value is valid else false
+     */
+    public boolean validate() {
+        for (ValidatorBase validator : validators) {
+            if (validator.getSrcControl() == null) {
+                validator.setSrcControl(this);
+            }
+            validator.validate();
+            if (validator.getHasErrors()) {
+                activeValidator.set(validator);
+                return false;
+            }
+        }
+        activeValidator.set(null);
+        return true;
+    }
+
+    public void resetValidation() {
+        pseudoClassStateChanged(ValidatorBase.PSEUDO_CLASS_ERROR, false);
+        activeValidator.set(null);
+    }
+
+    /***************************************************************************
+     *                                                                         *
+     * styleable Properties                                                    *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * set true to show a float the prompt text when focusing the field
+     */
+    private StyleableBooleanProperty labelFloat = new SimpleStyleableBooleanProperty(StyleableProperties.LABEL_FLOAT, JFXPasswordField.this, "lableFloat", false);
+
+    public final StyleableBooleanProperty labelFloatProperty() {
+        return this.labelFloat;
+    }
+
+    public final boolean isLabelFloat() {
+        return this.labelFloatProperty().get();
+    }
+
+    public final void setLabelFloat(final boolean labelFloat) {
+        this.labelFloatProperty().set(labelFloat);
+    }
+
+    /**
+     * default color used when the field is unfocused
+     */
+    private StyleableObjectProperty<Paint> unFocusColor = new SimpleStyleableObjectProperty<>(StyleableProperties.UNFOCUS_COLOR, JFXPasswordField.this, "unFocusColor", Color.rgb(77, 77, 77));
+
+    public Paint getUnFocusColor() {
+        return unFocusColor == null ? Color.rgb(77, 77, 77) : unFocusColor.get();
+    }
+
+    public StyleableObjectProperty<Paint> unFocusColorProperty() {
+        return this.unFocusColor;
+    }
+
+    public void setUnFocusColor(Paint color) {
+        this.unFocusColor.set(color);
+    }
+
+    /**
+     * default color used when the field is focused
+     */
+    private StyleableObjectProperty<Paint> focusColor = new SimpleStyleableObjectProperty<>(StyleableProperties.FOCUS_COLOR, JFXPasswordField.this, "focusColor", Color.valueOf("#4059A9"));
+
+    public Paint getFocusColor() {
+        return focusColor == null ? Color.valueOf("#4059A9") : focusColor.get();
+    }
+
+    public StyleableObjectProperty<Paint> focusColorProperty() {
+        return this.focusColor;
+    }
+
+    public void setFocusColor(Paint color) {
+        this.focusColor.set(color);
+    }
+
+    /**
+     * disable animation on validation
+     */
+    private StyleableBooleanProperty disableAnimation = new SimpleStyleableBooleanProperty(StyleableProperties.DISABLE_ANIMATION, JFXPasswordField.this, "disableAnimation", false);
+
+    public final StyleableBooleanProperty disableAnimationProperty() {
+        return this.disableAnimation;
+    }
+
+    public final Boolean isDisableAnimation() {
+        return disableAnimation != null && this.disableAnimationProperty().get();
+    }
+
+    public final void setDisableAnimation(final Boolean disabled) {
+        this.disableAnimationProperty().set(disabled);
+    }
+
+    private final static class StyleableProperties {
+        private static final CssMetaData<JFXPasswordField, Paint> UNFOCUS_COLOR = new CssMetaData<JFXPasswordField, Paint>("-jfx-unfocus-color", PaintConverter.getInstance(), Color.valueOf("#A6A6A6")) {
+            @Override
+            public boolean isSettable(JFXPasswordField control) {
+                return control.unFocusColor == null || !control.unFocusColor.isBound();
+            }
+
+            @Override
+            public StyleableProperty<Paint> getStyleableProperty(JFXPasswordField control) {
+                return control.unFocusColorProperty();
+            }
+        };
+        private static final CssMetaData<JFXPasswordField, Paint> FOCUS_COLOR = new CssMetaData<JFXPasswordField, Paint>("-jfx-focus-color", PaintConverter.getInstance(), Color.valueOf("#3f51b5")) {
+            @Override
+            public boolean isSettable(JFXPasswordField control) {
+                return control.focusColor == null || !control.focusColor.isBound();
+            }
+
+            @Override
+            public StyleableProperty<Paint> getStyleableProperty(JFXPasswordField control) {
+                return control.focusColorProperty();
+            }
+        };
+
+        private static final CssMetaData<JFXPasswordField, Boolean> LABEL_FLOAT = new CssMetaData<JFXPasswordField, Boolean>("-jfx-label-float", BooleanConverter.getInstance(), false) {
+            @Override
+            public boolean isSettable(JFXPasswordField control) {
+                return control.labelFloat == null || !control.labelFloat.isBound();
+            }
+
+            @Override
+            public StyleableBooleanProperty getStyleableProperty(JFXPasswordField control) {
+                return control.labelFloatProperty();
+            }
+        };
+
+        private static final CssMetaData<JFXPasswordField, Boolean> DISABLE_ANIMATION = new CssMetaData<JFXPasswordField, Boolean>("-fx-disable-animation", BooleanConverter.getInstance(), false) {
+            @Override
+            public boolean isSettable(JFXPasswordField control) {
+                return control.disableAnimation == null || !control.disableAnimation.isBound();
+            }
+
+            @Override
+            public StyleableBooleanProperty getStyleableProperty(JFXPasswordField control) {
+                return control.disableAnimationProperty();
+            }
+        };
+
+
+        private static final List<CssMetaData<? extends Styleable, ?>> CHILD_STYLEABLES;
+
+        static {
+            final List<CssMetaData<? extends Styleable, ?>> styleables = new ArrayList<>(Control.getClassCssMetaData());
+            Collections.addAll(styleables, UNFOCUS_COLOR, FOCUS_COLOR, LABEL_FLOAT, DISABLE_ANIMATION);
+            CHILD_STYLEABLES = Collections.unmodifiableList(styleables);
+        }
+    }
+
+    // inherit the styleable properties from parent
+    private List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
+
+    @Override
+    public List<CssMetaData<? extends Styleable, ?>> getControlCssMetaData() {
+        if (STYLEABLES == null) {
+            final List<CssMetaData<? extends Styleable, ?>> styleables = new ArrayList<>(Control.getClassCssMetaData());
+            styleables.addAll(getClassCssMetaData());
+            styleables.addAll(TextField.getClassCssMetaData());
+            STYLEABLES = Collections.unmodifiableList(styleables);
+        }
+        return STYLEABLES;
+    }
+
+    public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
+        return StyleableProperties.CHILD_STYLEABLES;
+    }
+
+}
+
@@ -0,0 +1,188 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.jfoenix.controls;
+
+import com.jfoenix.skins.JFXPopupSkin;
+import javafx.application.Platform;
+import javafx.beans.DefaultProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.geometry.NodeOrientation;
+import javafx.geometry.Point2D;
+import javafx.scene.Node;
+import javafx.scene.Scene;
+import javafx.scene.control.PopupControl;
+import javafx.scene.control.Skin;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.Region;
+import javafx.stage.Window;
+
+/// JFXPopup is the material design implementation of a popup.
+///
+/// @author Shadi Shaheen
+/// @version 2.0
+/// @since 2017-03-01
+@DefaultProperty(value = "popupContent")
+public class JFXPopup extends PopupControl {
+
+    public enum PopupHPosition {
+        RIGHT,
+        LEFT;
+
+        public PopupHPosition getOpposite() {
+            return (this == RIGHT) ? LEFT : RIGHT;
+        }
+    }
+
+    public enum PopupVPosition {
+        TOP, BOTTOM
+    }
+
+    /// Creates empty popup.
+    public JFXPopup() {
+        this(null);
+    }
+
+    /// creates popup with a specified container and content
+    ///
+    /// @param content the node that will be shown in the popup
+    public JFXPopup(Region content) {
+        setPopupContent(content);
+        initialize();
+    }
+
+    private void initialize() {
+        this.setAutoFix(false);
+        this.setAutoHide(true);
+        this.setHideOnEscape(true);
+        this.setConsumeAutoHidingEvents(false);
+        this.getStyleClass().add(DEFAULT_STYLE_CLASS);
+    }
+
+    @Override
+    protected Skin<?> createDefaultSkin() {
+        return new JFXPopupSkin(this);
+    }
+
+    /***************************************************************************
+     *                                                                         *
+     * Setters / Getters                                                       *
+     *                                                                         *
+     **************************************************************************/
+
+    private final ObjectProperty<Region> popupContent = new SimpleObjectProperty<>(new Pane());
+
+    public final ObjectProperty<Region> popupContentProperty() {
+        return this.popupContent;
+    }
+
+    public final Region getPopupContent() {
+        return this.popupContentProperty().get();
+    }
+
+    public final void setPopupContent(final Region popupContent) {
+        this.popupContentProperty().set(popupContent);
+    }
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /// show the popup using the default position
+    public void show(Node node) {
+        this.show(node, PopupVPosition.TOP, PopupHPosition.LEFT, 0, 0);
+    }
+
+    /// show the popup according to the specified position
+    ///
+    /// @param vAlign can be TOP/BOTTOM
+    /// @param hAlign can be LEFT/RIGHT
+    public void show(Node node, PopupVPosition vAlign, PopupHPosition hAlign) {
+        this.show(node, vAlign, hAlign, 0, 0);
+    }
+
+    /// show the popup according to the specified position with a certain offset
+    ///
+    /// @param vAlign      can be TOP/BOTTOM
+    /// @param hAlign      can be LEFT/RIGHT
+    /// @param initOffsetX on the x-axis
+    /// @param initOffsetY on the y-axis
+    public void show(Node node, PopupVPosition vAlign, PopupHPosition hAlign, double initOffsetX, double initOffsetY) {
+        show(node, vAlign, hAlign, initOffsetX, initOffsetY, false);
+    }
+
+    public void show(Node node, PopupVPosition vAlign, PopupHPosition hAlign, double initOffsetX, double initOffsetY, boolean attachToNode) {
+        if (!isShowing()) {
+            Scene scene = node.getScene();
+            if (scene == null || scene.getWindow() == null) {
+                throw new IllegalStateException("Can not show popup. The node must be attached to a scene/window.");
+            }
+            Window parent = scene.getWindow();
+            final Point2D origin = node.localToScene(0, 0);
+
+            boolean isRTL = node.getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT;
+
+            double anchorX = parent.getX() + scene.getX() + origin.getX() + (hAlign == PopupHPosition.RIGHT ? ((Region) node).getWidth() : 0);
+            double anchorY = parent.getY() + origin.getY() + scene.getY() + (vAlign == PopupVPosition.BOTTOM ? ((Region) node).getHeight() : 0);
+
+            if (attachToNode)
+                this.show(node, anchorX, anchorY);
+            else
+                this.show(parent, anchorX, anchorY);
+
+            ((JFXPopupSkin) getSkin()).reset(vAlign, isRTL ? hAlign.getOpposite() : hAlign, isRTL ? -initOffsetX : initOffsetX, initOffsetY);
+            Platform.runLater(() -> ((JFXPopupSkin) getSkin()).animate());
+        }
+    }
+
+    public void show(Window window, double x, double y, PopupVPosition vAlign, PopupHPosition hAlign, double initOffsetX, double initOffsetY) {
+        if (!isShowing()) {
+            if (window == null) {
+                throw new IllegalStateException("Can not show popup. The node must be attached to a scene/window.");
+            }
+            Window parent = window;
+            final double anchorX = parent.getX() + x + initOffsetX;
+            final double anchorY = parent.getY() + y + initOffsetY;
+            this.show(parent, anchorX, anchorY);
+            ((JFXPopupSkin) getSkin()).reset(vAlign, hAlign, initOffsetX, initOffsetY);
+            Platform.runLater(() -> ((JFXPopupSkin) getSkin()).animate());
+        }
+    }
+
+    @Override
+    public void hide() {
+        super.hide();
+        ((JFXPopupSkin) getSkin()).init();
+    }
+
+    /***************************************************************************
+     *                                                                         *
+     * Stylesheet Handling                                                     *
+     *                                                                         *
+     **************************************************************************/
+
+    /// Initialize the style class to 'jfx-popup'.
+    ///
+    /// This is the selector class from which CSS can be used to style
+    /// this control.
+    private static final String DEFAULT_STYLE_CLASS = "jfx-popup";
+}
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.jfoenix.controls;
+
+import com.jfoenix.skins.JFXProgressBarSkin;
+import javafx.scene.control.ProgressBar;
+import javafx.scene.control.Skin;
+
+/// JFXProgressBar is the material design implementation of a progress bar.
+///
+/// @author Shadi Shaheen
+/// @version 1.0
+/// @since 2016-03-09
+public class JFXProgressBar extends ProgressBar {
+    /// Initialize the style class to 'jfx-progress-bar'.
+    ///
+    /// This is the selector class from which CSS can be used to style
+    /// this control.
+    private static final String DEFAULT_STYLE_CLASS = "jfx-progress-bar";
+
+    public JFXProgressBar() {
+        initialize();
+    }
+
+    public JFXProgressBar(double progress) {
+        super(progress);
+        initialize();
+    }
+
+    @Override
+    protected Skin<?> createDefaultSkin() {
+        return new JFXProgressBarSkin(this);
+    }
+
+    private boolean smoothProgress = true;
+
+    public boolean isSmoothProgress() {
+        return smoothProgress;
+    }
+
+    public void setSmoothProgress(boolean smoothProgress) {
+        this.smoothProgress = smoothProgress;
+    }
+
+    private void initialize() {
+        setPrefWidth(200);
+        getStyleClass().add(DEFAULT_STYLE_CLASS);
+    }
+}
@@ -0,0 +1,160 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.jfoenix.controls;
+
+import com.jfoenix.skins.JFXRadioButtonSkin;
+import javafx.css.*;
+import javafx.css.converter.ColorConverter;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.Skin;
+import javafx.scene.paint.Color;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/// JFXRadioButton is the material design implementation of a radio button.
+///
+/// @author Bashir Elias & Shadi Shaheen
+/// @version 1.0
+/// @since 2016-03-09
+public class JFXRadioButton extends RadioButton {
+
+    public JFXRadioButton(String text) {
+        super(text);
+        initialize();
+    }
+
+    public JFXRadioButton() {
+        initialize();
+    }
+
+    @Override
+    protected Skin<?> createDefaultSkin() {
+        return new JFXRadioButtonSkin(this);
+    }
+
+    private void initialize() {
+        this.getStyleClass().add(DEFAULT_STYLE_CLASS);
+    }
+
+    /// Initialize the style class to 'jfx-radio-button'.
+    ///
+    /// This is the selector class from which CSS can be used to style
+    /// this control.
+    private static final String DEFAULT_STYLE_CLASS = "jfx-radio-button";
+
+    /// default color used when the radio button is selected
+    private StyleableObjectProperty<Color> selectedColor;
+
+    private static final Color DEFAULT_SELECTED_COLOR = Color.valueOf("#0F9D58");
+
+    public final StyleableObjectProperty<Color> selectedColorProperty() {
+        if (selectedColor == null) {
+            selectedColor = new SimpleStyleableObjectProperty<>(StyleableProperties.SELECTED_COLOR,
+                    JFXRadioButton.this,
+                    "selectedColor",
+                    DEFAULT_SELECTED_COLOR);
+        }
+        return this.selectedColor;
+    }
+
+    public final Color getSelectedColor() {
+        return selectedColor == null ? DEFAULT_SELECTED_COLOR : this.selectedColorProperty().get();
+    }
+
+    public final void setSelectedColor(final Color selectedColor) {
+        this.selectedColorProperty().set(selectedColor);
+    }
+
+    /// default color used when the radio button is not selected
+    private StyleableObjectProperty<Color> unSelectedColor;
+
+    private static final Color DEFAULT_UNSELECTED_COLOR = Color.valueOf("#5A5A5A");
+
+    public final StyleableObjectProperty<Color> unSelectedColorProperty() {
+        if (unSelectedColor == null) {
+            unSelectedColor = new SimpleStyleableObjectProperty<>(
+                    StyleableProperties.UNSELECTED_COLOR,
+                    JFXRadioButton.this,
+                    "unSelectedColor",
+                    DEFAULT_UNSELECTED_COLOR);
+        }
+        return this.unSelectedColor;
+    }
+
+    public final Color getUnSelectedColor() {
+        return unSelectedColor == null ? DEFAULT_UNSELECTED_COLOR : this.unSelectedColorProperty().get();
+    }
+
+    public final void setUnSelectedColor(final Color unSelectedColor) {
+        this.unSelectedColorProperty().set(unSelectedColor);
+    }
+
+    private static final class StyleableProperties {
+        private static final CssMetaData<JFXRadioButton, Color> SELECTED_COLOR =
+                new CssMetaData<JFXRadioButton, Color>("-jfx-selected-color",
+                        ColorConverter.getInstance(), DEFAULT_SELECTED_COLOR) {
+                    @Override
+                    public boolean isSettable(JFXRadioButton control) {
+                        return control.selectedColor == null || !control.selectedColor.isBound();
+                    }
+
+                    @Override
+                    public StyleableProperty<Color> getStyleableProperty(JFXRadioButton control) {
+                        return control.selectedColorProperty();
+                    }
+                };
+        private static final CssMetaData<JFXRadioButton, Color> UNSELECTED_COLOR =
+                new CssMetaData<JFXRadioButton, Color>("-jfx-unselected-color",
+                        ColorConverter.getInstance(), DEFAULT_UNSELECTED_COLOR) {
+                    @Override
+                    public boolean isSettable(JFXRadioButton control) {
+                        return control.unSelectedColor == null || !control.unSelectedColor.isBound();
+                    }
+
+                    @Override
+                    public StyleableProperty<Color> getStyleableProperty(JFXRadioButton control) {
+                        return control.unSelectedColorProperty();
+                    }
+                };
+
+        private static final List<CssMetaData<? extends Styleable, ?>> CHILD_STYLEABLES;
+
+        static {
+            final List<CssMetaData<? extends Styleable, ?>> styleables =
+                    new ArrayList<>(RadioButton.getClassCssMetaData());
+            Collections.addAll(styleables,
+                    SELECTED_COLOR,
+                    UNSELECTED_COLOR
+            );
+            CHILD_STYLEABLES = List.copyOf(styleables);
+        }
+    }
+
+    @Override
+    public List<CssMetaData<? extends Styleable, ?>> getControlCssMetaData() {
+        return getClassCssMetaData();
+    }
+
+    public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
+        return StyleableProperties.CHILD_STYLEABLES;
+    }
+}
@@ -34,6 +34,7 @@ import javafx.geometry.Bounds;
 import javafx.scene.CacheHint;
 import javafx.scene.Group;
 import javafx.scene.Node;
+import javafx.scene.input.MouseButton;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.Region;
@@ -77,14 +78,13 @@ public class JFXRippler extends StackPane {
    protected Node control;

    protected static final double RIPPLE_MAX_RADIUS = 300;
-
-    private boolean enabled = true;
-    private boolean forceOverlay = false;
-    private final Interpolator rippleInterpolator = Interpolator.SPLINE(0.0825,
+    private static final Interpolator RIPPLE_INTERPOLATOR = Interpolator.SPLINE(0.0825,
            0.3025,
            0.0875,
            0.9975); //0.1, 0.54, 0.28, 0.95);

+    private boolean forceOverlay = false;
+
    /// creates empty rippler node
    public JFXRippler() {
        this(null, RipplerMask.RECT, RipplerPos.FRONT);
@@ -176,10 +176,6 @@ public class JFXRippler extends StackPane {
        return control;
    }

-    public void setEnabled(boolean enable) {
-        this.enabled = enable;
-    }
-
    // methods that can be changed by extending the rippler class

    /// generate the clipping mask
@@ -235,10 +231,11 @@ public class JFXRippler extends StackPane {
     *
     * @return the ripple radius size
     */
-    protected double computeRippleRadius() {
-        double width2 = control.getLayoutBounds().getWidth() * control.getLayoutBounds().getWidth();
-        double height2 = control.getLayoutBounds().getHeight() * control.getLayoutBounds().getHeight();
-        return Math.min(Math.sqrt(width2 + height2), RIPPLE_MAX_RADIUS) * 1.1 + 5;
+    protected double computeRippleRadius(double centerX, double centerY) {
+        double dx = Math.max(centerX, control.getLayoutBounds().getWidth() - centerX);
+        double dy = Math.max(centerY, control.getLayoutBounds().getHeight() - centerY);
+
+        return (Math.sqrt(dx * dx + dy * dy) / 0.9) + 2;
    }

    protected void setOverLayBounds(Rectangle overlay) {
@@ -255,10 +252,15 @@ public class JFXRippler extends StackPane {
        if (getChildren().contains(control)) {
            control.boundsInParentProperty().addListener(observable -> resetRippler());
        }
-        control.addEventHandler(MouseEvent.MOUSE_PRESSED,
-                (event) -> createRipple(event.getX(), event.getY()));
+        control.addEventHandler(MouseEvent.MOUSE_PRESSED, event -> {
+            if (event.getButton() == MouseButton.PRIMARY)
+                createRipple(event.getX(), event.getY());
+        });
        // create fade out transition for the ripple
-        control.addEventHandler(MouseEvent.MOUSE_RELEASED, e -> releaseRipple());
+        control.addEventHandler(MouseEvent.MOUSE_RELEASED, event -> {
+            if (event.getButton() == MouseButton.PRIMARY)
+                releaseRipple();
+        });
    }

    /**
@@ -363,25 +365,23 @@ public class JFXRippler extends StackPane {
        }

        void createRipple() {
-            if (enabled) {
-                if (!generating.getAndSet(true)) {
-                    // create overlay once then change its color later
-                    createOverlay();
-                    if (this.getClip() == null || (getChildren().size() == 1 && !cacheRipplerClip) || resetClip) {
-                        this.setClip(getMask());
-                    }
-                    this.resetClip = false;
-
-                    // create the ripple effect
-                    final Ripple ripple = new Ripple(generatorCenterX, generatorCenterY);
-                    getChildren().add(ripple);
-                    ripplesQueue.add(ripple);
-
-                    // animate the ripple
-                    overlayRect.outAnimation.stop();
-                    overlayRect.inAnimation.play();
-                    ripple.inAnimation.play();
+            if (!generating.getAndSet(true)) {
+                // create overlay once then change its color later
+                createOverlay();
+                if (this.getClip() == null || (getChildren().size() == 1 && !cacheRipplerClip) || resetClip) {
+                    this.setClip(getMask());
                }
+                this.resetClip = false;
+
+                // create the ripple effect
+                final Ripple ripple = new Ripple(generatorCenterX, generatorCenterY);
+                getChildren().add(ripple);
+                ripplesQueue.add(ripple);
+
+                // animate the ripple
+                overlayRect.outAnimation.stop();
+                overlayRect.inAnimation.play();
+                ripple.inAnimation.play();
            }
        }

@@ -415,15 +415,15 @@ public class JFXRippler extends StackPane {
                overlayRect.setClip(getMask());
                getChildren().add(0, overlayRect);
                overlayRect.fillProperty().bind(Bindings.createObjectBinding(() -> {
-                    if (ripplerFill.get() instanceof Color) {
-                        return new Color(((Color) ripplerFill.get()).getRed(),
-                                ((Color) ripplerFill.get()).getGreen(),
-                                ((Color) ripplerFill.get()).getBlue(),
+                    if (getRipplerFill() instanceof Color fill) {
+                        return new Color(fill.getRed(),
+                                fill.getGreen(),
+                                fill.getBlue(),
                                0.2);
                    } else {
                        return Color.TRANSPARENT;
                    }
-                }, ripplerFill));
+                }, ripplerFillProperty()));
            }
        }

@@ -473,8 +473,8 @@ public class JFXRippler extends StackPane {
            private Ripple(double centerX, double centerY) {
                super(centerX,
                        centerY,
-                        ripplerRadius.get().doubleValue() == Region.USE_COMPUTED_SIZE ?
-                                computeRippleRadius() : ripplerRadius.get().doubleValue(), null);
+                        getRipplerRadius() == Region.USE_COMPUTED_SIZE ?
+                                computeRippleRadius(centerX, centerY) : getRipplerRadius(), null);
                setCache(true);
                setCacheHint(CacheHint.SPEED);
                setCacheShape(true);
@@ -484,12 +484,12 @@ public class JFXRippler extends StackPane {
                KeyValue[] inKeyValues = new KeyValue[isRipplerRecenter() ? 4 : 2];
                outKeyValues = new KeyValue[isRipplerRecenter() ? 5 : 3];

-                inKeyValues[0] = new KeyValue(scaleXProperty(), 0.9, rippleInterpolator);
-                inKeyValues[1] = new KeyValue(scaleYProperty(), 0.9, rippleInterpolator);
+                inKeyValues[0] = new KeyValue(scaleXProperty(), 0.9, RIPPLE_INTERPOLATOR);
+                inKeyValues[1] = new KeyValue(scaleYProperty(), 0.9, RIPPLE_INTERPOLATOR);

-                outKeyValues[0] = new KeyValue(this.scaleXProperty(), 1, rippleInterpolator);
-                outKeyValues[1] = new KeyValue(this.scaleYProperty(), 1, rippleInterpolator);
-                outKeyValues[2] = new KeyValue(this.opacityProperty(), 0, rippleInterpolator);
+                outKeyValues[0] = new KeyValue(this.scaleXProperty(), 1, RIPPLE_INTERPOLATOR);
+                outKeyValues[1] = new KeyValue(this.scaleYProperty(), 1, RIPPLE_INTERPOLATOR);
+                outKeyValues[2] = new KeyValue(this.opacityProperty(), 0, RIPPLE_INTERPOLATOR);

                if (isRipplerRecenter()) {
                    double dx = (control.getLayoutBounds().getWidth() / 2 - centerX) / 1.55;
@@ -497,42 +497,42 @@ public class JFXRippler extends StackPane {
                    inKeyValues[2] = outKeyValues[3] = new KeyValue(translateXProperty(),
                            Math.signum(dx) * Math.min(Math.abs(dx),
                                    this.getRadius() / 2),
-                            rippleInterpolator);
+                            RIPPLE_INTERPOLATOR);
                    inKeyValues[3] = outKeyValues[4] = new KeyValue(translateYProperty(),
                            Math.signum(dy) * Math.min(Math.abs(dy),
                                    this.getRadius() / 2),
-                            rippleInterpolator);
+                            RIPPLE_INTERPOLATOR);
                }
                inAnimation = new Timeline(new KeyFrame(Duration.ZERO,
                        new KeyValue(scaleXProperty(),
                                0,
-                                rippleInterpolator),
+                                RIPPLE_INTERPOLATOR),
                        new KeyValue(scaleYProperty(),
                                0,
-                                rippleInterpolator),
+                                RIPPLE_INTERPOLATOR),
                        new KeyValue(translateXProperty(),
                                0,
-                                rippleInterpolator),
+                                RIPPLE_INTERPOLATOR),
                        new KeyValue(translateYProperty(),
                                0,
-                                rippleInterpolator),
+                                RIPPLE_INTERPOLATOR),
                        new KeyValue(opacityProperty(),
                                1,
-                                rippleInterpolator)
-                ), new KeyFrame(Duration.millis(900), inKeyValues));
+                                RIPPLE_INTERPOLATOR)
+                ), new KeyFrame(Duration.millis(600), inKeyValues));

                setScaleX(0);
                setScaleY(0);
-                if (ripplerFill.get() instanceof Color) {
-                    Color circleColor = new Color(((Color) ripplerFill.get()).getRed(),
-                            ((Color) ripplerFill.get()).getGreen(),
-                            ((Color) ripplerFill.get()).getBlue(),
+                if (getRipplerFill() instanceof Color fill) {
+                    Color circleColor = new Color(fill.getRed(),
+                            fill.getGreen(),
+                            fill.getBlue(),
                            0.3);
                    setStroke(circleColor);
                    setFill(circleColor);
                } else {
-                    setStroke(ripplerFill.get());
-                    setFill(ripplerFill.get());
+                    setStroke(getRipplerFill());
+                    setFill(getRipplerFill());
                }
            }
        }
@@ -585,110 +585,125 @@ public class JFXRippler extends StackPane {
     * the ripple recenter property, by default it's false.
     * if true the ripple effect will show gravitational pull to the center of its control
     */
-    private final StyleableObjectProperty<Boolean> ripplerRecenter = new SimpleStyleableObjectProperty<>(
-            StyleableProperties.RIPPLER_RECENTER,
-            JFXRippler.this,
-            "ripplerRecenter",
-            false);
+    private StyleableBooleanProperty ripplerRecenter;

-    public Boolean isRipplerRecenter() {
+    public boolean isRipplerRecenter() {
        return ripplerRecenter != null && ripplerRecenter.get();
    }

-    public StyleableObjectProperty<Boolean> ripplerRecenterProperty() {
+    public StyleableBooleanProperty ripplerRecenterProperty() {
+        if (this.ripplerRecenter == null) {
+            this.ripplerRecenter = new SimpleStyleableBooleanProperty(
+                    StyleableProperties.RIPPLER_RECENTER,
+                    JFXRippler.this,
+                    "ripplerRecenter",
+                    false);
+        }
        return this.ripplerRecenter;
    }

-    public void setRipplerRecenter(Boolean radius) {
-        this.ripplerRecenter.set(radius);
+    public void setRipplerRecenter(boolean recenter) {
+        ripplerRecenterProperty().set(recenter);
    }

    /**
     * the ripple radius size, by default it will be automatically computed.
     */
-    private final StyleableObjectProperty<Number> ripplerRadius = new SimpleStyleableObjectProperty<>(
-            StyleableProperties.RIPPLER_RADIUS,
-            JFXRippler.this,
-            "ripplerRadius",
-            Region.USE_COMPUTED_SIZE);
+    private StyleableDoubleProperty ripplerRadius;

-    public Number getRipplerRadius() {
+    public double getRipplerRadius() {
        return ripplerRadius == null ? Region.USE_COMPUTED_SIZE : ripplerRadius.get();
    }

-    public StyleableObjectProperty<Number> ripplerRadiusProperty() {
+    public StyleableDoubleProperty ripplerRadiusProperty() {
+        if (this.ripplerRadius == null) {
+            this.ripplerRadius = new SimpleStyleableDoubleProperty(
+                    StyleableProperties.RIPPLER_RADIUS,
+                    JFXRippler.this,
+                    "ripplerRadius",
+                    Region.USE_COMPUTED_SIZE);
+        }
        return this.ripplerRadius;
    }

-    public void setRipplerRadius(Number radius) {
-        this.ripplerRadius.set(radius);
+    public void setRipplerRadius(double radius) {
+        ripplerRadiusProperty().set(radius);
    }

+    private static final Color DEFAULT_RIPPLER_FILL = Color.rgb(0, 200, 255);
+
    /**
     * the default color of the ripple effect
     */
-    private final StyleableObjectProperty<Paint> ripplerFill = new SimpleStyleableObjectProperty<>(StyleableProperties.RIPPLER_FILL,
-            JFXRippler.this,
-            "ripplerFill",
-            Color.rgb(0,
-                    200,
-                    255));
+    private StyleableObjectProperty<Paint> ripplerFill;

    public Paint getRipplerFill() {
-        return ripplerFill == null ? Color.rgb(0, 200, 255) : ripplerFill.get();
+        return ripplerFill == null ? DEFAULT_RIPPLER_FILL : ripplerFill.get();
    }

    public StyleableObjectProperty<Paint> ripplerFillProperty() {
+        if (this.ripplerFill == null) {
+            this.ripplerFill = new SimpleStyleableObjectProperty<>(StyleableProperties.RIPPLER_FILL,
+                    JFXRippler.this,
+                    "ripplerFill",
+                    DEFAULT_RIPPLER_FILL);
+        }
        return this.ripplerFill;
    }

    public void setRipplerFill(Paint color) {
-        this.ripplerFill.set(color);
+        ripplerFillProperty().set(color);
    }

    /// mask property used for clipping the rippler.
    /// can be either CIRCLE/RECT
-    private final StyleableObjectProperty<RipplerMask> maskType = new SimpleStyleableObjectProperty<>(
-            StyleableProperties.MASK_TYPE,
-            JFXRippler.this,
-            "maskType",
-            RipplerMask.RECT);
+    private StyleableObjectProperty<RipplerMask> maskType;

    public RipplerMask getMaskType() {
        return maskType == null ? RipplerMask.RECT : maskType.get();
    }

    public StyleableObjectProperty<RipplerMask> maskTypeProperty() {
+        if (this.maskType == null) {
+            this.maskType = new SimpleStyleableObjectProperty<>(
+                    StyleableProperties.MASK_TYPE,
+                    JFXRippler.this,
+                    "maskType",
+                    RipplerMask.RECT);
+        }
        return this.maskType;
    }

    public void setMaskType(RipplerMask type) {
-        this.maskType.set(type);
+        if (this.maskType != null || type != RipplerMask.RECT)
+            maskTypeProperty().set(type);
    }

    /**
     * the ripple disable, by default it's false.
     * if true the ripple effect will be hidden
     */
-    private final StyleableBooleanProperty ripplerDisabled = new SimpleStyleableBooleanProperty(
-            StyleableProperties.RIPPLER_DISABLED,
-            JFXRippler.this,
-            "ripplerDisabled",
-            false);
+    private StyleableBooleanProperty ripplerDisabled;

-    public Boolean isRipplerDisabled() {
+    public boolean isRipplerDisabled() {
        return ripplerDisabled != null && ripplerDisabled.get();
    }

    public StyleableBooleanProperty ripplerDisabledProperty() {
+        if (this.ripplerDisabled == null) {
+            this.ripplerDisabled = new SimpleStyleableBooleanProperty(
+                    StyleableProperties.RIPPLER_DISABLED,
+                    JFXRippler.this,
+                    "ripplerDisabled",
+                    false);
+        }
        return this.ripplerDisabled;
    }

-    public void setRipplerDisabled(Boolean disabled) {
-        this.ripplerDisabled.set(disabled);
+    public void setRipplerDisabled(boolean disabled) {
+        ripplerDisabledProperty().set(disabled);
    }

-
    /**
     * indicates whether the ripple effect is infront of or behind the node
     */
@@ -735,7 +750,7 @@ public class JFXRippler extends StackPane {
                };
        private static final CssMetaData<JFXRippler, Paint> RIPPLER_FILL =
                new CssMetaData<>("-jfx-rippler-fill",
-                        PaintConverter.getInstance(), Color.rgb(0, 200, 255)) {
+                        PaintConverter.getInstance(), DEFAULT_RIPPLER_FILL) {
                    @Override
                    public boolean isSettable(JFXRippler control) {
                        return control.ripplerFill == null || !control.ripplerFill.isBound();
@@ -0,0 +1,180 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.jfoenix.controls;
+
+import com.jfoenix.converters.IndicatorPositionConverter;
+import com.jfoenix.skins.JFXSliderSkin;
+import javafx.beans.binding.StringBinding;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.css.*;
+import javafx.scene.control.Skin;
+import javafx.scene.control.Slider;
+import javafx.util.Callback;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/// JFXSlider is the material design implementation of a slider.
+///
+/// @author Bashir Elias & Shadi Shaheen
+/// @version 1.0
+/// @since 2016-03-09
+public class JFXSlider extends Slider {
+
+    public JFXSlider() {
+        super(0, 100, 50);
+        initialize();
+    }
+
+    public JFXSlider(double min, double max, double value) {
+        super(min, max, value);
+        initialize();
+    }
+
+    @Override
+    protected Skin<?> createDefaultSkin() {
+        return new JFXSliderSkin(this);
+    }
+
+    private void initialize() {
+        getStyleClass().add(DEFAULT_STYLE_CLASS);
+    }
+
+    public enum IndicatorPosition {
+        LEFT, RIGHT
+    }
+
+    /***************************************************************************
+     *                                                                         *
+     * Properties                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /// String binding factory for the slider value.
+    /// Sets a custom string for the value text (by default, it shows the value rounded to the nearest whole number).
+    ///
+    ///
+    /// For example, to have the value displayed as a percentage (assuming the slider has a range of (0, 100)):
+    /// ```java
+    /// JFXSlider mySlider = ...
+    /// mySlider.setValueFactory(slider ->
+    ///        Bindings.createStringBinding(
+    ///            () -> ((int) slider.getValue()) + "%",
+    ///            slider.valueProperty()
+    ///        )
+    /// );
+    /// ```
+    ///
+    /// NOTE: might be replaced later with a call back to create the animated thumb node
+    ///
+    /// @param callback a callback to create the string value binding
+    private ObjectProperty<Callback<JFXSlider, StringBinding>> valueFactory;
+
+    public final ObjectProperty<Callback<JFXSlider, StringBinding>> valueFactoryProperty() {
+        if (valueFactory == null) {
+            valueFactory = new SimpleObjectProperty<>(this, "valueFactory");
+        }
+        return valueFactory;
+    }
+
+    /// @return the current slider value factory
+    public final Callback<JFXSlider, StringBinding> getValueFactory() {
+        return valueFactory == null ? null : valueFactory.get();
+    }
+
+    /// sets custom string binding for the slider text value
+    ///
+    /// @param valueFactory a callback to create the string value binding
+    public final void setValueFactory(final Callback<JFXSlider, StringBinding> valueFactory) {
+        this.valueFactoryProperty().set(valueFactory);
+    }
+
+    /***************************************************************************
+     *                                                                         *
+     * Stylesheet Handling                                                     *
+     *                                                                         *
+     **************************************************************************/
+
+    /// Initialize the style class to 'jfx-slider'.
+    ///
+    /// This is the selector class from which CSS can be used to style
+    /// this control.
+    private static final String DEFAULT_STYLE_CLASS = "jfx-slider";
+
+    /// indicates the position of the slider indicator, can be
+    /// either LEFT or RIGHT
+    private StyleableObjectProperty<IndicatorPosition> indicatorPosition;
+
+    public StyleableObjectProperty<IndicatorPosition> indicatorPositionProperty() {
+        if (indicatorPosition == null) {
+            indicatorPosition = new SimpleStyleableObjectProperty<>(
+                    StyleableProperties.INDICATOR_POSITION,
+                    JFXSlider.this,
+                    "indicatorPosition",
+                    IndicatorPosition.LEFT);
+        }
+        return this.indicatorPosition;
+    }
+
+    public IndicatorPosition getIndicatorPosition() {
+        return indicatorPosition == null ? IndicatorPosition.LEFT : indicatorPosition.get();
+    }
+
+    public void setIndicatorPosition(IndicatorPosition pos) {
+        indicatorPositionProperty().set(pos);
+    }
+
+    private static final class StyleableProperties {
+        private static final CssMetaData<JFXSlider, IndicatorPosition> INDICATOR_POSITION = new CssMetaData<>(
+                "-jfx-indicator-position",
+                IndicatorPositionConverter.getInstance(),
+                IndicatorPosition.LEFT) {
+            @Override
+            public boolean isSettable(JFXSlider control) {
+                return control.indicatorPosition == null || !control.indicatorPosition.isBound();
+            }
+
+            @Override
+            public StyleableProperty<IndicatorPosition> getStyleableProperty(JFXSlider control) {
+                return control.indicatorPositionProperty();
+            }
+        };
+
+        private static final List<CssMetaData<? extends Styleable, ?>> CHILD_STYLEABLES;
+
+        static {
+            final List<CssMetaData<? extends Styleable, ?>> styleables = new ArrayList<>(
+                    Slider.getClassCssMetaData());
+            Collections.addAll(styleables, INDICATOR_POSITION);
+            CHILD_STYLEABLES = List.copyOf(styleables);
+        }
+    }
+
+    @Override
+    public List<CssMetaData<? extends Styleable, ?>> getControlCssMetaData() {
+        return getClassCssMetaData();
+    }
+
+    public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
+        return StyleableProperties.CHILD_STYLEABLES;
+    }
+}
@@ -0,0 +1,421 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.jfoenix.controls;
+
+import javafx.animation.KeyFrame;
+import javafx.animation.KeyValue;
+import javafx.animation.PauseTransition;
+import javafx.animation.Timeline;
+import javafx.application.Platform;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.WeakChangeListener;
+import javafx.css.PseudoClass;
+import javafx.event.Event;
+import javafx.event.EventType;
+import javafx.geometry.Bounds;
+import javafx.scene.Group;
+import javafx.scene.Node;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.StackPane;
+import javafx.util.Duration;
+import org.jackhuang.hmcl.ui.animation.Motion;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/// "Snackbars provide brief messages about app processes at the bottom of the screen"
+/// (<a href="https://material.io/design/components/snackbars.html#">Material Design Guidelines</a>).
+///
+/// To show a snackbar you need to
+/// <ol>
+///   - Have a [Pane] (snackbarContainer) to show the snackbar on top of. Register it in
+///     [the JFXSnackbar constructor][#JFXSnackbar(Pane)] or using the [#registerSnackbarContainer(Pane)] method.
+///   - Have or create a [JFXSnackbar].  - Having one snackbar where you pass all your
+///     [SnackbarEvents][JFXSnackbar.SnackbarEvent] will ensure that the [enqueuemethod][JFXSnackbar#enqueue(SnackbarEvent)] works as intended.
+///
+///   - Have something to show in the snackbar. A [JFXSnackbarLayout] is nice and pretty,
+///     but any arbitrary [Node] will do.
+///   - Create a [SnackbarEvent][JFXSnackbar.SnackbarEvent] specifying the contents and the
+///     duration.
+/// </ol>
+///
+/// Finally, with all those things prepared, show your snackbar using
+/// [snackbar.enqueue(snackbarEvent);][JFXSnackbar#enqueue(SnackbarEvent)].
+///
+/// It's most convenient to create functions to do most of this (creating the layout and event) with the default
+/// settings; that way all you need to do to show a snackbar is specify the message or just the message and the duration.
+///
+/// @see <a href="https://material.io/design/components/snackbars.html#"> The Material Design Snackbar</a>
+public class JFXSnackbar extends Group {
+
+    private static final String DEFAULT_STYLE_CLASS = "jfx-snackbar";
+
+    private Pane snackbarContainer;
+    private final ChangeListener<? super Number> sizeListener = (o, oldVal, newVal) -> refreshPopup();
+    private final WeakChangeListener<? super Number> weakSizeListener = new WeakChangeListener<>(sizeListener);
+
+    private final AtomicBoolean processingQueue = new AtomicBoolean(false);
+    private final ConcurrentLinkedQueue<SnackbarEvent> eventQueue = new ConcurrentLinkedQueue<>();
+    private final ConcurrentHashMap.KeySetView<Object, Boolean> eventsSet = ConcurrentHashMap.newKeySet();
+
+    private final Pane content;
+    private PseudoClass activePseudoClass = null;
+    private PauseTransition pauseTransition;
+
+    /// This constructor assumes that you will eventually call the [#registerSnackbarContainer(Pane)] method before
+    /// calling the [#enqueue(SnackbarEvent)] method. Otherwise, how will the snackbar know where to show itself?
+    ///
+    ///
+    /// "Snackbars provide brief messages about app processes at the bottom of the screen"
+    /// (<a href="https://material.io/design/components/snackbars.html#">Material Design Guidelines</a>).
+    ///
+    /// To show a snackbar you need to
+    ///
+    /// - Have a [Pane] (snackbarContainer) to show the snackbar on top of. Register it in
+    ///   [the JFXSnackbar constructor][#JFXSnackbar(Pane)] or using the [#registerSnackbarContainer(Pane)] method.
+    /// - Have or create a [JFXSnackbar].  - Having one snackbar where you pass all your
+    ///   [SnackbarEvents][JFXSnackbar.SnackbarEvent] will ensure that the [enqueuemethod][JFXSnackbar#enqueue(SnackbarEvent)] works as intended.
+    /// - Have something to show in the snackbar. A [JFXSnackbarLayout] is nice and pretty,
+    ///   but any arbitrary [Node] will do.
+    /// - Create a [SnackbarEvent][JFXSnackbar.SnackbarEvent] specifying the contents and the
+    ///   duration.
+    ///
+    /// Finally, with all those things prepared, show your snackbar using
+    /// [snackbar.enqueue(snackbarEvent);][JFXSnackbar#enqueue(SnackbarEvent)].
+    ///
+    public JFXSnackbar() {
+        this(null);
+    }
+
+    /// "Snackbars provide brief messages about app processes at the bottom of the screen"
+    /// (<a href="https://material.io/design/components/snackbars.html#">Material Design Guidelines</a>).
+    ///
+    /// To show a snackbar you need to
+    ///
+    /// - Have a [Pane] (snackbarContainer) to show the snackbar on top of. Register it in
+    ///   [the JFXSnackbar constructor][#JFXSnackbar(Pane)] or using the [#registerSnackbarContainer(Pane)] method.
+    /// - Have or create a [JFXSnackbar].  - Having one snackbar where you pass all your
+    ///   [SnackbarEvents][JFXSnackbar.SnackbarEvent] will ensure that the [enqueuemethod][JFXSnackbar#enqueue(SnackbarEvent)] works as intended.
+    /// - Have something to show in the snackbar. A [JFXSnackbarLayout] is nice and pretty,
+    ///   but any arbitrary [Node] will do.
+    /// - Create a [SnackbarEvent][JFXSnackbar.SnackbarEvent] specifying the contents and the
+    ///   duration.
+    ///
+    /// Finally, with all those things prepared, show your snackbar using
+    /// [snackbar.enqueue(snackbarEvent);][JFXSnackbar#enqueue(SnackbarEvent)].
+    ///
+    /// @param snackbarContainer where the snackbar will appear. Using a single snackbar instead of many, will ensure that
+    ///                                                                                                                              the [#enqueue(SnackbarEvent)] method works correctly.
+    public JFXSnackbar(Pane snackbarContainer) {
+        initialize();
+        content = new StackPane();
+        content.getStyleClass().add("jfx-snackbar-content");
+        //wrap the content in a group so that the content is managed inside its own container
+        //but the group is not managed in the snackbarContainer so it does not affect any layout calculations
+        getChildren().add(content);
+        setManaged(false);
+        setVisible(false);
+
+        // register the container before resizing it
+        registerSnackbarContainer(snackbarContainer);
+
+        // resize the popup if its layout has been changed
+        layoutBoundsProperty().addListener((o, oldVal, newVal) -> refreshPopup());
+
+        addEventHandler(SnackbarEvent.SNACKBAR, this::enqueue);
+    }
+
+    private void initialize() {
+        this.getStyleClass().add(DEFAULT_STYLE_CLASS);
+    }
+
+    // Setters / Getters
+
+    public Pane getPopupContainer() {
+        return snackbarContainer;
+    }
+
+    public void setPrefWidth(double width) {
+        content.setPrefWidth(width);
+    }
+
+    public double getPrefWidth() {
+        return content.getPrefWidth();
+    }
+
+    // Public API
+
+    public void registerSnackbarContainer(Pane snackbarContainer) {
+        if (snackbarContainer != null) {
+            if (this.snackbarContainer != null) {
+                //since listeners are added the container should be properly registered/unregistered
+                throw new IllegalArgumentException("Snackbar Container already set");
+            }
+            this.snackbarContainer = snackbarContainer;
+            this.snackbarContainer.getChildren().add(this);
+            this.snackbarContainer.heightProperty().addListener(weakSizeListener);
+            this.snackbarContainer.widthProperty().addListener(weakSizeListener);
+        }
+    }
+
+    public void unregisterSnackbarContainer(Pane snackbarContainer) {
+        if (snackbarContainer != null) {
+            if (this.snackbarContainer == null) {
+                throw new IllegalArgumentException("Snackbar Container not set");
+            }
+            this.snackbarContainer.getChildren().remove(this);
+            this.snackbarContainer.heightProperty().removeListener(weakSizeListener);
+            this.snackbarContainer.widthProperty().removeListener(weakSizeListener);
+            this.snackbarContainer = null;
+        }
+    }
+
+    private void show(SnackbarEvent event) {
+        content.getChildren().setAll(event.getContent());
+        openAnimation = getTimeline(event.getTimeout());
+        if (event.getPseudoClass() != null) {
+            activePseudoClass = event.getPseudoClass();
+            content.pseudoClassStateChanged(activePseudoClass, true);
+        }
+        openAnimation.play();
+    }
+
+    private Timeline openAnimation = null;
+
+    private Timeline getTimeline(Duration timeout) {
+        Timeline animation;
+        animation = new Timeline(
+                new KeyFrame(
+                        Duration.ZERO,
+                        e -> {
+                            this.toBack();
+                            this.setVisible(false);
+                        },
+                        new KeyValue(this.translateYProperty(), this.getLayoutBounds().getHeight(), Motion.EASE),
+                        new KeyValue(this.opacityProperty(), 0, Motion.EASE)
+                ),
+                new KeyFrame(
+                        Duration.millis(10),
+                        e -> {
+                            this.toFront();
+                            this.setVisible(true);
+                        }
+                ),
+                new KeyFrame(Duration.millis(300),
+                        new KeyValue(this.opacityProperty(), 1, Motion.EASE),
+                        new KeyValue(this.translateYProperty(), 0, Motion.EASE)
+                )
+        );
+        animation.setCycleCount(1);
+        pauseTransition = Duration.INDEFINITE.equals(timeout) ? null : new PauseTransition(timeout);
+        if (pauseTransition != null) {
+            animation.setOnFinished(finish -> {
+                pauseTransition.setOnFinished(done -> {
+                    pauseTransition = null;
+                    eventsSet.remove(currentEvent);
+                    currentEvent = eventQueue.peek();
+                    close();
+                });
+                pauseTransition.play();
+            });
+        }
+        return animation;
+    }
+
+    public void close() {
+        if (openAnimation != null) {
+            openAnimation.stop();
+        }
+        if (this.isVisible()) {
+            Timeline closeAnimation = new Timeline(
+                    new KeyFrame(
+                            Duration.ZERO,
+                            e -> this.toFront(),
+                            new KeyValue(this.opacityProperty(), 1, Motion.EASE),
+                            new KeyValue(this.translateYProperty(), 0, Motion.EASE)
+                    ),
+                    new KeyFrame(
+                            Duration.millis(290),
+                            e -> this.setVisible(true)
+                    ),
+                    new KeyFrame(Duration.millis(300),
+                            e -> {
+                                this.toBack();
+                                this.setVisible(false);
+                            },
+                            new KeyValue(this.translateYProperty(), this.getLayoutBounds().getHeight(), Motion.EASE),
+                            new KeyValue(this.opacityProperty(), 0, Motion.EASE)
+                    )
+            );
+            closeAnimation.setCycleCount(1);
+            closeAnimation.setOnFinished(e -> {
+                resetPseudoClass();
+                processSnackbar();
+            });
+            closeAnimation.play();
+        }
+    }
+
+    private SnackbarEvent currentEvent = null;
+
+    public SnackbarEvent getCurrentEvent() {
+        return currentEvent;
+    }
+
+    /**
+     * Shows {@link SnackbarEvent SnackbarEvents} one by one. The next event will be shown after the current event's duration.
+     *
+     * @param event the {@link SnackbarEvent event} to put in the queue.
+     */
+    public void enqueue(SnackbarEvent event) {
+        synchronized (this) {
+            if (!eventsSet.contains(event)) {
+                eventsSet.add(event);
+                eventQueue.offer(event);
+            } else if (currentEvent == event && pauseTransition != null) {
+                pauseTransition.playFromStart();
+            }
+        }
+        if (processingQueue.compareAndSet(false, true)) {
+            Platform.runLater(() -> {
+                currentEvent = eventQueue.poll();
+                if (currentEvent != null) {
+                    show(currentEvent);
+                }
+            });
+        }
+    }
+
+    private void resetPseudoClass() {
+        if (activePseudoClass != null) {
+            content.pseudoClassStateChanged(activePseudoClass, false);
+            activePseudoClass = null;
+        }
+    }
+
+    private void processSnackbar() {
+        currentEvent = eventQueue.poll();
+        if (currentEvent != null) {
+            eventsSet.remove(currentEvent);
+            show(currentEvent);
+        } else {
+            //The enqueue method and this listener should be executed sequentially on the FX Thread so there
+            //should not be a race condition
+            processingQueue.getAndSet(false);
+        }
+    }
+
+    private void refreshPopup() {
+        if (snackbarContainer == null) {
+            return;
+        }
+        Bounds contentBound = this.getLayoutBounds();
+        double offsetX = Math.ceil(snackbarContainer.getWidth() / 2) - Math.ceil(contentBound.getWidth() / 2);
+        double offsetY = snackbarContainer.getHeight() - contentBound.getHeight();
+        this.setLayoutX(offsetX);
+        this.setLayoutY(offsetY);
+
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Event API
+    ///////////////////////////////////////////////////////////////////////////
+
+    /// Specifies _what_ and _how long_ to show a [JFXSnackbar].
+    ///
+    /// The _what_ can be any arbitrary [Node]; the [JFXSnackbarLayout] is a great choice.
+    ///
+    /// The _how long_ is specified in the form of a [javafx.util.Duration][javafx.util.Duration], not to be
+    /// confused with the [java.time.Duration].
+    public static class SnackbarEvent extends Event {
+
+        public static final EventType<SnackbarEvent> SNACKBAR = new EventType<>(Event.ANY, "SNACKBAR");
+
+        /// The amount of time the snackbar will show for, if not otherwise specified.
+        ///
+        /// It's 1.5 seconds.
+        public static Duration DEFAULT_DURATION = Duration.seconds(1.5);
+
+        private final Node content;
+        private final PseudoClass pseudoClass;
+        private final Duration timeout;
+
+        /// Creates a [SnackbarEvent] with the [default duration][#DEFAULT_DURATION] and no pseudoClass.
+        ///
+        /// @param content what you want shown in the snackbar; a [JFXSnackbarLayout] is a great choice.
+        public SnackbarEvent(Node content) {
+            this(content, DEFAULT_DURATION, null);
+        }
+
+        /// Creates a [SnackbarEvent] with the [default duration][#DEFAULT_DURATION]; you specify the contents and
+        /// pseudoClass.
+        ///
+        /// @param content what you want shown in the snackbar; a [JFXSnackbarLayout] is a great choice.
+        public SnackbarEvent(Node content, PseudoClass pseudoClass) {
+            this(content, DEFAULT_DURATION, pseudoClass);
+        }
+
+        /// Creates a SnackbarEvent with no pseudoClass; you specify the contents and duration.
+        /// pseudoClass.
+        ///
+        /// @param content what you want shown in the snackbar; a [JFXSnackbarLayout] is a great choice.
+        /// @param timeout the amount of time you want the snackbar to show for.
+        public SnackbarEvent(Node content, Duration timeout) {
+            this(content, timeout, null);
+        }
+
+        /// Creates a SnackbarEvent; you specify the contents, duration and pseudoClass.
+        ///
+        /// If you don't need so much customization, try one of the other constructors.
+        ///
+        /// @param content what you want shown in the snackbar; a [JFXSnackbarLayout] is a great choice.
+        /// @param timeout the amount of time you want the snackbar to show for.
+        public SnackbarEvent(Node content, Duration timeout, PseudoClass pseudoClass) {
+            super(SNACKBAR);
+            this.content = content;
+            this.pseudoClass = pseudoClass;
+            this.timeout = timeout;
+        }
+
+        public Node getContent() {
+            return content;
+        }
+
+        public PseudoClass getPseudoClass() {
+            return pseudoClass;
+        }
+
+        public Duration getTimeout() {
+            return timeout;
+        }
+
+        @Override
+        @SuppressWarnings("unchecked")
+        public EventType<? extends SnackbarEvent> getEventType() {
+            return (EventType<? extends SnackbarEvent>) super.getEventType();
+        }
+
+        public boolean isPersistent() {
+            return Duration.INDEFINITE.equals(getTimeout());
+        }
+    }
+}
+
@@ -0,0 +1,110 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.jfoenix.controls;
+
+import javafx.beans.binding.Bindings;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
+import javafx.geometry.Insets;
+import javafx.scene.control.Control;
+import javafx.scene.control.Label;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.StackPane;
+
+/// JFXSnackbarLayout default layout for snackbar content
+///
+/// @author Shadi Shaheen
+/// @version 1.0
+/// @since 2018-11-16
+public class JFXSnackbarLayout extends BorderPane {
+
+    private final Label toast;
+    private JFXButton action;
+    private final StackPane actionContainer;
+
+    public JFXSnackbarLayout(String message) {
+        this(message, null, null);
+    }
+
+    public JFXSnackbarLayout(String message, String actionText, EventHandler<ActionEvent> actionHandler) {
+        initialize();
+
+        toast = new Label();
+        toast.setMinWidth(Control.USE_PREF_SIZE);
+        toast.getStyleClass().add("jfx-snackbar-toast");
+        toast.setWrapText(true);
+        toast.setText(message);
+        StackPane toastContainer = new StackPane(toast);
+        toastContainer.setPadding(new Insets(20));
+        actionContainer = new StackPane();
+        actionContainer.setPadding(new Insets(0, 10, 0, 0));
+
+        toast.prefWidthProperty().bind(Bindings.createDoubleBinding(() -> {
+            if (getPrefWidth() == -1) {
+                return getPrefWidth();
+            }
+            double actionWidth = actionContainer.isVisible() ? actionContainer.getWidth() : 0.0;
+            return prefWidthProperty().get() - actionWidth;
+        }, prefWidthProperty(), actionContainer.widthProperty(), actionContainer.visibleProperty()));
+
+        setLeft(toastContainer);
+        setRight(actionContainer);
+
+        if (actionText != null) {
+            action = new JFXButton();
+            action.setText(actionText);
+            action.setOnAction(actionHandler);
+            action.setMinWidth(Control.USE_PREF_SIZE);
+            action.setButtonType(JFXButton.ButtonType.FLAT);
+            action.getStyleClass().add("jfx-snackbar-action");
+            // actions will be added upon showing the snackbar if needed
+            actionContainer.getChildren().add(action);
+
+            if (!actionText.isEmpty()) {
+                action.setVisible(true);
+                actionContainer.setVisible(true);
+                actionContainer.setManaged(true);
+                // to force updating the layout bounds
+                action.setText("");
+                action.setText(actionText);
+                action.setOnAction(actionHandler);
+            } else {
+                actionContainer.setVisible(false);
+                actionContainer.setManaged(false);
+                action.setVisible(false);
+            }
+        }
+    }
+
+    private static final String DEFAULT_STYLE_CLASS = "jfx-snackbar-layout";
+
+    public String getToast() {
+        return toast.getText();
+    }
+
+    public void setToast(String toast) {
+        this.toast.setText(toast);
+    }
+
+    private void initialize() {
+        this.getStyleClass().add(DEFAULT_STYLE_CLASS);
+    }
+}
+
@@ -0,0 +1,138 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.jfoenix.controls;
+
+import com.jfoenix.skins.JFXSpinnerSkin;
+import javafx.css.CssMetaData;
+import javafx.css.SimpleStyleableDoubleProperty;
+import javafx.css.Styleable;
+import javafx.css.StyleableDoubleProperty;
+import javafx.css.converter.SizeConverter;
+import javafx.scene.control.ProgressIndicator;
+import javafx.scene.control.Skin;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;
+
+/// JFXSpinner is the material design implementation of a loading spinner.
+///
+/// @author Bashir Elias & Shadi Shaheen
+/// @version 1.0
+/// @since 2016-03-09
+public class JFXSpinner extends ProgressIndicator {
+
+    public static final double INDETERMINATE_PROGRESS = ProgressIndicator.INDETERMINATE_PROGRESS;
+
+    public JFXSpinner() {
+        this(INDETERMINATE_PROGRESS);
+    }
+
+    public JFXSpinner(double progress) {
+        super(progress);
+        init();
+    }
+
+    private void init() {
+        getStyleClass().add(DEFAULT_STYLE_CLASS);
+    }
+
+    @Override
+    protected Skin<?> createDefaultSkin() {
+        return new JFXSpinnerSkin(this);
+    }
+
+    /***************************************************************************
+     *                                                                         *
+     * Stylesheet Handling                                                     *
+     *                                                                         *
+     **************************************************************************/
+
+    /// Initialize the style class to 'jfx-spinner'.
+    ///
+    /// This is the selector class from which CSS can be used to style
+    /// this control.
+    private static final String DEFAULT_STYLE_CLASS = "jfx-spinner";
+
+    private static final double DEFAULT_RADIUS = 16.0;
+
+    /**
+     * specifies the radius of the spinner node, by default it's set to `16.0`
+     */
+    private StyleableDoubleProperty radius;
+
+    public final StyleableDoubleProperty radiusProperty() {
+        if (this.radius == null) {
+            this.radius = new SimpleStyleableDoubleProperty(StyleableProperties.RADIUS,
+                    JFXSpinner.this,
+                    "radius",
+                    DEFAULT_RADIUS);
+        }
+        return this.radius;
+    }
+
+    public final double getRadius() {
+        return radius != null ? radius.get() : DEFAULT_RADIUS;
+    }
+
+    public final void setRadius(final double radius) {
+        this.radiusProperty().set(radius);
+    }
+
+    public double getStartingAngle() {
+        return 360 - ThreadLocalRandom.current().nextDouble() * 720;
+    }
+
+    private static final class StyleableProperties {
+        private static final CssMetaData<JFXSpinner, Number> RADIUS =
+                new CssMetaData<>("-jfx-radius",
+                        SizeConverter.getInstance(), DEFAULT_RADIUS) {
+                    @Override
+                    public boolean isSettable(JFXSpinner control) {
+                        return control.radius == null || !control.radius.isBound();
+                    }
+
+                    @Override
+                    public StyleableDoubleProperty getStyleableProperty(JFXSpinner control) {
+                        return control.radiusProperty();
+                    }
+                };
+
+        private static final List<CssMetaData<? extends Styleable, ?>> CHILD_STYLEABLES;
+
+        static {
+            final List<CssMetaData<? extends Styleable, ?>> styleables =
+                    new ArrayList<>(ProgressIndicator.getClassCssMetaData());
+            Collections.addAll(styleables, RADIUS);
+            CHILD_STYLEABLES = List.copyOf(styleables);
+        }
+    }
+
+    @Override
+    public List<CssMetaData<? extends Styleable, ?>> getControlCssMetaData() {
+        return getClassCssMetaData();
+    }
+
+    public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
+        return StyleableProperties.CHILD_STYLEABLES;
+    }
+
+}
@@ -0,0 +1,297 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.jfoenix.controls;
+
+import com.jfoenix.skins.JFXTextAreaSkin;
+import com.jfoenix.validation.base.ValidatorBase;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.beans.property.ReadOnlyObjectWrapper;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.css.*;
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.PaintConverter;
+import javafx.scene.control.Control;
+import javafx.scene.control.Skin;
+import javafx.scene.control.TextArea;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.Paint;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import static org.jackhuang.hmcl.ui.FXUtils.useJFXContextMenu;
+
+/**
+ * JFXTextArea is the material design implementation of a text area.
+ *
+ * @author Shadi Shaheen
+ * @version 1.0
+ * @since 2016-03-09
+ */
+public class JFXTextArea extends TextArea {
+    /**
+     * Initialize the style class to 'jfx-text-field'.
+     * <p>
+     * This is the selector class from which CSS can be used to style
+     * this control.
+     */
+    private static final String DEFAULT_STYLE_CLASS = "jfx-text-area";
+
+    /**
+     * {@inheritDoc}
+     */
+    public JFXTextArea() {
+        initialize();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public JFXTextArea(String text) {
+        super(text);
+        initialize();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected Skin<?> createDefaultSkin() {
+        return new JFXTextAreaSkin(this);
+    }
+
+    private void initialize() {
+        this.getStyleClass().add(DEFAULT_STYLE_CLASS);
+        if ("dalvik".equalsIgnoreCase(System.getProperty("java.vm.name"))) {
+            this.setStyle("-fx-skin: \"com.jfoenix.android.skins.JFXTextAreaSkinAndroid\";");
+        }
+
+        useJFXContextMenu(this);
+    }
+
+    /***************************************************************************
+     *                                                                         *
+     * Properties                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * holds the current active validator on the text area in case of validation error
+     */
+    private ReadOnlyObjectWrapper<ValidatorBase> activeValidator = new ReadOnlyObjectWrapper<>();
+
+    public ValidatorBase getActiveValidator() {
+        return activeValidator == null ? null : activeValidator.get();
+    }
+
+    public ReadOnlyObjectProperty<ValidatorBase> activeValidatorProperty() {
+        return this.activeValidator.getReadOnlyProperty();
+    }
+
+    /**
+     * list of validators that will validate the text value upon calling
+     * {{@link #validate()}
+     */
+    private ObservableList<ValidatorBase> validators = FXCollections.observableArrayList();
+
+    public ObservableList<ValidatorBase> getValidators() {
+        return validators;
+    }
+
+    public void setValidators(ValidatorBase... validators) {
+        this.validators.addAll(validators);
+    }
+
+    /**
+     * validates the text value using the list of validators provided by the user
+     * {{@link #setValidators(ValidatorBase...)}
+     *
+     * @return true if the value is valid else false
+     */
+    public boolean validate() {
+        for (ValidatorBase validator : validators) {
+            if (validator.getSrcControl() == null) {
+                validator.setSrcControl(this);
+            }
+            validator.validate();
+            if (validator.getHasErrors()) {
+                activeValidator.set(validator);
+                return false;
+            }
+        }
+        activeValidator.set(null);
+        return true;
+    }
+
+    public void resetValidation() {
+        pseudoClassStateChanged(ValidatorBase.PSEUDO_CLASS_ERROR, false);
+        activeValidator.set(null);
+    }
+
+    /***************************************************************************
+     *                                                                         *
+     * styleable Properties                                                    *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * set true to show a float the prompt text when focusing the field
+     */
+    private StyleableBooleanProperty labelFloat = new SimpleStyleableBooleanProperty(StyleableProperties.LABEL_FLOAT, JFXTextArea.this, "lableFloat", false);
+
+    public final StyleableBooleanProperty labelFloatProperty() {
+        return this.labelFloat;
+    }
+
+    public final boolean isLabelFloat() {
+        return this.labelFloatProperty().get();
+    }
+
+    public final void setLabelFloat(final boolean labelFloat) {
+        this.labelFloatProperty().set(labelFloat);
+    }
+
+    /**
+     * default color used when the text area is unfocused
+     */
+    private StyleableObjectProperty<Paint> unFocusColor = new SimpleStyleableObjectProperty<>(StyleableProperties.UNFOCUS_COLOR, JFXTextArea.this, "unFocusColor", Color.rgb(77, 77, 77));
+
+    public Paint getUnFocusColor() {
+        return unFocusColor == null ? Color.rgb(77, 77, 77) : unFocusColor.get();
+    }
+
+    public StyleableObjectProperty<Paint> unFocusColorProperty() {
+        return this.unFocusColor;
+    }
+
+    public void setUnFocusColor(Paint color) {
+        this.unFocusColor.set(color);
+    }
+
+    /**
+     * default color used when the text area is focused
+     */
+    private StyleableObjectProperty<Paint> focusColor = new SimpleStyleableObjectProperty<>(StyleableProperties.FOCUS_COLOR, JFXTextArea.this, "focusColor", Color.valueOf("#4059A9"));
+
+    public Paint getFocusColor() {
+        return focusColor == null ? Color.valueOf("#4059A9") : focusColor.get();
+    }
+
+    public StyleableObjectProperty<Paint> focusColorProperty() {
+        return this.focusColor;
+    }
+
+    public void setFocusColor(Paint color) {
+        this.focusColor.set(color);
+    }
+
+    /**
+     * disable animation on validation
+     */
+    private StyleableBooleanProperty disableAnimation = new SimpleStyleableBooleanProperty(StyleableProperties.DISABLE_ANIMATION, JFXTextArea.this, "disableAnimation", false);
+
+    public final StyleableBooleanProperty disableAnimationProperty() {
+        return this.disableAnimation;
+    }
+
+    public final Boolean isDisableAnimation() {
+        return disableAnimation != null && this.disableAnimationProperty().get();
+    }
+
+    public final void setDisableAnimation(final Boolean disabled) {
+        this.disableAnimationProperty().set(disabled);
+    }
+
+    private final static class StyleableProperties {
+        private static final CssMetaData<JFXTextArea, Paint> UNFOCUS_COLOR = new CssMetaData<JFXTextArea, Paint>("-jfx-unfocus-color", PaintConverter.getInstance(), Color.rgb(77, 77, 77)) {
+            @Override
+            public boolean isSettable(JFXTextArea control) {
+                return control.unFocusColor == null || !control.unFocusColor.isBound();
+            }
+
+            @Override
+            public StyleableProperty<Paint> getStyleableProperty(JFXTextArea control) {
+                return control.unFocusColorProperty();
+            }
+        };
+        private static final CssMetaData<JFXTextArea, Paint> FOCUS_COLOR = new CssMetaData<JFXTextArea, Paint>("-jfx-focus-color", PaintConverter.getInstance(), Color.valueOf("#4059A9")) {
+            @Override
+            public boolean isSettable(JFXTextArea control) {
+                return control.focusColor == null || !control.focusColor.isBound();
+            }
+
+            @Override
+            public StyleableProperty<Paint> getStyleableProperty(JFXTextArea control) {
+                return control.focusColorProperty();
+            }
+        };
+        private static final CssMetaData<JFXTextArea, Boolean> LABEL_FLOAT = new CssMetaData<JFXTextArea, Boolean>("-jfx-label-float", BooleanConverter.getInstance(), false) {
+            @Override
+            public boolean isSettable(JFXTextArea control) {
+                return control.labelFloat == null || !control.labelFloat.isBound();
+            }
+
+            @Override
+            public StyleableBooleanProperty getStyleableProperty(JFXTextArea control) {
+                return control.labelFloatProperty();
+            }
+        };
+
+        private static final CssMetaData<JFXTextArea, Boolean> DISABLE_ANIMATION = new CssMetaData<JFXTextArea, Boolean>("-jfx-disable-animation", BooleanConverter.getInstance(), false) {
+            @Override
+            public boolean isSettable(JFXTextArea control) {
+                return control.disableAnimation == null || !control.disableAnimation.isBound();
+            }
+
+            @Override
+            public StyleableBooleanProperty getStyleableProperty(JFXTextArea control) {
+                return control.disableAnimationProperty();
+            }
+        };
+
+        private static final List<CssMetaData<? extends Styleable, ?>> CHILD_STYLEABLES;
+
+        static {
+            final List<CssMetaData<? extends Styleable, ?>> styleables = new ArrayList<>(Control.getClassCssMetaData());
+            Collections.addAll(styleables, UNFOCUS_COLOR, FOCUS_COLOR, LABEL_FLOAT, DISABLE_ANIMATION);
+            CHILD_STYLEABLES = Collections.unmodifiableList(styleables);
+        }
+    }
+
+    // inherit the styleable properties from parent
+    private List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
+
+    @Override
+    public List<CssMetaData<? extends Styleable, ?>> getControlCssMetaData() {
+        if (STYLEABLES == null) {
+            final List<CssMetaData<? extends Styleable, ?>> styleables = new ArrayList<>(Control.getClassCssMetaData());
+            styleables.addAll(getClassCssMetaData());
+            styleables.addAll(TextArea.getClassCssMetaData());
+            STYLEABLES = Collections.unmodifiableList(styleables);
+        }
+        return STYLEABLES;
+    }
+
+    public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
+        return StyleableProperties.CHILD_STYLEABLES;
+    }
+}
@@ -0,0 +1,307 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.jfoenix.controls;
+
+import com.jfoenix.skins.JFXTextFieldSkin;
+import com.jfoenix.validation.base.ValidatorBase;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.beans.property.ReadOnlyObjectWrapper;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.css.*;
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.PaintConverter;
+import javafx.scene.control.Control;
+import javafx.scene.control.Skin;
+import javafx.scene.control.TextField;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.Paint;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import static org.jackhuang.hmcl.ui.FXUtils.useJFXContextMenu;
+
+/**
+ * JFXTextField is the material design implementation of a text Field.
+ *
+ * @author Shadi Shaheen
+ * @version 1.0
+ * @since 2016-03-09
+ */
+public class JFXTextField extends TextField {
+    /**
+     * Initialize the style class to 'jfx-text-field'.
+     * <p>
+     * This is the selector class from which CSS can be used to style
+     * this control.
+     */
+    private static final String DEFAULT_STYLE_CLASS = "jfx-text-field";
+
+    /**
+     * {@inheritDoc}
+     */
+    public JFXTextField() {
+        initialize();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public JFXTextField(String text) {
+        super(text);
+        initialize();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected Skin<?> createDefaultSkin() {
+        return new JFXTextFieldSkin(this);
+    }
+
+    private void initialize() {
+        this.getStyleClass().add(DEFAULT_STYLE_CLASS);
+        if ("dalvik".equalsIgnoreCase(System.getProperty("java.vm.name"))) {
+            this.setStyle("-fx-skin: \"com.jfoenix.android.skins.JFXTextFieldSkinAndroid\";");
+        }
+
+        useJFXContextMenu(this);
+    }
+
+    // https://github.com/HMCL-dev/HMCL/issues/5822
+    // TODO: This method may no longer be needed after we update JFXTextFieldSkin
+    @Override
+    protected void layoutChildren() {
+        super.layoutChildren();
+        this.setNeedsLayout(false);
+    }
+
+    /***************************************************************************
+     *                                                                         *
+     * Properties                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * holds the current active validator on the text field in case of validation error
+     */
+    private ReadOnlyObjectWrapper<ValidatorBase> activeValidator = new ReadOnlyObjectWrapper<>();
+
+    public ValidatorBase getActiveValidator() {
+        return activeValidator == null ? null : activeValidator.get();
+    }
+
+    public ReadOnlyObjectProperty<ValidatorBase> activeValidatorProperty() {
+        return this.activeValidator.getReadOnlyProperty();
+    }
+
+    /**
+     * list of validators that will validate the text value upon calling
+     * {{@link #validate()}
+     */
+    private ObservableList<ValidatorBase> validators = FXCollections.observableArrayList();
+
+    public ObservableList<ValidatorBase> getValidators() {
+        return validators;
+    }
+
+    public void setValidators(ValidatorBase... validators) {
+        this.validators.addAll(validators);
+    }
+
+    /**
+     * validates the text value using the list of validators provided by the user
+     * {{@link #setValidators(ValidatorBase...)}
+     *
+     * @return true if the value is valid else false
+     */
+    public boolean validate() {
+        for (ValidatorBase validator : validators) {
+            if (validator.getSrcControl() == null) {
+                validator.setSrcControl(this);
+            }
+            validator.validate();
+            if (validator.getHasErrors()) {
+                activeValidator.set(validator);
+                return false;
+            }
+        }
+        activeValidator.set(null);
+        return true;
+    }
+
+    public void resetValidation() {
+        pseudoClassStateChanged(ValidatorBase.PSEUDO_CLASS_ERROR, false);
+        activeValidator.set(null);
+    }
+
+    /***************************************************************************
+     *                                                                         *
+     * styleable Properties                                                    *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * set true to show a float the prompt text when focusing the field
+     */
+    private StyleableBooleanProperty labelFloat = new SimpleStyleableBooleanProperty(StyleableProperties.LABEL_FLOAT, JFXTextField.this, "lableFloat", false);
+
+    public final StyleableBooleanProperty labelFloatProperty() {
+        return this.labelFloat;
+    }
+
+    public final boolean isLabelFloat() {
+        return this.labelFloatProperty().get();
+    }
+
+    public final void setLabelFloat(final boolean labelFloat) {
+        this.labelFloatProperty().set(labelFloat);
+    }
+
+    /**
+     * default color used when the field is unfocused
+     */
+    private StyleableObjectProperty<Paint> unFocusColor = new SimpleStyleableObjectProperty<>(StyleableProperties.UNFOCUS_COLOR, JFXTextField.this, "unFocusColor", Color.rgb(77, 77, 77));
+
+    public Paint getUnFocusColor() {
+        return unFocusColor == null ? Color.rgb(77, 77, 77) : unFocusColor.get();
+    }
+
+    public StyleableObjectProperty<Paint> unFocusColorProperty() {
+        return this.unFocusColor;
+    }
+
+    public void setUnFocusColor(Paint color) {
+        this.unFocusColor.set(color);
+    }
+
+    /**
+     * default color used when the field is focused
+     */
+    private StyleableObjectProperty<Paint> focusColor = new SimpleStyleableObjectProperty<>(StyleableProperties.FOCUS_COLOR, JFXTextField.this, "focusColor", Color.valueOf("#4059A9"));
+
+    public Paint getFocusColor() {
+        return focusColor == null ? Color.valueOf("#4059A9") : focusColor.get();
+    }
+
+    public StyleableObjectProperty<Paint> focusColorProperty() {
+        return this.focusColor;
+    }
+
+    public void setFocusColor(Paint color) {
+        this.focusColor.set(color);
+    }
+
+    /**
+     * disable animation on validation
+     */
+    private StyleableBooleanProperty disableAnimation = new SimpleStyleableBooleanProperty(StyleableProperties.DISABLE_ANIMATION, JFXTextField.this, "disableAnimation", false);
+
+    public final StyleableBooleanProperty disableAnimationProperty() {
+        return this.disableAnimation;
+    }
+
+    public final Boolean isDisableAnimation() {
+        return disableAnimation != null && this.disableAnimationProperty().get();
+    }
+
+    public final void setDisableAnimation(final Boolean disabled) {
+        this.disableAnimationProperty().set(disabled);
+    }
+
+    private final static class StyleableProperties {
+        private static final CssMetaData<JFXTextField, Paint> UNFOCUS_COLOR = new CssMetaData<JFXTextField, Paint>("-jfx-unfocus-color", PaintConverter.getInstance(), Color.valueOf("#A6A6A6")) {
+            @Override
+            public boolean isSettable(JFXTextField control) {
+                return control.unFocusColor == null || !control.unFocusColor.isBound();
+            }
+
+            @Override
+            public StyleableProperty<Paint> getStyleableProperty(JFXTextField control) {
+                return control.unFocusColorProperty();
+            }
+        };
+        private static final CssMetaData<JFXTextField, Paint> FOCUS_COLOR = new CssMetaData<JFXTextField, Paint>("-jfx-focus-color", PaintConverter.getInstance(), Color.valueOf("#3f51b5")) {
+            @Override
+            public boolean isSettable(JFXTextField control) {
+                return control.focusColor == null || !control.focusColor.isBound();
+            }
+
+            @Override
+            public StyleableProperty<Paint> getStyleableProperty(JFXTextField control) {
+                return control.focusColorProperty();
+            }
+        };
+        private static final CssMetaData<JFXTextField, Boolean> LABEL_FLOAT = new CssMetaData<JFXTextField, Boolean>("-jfx-label-float", BooleanConverter.getInstance(), false) {
+            @Override
+            public boolean isSettable(JFXTextField control) {
+                return control.labelFloat == null || !control.labelFloat.isBound();
+            }
+
+            @Override
+            public StyleableBooleanProperty getStyleableProperty(JFXTextField control) {
+                return control.labelFloatProperty();
+            }
+        };
+
+        private static final CssMetaData<JFXTextField, Boolean> DISABLE_ANIMATION = new CssMetaData<JFXTextField, Boolean>("-jfx-disable-animation", BooleanConverter.getInstance(), false) {
+            @Override
+            public boolean isSettable(JFXTextField control) {
+                return control.disableAnimation == null || !control.disableAnimation.isBound();
+            }
+
+            @Override
+            public StyleableBooleanProperty getStyleableProperty(JFXTextField control) {
+                return control.disableAnimationProperty();
+            }
+        };
+
+
+        private static final List<CssMetaData<? extends Styleable, ?>> CHILD_STYLEABLES;
+
+        static {
+            final List<CssMetaData<? extends Styleable, ?>> styleables = new ArrayList<>(Control.getClassCssMetaData());
+            Collections.addAll(styleables, UNFOCUS_COLOR, FOCUS_COLOR, LABEL_FLOAT, DISABLE_ANIMATION);
+            CHILD_STYLEABLES = Collections.unmodifiableList(styleables);
+        }
+    }
+
+    // inherit the styleable properties from parent
+    private List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
+
+    @Override
+    public List<CssMetaData<? extends Styleable, ?>> getControlCssMetaData() {
+        if (STYLEABLES == null) {
+            final List<CssMetaData<? extends Styleable, ?>> styleables = new ArrayList<>(Control.getClassCssMetaData());
+            styleables.addAll(getClassCssMetaData());
+            styleables.addAll(TextField.getClassCssMetaData());
+            STYLEABLES = Collections.unmodifiableList(styleables);
+        }
+        return STYLEABLES;
+    }
+
+    public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
+        return StyleableProperties.CHILD_STYLEABLES;
+    }
+}
+
@@ -0,0 +1,146 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.jfoenix.controls;
+
+import com.jfoenix.utils.JFXNodeUtils;
+import javafx.beans.InvalidationListener;
+import javafx.beans.WeakInvalidationListener;
+import javafx.geometry.Insets;
+import javafx.scene.Node;
+import javafx.scene.control.TreeCell;
+import javafx.scene.control.TreeItem;
+import javafx.scene.layout.*;
+import javafx.scene.paint.Color;
+
+import java.lang.ref.WeakReference;
+
+/// JFXTreeCell is simple material design implementation of a tree cell.
+///
+/// @author Shadi Shaheen
+/// @version 1.0
+/// @since 2017-02-15
+public class JFXTreeCell<T> extends TreeCell<T> {
+
+    protected JFXRippler cellRippler = new JFXRippler(this) {
+        @Override
+        protected Node getMask() {
+            Region clip = new Region();
+            JFXNodeUtils.updateBackground(JFXTreeCell.this.getBackground(), clip);
+            double width = control.getLayoutBounds().getWidth();
+            double height = control.getLayoutBounds().getHeight();
+            clip.resize(width, height);
+            return clip;
+        }
+
+        @Override
+        protected void positionControl(Node control) {
+            // do nothing
+        }
+    };
+    private HBox hbox;
+    private final StackPane selectedPane = new StackPane();
+
+    private final InvalidationListener treeItemGraphicInvalidationListener = observable -> updateDisplay(getItem(),
+            isEmpty());
+    private final WeakInvalidationListener weakTreeItemGraphicListener = new WeakInvalidationListener(
+            treeItemGraphicInvalidationListener);
+
+    private WeakReference<TreeItem<T>> treeItemRef;
+
+    public JFXTreeCell() {
+        selectedPane.getStyleClass().add("selection-bar");
+        selectedPane.setBackground(new Background(new BackgroundFill(Color.RED, CornerRadii.EMPTY, Insets.EMPTY)));
+        selectedPane.setPrefWidth(3);
+        selectedPane.setMouseTransparent(true);
+        selectedProperty().addListener((o, oldVal, newVal) -> selectedPane.setVisible(newVal ? true : false));
+
+        final InvalidationListener treeItemInvalidationListener = observable -> {
+            TreeItem<T> oldTreeItem = treeItemRef == null ? null : treeItemRef.get();
+            if (oldTreeItem != null) {
+                oldTreeItem.graphicProperty().removeListener(weakTreeItemGraphicListener);
+            }
+
+            TreeItem<T> newTreeItem = getTreeItem();
+            if (newTreeItem != null) {
+                newTreeItem.graphicProperty().addListener(weakTreeItemGraphicListener);
+                treeItemRef = new WeakReference<>(newTreeItem);
+            }
+        };
+        final WeakInvalidationListener weakTreeItemListener = new WeakInvalidationListener(treeItemInvalidationListener);
+        treeItemProperty().addListener(weakTreeItemListener);
+        if (getTreeItem() != null) {
+            getTreeItem().graphicProperty().addListener(weakTreeItemGraphicListener);
+        }
+    }
+
+    @Override
+    protected void layoutChildren() {
+        super.layoutChildren();
+        if (!getChildren().contains(selectedPane)) {
+            getChildren().add(0, cellRippler);
+            cellRippler.rippler.clear();
+            getChildren().add(0, selectedPane);
+        }
+        cellRippler.resizeRelocate(0, 0, getWidth(), getHeight());
+        cellRippler.releaseRipple();
+        selectedPane.resizeRelocate(0, 0, selectedPane.prefWidth(-1), getHeight());
+        selectedPane.setVisible(isSelected());
+    }
+
+    private void updateDisplay(T item, boolean empty) {
+        if (item == null || empty) {
+            hbox = null;
+            setText(null);
+            setGraphic(null);
+        } else {
+            TreeItem<T> treeItem = getTreeItem();
+            if (treeItem != null && treeItem.getGraphic() != null) {
+                if (item instanceof Node) {
+                    setText(null);
+                    if (hbox == null) {
+                        hbox = new HBox(3);
+                    }
+                    hbox.getChildren().setAll(treeItem.getGraphic(), (Node) item);
+                    setGraphic(hbox);
+                } else {
+                    hbox = null;
+                    setText(item.toString());
+                    setGraphic(treeItem.getGraphic());
+                }
+            } else {
+                hbox = null;
+                if (item instanceof Node) {
+                    setText(null);
+                    setGraphic((Node) item);
+                } else {
+                    setText(item.toString());
+                    setGraphic(null);
+                }
+            }
+        }
+    }
+
+    @Override
+    protected void updateItem(T item, boolean empty) {
+        super.updateItem(item, empty);
+        updateDisplay(item, empty);
+        setMouseTransparent(item == null || empty);
+    }
+}
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.jfoenix.controls;
+
+import javafx.scene.control.TreeItem;
+import javafx.scene.control.TreeView;
+
+/// JFXTreeView is the material design implementation of a TreeView
+/// with expand/collapse animation and selection indicator.
+///
+/// @author Shadi Shaheen
+/// @version 1.0
+/// @since 2017-02-15
+public class JFXTreeView<T> extends TreeView<T> {
+
+    private static final String DEFAULT_STYLE_CLASS = "jfx-tree-view";
+
+    public JFXTreeView() {
+        init();
+    }
+
+    public JFXTreeView(TreeItem<T> root) {
+        super(root);
+        init();
+    }
+
+    private void init() {
+        this.setCellFactory((view) -> new JFXTreeCell<>());
+        this.getStyleClass().add(DEFAULT_STYLE_CLASS);
+    }
+}
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.jfoenix.controls.datamodels.treetable;
+
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.scene.control.TreeTableColumn;
+
+/// data model that is used in JFXTreeTableView, it's used to implement
+/// the grouping feature.
+///
+/// **Note:** the data object used in JFXTreeTableView **must** extends this class
+///
+/// @param <T> is the concrete object of the Tree table
+/// @author Shadi Shaheen
+/// @version 1.0
+/// @since 2016-03-09
+public class RecursiveTreeObject<T> {
+
+    /// grouped children objects
+    private ObservableList<T> children = FXCollections.observableArrayList();
+
+    public ObservableList<T> getChildren() {
+        return children;
+    }
+
+    public void setChildren(ObservableList<T> children) {
+        this.children = children;
+    }
+
+    /// Whether or not the object is grouped by a specified tree table column
+    ObjectProperty<TreeTableColumn<T, ?>> groupedColumn = new SimpleObjectProperty<>();
+
+    public final ObjectProperty<TreeTableColumn<T, ?>> groupedColumnProperty() {
+        return this.groupedColumn;
+    }
+
+    public final TreeTableColumn<T, ?> getGroupedColumn() {
+        return this.groupedColumnProperty().get();
+    }
+
+    public final void setGroupedColumn(final TreeTableColumn<T, ?> groupedColumn) {
+        this.groupedColumnProperty().set(groupedColumn);
+    }
+
+    /// the value that must be shown when grouped
+    ObjectProperty<Object> groupedValue = new SimpleObjectProperty<>();
+
+    public final ObjectProperty<Object> groupedValueProperty() {
+        return this.groupedValue;
+    }
+
+    public final Object getGroupedValue() {
+        return this.groupedValueProperty().get();
+    }
+
+    public final void setGroupedValue(final Object groupedValue) {
+        this.groupedValueProperty().set(groupedValue);
+    }
+
+}
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.jfoenix.controls.events;
+
+import javafx.event.Event;
+import javafx.event.EventType;
+
+import java.io.Serial;
+
+/// JFXDialog events, used exclusively by the following methods:
+///
+///   - [com.jfoenix.controls.JFXDialog#show()]
+///   - [com.jfoenix.controls.JFXDialog#close()]
+///
+/// @author Shadi Shaheen
+/// @version 1.0
+/// @since 2016-03-09
+public class JFXDialogEvent extends Event {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /// This event occurs when a JFXDialog is closed, no longer visible to the user
+    /// ( after the exit animation ends )
+    public static final EventType<JFXDialogEvent> CLOSED = new EventType<>(Event.ANY, "JFX_DIALOG_CLOSED");
+
+    /// This event occurs when a JFXDialog is opened, visible to the user
+    /// ( after the entrance animation ends )
+    public static final EventType<JFXDialogEvent> OPENED = new EventType<>(Event.ANY, "JFX_DIALOG_OPENED");
+
+    /// Construct a new JFXDialog `Event` with the specified event type
+    ///
+    /// @param eventType the event type
+    public JFXDialogEvent(EventType<? extends Event> eventType) {
+        super(eventType);
+    }
+
+}
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2016 JFoenix
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package com.jfoenix.effects;
+
+import javafx.scene.Node;
+import javafx.scene.effect.BlurType;
+import javafx.scene.effect.DropShadow;
+import javafx.scene.layout.Pane;
+import javafx.scene.paint.Color;
+
+/**
+ * it will create a shadow effect for a given node and a specified depth level.
+ * depth levels are {0,1,2,3,4,5}
+ *
+ * @author Shadi Shaheen
+ * @version 1.0
+ * @since 2016-03-09
+ */
+public final class JFXDepthManager {
+    private JFXDepthManager() {
+        throw new AssertionError();
+    }
+
+    private static final DropShadow[] depth = new DropShadow[] {
+            new DropShadow(BlurType.GAUSSIAN, Color.TRANSPARENT, 0, 0, 0, 0),
+            new DropShadow(BlurType.GAUSSIAN, Color.rgb(0, 0, 0, 0.12), 4, 0, 0, 0),
+            new DropShadow(BlurType.GAUSSIAN, Color.rgb(0, 0, 0, 0.16), 8, 0, 0, 4),
+            new DropShadow(BlurType.GAUSSIAN, Color.rgb(0, 0, 0, 0.20), 12, 0, 0, 4),
+            new DropShadow(BlurType.GAUSSIAN, Color.rgb(0, 0, 0, 0.24), 16, 0, 0, 4),
+            new DropShadow(BlurType.GAUSSIAN, Color.rgb(0, 0, 0, 0.28), 20, 0, 0, 8)
+    };
+
+    /**
+     * this method is used to add shadow effect to the node,
+     * however the shadow is not real ( gets affected with node transformations)
+     * <p>
+     * use {@link #createMaterialNode(Node, int)} instead to generate a real shadow
+     */
+    public static void setDepth(Node control, int level) {
+        level = level < 0 ? 0 : level;
+        level = level > 5 ? 5 : level;
+        control.setEffect(new DropShadow(BlurType.GAUSSIAN,
+                depth[level].getColor(),
+                depth[level].getRadius(),
+                depth[level].getSpread(),
+                depth[level].getOffsetX(),
+                depth[level].getOffsetY()));
+    }
+
+    public static int getLevels() {
+        return depth.length;
+    }
+
+    public static DropShadow getShadowAt(int level) {
+        return depth[level];
+    }
+
+    /**
+     * this method will generate a new container node that prevent
+     * control transformation to be applied to the shadow effect
+     * (which makes it looks as a real shadow)
+     */
+    public static Node createMaterialNode(Node control, int level) {
+        Node container = new Pane(control) {
+            @Override
+            protected double computeMaxWidth(double height) {
+                return computePrefWidth(height);
+            }
+
+            @Override
+            protected double computeMaxHeight(double width) {
+                return computePrefHeight(width);
+            }
+
+            @Override
+            protected double computePrefWidth(double height) {
+                return control.prefWidth(height);
+            }
+
+            @Override
+            protected double computePrefHeight(double width) {
+                return control.prefHeight(width);
+            }
+        };
+        container.getStyleClass().add("depth-container");
+        container.setPickOnBounds(false);
+        level = level < 0 ? 0 : level;
+        level = level > 5 ? 5 : level;
+        container.setEffect(new DropShadow(BlurType.GAUSSIAN,
+                depth[level].getColor(),
+                depth[level].getRadius(),
+                depth[level].getSpread(),
+                depth[level].getOffsetX(),
+                depth[level].getOffsetY()));
+        return container;
+    }
+
+    public static void pop(Node control) {
+        control.setEffect(new DropShadow(BlurType.GAUSSIAN, Color.rgb(0, 0, 0, 0.26), 5, 0.05, 0, 1));
+    }
+
+}
+
@@ -0,0 +1,222 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by Fernflower decompiler)
+//
+
+package com.jfoenix.skins;
+
+import com.jfoenix.adapters.skins.ButtonSkin;
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXRippler;
+import com.jfoenix.effects.JFXDepthManager;
+import com.jfoenix.transitions.CachedTransition;
+import javafx.animation.Interpolator;
+import javafx.animation.KeyFrame;
+import javafx.animation.KeyValue;
+import javafx.animation.Timeline;
+import javafx.animation.Transition;
+import javafx.beans.binding.Bindings;
+import javafx.beans.property.ReadOnlyBooleanProperty;
+import javafx.geometry.Insets;
+import javafx.scene.Node;
+import javafx.scene.control.Label;
+import javafx.scene.effect.DropShadow;
+import javafx.scene.layout.Background;
+import javafx.scene.layout.BackgroundFill;
+import javafx.scene.layout.CornerRadii;
+import javafx.scene.layout.StackPane;
+import javafx.scene.paint.Color;
+import javafx.scene.shape.Shape;
+import javafx.util.Duration;
+import org.jackhuang.hmcl.ui.FXUtils;
+
+public class JFXButtonSkin extends ButtonSkin {
+    private final StackPane buttonContainer = new StackPane();
+    private final JFXRippler buttonRippler = new JFXRippler(new StackPane()) {
+        protected Node getMask() {
+            StackPane mask = new StackPane();
+            mask.shapeProperty().bind(JFXButtonSkin.this.buttonContainer.shapeProperty());
+            mask.backgroundProperty().bind(Bindings.createObjectBinding(() -> new Background(
+                    new BackgroundFill(Color.WHITE,
+                            JFXButtonSkin.this.buttonContainer.backgroundProperty().get() != null && !JFXButtonSkin.this.buttonContainer.getBackground().getFills().isEmpty()
+                                    ? JFXButtonSkin.this.buttonContainer.getBackground().getFills().get(0).getRadii()
+                                    : JFXButtonSkin.this.defaultRadii, JFXButtonSkin.this.buttonContainer.backgroundProperty().get() != null && !JFXButtonSkin.this.buttonContainer.getBackground().getFills().isEmpty() ? JFXButtonSkin.this.buttonContainer.getBackground().getFills().get(0).getInsets() : Insets.EMPTY)),
+                    JFXButtonSkin.this.buttonContainer.backgroundProperty()));
+            mask.resize(JFXButtonSkin.this.buttonContainer.getWidth() - JFXButtonSkin.this.buttonContainer.snappedRightInset() - JFXButtonSkin.this.buttonContainer.snappedLeftInset(), JFXButtonSkin.this.buttonContainer.getHeight() - JFXButtonSkin.this.buttonContainer.snappedBottomInset() - JFXButtonSkin.this.buttonContainer.snappedTopInset());
+            return mask;
+        }
+
+        private void initListeners() {
+            this.ripplerPane.setOnMousePressed((event) -> {
+                if (JFXButtonSkin.this.releaseManualRippler != null) {
+                    JFXButtonSkin.this.releaseManualRippler.run();
+                }
+
+                JFXButtonSkin.this.releaseManualRippler = null;
+                this.createRipple(event.getX(), event.getY());
+            });
+        }
+    };
+    private Transition clickedAnimation;
+    private final CornerRadii defaultRadii = new CornerRadii(3.0);
+    private boolean invalid = true;
+    private Runnable releaseManualRippler = null;
+
+    public JFXButtonSkin(JFXButton button) {
+        super(button);
+        this.getSkinnable().armedProperty().addListener((o, oldVal, newVal) -> {
+            if (newVal) {
+                this.releaseManualRippler = this.buttonRippler.createManualRipple();
+                if (this.clickedAnimation != null) {
+                    this.clickedAnimation.setRate(1.0);
+                    this.clickedAnimation.play();
+                }
+            } else {
+                if (this.releaseManualRippler != null) {
+                    this.releaseManualRippler.run();
+                }
+
+                if (this.clickedAnimation != null) {
+                    this.clickedAnimation.setRate(-1.0);
+                    this.clickedAnimation.play();
+                }
+            }
+
+        });
+        this.buttonContainer.getChildren().add(this.buttonRippler);
+        button.buttonTypeProperty().addListener((o, oldVal, newVal) -> this.updateButtonType(newVal));
+        button.setOnMousePressed((e) -> {
+            if (this.clickedAnimation != null) {
+                this.clickedAnimation.setRate(1.0F);
+                this.clickedAnimation.play();
+            }
+        });
+        button.setOnMouseReleased((e) -> {
+            if (this.clickedAnimation != null) {
+                this.clickedAnimation.setRate(-1.0F);
+                this.clickedAnimation.play();
+            }
+        });
+
+        ReadOnlyBooleanProperty focusVisibleProperty = FXUtils.focusVisibleProperty(button);
+        if (focusVisibleProperty == null) {
+            focusVisibleProperty = button.focusedProperty();
+        }
+        focusVisibleProperty.addListener((o, oldVal, newVal) -> {
+            if (newVal) {
+                if (!this.getSkinnable().isPressed()) {
+                    this.buttonRippler.showOverlay();
+                }
+            } else {
+                this.buttonRippler.hideOverlay();
+            }
+        });
+        button.pressedProperty().addListener((o, oldVal, newVal) -> this.buttonRippler.hideOverlay());
+        button.setPickOnBounds(false);
+        this.buttonContainer.setPickOnBounds(false);
+        this.buttonContainer.shapeProperty().bind(this.getSkinnable().shapeProperty());
+        this.buttonContainer.borderProperty().bind(this.getSkinnable().borderProperty());
+        this.buttonContainer.backgroundProperty().bind(Bindings.createObjectBinding(() -> {
+            if (button.getBackground() == null || this.isJavaDefaultBackground(button.getBackground()) || this.isJavaDefaultClickedBackground(button.getBackground())) {
+                button.setBackground(new Background(new BackgroundFill(Color.TRANSPARENT, this.defaultRadii, null)));
+            }
+
+            try {
+                return new Background(new BackgroundFill(this.getSkinnable().getBackground() != null ? this.getSkinnable().getBackground().getFills().get(0).getFill() : Color.TRANSPARENT, this.getSkinnable().getBackground() != null ? this.getSkinnable().getBackground().getFills().get(0).getRadii() : this.defaultRadii, Insets.EMPTY));
+            } catch (Exception var3) {
+                return this.getSkinnable().getBackground();
+            }
+        }, this.getSkinnable().backgroundProperty()));
+        button.ripplerFillProperty().addListener((o, oldVal, newVal) -> this.buttonRippler.setRipplerFill(newVal));
+        if (button.getBackground() == null || this.isJavaDefaultBackground(button.getBackground())) {
+            button.setBackground(new Background(new BackgroundFill(Color.TRANSPARENT, this.defaultRadii, null)));
+        }
+
+        this.updateButtonType(button.getButtonType());
+        this.updateChildren();
+    }
+
+    protected void updateChildren() {
+        super.updateChildren();
+        if (this.buttonContainer != null) {
+            this.getChildren().add(0, this.buttonContainer);
+        }
+
+        for (int i = 1; i < this.getChildren().size(); ++i) {
+            this.getChildren().get(i).setMouseTransparent(true);
+        }
+    }
+
+    protected void layoutChildren(double x, double y, double w, double h) {
+        if (this.invalid) {
+            if (((JFXButton) this.getSkinnable()).getRipplerFill() == null) {
+                for (int i = this.getChildren().size() - 1; i >= 1; --i) {
+                    if (this.getChildren().get(i) instanceof Shape shape) {
+                        this.buttonRippler.setRipplerFill(shape.getFill());
+                        shape.fillProperty().addListener((o, oldVal, newVal) -> this.buttonRippler.setRipplerFill(newVal));
+                        break;
+                    }
+
+                    if (this.getChildren().get(i) instanceof Label label) {
+                        this.buttonRippler.setRipplerFill(label.getTextFill());
+                        label.textFillProperty().addListener((o, oldVal, newVal) -> this.buttonRippler.setRipplerFill(newVal));
+                        break;
+                    }
+                }
+            } else {
+                this.buttonRippler.setRipplerFill(((JFXButton) this.getSkinnable()).getRipplerFill());
+            }
+
+            this.invalid = false;
+        }
+
+        double shift = 1.0F;
+        this.buttonContainer.resizeRelocate(this.getSkinnable().getLayoutBounds().getMinX() - shift, this.getSkinnable().getLayoutBounds().getMinY() - shift, this.getSkinnable().getWidth() + (double) 2.0F * shift, this.getSkinnable().getHeight() + (double) 2.0F * shift);
+        this.layoutLabelInArea(x, y, w, h);
+    }
+
+    private boolean isJavaDefaultBackground(Background background) {
+        try {
+            String firstFill = background.getFills().get(0).getFill().toString();
+            return "0xffffffba".equals(firstFill) || "0xffffffbf".equals(firstFill) || "0xffffff12".equals(firstFill) || "0xffffffbd".equals(firstFill);
+        } catch (Exception var3) {
+            return false;
+        }
+    }
+
+    private boolean isJavaDefaultClickedBackground(Background background) {
+        try {
+            return "0x039ed3ff".equals(background.getFills().get(0).getFill().toString());
+        } catch (Exception var3) {
+            return false;
+        }
+    }
+
+    private void updateButtonType(JFXButton.ButtonType type) {
+        switch (type) {
+            case RAISED -> {
+                JFXDepthManager.setDepth(this.buttonContainer, 2);
+                this.clickedAnimation = new ButtonClickTransition();
+            }
+            case FLAT -> this.buttonContainer.setEffect(null);
+        }
+    }
+
+    private class ButtonClickTransition extends CachedTransition {
+        public ButtonClickTransition() {
+            super(JFXButtonSkin.this.buttonContainer, new Timeline(
+                    new KeyFrame(Duration.ZERO,
+                            new KeyValue(((DropShadow) JFXButtonSkin.this.buttonContainer.getEffect()).radiusProperty(), JFXDepthManager.getShadowAt(2).radiusProperty().get(), Interpolator.EASE_BOTH),
+                            new KeyValue(((DropShadow) JFXButtonSkin.this.buttonContainer.getEffect()).spreadProperty(), JFXDepthManager.getShadowAt(2).spreadProperty().get(), Interpolator.EASE_BOTH),
+                            new KeyValue(((DropShadow) JFXButtonSkin.this.buttonContainer.getEffect()).offsetXProperty(), JFXDepthManager.getShadowAt(2).offsetXProperty().get(), Interpolator.EASE_BOTH),
+                            new KeyValue(((DropShadow) JFXButtonSkin.this.buttonContainer.getEffect()).offsetYProperty(), JFXDepthManager.getShadowAt(2).offsetYProperty().get(), Interpolator.EASE_BOTH)),
+                    new KeyFrame(Duration.millis(1000.0F),
+                            new KeyValue(((DropShadow) JFXButtonSkin.this.buttonContainer.getEffect()).radiusProperty(), JFXDepthManager.getShadowAt(5).radiusProperty().get(), Interpolator.EASE_BOTH),
+                            new KeyValue(((DropShadow) JFXButtonSkin.this.buttonContainer.getEffect()).spreadProperty(), JFXDepthManager.getShadowAt(5).spreadProperty().get(), Interpolator.EASE_BOTH),
+                            new KeyValue(((DropShadow) JFXButtonSkin.this.buttonContainer.getEffect()).offsetXProperty(), JFXDepthManager.getShadowAt(5).offsetXProperty().get(), Interpolator.EASE_BOTH),
+                            new KeyValue(((DropShadow) JFXButtonSkin.this.buttonContainer.getEffect()).offsetYProperty(), JFXDepthManager.getShadowAt(5).offsetYProperty().get(), Interpolator.EASE_BOTH))));
+            this.setCycleDuration(Duration.seconds(0.2));
+            this.setDelay(Duration.seconds(0.0F));
+        }
+    }
+}
@@ -17,6 +17,7 @@ import javafx.animation.KeyFrame;
 import javafx.animation.KeyValue;
 import javafx.animation.Timeline;
 import javafx.animation.Transition;
+import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.geometry.HPos;
 import javafx.geometry.Insets;
 import javafx.geometry.VPos;
@@ -35,6 +36,7 @@ import javafx.scene.paint.Color;
 import javafx.scene.shape.SVGPath;
 import javafx.util.Duration;
 import org.jackhuang.hmcl.theme.Themes;
+import org.jackhuang.hmcl.ui.FXUtils;

 public class JFXCheckBoxSkin extends CheckBoxSkin {
    private final StackPane box = new StackPane();
@@ -75,7 +77,11 @@ public class JFXCheckBoxSkin extends CheckBoxSkin {
            this.updateRippleColor();
            this.playSelectAnimation(newVal);
        });
-        control.focusedProperty().addListener((o, oldVal, newVal) -> {
+
+        ReadOnlyBooleanProperty focusVisibleProperty = FXUtils.focusVisibleProperty(control);
+        if (focusVisibleProperty == null)
+            focusVisibleProperty = control.focusedProperty();
+        focusVisibleProperty.addListener((o, oldVal, newVal) -> {
            if (newVal) {
                if (!this.getSkinnable().isPressed()) {
                    this.rippler.showOverlay();
@@ -0,0 +1,277 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by Fernflower decompiler)
+//
+
+package com.jfoenix.skins;
+
+import com.jfoenix.adapters.skins.ComboBoxListViewSkin;
+import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.controls.JFXComboBox;
+import com.jfoenix.transitions.CachedTransition;
+import javafx.animation.*;
+import javafx.application.Platform;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.control.ComboBoxBase;
+import javafx.scene.layout.*;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.Paint;
+import javafx.scene.text.Text;
+import javafx.scene.transform.Scale;
+import javafx.util.Duration;
+
+public class JFXComboBoxListViewSkin<T> extends ComboBoxListViewSkin<T> {
+    protected final ObjectProperty<Paint> promptTextFill;
+    private boolean invalid = true;
+    private final StackPane customPane;
+    private final StackPane line = new StackPane();
+    private final StackPane focusedLine = new StackPane();
+    private final Text promptText = new Text();
+    private final double initScale = 0.05;
+    private final Scale scale;
+    private final Timeline linesAnimation;
+    private ParallelTransition transition;
+    private CachedTransition promptTextUpTransition;
+    private CachedTransition promptTextDownTransition;
+    private CachedTransition promptTextColorTransition;
+    private final Scale promptTextScale;
+    private Paint oldPromptTextFill;
+    private final BooleanBinding usePromptText;
+
+    public JFXComboBoxListViewSkin(JFXComboBox<T> comboBox) {
+        super(comboBox);
+        this.scale = new Scale(this.initScale, 1.0F);
+        this.linesAnimation = new Timeline(new KeyFrame(Duration.ZERO, new KeyValue(this.scale.xProperty(), this.initScale, Interpolator.EASE_BOTH), new KeyValue(this.focusedLine.opacityProperty(), 0, Interpolator.EASE_BOTH)), new KeyFrame(Duration.millis(1.0F), new KeyValue(this.focusedLine.opacityProperty(), 1, Interpolator.EASE_BOTH)), new KeyFrame(Duration.millis(160.0F), new KeyValue(this.scale.xProperty(), 1, Interpolator.EASE_BOTH)));
+        this.promptTextScale = new Scale(1.0F, 1.0F, 0.0F, 0.0F);
+        this.promptTextFill = new SimpleObjectProperty(Color.valueOf("#B2B2B2"));
+        this.usePromptText = Bindings.createBooleanBinding(this::usePromptText, ((JFXComboBox) this.getSkinnable()).valueProperty(), this.getSkinnable().promptTextProperty());
+        this.getArrowButton().setBackground(new Background(new BackgroundFill(Color.TRANSPARENT, null, null)));
+        this.promptText.textProperty().bind(comboBox.promptTextProperty());
+        this.promptText.fillProperty().bind(this.promptTextFill);
+        this.promptText.getStyleClass().addAll("text", "prompt-text");
+        this.promptText.getTransforms().add(this.promptTextScale);
+        if (!comboBox.isLabelFloat()) {
+            this.promptText.visibleProperty().bind(this.usePromptText);
+        }
+
+        this.customPane = new StackPane();
+        this.customPane.setMouseTransparent(true);
+        this.customPane.getStyleClass().add("combo-box-button-container");
+        this.customPane.backgroundProperty().bindBidirectional(this.getSkinnable().backgroundProperty());
+        this.customPane.setBackground(new Background(new BackgroundFill(Color.TRANSPARENT, null, null)));
+        this.customPane.getChildren().add(this.promptText);
+        this.getChildren().add(0, this.customPane);
+        StackPane.setAlignment(this.promptText, Pos.CENTER_LEFT);
+        this.line.getStyleClass().add("input-line");
+        this.focusedLine.getStyleClass().add("input-focused-line");
+        this.getChildren().add(this.line);
+        this.getChildren().add(this.focusedLine);
+        this.line.setPrefHeight(1.0F);
+        this.line.setTranslateY(1.0F);
+        this.line.setManaged(false);
+        this.line.setBackground(new Background(new BackgroundFill(((JFXComboBox) this.getSkinnable()).getUnFocusColor(), CornerRadii.EMPTY, Insets.EMPTY)));
+        if (this.getSkinnable().isDisabled()) {
+            this.line.setBorder(new Border(new BorderStroke(((JFXComboBox) this.getSkinnable()).getUnFocusColor(), BorderStrokeStyle.DASHED, CornerRadii.EMPTY, new BorderWidths(1.0F))));
+            this.line.setBackground(new Background(new BackgroundFill(Color.TRANSPARENT, CornerRadii.EMPTY, Insets.EMPTY)));
+        }
+
+        this.focusedLine.setPrefHeight(2.0F);
+        this.focusedLine.setTranslateY(0.0F);
+        this.focusedLine.setBackground(new Background(new BackgroundFill(((JFXComboBox) this.getSkinnable()).getFocusColor(), CornerRadii.EMPTY, Insets.EMPTY)));
+        this.focusedLine.setOpacity(0.0F);
+        this.focusedLine.getTransforms().add(this.scale);
+        this.focusedLine.setManaged(false);
+        if (comboBox.isEditable()) {
+            comboBox.getEditor().setStyle("-fx-background-color:TRANSPARENT;-fx-padding: 4 8 4 8");
+            comboBox.getEditor().promptTextProperty().unbind();
+            comboBox.getEditor().setPromptText(null);
+            comboBox.getEditor().textProperty().addListener((o, oldVal, newVal) -> {
+                this.usePromptText.invalidate();
+                comboBox.setValue(this.getConverter().fromString(newVal));
+            });
+        }
+
+        comboBox.labelFloatProperty().addListener((o, oldVal, newVal) -> {
+            if (newVal) {
+                this.promptText.visibleProperty().unbind();
+                JFXUtilities.runInFX(() -> this.createFloatingAnimation());
+            } else {
+                this.promptText.visibleProperty().bind(this.usePromptText);
+            }
+
+            this.createFocusTransition();
+        });
+        comboBox.focusColorProperty().addListener((o, oldVal, newVal) -> {
+            if (newVal != null) {
+                this.focusedLine.setBackground(new Background(new BackgroundFill(newVal, CornerRadii.EMPTY, Insets.EMPTY)));
+                if (((JFXComboBox) this.getSkinnable()).isLabelFloat()) {
+                    this.promptTextColorTransition = new CachedTransition(this.customPane, new Timeline(new KeyFrame(Duration.millis(1300.0F), new KeyValue(this.promptTextFill, newVal, Interpolator.EASE_BOTH)))) {
+                        {
+                            this.setDelay(Duration.millis(0.0F));
+                            this.setCycleDuration(Duration.millis(160.0F));
+                        }
+
+                        protected void starting() {
+                            super.starting();
+                            JFXComboBoxListViewSkin.this.oldPromptTextFill = JFXComboBoxListViewSkin.this.promptTextFill.get();
+                        }
+                    };
+                    this.transition = null;
+                }
+            }
+
+        });
+        comboBox.unFocusColorProperty().addListener((o, oldVal, newVal) -> {
+            if (newVal != null) {
+                this.line.setBackground(new Background(new BackgroundFill(newVal, CornerRadii.EMPTY, Insets.EMPTY)));
+            }
+
+        });
+        comboBox.disabledProperty().addListener((o, oldVal, newVal) -> {
+            this.line.setBorder(newVal ? new Border(new BorderStroke(((JFXComboBox) this.getSkinnable()).getUnFocusColor(), BorderStrokeStyle.DASHED, CornerRadii.EMPTY, new BorderWidths(this.line.getHeight()))) : Border.EMPTY);
+            this.line.setBackground(new Background(new BackgroundFill(newVal ? Color.TRANSPARENT : ((JFXComboBox) this.getSkinnable()).getUnFocusColor(), CornerRadii.EMPTY, Insets.EMPTY)));
+        });
+        comboBox.focusedProperty().addListener((o, oldVal, newVal) -> {
+            if (newVal) {
+                this.focus();
+            } else {
+                this.unFocus();
+            }
+
+        });
+        comboBox.valueProperty().addListener((o, oldVal, newVal) -> {
+            if (((JFXComboBox) this.getSkinnable()).isLabelFloat()) {
+                this.animateFloatingLabel(newVal != null && !newVal.toString().isEmpty());
+            }
+
+        });
+    }
+
+    protected void layoutChildren(double x, double y, double w, double h) {
+        super.layoutChildren(x, y, w, h);
+        this.customPane.resizeRelocate(x, y, w, h);
+        if (this.invalid) {
+            this.invalid = false;
+            if (!this.getSkinnable().isEditable()) {
+                Text javaPromptText = (Text) super.getDisplayNode().lookup(".text");
+                if (javaPromptText != null) {
+                    this.promptTextFill.set(javaPromptText.getFill());
+                }
+            }
+
+            this.createFloatingAnimation();
+            if (((ComboBoxBase) this.getSkinnable()).getValue() != null) {
+                this.animateFloatingLabel(true);
+            }
+        }
+
+        this.focusedLine.resizeRelocate(x, this.getSkinnable().getHeight(), w, this.focusedLine.prefHeight(-1.0F));
+        this.line.resizeRelocate(x, this.getSkinnable().getHeight(), w, this.line.prefHeight(-1.0F));
+        this.scale.setPivotX(w / (double) 2.0F);
+    }
+
+    private void createFloatingAnimation() {
+        this.promptTextUpTransition = new CachedTransition(this.customPane, new Timeline(new KeyFrame(Duration.millis(1300.0F), new KeyValue(this.promptText.translateYProperty(), -this.customPane.getHeight() + 6.05, Interpolator.EASE_BOTH), new KeyValue(this.promptTextScale.xProperty(), 0.85, Interpolator.EASE_BOTH), new KeyValue(this.promptTextScale.yProperty(), 0.85, Interpolator.EASE_BOTH)))) {
+            {
+                this.setDelay(Duration.millis(0.0F));
+                this.setCycleDuration(Duration.millis(240.0F));
+            }
+        };
+        this.promptTextColorTransition = new CachedTransition(this.customPane, new Timeline(new KeyFrame(Duration.millis(1300.0F), new KeyValue(this.promptTextFill, ((JFXComboBox) this.getSkinnable()).getFocusColor(), Interpolator.EASE_BOTH)))) {
+            {
+                this.setDelay(Duration.millis(0.0F));
+                this.setCycleDuration(Duration.millis(160.0F));
+            }
+
+            protected void starting() {
+                super.starting();
+                JFXComboBoxListViewSkin.this.oldPromptTextFill = JFXComboBoxListViewSkin.this.promptTextFill.get();
+            }
+        };
+        this.promptTextDownTransition = new CachedTransition(this.customPane, new Timeline(new KeyFrame(Duration.millis(1300.0F), new KeyValue(this.promptText.translateYProperty(), 0, Interpolator.EASE_BOTH), new KeyValue(this.promptTextScale.xProperty(), 1, Interpolator.EASE_BOTH), new KeyValue(this.promptTextScale.yProperty(), 1, Interpolator.EASE_BOTH)))) {
+            {
+                this.setDelay(Duration.millis(0.0F));
+                this.setCycleDuration(Duration.millis(240.0F));
+            }
+        };
+        this.promptTextDownTransition.setOnFinished((finish) -> {
+            this.promptText.setTranslateY(0.0F);
+            this.promptTextScale.setX(1.0F);
+            this.promptTextScale.setY(1.0F);
+        });
+    }
+
+    private void focus() {
+        if (this.transition == null) {
+            this.createFocusTransition();
+        }
+
+        this.transition.play();
+    }
+
+    private void animateFloatingLabel(boolean up) {
+        if (this.promptText == null) {
+            Platform.runLater(() -> this.animateFloatingLabel(up));
+        } else {
+            if (this.transition != null) {
+                this.transition.stop();
+                this.transition.getChildren().remove(this.promptTextUpTransition);
+                this.transition.getChildren().remove(this.promptTextColorTransition);
+                this.transition = null;
+            }
+
+            if (up && this.promptText.getTranslateY() == (double) 0.0F) {
+                this.promptTextDownTransition.stop();
+                this.promptTextUpTransition.play();
+                if (this.getSkinnable().isFocused()) {
+                    this.promptTextColorTransition.play();
+                }
+            } else if (!up) {
+                this.promptTextUpTransition.stop();
+                if (this.getSkinnable().isFocused()) {
+                    this.promptTextFill.set(this.oldPromptTextFill);
+                }
+
+                this.promptTextDownTransition.play();
+            }
+        }
+
+    }
+
+    private void createFocusTransition() {
+        this.transition = new ParallelTransition();
+        if (((JFXComboBox) this.getSkinnable()).isLabelFloat()) {
+            this.transition.getChildren().add(this.promptTextUpTransition);
+            this.transition.getChildren().add(this.promptTextColorTransition);
+        }
+
+        this.transition.getChildren().add(this.linesAnimation);
+    }
+
+    private void unFocus() {
+        if (this.transition != null) {
+            this.transition.stop();
+        }
+
+        this.scale.setX(this.initScale);
+        this.focusedLine.setOpacity(0.0F);
+        if (((JFXComboBox) this.getSkinnable()).isLabelFloat() && this.oldPromptTextFill != null) {
+            this.promptTextFill.set(this.oldPromptTextFill);
+            if (this.usePromptText()) {
+                this.promptTextDownTransition.play();
+            }
+        }
+
+    }
+
+    private boolean usePromptText() {
+        Object txt = ((JFXComboBox) this.getSkinnable()).getValue();
+        String promptTxt = this.getSkinnable().getPromptText();
+        return (txt == null || txt.toString().isEmpty()) && promptTxt != null && !promptTxt.isEmpty() && !this.promptTextFill.get().equals(Color.TRANSPARENT);
+    }
+}
@@ -34,14 +34,21 @@ import javafx.geometry.Insets;
 import javafx.geometry.Rectangle2D;
 import javafx.scene.Scene;
 import javafx.scene.control.Tab;
+import javafx.scene.control.TextFormatter;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.*;
 import javafx.scene.paint.Color;
 import javafx.stage.*;
 import javafx.util.Duration;
+import org.glavo.monetfx.ColorScheme;
 import org.jackhuang.hmcl.setting.StyleSheets;
+import org.jackhuang.hmcl.theme.Themes;
+import org.jackhuang.hmcl.util.StringUtils;

 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.regex.Pattern;
+
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 /**
 * @author Shadi Shaheen
@@ -75,7 +82,7 @@ public class JFXCustomColorPickerDialog extends StackPane {

        // create JFX Decorator
        pickerDecorator = new JFXDecorator(dialog, this, false, false, false);
-        pickerDecorator.setOnCloseButtonAction(this::updateColor);
+        pickerDecorator.setOnCloseButtonAction(this::close);
        pickerDecorator.setPickOnBounds(false);
        customScene = new Scene(pickerDecorator, Color.TRANSPARENT);
        StyleSheets.init(customScene);
@@ -95,14 +102,17 @@ public class JFXCustomColorPickerDialog extends StackPane {

        rgbField.getStyleClass().add("custom-color-field");
        rgbField.setPromptText("RGB Color");
+        rgbField.setTextFormatter(colorCharFormatter());
        rgbField.textProperty().addListener((o, oldVal, newVal) -> updateColorFromUserInput(newVal));

        hsbField.getStyleClass().add("custom-color-field");
        hsbField.setPromptText("HSB Color");
+        hsbField.setTextFormatter(colorCharFormatter());
        hsbField.textProperty().addListener((o, oldVal, newVal) -> updateColorFromUserInput(newVal));

        hexField.getStyleClass().add("custom-color-field");
        hexField.setPromptText("#HEX Color");
+        hexField.setTextFormatter(colorCharFormatter());
        hexField.textProperty().addListener((o, oldVal, newVal) -> updateColorFromUserInput(newVal));

        StackPane tabContent = new StackPane();
@@ -147,6 +157,22 @@ public class JFXCustomColorPickerDialog extends StackPane {
            paraTransition.play();
        });

+        container.getChildren().add(tabs);
+
+        HBox actionsHBox = new HBox();
+        actionsHBox.getStyleClass().add("jfx-color-dialog-actions");
+
+        JFXButton acceptButton = new JFXButton(i18n("button.ok"));
+        acceptButton.setOnAction(event -> updateColor());
+        acceptButton.getStyleClass().add("jfx-color-dialog-accept");
+
+        JFXButton cancelButton = new JFXButton(i18n("button.cancel"));
+        cancelButton.setOnAction(event -> close());
+        cancelButton.getStyleClass().add("jfx-color-dialog-cancel");
+
+        actionsHBox.getChildren().addAll(acceptButton, cancelButton);
+        container.getChildren().add(actionsHBox);
+
        initRun = () -> {
            // change tabs labels font color according to the selected color
            pane.backgroundProperty().addListener((o, oldVal, newVal) -> {
@@ -173,7 +199,7 @@ public class JFXCustomColorPickerDialog extends StackPane {
                            (int) (newColor.getRed() * 255),
                            (int) (newColor.getGreen() * 255),
                            (int) (newColor.getBlue() * 255));
-                    String rgb = String.format("rgba(%d, %d, %d, 1)",
+                    String rgb = String.format("rgb(%d, %d, %d)",
                            (int) (newColor.getRed() * 255),
                            (int) (newColor.getGreen() * 255),
                            (int) (newColor.getBlue() * 255));
@@ -226,7 +252,13 @@ public class JFXCustomColorPickerDialog extends StackPane {
                hexField.focusColorProperty().bind(Bindings.createObjectBinding(() -> {
                    return pane.getBackground().getFills().get(0).getFill();
                }, pane.backgroundProperty()));
-
+                acceptButton.textFillProperty().bind(Bindings.createObjectBinding(() -> {
+                    Color fill = (Color) pane.getBackground().getFills().get(0).getFill();
+                    return ColorScheme.newBuilder(Themes.getColorScheme())
+                            .setPrimaryColorSeed(fill)
+                            .build()
+                            .getPrimary();
+                }, pane.backgroundProperty()));

                ((Pane) pickerDecorator.lookup(".jfx-decorator-buttons-container")).backgroundProperty()
                        .bind(Bindings.createObjectBinding(() -> {
@@ -256,9 +288,6 @@ public class JFXCustomColorPickerDialog extends StackPane {
            });
        };

-
-        container.getChildren().add(tabs);
-
        this.getChildren().add(container);
        this.setPadding(new Insets(0));

@@ -288,7 +317,11 @@ public class JFXCustomColorPickerDialog extends StackPane {
        if (!systemChange) {
            userChange = true;
            try {
-                curvedColorPicker.setColor(Color.valueOf(colorWebString));
+                Color color = Color.valueOf(colorWebString);
+                if (color.getOpacity() != 1.0) {
+                    color = Color.color(color.getRed(), color.getGreen(), color.getBlue());
+                }
+                curvedColorPicker.setColor(color);
            } catch (IllegalArgumentException ignored) {
                // if color is not valid then do nothing
            }
@@ -303,6 +336,9 @@ public class JFXCustomColorPickerDialog extends StackPane {

    public void setCurrentColor(Color currentColor) {
        this.currentColorProperty.set(currentColor);
+        if (curvedColorPicker != null && currentColor != null) {
+            curvedColorPicker.setColor(currentColor);
+        }
    }

    Color getCurrentColor() {
@@ -404,4 +440,20 @@ public class JFXCustomColorPickerDialog extends StackPane {
        dialog.setMinWidth(minWidth);
        dialog.setMinHeight(minHeight);
    }
+
+    private static final Pattern COLOR_CHAR_PATTERN = Pattern.compile("[0-9a-zA-Z#(),%.\\s]*");
+
+    private static TextFormatter<String> colorCharFormatter() {
+        return new TextFormatter<>(change -> {
+            if (!change.isContentChange()) return change;
+
+            String ins = StringUtils.toHalfWidth(change.getText());
+            if (!COLOR_CHAR_PATTERN.matcher(ins).matches()) return null;
+            String full = StringUtils.toHalfWidth(change.getControlNewText());
+            long h = full.chars().filter(c -> c == '#').count();
+            if (h > 1 || (h == 1 && full.indexOf('#') != 0)) return null;
+            change.setText(ins);
+            return change;
+        });
+    }
 }
@@ -20,26 +20,23 @@
 */
 package com.jfoenix.skins;

-import com.jfoenix.adapters.skins.ListViewSkin;
 import com.jfoenix.controls.JFXListView;
 import com.jfoenix.effects.JFXDepthManager;
 import javafx.scene.control.ListCell;
+import javafx.scene.control.skin.ListViewSkin;
 import javafx.scene.control.skin.VirtualFlow;
-import javafx.scene.layout.Region;
 import org.jackhuang.hmcl.ui.FXUtils;

-// https://github.com/HMCL-dev/HMCL/issues/4720
 public class JFXListViewSkin<T> extends ListViewSkin<T> {

-    private final VirtualFlow<ListCell<T>> flow;
-
-    @SuppressWarnings("unchecked")
    public JFXListViewSkin(final JFXListView<T> listView) {
        super(listView);
-        flow = (VirtualFlow<ListCell<T>>) getChildren().get(0);
-        JFXDepthManager.setDepth(flow, listView.depthProperty().get());
-        listView.depthProperty().addListener((o, oldVal, newVal) -> JFXDepthManager.setDepth(flow, newVal));
-        FXUtils.smoothScrolling(flow);
+        VirtualFlow<ListCell<T>> flow = getVirtualFlow();
+        FXUtils.onChangeAndOperate(listView.depthProperty(), depth -> JFXDepthManager.setDepth(flow, depth.intValue()));
+
+        if (!Boolean.TRUE.equals(listView.getProperties().get("no-smooth-scrolling"))) {
+            FXUtils.smoothScrolling(flow);
+        }
    }

    @Override
@@ -47,47 +44,4 @@ public class JFXListViewSkin<T> extends ListViewSkin<T> {
        return 200;
    }

-    @Override
-    protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        final int itemsCount = getSkinnable().getItems().size();
-        if (getSkinnable().maxHeightProperty().isBound() || itemsCount <= 0) {
-            return super.computePrefHeight(width, topInset, rightInset, bottomInset, leftInset);
-        }
-
-        final double fixedCellSize = getSkinnable().getFixedCellSize();
-        double computedHeight = fixedCellSize != Region.USE_COMPUTED_SIZE ?
-                fixedCellSize * itemsCount + snapVerticalInsets() : estimateHeight();
-        double height = super.computePrefHeight(width, topInset, rightInset, bottomInset, leftInset);
-        if (height > computedHeight) {
-            height = computedHeight;
-        }
-
-        if (getSkinnable().getMaxHeight() > 0 && computedHeight > getSkinnable().getMaxHeight()) {
-            return getSkinnable().getMaxHeight();
-        }
-
-        return height;
-    }
-
-    private double estimateHeight() {
-        // compute the border/padding for the list
-        double borderWidth = snapVerticalInsets();
-        // compute the gap between list cells
-
-        JFXListView<T> listview = (JFXListView<T>) getSkinnable();
-        double gap = listview.isExpanded() ? ((JFXListView<T>) getSkinnable()).getVerticalGap() * (getSkinnable().getItems()
-                .size()) : 0;
-        // compute the height of each list cell
-        double cellsHeight = 0;
-        for (int i = 0; i < flow.getCellCount(); i++) {
-            ListCell<T> cell = flow.getCell(i);
-            cellsHeight += cell.getHeight();
-        }
-        return cellsHeight + gap + borderWidth;
-    }
-
-    private double snapVerticalInsets() {
-        return getSkinnable().snappedBottomInset() + getSkinnable().snappedTopInset();
-    }
-
 }
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2016 JFoenix
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package com.jfoenix.skins;
+
+import com.jfoenix.controls.JFXPopup;
+import com.jfoenix.controls.JFXPopup.PopupHPosition;
+import com.jfoenix.controls.JFXPopup.PopupVPosition;
+import com.jfoenix.effects.JFXDepthManager;
+import javafx.animation.*;
+import javafx.animation.Animation.Status;
+import javafx.scene.Node;
+import javafx.scene.control.Skin;
+import javafx.scene.layout.*;
+import javafx.scene.transform.Scale;
+import javafx.util.Duration;
+import org.jackhuang.hmcl.ui.animation.AnimationUtils;
+import org.jackhuang.hmcl.ui.animation.Motion;
+
+/// # Material Design Popup Skin
+/// TODO: REWORK
+///
+/// @author Shadi Shaheen
+/// @version 2.0
+/// @since 2017-03-01
+public class JFXPopupSkin implements Skin<JFXPopup> {
+
+    protected JFXPopup control;
+    protected StackPane container = new StackPane();
+    protected Region popupContent;
+    protected Node root;
+
+    private Animation animation;
+    protected Scale scale;
+
+    public JFXPopupSkin(JFXPopup control) {
+        this.control = control;
+        // set scale y to 0.01 instead of 0 to allow layout of the content,
+        // otherwise it will cause exception in traverse engine, when focusing the 1st node
+        scale = new Scale(1.0, 0.01, 0, 0);
+        popupContent = control.getPopupContent();
+        container.getStyleClass().add("jfx-popup-container");
+        container.getChildren().add(popupContent);
+        container.getTransforms().add(scale);
+        container.setOpacity(0);
+        root = JFXDepthManager.createMaterialNode(container, 4);
+        animation = AnimationUtils.isAnimationEnabled() ? getAnimation() : null;
+    }
+
+    public void reset(PopupVPosition vAlign, PopupHPosition hAlign, double offsetX, double offsetY) {
+        // postion the popup according to its animation
+        scale.setPivotX(hAlign == PopupHPosition.RIGHT ? container.getWidth() : 0);
+        scale.setPivotY(vAlign == PopupVPosition.BOTTOM ? container.getHeight() : 0);
+        control.setX(control.getX() + (hAlign == PopupHPosition.RIGHT ? -container.getWidth() + offsetX : offsetX));
+        control.setY(control.getY() + (vAlign == PopupVPosition.BOTTOM ? -container.getHeight() + offsetY : offsetY));
+    }
+
+    public final void animate() {
+        if (animation != null) {
+            if (animation.getStatus() == Status.STOPPED) {
+                container.setOpacity(1);
+                animation.playFromStart();
+            }
+        } else {
+            container.setOpacity(1);
+            popupContent.setOpacity(1);
+            scale.setX(1.0);
+            scale.setY(1.0);
+        }
+    }
+
+    @Override
+    public JFXPopup getSkinnable() {
+        return control;
+    }
+
+    @Override
+    public Node getNode() {
+        return root;
+    }
+
+    @Override
+    public void dispose() {
+        if (animation != null) {
+            animation.stop();
+            animation = null;
+        }
+        container = null;
+        control = null;
+        popupContent = null;
+        root = null;
+    }
+
+    protected Animation getAnimation() {
+        Interpolator interpolator = Motion.EASE;
+        return new Timeline(
+                new KeyFrame(
+                        Duration.ZERO,
+                        new KeyValue(popupContent.opacityProperty(), 0, interpolator),
+                        new KeyValue(scale.xProperty(), 0, interpolator),
+                        new KeyValue(scale.yProperty(), 0, interpolator)
+                ),
+                new KeyFrame(Motion.SHORT4,
+                        new KeyValue(popupContent.opacityProperty(), 0, interpolator),
+                        new KeyValue(scale.xProperty(), 1, interpolator)
+                ),
+                new KeyFrame(Motion.MEDIUM2,
+                        new KeyValue(popupContent.opacityProperty(), 1, interpolator),
+                        new KeyValue(scale.yProperty(), 1, interpolator)
+                )
+        );
+    }
+
+    public void init() {
+        if (animation != null)
+            animation.stop();
+        container.setOpacity(0);
+        scale.setX(1.0);
+        scale.setY(0.01);
+    }
+}
@@ -0,0 +1,225 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.jfoenix.skins;
+
+import com.jfoenix.controls.JFXProgressBar;
+import com.jfoenix.utils.TreeShowingProperty;
+import javafx.animation.*;
+import javafx.scene.Node;
+import javafx.scene.control.SkinBase;
+import javafx.scene.layout.*;
+import javafx.scene.shape.Rectangle;
+import javafx.util.Duration;
+import org.jackhuang.hmcl.ui.animation.AnimationUtils;
+
+/// # Material Design ProgressBar Skin
+///
+/// @author Shadi Shaheen
+/// @version 2.0
+/// @since 2017-10-06
+public class JFXProgressBarSkin extends SkinBase<JFXProgressBar> {
+
+    private static final double DEFAULT_HEIGHT = 4;
+
+    private final StackPane track;
+    private final StackPane bar;
+    private final Rectangle clip;
+    private Animation transition;
+    private final TreeShowingProperty treeShowingProperty;
+    private double fullWidth;
+
+    public JFXProgressBarSkin(JFXProgressBar control) {
+        super(control);
+
+        this.treeShowingProperty = new TreeShowingProperty(control);
+
+        registerChangeListener(treeShowingProperty, obs -> updateProgress(false));
+        registerChangeListener(control.progressProperty(), obs -> updateProgress(true));
+
+        track = new StackPane();
+        track.getStyleClass().setAll("track");
+
+        bar = new StackPane();
+        bar.getStyleClass().setAll("bar");
+
+        clip = new Rectangle();
+        clip.setArcWidth(DEFAULT_HEIGHT);
+        clip.setArcHeight(DEFAULT_HEIGHT);
+        bar.setClip(clip);
+
+        getChildren().setAll(track, bar);
+
+        getSkinnable().requestLayout();
+    }
+
+    @Override
+    public double computeBaselineOffset(double topInset, double rightInset, double bottomInset, double leftInset) {
+        return Node.BASELINE_OFFSET_SAME_AS_HEIGHT;
+    }
+
+    @Override
+    protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return Math.max(100, leftInset + bar.prefWidth(getSkinnable().getWidth()) + rightInset);
+    }
+
+    @Override
+    protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return topInset + DEFAULT_HEIGHT + bottomInset;
+    }
+
+    @Override
+    protected double computeMaxWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return getSkinnable().prefWidth(height);
+    }
+
+    @Override
+    protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return getSkinnable().prefHeight(width);
+    }
+
+    @Override
+    protected void layoutChildren(double x, double y, double w, double h) {
+        track.resizeRelocate(x, y, w, h);
+        bar.resizeRelocate(x, y, w, h);
+
+        clip.relocate(0, 0);
+        clip.setWidth(0);
+        clip.setHeight(h);
+        clip.setTranslateX(0);
+
+        fullWidth = w;
+
+        clearAnimation();
+        updateProgress(false);
+    }
+
+    private boolean wasIndeterminate = false;
+
+    private void updateProgress(boolean playProgressAnimation) {
+        double progress = Math.min(getSkinnable().getProgress(), 1.0);
+        boolean isIndeterminate = progress < 0.0;
+        boolean isTreeShowing = treeShowingProperty.get();
+
+        if (isIndeterminate != wasIndeterminate) {
+            wasIndeterminate = isIndeterminate;
+            clearAnimation();
+            clip.setTranslateX(0);
+        }
+
+        if (isIndeterminate) { // indeterminate
+            if (isTreeShowing) {
+                if (transition == null) {
+                    transition = createIndeterminateTransition();
+                    transition.playFromStart();
+                } else {
+                    transition.play();
+                }
+            } else if (transition != null) {
+                transition.pause();
+            }
+        } else { // determinate
+            clearAnimation();
+            if (isTreeShowing && playProgressAnimation
+                    && AnimationUtils.isAnimationEnabled()
+                    && getSkinnable().isSmoothProgress()) {
+                transition = createDeterminateTransition(progress);
+                transition.playFromStart();
+            } else {
+                clip.setWidth(computeBarWidth(progress));
+            }
+        }
+    }
+
+    private static final Duration INDETERMINATE_DURATION = Duration.seconds(1);
+
+    private Transition createIndeterminateTransition() {
+        double minWidth = 0;
+        double maxWidth = fullWidth * 0.4;
+        Transition transition = new Transition() {
+            {
+                setInterpolator(Interpolator.LINEAR);
+                setCycleDuration(INDETERMINATE_DURATION);
+            }
+
+            @Override
+            protected void interpolate(double frac) {
+                double currentWidth;
+
+                if (frac <= 0.5) {
+                    currentWidth = Interpolator.EASE_IN.interpolate(minWidth, maxWidth, frac / 0.5);
+                } else {
+                    currentWidth = Interpolator.EASE_OUT.interpolate(maxWidth, minWidth, (frac - 0.5) / 0.5);
+                }
+
+                double targetCenter;
+                if (frac <= 0.1) {
+                    targetCenter = 0.0;
+                } else if (frac >= 0.9) {
+                    targetCenter = fullWidth;
+                } else {
+                    targetCenter = ((frac - 0.1) / 0.8) * fullWidth;
+                }
+
+                clip.setWidth(currentWidth);
+                clip.setTranslateX(targetCenter - currentWidth / 2.0);
+            }
+        };
+
+        transition.setCycleCount(Timeline.INDEFINITE);
+        return transition;
+    }
+
+    private static final Duration DETERMINATE_DURATION = Duration.seconds(0.2);
+
+    private Timeline createDeterminateTransition(double targetProgress) {
+        Timeline timeline = new Timeline(
+                new KeyFrame(Duration.ZERO,
+                        new KeyValue(clip.widthProperty(), clip.getWidth(), Interpolator.EASE_OUT)),
+                new KeyFrame(DETERMINATE_DURATION,
+                        new KeyValue(clip.widthProperty(), computeBarWidth(targetProgress), Interpolator.EASE_OUT))
+        );
+        timeline.setOnFinished(e -> {
+            if (transition == timeline) {
+                transition = null;
+            }
+        });
+        return timeline;
+    }
+
+    private void clearAnimation() {
+        if (transition != null) {
+            transition.stop();
+            transition = null;
+        }
+    }
+
+    @Override
+    public void dispose() {
+        super.dispose();
+        treeShowingProperty.dispose();
+        clearAnimation();
+    }
+
+    private double computeBarWidth(double progress) {
+        assert progress >= 0 && progress <= 1;
+        double barWidth = ((int) fullWidth * 2 * progress) / 2.0;
+        return progress > 0 ? Math.max(barWidth, DEFAULT_HEIGHT) : barWidth;
+    }
+}
@@ -12,6 +12,7 @@ import javafx.animation.Interpolator;
 import javafx.animation.KeyFrame;
 import javafx.animation.KeyValue;
 import javafx.animation.Timeline;
+import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.geometry.HPos;
 import javafx.geometry.Insets;
 import javafx.geometry.VPos;
@@ -23,6 +24,7 @@ import javafx.scene.paint.Color;
 import javafx.scene.shape.Circle;
 import javafx.scene.text.Text;
 import javafx.util.Duration;
+import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.animation.AnimationUtils;

 public class JFXRadioButtonSkin extends RadioButtonSkin {
@@ -58,7 +60,12 @@ public class JFXRadioButtonSkin extends RadioButtonSkin {
        AnchorPane.setRightAnchor(this.rippler, this.labelOffset);

        this.updateChildren();
-        control.focusedProperty().addListener((o, oldVal, newVal) -> {
+        ReadOnlyBooleanProperty focusVisibleProperty = FXUtils.focusVisibleProperty(control);
+        if (focusVisibleProperty == null) {
+            focusVisibleProperty = control.focusedProperty();
+        }
+
+        focusVisibleProperty.addListener((o, oldVal, newVal) -> {
            if (newVal) {
                if (!this.getSkinnable().isPressed()) {
                    this.rippler.showOverlay();
@@ -66,7 +73,6 @@ public class JFXRadioButtonSkin extends RadioButtonSkin {
            } else {
                this.rippler.hideOverlay();
            }
-
        });
        control.pressedProperty().addListener((o, oldVal, newVal) -> this.rippler.hideOverlay());
        this.registerChangeListener(control.selectedColorProperty(), ignored -> updateColors());
@@ -0,0 +1,291 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.jfoenix.skins;
+
+import com.jfoenix.controls.JFXSlider;
+import com.jfoenix.controls.JFXSlider.IndicatorPosition;
+import javafx.animation.Interpolator;
+import javafx.animation.KeyFrame;
+import javafx.animation.KeyValue;
+import javafx.animation.Timeline;
+import javafx.beans.binding.Bindings;
+import javafx.beans.property.DoubleProperty;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import javafx.css.PseudoClass;
+import javafx.geometry.Orientation;
+import javafx.scene.Node;
+import javafx.scene.chart.NumberAxis;
+import javafx.scene.control.Slider;
+import javafx.scene.control.skin.SliderSkin;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.StackPane;
+import javafx.scene.text.Text;
+import javafx.util.Duration;
+
+/// # Material Design Slider Skin
+///
+/// rework of JFXSliderSkin by extending Java SliderSkin
+/// this solves padding and resizing issues
+///
+/// @author Shadi Shaheen
+/// @version 1.0
+/// @since 2016-03-09
+public class JFXSliderSkin extends SliderSkin {
+
+    private static final PseudoClass MIN_VALUE = PseudoClass.getPseudoClass("min");
+    private static final PseudoClass MAX_VALUE = PseudoClass.getPseudoClass("max");
+
+    private final Pane mouseHandlerPane = new Pane();
+    private final Text sliderValue;
+    private final StackPane coloredTrack;
+    private final StackPane thumb;
+    private final StackPane track;
+    private final StackPane animatedThumb;
+    private NumberAxis tickLine;
+
+    private Timeline timeline;
+
+    private double indicatorRotation;
+    private double horizontalRotation;
+    private double shifting;
+
+    public JFXSliderSkin(JFXSlider slider) {
+        super(slider);
+
+        track = (StackPane) getSkinnable().lookup(".track");
+        thumb = (StackPane) getSkinnable().lookup(".thumb");
+        tickLine = (NumberAxis) getSkinnable().lookup(".axis");
+        if (tickLine != null) tickLine.setAnimated(false);
+
+        coloredTrack = new StackPane();
+        coloredTrack.getStyleClass().add("colored-track");
+        coloredTrack.setMouseTransparent(true);
+
+        sliderValue = new Text();
+        sliderValue.getStyleClass().setAll("slider-value");
+
+        animatedThumb = new StackPane();
+        animatedThumb.getStyleClass().add("animated-thumb");
+        animatedThumb.getChildren().add(sliderValue);
+        animatedThumb.setMouseTransparent(true);
+        animatedThumb.setScaleX(0);
+        animatedThumb.setScaleY(0);
+
+        thumb.layoutXProperty().addListener(x -> {
+            if (slider.getOrientation() == Orientation.VERTICAL) initAnimation(Orientation.VERTICAL);
+        });
+        thumb.layoutYProperty().addListener(y -> {
+            if (slider.getOrientation() == Orientation.HORIZONTAL) initAnimation(Orientation.HORIZONTAL);
+        });
+
+        addJFXChildren();
+        getChildren().addListener((ListChangeListener<Node>) c -> {
+            while (c.next()) {
+                if (c.wasAdded()) {
+                    c.getAddedSubList().forEach(added -> {
+                        if (added instanceof NumberAxis) {
+                            tickLine = (NumberAxis) added;
+                            tickLine.setAnimated(false);
+                        }
+                    });
+                }
+            }
+        });
+        registerChangeListener(slider.showTickMarksProperty(), e -> addJFXChildren());
+        registerChangeListener(slider.showTickLabelsProperty(), e -> addJFXChildren());
+        registerChangeListener(slider.valueFactoryProperty(), obs -> refreshSliderValueBinding());
+
+        initListeners();
+    }
+
+    private void addJFXChildren() {
+        ObservableList<Node> children = getChildren();
+        Slider slider = getSkinnable();
+        if ((slider.isShowTickMarks() || slider.isShowTickLabels()) && tickLine != null && !children.contains(tickLine)) {
+            children.add(0, tickLine);
+        }
+        if (children.contains(coloredTrack)) return;
+        children.add(children.indexOf(thumb), coloredTrack);
+        children.add(children.indexOf(thumb), animatedThumb);
+        children.add(0, mouseHandlerPane);
+    }
+
+    private void refreshSliderValueBinding() {
+        sliderValue.textProperty().unbind();
+        if (((JFXSlider) getSkinnable()).getValueFactory() != null) {
+            sliderValue.textProperty()
+                    .bind(((JFXSlider) getSkinnable()).getValueFactory().call((JFXSlider) getSkinnable()));
+        } else {
+            sliderValue.textProperty().bind(Bindings.createStringBinding(() -> {
+                if (getSkinnable().getLabelFormatter() != null) {
+                    return getSkinnable().getLabelFormatter().toString(getSkinnable().getValue());
+                } else {
+                    return String.valueOf(Math.round(getSkinnable().getValue()));
+                }
+            }, getSkinnable().valueProperty()));
+        }
+    }
+
+    @Override
+    protected void layoutChildren(double x, double y, double w, double h) {
+        super.layoutChildren(x, y, w, h);
+
+        if (timeline == null) {
+            initAnimation(getSkinnable().getOrientation());
+        }
+
+        double prefWidth = animatedThumb.prefWidth(-1);
+        animatedThumb.resize(prefWidth, animatedThumb.prefHeight(prefWidth));
+
+        boolean horizontal = getSkinnable().getOrientation() == Orientation.HORIZONTAL;
+        double width, height, layoutX, layoutY;
+        if (horizontal) {
+            width = thumb.getLayoutX() - snappedLeftInset();
+            height = track.getHeight();
+            layoutX = track.getLayoutX();
+            layoutY = track.getLayoutY();
+            animatedThumb.setLayoutX(thumb.getLayoutX() + thumb.getWidth() / 2 - animatedThumb.getWidth() / 2);
+        } else {
+            height = track.getLayoutBounds().getMaxY() + track.getLayoutY() - thumb.getLayoutY() - snappedBottomInset();
+            width = track.getWidth();
+            layoutX = track.getLayoutX();
+            layoutY = thumb.getLayoutY();
+            animatedThumb.setLayoutY(thumb.getLayoutY() + thumb.getHeight() / 2 - animatedThumb.getHeight() / 2);
+        }
+
+        coloredTrack.resizeRelocate(layoutX, layoutY, width, height);
+        mouseHandlerPane.resizeRelocate(x, y, w, h);
+    }
+
+    private void initializeVariables() {
+        shifting = 30 + thumb.getWidth();
+        if (getSkinnable().getOrientation() != Orientation.HORIZONTAL) {
+            horizontalRotation = -90;
+        }
+        if (((JFXSlider) getSkinnable()).getIndicatorPosition() != IndicatorPosition.LEFT) {
+            indicatorRotation = 180;
+            shifting = -shifting;
+        }
+        final double rotationAngle = 45;
+        sliderValue.setRotate(rotationAngle + indicatorRotation + 3 * horizontalRotation);
+        animatedThumb.setRotate(-rotationAngle + indicatorRotation + horizontalRotation);
+    }
+
+    private void initListeners() {
+        // delegate slider mouse events to track node
+        mouseHandlerPane.setOnMousePressed(this::delegateToTrack);
+        mouseHandlerPane.setOnMouseReleased(this::delegateToTrack);
+        mouseHandlerPane.setOnMouseDragged(this::delegateToTrack);
+
+        // animate value node
+        track.addEventHandler(MouseEvent.MOUSE_PRESSED, (event) -> {
+            timeline.setRate(1);
+            timeline.play();
+        });
+        track.addEventHandler(MouseEvent.MOUSE_RELEASED, (event) -> {
+            timeline.setRate(-1);
+            timeline.play();
+        });
+        thumb.addEventHandler(MouseEvent.MOUSE_PRESSED, (event) -> {
+            timeline.setRate(1);
+            timeline.play();
+        });
+        thumb.addEventHandler(MouseEvent.MOUSE_RELEASED, (event) -> {
+            timeline.setRate(-1);
+            timeline.play();
+        });
+
+        refreshSliderValueBinding();
+        updateValueStyleClass();
+
+        getSkinnable().valueProperty().addListener(observable -> updateValueStyleClass());
+    }
+
+    private void delegateToTrack(MouseEvent event) {
+        if (!event.isConsumed()) {
+            event.consume();
+            track.fireEvent(event);
+        }
+    }
+
+    private void updateValueStyleClass() {
+        getSkinnable().pseudoClassStateChanged(MIN_VALUE, getSkinnable().getMin() == getSkinnable().getValue());
+        getSkinnable().pseudoClassStateChanged(MAX_VALUE, getSkinnable().getMax() == getSkinnable().getValue());
+    }
+
+    private void initAnimation(Orientation orientation) {
+        initializeVariables();
+
+        double thumbPos, thumbNewPos;
+        DoubleProperty layoutProperty;
+
+        if (orientation == Orientation.HORIZONTAL) {
+            if (((JFXSlider) getSkinnable()).getIndicatorPosition() == IndicatorPosition.RIGHT) {
+                thumbPos = thumb.getLayoutY() - thumb.getHeight();
+                thumbNewPos = thumbPos - shifting;
+            } else {
+                double height = animatedThumb.prefHeight(animatedThumb.prefWidth(-1));
+                thumbPos = thumb.getLayoutY() - height / 2;
+                thumbNewPos = thumb.getLayoutY() - height - thumb.getHeight();
+            }
+            layoutProperty = animatedThumb.translateYProperty();
+        } else {
+            if (((JFXSlider) getSkinnable()).getIndicatorPosition() == IndicatorPosition.RIGHT) {
+                thumbPos = thumb.getLayoutX() - thumb.getWidth();
+                thumbNewPos = thumbPos - shifting;
+            } else {
+                double width = animatedThumb.prefWidth(-1);
+                thumbPos = thumb.getLayoutX() - width / 2;
+                thumbNewPos = thumb.getLayoutX() - width - thumb.getWidth();
+            }
+            layoutProperty = animatedThumb.translateXProperty();
+        }
+
+        clearAnimation();
+
+        timeline = new Timeline(
+                new KeyFrame(
+                        Duration.ZERO,
+                        new KeyValue(animatedThumb.scaleXProperty(), 0, Interpolator.EASE_BOTH),
+                        new KeyValue(animatedThumb.scaleYProperty(), 0, Interpolator.EASE_BOTH),
+                        new KeyValue(layoutProperty, thumbPos, Interpolator.EASE_BOTH)),
+                new KeyFrame(
+                        Duration.seconds(0.2),
+                        new KeyValue(animatedThumb.scaleXProperty(), 1, Interpolator.EASE_BOTH),
+                        new KeyValue(animatedThumb.scaleYProperty(), 1, Interpolator.EASE_BOTH),
+                        new KeyValue(layoutProperty, thumbNewPos, Interpolator.EASE_BOTH)));
+    }
+
+    @Override
+    public void dispose() {
+        super.dispose();
+        clearAnimation();
+    }
+
+    private void clearAnimation() {
+        if (timeline != null) {
+            timeline.stop();
+            timeline.getKeyFrames().clear();
+            timeline = null;
+        }
+    }
+}
@@ -0,0 +1,264 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.jfoenix.skins;
+
+import com.jfoenix.controls.JFXSpinner;
+import com.jfoenix.utils.TreeShowingProperty;
+import javafx.animation.Interpolator;
+import javafx.animation.KeyFrame;
+import javafx.animation.KeyValue;
+import javafx.animation.Timeline;
+import javafx.scene.Group;
+import javafx.scene.control.SkinBase;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.StackPane;
+import javafx.scene.paint.Color;
+import javafx.scene.shape.Arc;
+import javafx.scene.shape.Rectangle;
+import javafx.scene.shape.StrokeLineCap;
+import javafx.util.Duration;
+import org.jackhuang.hmcl.ui.animation.AnimationUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/// JFXSpinner material design skin
+///
+/// @author Shadi Shaheen & Gerard Moubarak
+/// @version 1.0
+/// @since 2017-09-25
+public class JFXSpinnerSkin extends SkinBase<JFXSpinner> {
+
+    private static final double DEFAULT_STROKE_WIDTH = 4;
+
+    private JFXSpinner control;
+    private final TreeShowingProperty treeShowingProperty;
+    private boolean isValid = false;
+
+    private Timeline timeline;
+    private Arc arc;
+    private Arc track;
+    private final StackPane arcPane;
+    private final Rectangle fillRect;
+
+    private final double startingAngle;
+
+    public JFXSpinnerSkin(JFXSpinner control) {
+        super(control);
+
+        this.control = control;
+        this.treeShowingProperty = new TreeShowingProperty(control);
+        this.startingAngle = control.getStartingAngle();
+
+        arc = new Arc();
+        arc.setManaged(false);
+        arc.setLength(180);
+        arc.getStyleClass().setAll("arc");
+        arc.setFill(Color.TRANSPARENT);
+        arc.setStrokeWidth(DEFAULT_STROKE_WIDTH);
+        arc.setStrokeLineCap(StrokeLineCap.ROUND);
+
+        track = new Arc();
+        track.setManaged(false);
+        track.setLength(360);
+        track.setStrokeWidth(DEFAULT_STROKE_WIDTH);
+        track.getStyleClass().setAll("track");
+        track.setFill(Color.TRANSPARENT);
+
+        fillRect = new Rectangle();
+        fillRect.setFill(Color.TRANSPARENT);
+        final Group group = new Group(fillRect, track, arc);
+        group.setManaged(false);
+        arcPane = new StackPane(group);
+        arcPane.setPrefSize(50, 50);
+        getChildren().setAll(arcPane);
+
+        // register listeners
+        registerChangeListener(control.progressProperty(), obs -> updateProgress());
+        registerChangeListener(treeShowingProperty, obs -> updateProgress());
+    }
+
+    private void updateProgress() {
+        double progress = Double.min(getSkinnable().getProgress(), 1.0);
+        if (progress < 0) { // indeterminate
+            boolean treeShowing = treeShowingProperty.get();
+            if (treeShowing) {
+                if (timeline == null) {
+                    timeline = createTransition();
+                    timeline.playFromStart();
+                } else {
+                    timeline.play();
+                }
+            } else if (timeline != null) {
+                timeline.pause();
+            }
+        } else { // determinate
+            clearAnimation();
+            arc.setStartAngle(90);
+            arc.setLength(-360 * progress);
+        }
+    }
+
+    private double computeSize() {
+        return control.getRadius() * 2 + arc.getStrokeWidth() * 2;
+    }
+
+    @Override
+    protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        if (Region.USE_COMPUTED_SIZE == control.getRadius()) {
+            return super.computeMaxHeight(width, topInset, rightInset, bottomInset, leftInset);
+        } else {
+            return computeSize();
+        }
+    }
+
+    @Override
+    protected double computeMaxWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        if (Region.USE_COMPUTED_SIZE == control.getRadius()) {
+            return super.computeMaxWidth(height, topInset, rightInset, bottomInset, leftInset);
+        } else {
+            return computeSize();
+        }
+    }
+
+    @Override
+    protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        if (Region.USE_COMPUTED_SIZE == control.getRadius()) {
+            return arcPane.prefWidth(-1);
+        } else {
+            return computeSize();
+        }
+    }
+
+    @Override
+    protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        if (Region.USE_COMPUTED_SIZE == control.getRadius()) {
+            return arcPane.prefHeight(-1);
+        } else {
+            return computeSize();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void layoutChildren(double contentX, double contentY, double contentWidth, double contentHeight) {
+        final double strokeWidth = arc.getStrokeWidth();
+        double radius = control.getRadius();
+        final double arcSize = snapSizeX(radius * 2 + strokeWidth);
+
+        arcPane.resizeRelocate((contentWidth - arcSize) / 2 + 1, (contentHeight - arcSize) / 2 + 1, arcSize, arcSize);
+        updateArcLayout(radius, arcSize);
+
+        fillRect.setWidth(arcSize);
+        fillRect.setHeight(arcSize);
+
+        if (!isValid) {
+            updateProgress();
+            isValid = true;
+        }
+    }
+
+    private void updateArcLayout(double radius, double arcSize) {
+        arc.setRadiusX(radius);
+        arc.setRadiusY(radius);
+        arc.setCenterX(arcSize / 2);
+        arc.setCenterY(arcSize / 2);
+
+        track.setRadiusX(radius);
+        track.setRadiusY(radius);
+        track.setCenterX(arcSize / 2);
+        track.setCenterY(arcSize / 2);
+        track.setStrokeWidth(arc.getStrokeWidth());
+    }
+
+    private void addKeyFrames(List<KeyFrame> frames, double angle, double duration) {
+        frames.add(new KeyFrame(Duration.seconds(duration),
+                new KeyValue(arc.lengthProperty(), 5, Interpolator.LINEAR),
+                new KeyValue(arc.startAngleProperty(),
+                        angle + 45 + startingAngle,
+                        Interpolator.LINEAR)));
+        frames.add(new KeyFrame(Duration.seconds(duration + 0.4),
+                new KeyValue(arc.lengthProperty(), 250, Interpolator.LINEAR),
+                new KeyValue(arc.startAngleProperty(),
+                        angle + 90 + startingAngle,
+                        Interpolator.LINEAR)));
+        frames.add(new KeyFrame(Duration.seconds(duration + 0.7),
+                new KeyValue(arc.lengthProperty(), 250, Interpolator.LINEAR),
+                new KeyValue(arc.startAngleProperty(),
+                        angle + 135 + startingAngle,
+                        Interpolator.LINEAR)));
+        frames.add(new KeyFrame(Duration.seconds(duration + 1.1),
+                new KeyValue(arc.lengthProperty(), 5, Interpolator.LINEAR),
+                new KeyValue(arc.startAngleProperty(),
+                        angle + 435 + startingAngle,
+                        Interpolator.LINEAR)));
+    }
+
+    private Timeline createTransition() {
+        Timeline timeline;
+        if (AnimationUtils.isAnimationEnabled()) {
+            var keyFrames = new ArrayList<KeyFrame>(17);
+            addKeyFrames(keyFrames, 0, 0);
+            addKeyFrames(keyFrames, 450, 1.4);
+            addKeyFrames(keyFrames, 900, 2.8);
+            addKeyFrames(keyFrames, 1350, 4.2);
+            keyFrames.add(new KeyFrame(Duration.seconds(5.6),
+                    new KeyValue(arc.lengthProperty(), 5, Interpolator.LINEAR),
+                    new KeyValue(arc.startAngleProperty(),
+                            1845 + startingAngle,
+                            Interpolator.LINEAR)));
+
+            timeline = new Timeline();
+            timeline.getKeyFrames().setAll(keyFrames);
+        } else {
+            final double arcLength = 250;
+            timeline = new Timeline(
+                    new KeyFrame(Duration.ZERO,
+                            new KeyValue(arc.startAngleProperty(), 45 + startingAngle, Interpolator.LINEAR),
+                            new KeyValue(arc.lengthProperty(), arcLength, Interpolator.DISCRETE)),
+                    new KeyFrame(Duration.seconds(1.2),
+                            new KeyValue(arc.startAngleProperty(), 45 + 360 + startingAngle, Interpolator.LINEAR),
+                            new KeyValue(arc.lengthProperty(), arcLength, Interpolator.DISCRETE))
+            );
+        }
+
+        timeline.setCycleCount(Timeline.INDEFINITE);
+        return timeline;
+    }
+
+    private void clearAnimation() {
+        if (timeline != null) {
+            timeline.stop();
+            timeline = null;
+        }
+    }
+
+    @Override
+    public void dispose() {
+        super.dispose();
+        treeShowingProperty.dispose();
+        clearAnimation();
+        arc = null;
+        track = null;
+        control = null;
+    }
+}
@@ -19,13 +19,25 @@

 package com.jfoenix.utils;

+import javafx.beans.value.ObservableBooleanValue;
+import javafx.scene.Node;
+import javafx.scene.Scene;
 import javafx.scene.layout.Background;
 import javafx.scene.layout.BackgroundFill;
 import javafx.scene.layout.Region;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
+import javafx.stage.Window;
+import org.jetbrains.annotations.NotNull;

+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.reflect.Method;
 import java.util.Locale;
+import java.util.function.Function;
+
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;

 /// @author Shadi Shaheen
 /// @version 1.0
@@ -58,6 +70,70 @@ public final class JFXNodeUtils {
        }
    }

+    private static final @NotNull Function<Node, ObservableBooleanValue> treeVisiblePropertyGetter = initTreeVisiblePropertyGetter();
+
+    private static @NotNull Function<Node, ObservableBooleanValue> initTreeVisiblePropertyGetter() {
+
+        MethodHandles.Lookup lookup;
+        try {
+            lookup = MethodHandles.privateLookupIn(Node.class, MethodHandles.lookup());
+        } catch (IllegalAccessException e) {
+            LOG.warning("Failed to get private lookup for Node", e);
+            return JFXNodeUtils::defaultTreeVisibleProperty;
+        }
+
+        try {
+            Method treeVisiblePropertyMethod = Node.class.getDeclaredMethod("treeVisibleProperty");
+            if (!ObservableBooleanValue.class.isAssignableFrom(treeVisiblePropertyMethod.getReturnType())) {
+                LOG.warning("Node.treeVisibleProperty() does not return ObservableBooleanValue: " + treeVisiblePropertyMethod.getReturnType());
+                return JFXNodeUtils::defaultTreeVisibleProperty;
+            }
+
+            MethodHandle handle = lookup.unreflect(treeVisiblePropertyMethod)
+                    .asType(MethodType.methodType(ObservableBooleanValue.class, Node.class));
+            return item -> {
+                try {
+                    return (ObservableBooleanValue) handle.invokeExact((Node) item);
+                } catch (RuntimeException | Error e) {
+                    throw e;
+                } catch (Throwable e) {
+                    throw new AssertionError("Unreachable", e);
+                }
+            };
+        } catch (Exception e) {
+            LOG.warning("Failed to get method handle for Node.treeVisibleProperty()", e);
+            return JFXNodeUtils::defaultTreeVisibleProperty;
+        }
+    }
+
+    /// If `Node.treeVisibleProperty()` does not exist, use `Node.visibleProperty()` as a fallback
+    private static @NotNull ObservableBooleanValue defaultTreeVisibleProperty(Node item) {
+        return item.visibleProperty();
+    }
+
+    public static @NotNull ObservableBooleanValue treeVisibleProperty(Node item) {
+        return treeVisiblePropertyGetter.apply(item);
+    }
+
+    public static boolean isTreeVisible(Node item) {
+        return treeVisibleProperty(item).getValue();
+    }
+
+    public static boolean isTreeShowing(Node node) {
+        if (node == null)
+            return false;
+
+        Scene scene = node.getScene();
+        if (scene == null)
+            return false;
+
+        Window window = scene.getWindow();
+        if (window == null || !window.isShowing())
+            return false;
+
+        return isTreeVisible(node);
+    }
+
    private JFXNodeUtils() {
    }

@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2021, 2023, 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 com.jfoenix.utils;
+
+import javafx.beans.property.ReadOnlyBooleanPropertyBase;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableBooleanValue;
+import javafx.scene.Node;
+import javafx.scene.Scene;
+import javafx.stage.Window;
+
+/**
+ * Used to observe changes in tree showing status for a {@link Node}.  For a Node's tree to be showing
+ * it must be visible, its ancestors must be visible, the node must be part of a {@link Scene} and
+ * the scene must have a {@link Window} which is currently showing.<p>
+ *
+ * This class provides the exact same functionality as {@link JFXNodeUtils#isTreeShowing(Node)} in
+ * an observable form.
+ */
+public class TreeShowingProperty extends ReadOnlyBooleanPropertyBase {
+    private final ChangeListener<Boolean> windowShowingChangedListener = (obs, old, current) -> updateTreeShowing();
+    private final ChangeListener<Window> sceneWindowChangedListener = (obs, old, current) -> windowChanged(old, current);
+    private final ChangeListener<Scene> nodeSceneChangedListener = (obs, old, current) -> sceneChanged(old, current);
+
+    private final Node node;
+    private final ObservableBooleanValue treeVisibleProperty;
+
+    private boolean valid;
+    private boolean treeShowing;
+
+    /**
+     * Constructs a new instance.
+     *
+     * @param node a {@link Node} for which the tree showing status should be observed, cannot be null
+     */
+    public TreeShowingProperty(Node node) {
+        this.node = node;
+        this.treeVisibleProperty = JFXNodeUtils.treeVisibleProperty(node);
+
+        this.node.sceneProperty().addListener(nodeSceneChangedListener);
+        this.treeVisibleProperty.addListener(windowShowingChangedListener);
+
+        sceneChanged(null, node.getScene());
+    }
+
+    @Override
+    public Object getBean() {
+        return node;
+    }
+
+    @Override
+    public String getName() {
+        return "treeShowing";
+    }
+
+    /**
+     * Cleans up any listeners that this class may have registered on the {@link Node}
+     * that was supplied at construction.
+     */
+    public void dispose() {
+        node.sceneProperty().removeListener(nodeSceneChangedListener);
+
+        if (treeVisibleProperty != null)
+            treeVisibleProperty.removeListener(windowShowingChangedListener);
+
+        valid = false;  // prevents unregistration from triggering an invalidation notification
+        sceneChanged(node.getScene(), null);
+    }
+
+    protected void invalidate() {
+        if (valid) {
+            valid = false;
+            fireValueChangedEvent();
+        }
+    }
+
+    @Override
+    public boolean get() {
+        if (!valid) {
+            updateTreeShowing();
+            valid = true;
+        }
+
+        return treeShowing;
+    }
+
+    private void sceneChanged(Scene oldScene, Scene newScene) {
+        if (oldScene != null) {
+            oldScene.windowProperty().removeListener(sceneWindowChangedListener);
+        }
+        if (newScene != null) {
+            newScene.windowProperty().addListener(sceneWindowChangedListener);
+        }
+
+        windowChanged(
+                oldScene == null ? null : oldScene.getWindow(),
+                newScene == null ? null : newScene.getWindow()
+        );
+    }
+
+    private void windowChanged(Window oldWindow, Window newWindow) {
+        if (oldWindow != null) {
+            oldWindow.showingProperty().removeListener(windowShowingChangedListener);
+        }
+        if (newWindow != null) {
+            newWindow.showingProperty().addListener(windowShowingChangedListener);
+        }
+
+        updateTreeShowing();
+    }
+
+    private void updateTreeShowing() {
+        boolean newValue = JFXNodeUtils.isTreeShowing(node);
+
+        if (newValue != treeShowing) {
+            treeShowing = newValue;
+            invalidate();
+        }
+    }
+}
@@ -25,6 +25,7 @@ import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.io.JarUtils;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;

+import javax.swing.JOptionPane;
 import java.io.IOException;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -49,11 +50,15 @@ public final class EntryPoint {
        createHMCLDirectories();
        LOG.start(Metadata.HMCL_CURRENT_DIRECTORY.resolve("logs"));

-        setupJavaFXVMOptions();
-        checkDirectoryPath();
+        checkWine();

-        if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS && !isInsideMacAppBundle())
-            initIcon();
+        setupJavaFXVMOptions();
+
+        if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS) {
+            System.getProperties().putIfAbsent("apple.awt.application.appearance", "system");
+            if (!isInsideMacAppBundle())
+                initIcon();
+        }

        checkJavaFX();
        verifyJavaFX();
@@ -192,25 +197,12 @@ public final class EntryPoint {
        }
    }

-    private static void checkDirectoryPath() {
-        String currentDir = System.getProperty("user.dir", "");
-        if (currentDir.contains("!")) {
-            LOG.error("The current working path contains an exclamation mark: " + currentDir);
-            // No Chinese translation because both Swing and JavaFX cannot render Chinese character properly when exclamation mark exists in the path.
-            showErrorAndExit("Exclamation mark(!) is not allowed in the path where HMCL is in.\n"
-                    + "The path is " + currentDir);
-        }
-    }
-
    private static void checkJavaFX() {
        try {
            SelfDependencyPatcher.patch();
        } catch (SelfDependencyPatcher.PatchException e) {
            LOG.error("Unable to patch JVM", e);
            showErrorAndExit(i18n("fatal.javafx.missing"));
-        } catch (SelfDependencyPatcher.IncompatibleVersionException e) {
-            LOG.error("Unable to patch JVM", e);
-            showErrorAndExit(i18n("fatal.javafx.incompatible"));
        } catch (CancellationException e) {
            LOG.error("User cancels downloading JavaFX", e);
            exit(0);
@@ -231,6 +223,20 @@ public final class EntryPoint {
        }
    }

+    private static void checkWine() {
+        if (OperatingSystem.isRunningUnderWine()) {
+            SwingUtils.initLookAndFeel();
+            LOG.warning("HMCL is running under Wine or its distributions!");
+
+            int result = JOptionPane.showOptionDialog(null, i18n("fatal.wine_warning"), i18n("message.warning"), JOptionPane.OK_CANCEL_OPTION,
+                    JOptionPane.WARNING_MESSAGE, null, null, null);
+
+            if (result == JOptionPane.CANCEL_OPTION || result == JOptionPane.CLOSED_OPTION) {
+                exit(1);
+            }
+        }
+    }
+
    private static void addEnableNativeAccess() {
        if (JavaRuntime.CURRENT_VERSION > 21) {
            try {
@@ -17,35 +17,34 @@
 */
 package org.jackhuang.hmcl;

+import javafx.animation.KeyFrame;
+import javafx.animation.KeyValue;
+import javafx.animation.Timeline;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.beans.value.ObservableBooleanValue;
 import javafx.geometry.Rectangle2D;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
+import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.DataFormat;
 import javafx.stage.Screen;
 import javafx.stage.Stage;
+import javafx.util.Duration;
 import org.jackhuang.hmcl.setting.ConfigHolder;
 import org.jackhuang.hmcl.setting.SambaException;
-import org.jackhuang.hmcl.ui.FXUtils;
-import org.jackhuang.hmcl.util.FileSaver;
 import org.jackhuang.hmcl.task.AsyncTaskExecutor;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.ui.Controllers;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.theme.Themes;
 import org.jackhuang.hmcl.upgrade.UpdateChecker;
 import org.jackhuang.hmcl.upgrade.UpdateHandler;
-import org.jackhuang.hmcl.util.CrashReporter;
-import org.jackhuang.hmcl.util.Lang;
-import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.*;
 import org.jackhuang.hmcl.util.io.JarUtils;
-import org.jackhuang.hmcl.util.platform.Architecture;
-import org.jackhuang.hmcl.util.platform.CommandBuilder;
-import org.jackhuang.hmcl.util.platform.NativeUtils;
-import org.jackhuang.hmcl.util.platform.OperatingSystem;
-import org.jackhuang.hmcl.util.platform.SystemInfo;
+import org.jackhuang.hmcl.util.platform.*;

 import java.io.File;
 import java.io.IOException;
@@ -65,8 +64,8 @@ import java.util.concurrent.TimeUnit;

 import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.DataSizeUnit.MEGABYTES;
-import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;

 public final class Launcher extends Application {
    public static final CookieManager COOKIE_MANAGER = new CookieManager();
@@ -111,7 +110,7 @@ public final class Launcher extends Application {
            if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS
                    && ConfigHolder.isNewlyCreated()
                    && System.getProperty("user.dir").startsWith("/private/var/folders/")) {
-                if (showAlert(AlertType.WARNING, i18n("fatal.mac_app_translocation"), ButtonType.YES, ButtonType.NO) == ButtonType.NO)
+                if (!confirmWithCountdown(AlertType.WARNING, i18n("fatal.mac_app_translocation"), 5))
                    return;
            } else {
                checkConfigInTempDir();
@@ -137,6 +136,9 @@ public final class Launcher extends Application {
                Platform.setImplicitExit(false);
                Controllers.initialize(primaryStage);

+                if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS)
+                    Themes.applyNativeDarkMode(primaryStage);
+
                UpdateChecker.init();

                primaryStage.show();
@@ -182,6 +184,27 @@ public final class Launcher extends Application {
        return new Alert(alertType, contentText, buttons).showAndWait().orElse(null);
    }

+    private static boolean confirmWithCountdown(Alert.AlertType alertType, String contentText, int seconds) {
+        Alert alert = new Alert(alertType, contentText, ButtonType.YES, ButtonType.NO);
+        Button okButton = (Button) alert.getDialogPane().lookupButton(ButtonType.YES);
+
+        okButton.setDisable(true);
+
+        KeyFrame[] keyFrames = new KeyFrame[seconds + 1];
+        for (int i = 0; i < seconds; i++) {
+            keyFrames[i] = new KeyFrame(Duration.seconds(i),
+                    new KeyValue(okButton.textProperty(), i18n("button.ok.countdown", seconds - i)));
+        }
+        keyFrames[seconds] = new KeyFrame(Duration.seconds(seconds),
+                new KeyValue(okButton.textProperty(), i18n("button.ok")),
+                new KeyValue(okButton.disableProperty(), false));
+
+        Timeline timeline = new Timeline(keyFrames);
+        alert.setOnShown(e -> timeline.play());
+        alert.setOnCloseRequest(e -> timeline.stop());
+        return alert.showAndWait().orElse(null) == ButtonType.YES;
+    }
+
    private static boolean isConfigInTempDir() {
        String configPath = ConfigHolder.configLocation().toString();

@@ -221,7 +244,7 @@ public final class Launcher extends Application {

    private static void checkConfigInTempDir() {
        if (ConfigHolder.isNewlyCreated() && isConfigInTempDir()
-                && showAlert(AlertType.WARNING, i18n("fatal.config_in_temp_dir"), ButtonType.YES, ButtonType.NO) == ButtonType.NO) {
+                && !confirmWithCountdown(AlertType.WARNING, i18n("fatal.config_in_temp_dir"), 5)) {
            EntryPoint.exit(0);
        }
    }
@@ -253,7 +276,7 @@ public final class Launcher extends Application {
        if (Files.exists(mcDir))
            files.add(mcDir.toString());

-        String command = new CommandBuilder().add("sudo", "chown", "-R", userName).addAll(files).toString();
+        String command = new CommandBuilder().addAll("sudo", "chown", "-R", userName).addAll(files).toString();
        ButtonType copyAndExit = new ButtonType(i18n("button.copy_and_exit"));

        if (showAlert(AlertType.ERROR,
@@ -321,6 +344,8 @@ public final class Launcher extends Application {
                LOG.info("XDG Current Desktop: " + System.getenv("XDG_CURRENT_DESKTOP"));
            }

+            LOG.info("Zlib Compatible: " + ZlibUtils.IS_ZLIB_COMPATIBLE);
+
            Lang.thread(SystemInfo::initialize, "Detection System Information", true);

            launch(Launcher.class, args);
@@ -24,7 +24,6 @@ import org.jackhuang.hmcl.util.platform.OperatingSystem;
 import org.jetbrains.annotations.Nullable;

 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.EnumSet;

 /**
@@ -46,9 +45,9 @@ public final class Metadata {
    public static final int RECOMMENDED_JAVA_VERSION = 21;

    public static final String PUBLISH_URL = "https://hmcl.huangyuhui.net";
-    public static final String ABOUT_URL = PUBLISH_URL + "/about";
    public static final String DOWNLOAD_URL = PUBLISH_URL + "/download";
    public static final String HMCL_UPDATE_URL = System.getProperty("hmcl.update_source.override", PUBLISH_URL + "/api/update_link");
+    public static final String MANUAL_UPDATE_URL = "https://github.com/HMCL-dev/HMCL/releases";

    public static final String DOCS_URL = "https://docs.hmcl.net";
    public static final String CONTACT_URL = DOCS_URL + "/help.html";
@@ -59,34 +58,38 @@ public final class Metadata {
    public static final String BUILD_CHANNEL = JarUtils.getAttribute("hmcl.version.type", "nightly");
    public static final String GITHUB_SHA = JarUtils.getAttribute("hmcl.version.hash", null);

-    public static final Path CURRENT_DIRECTORY = Paths.get(System.getProperty("user.dir")).toAbsolutePath().normalize();
+    public static final Path CURRENT_DIRECTORY = Path.of(System.getProperty("user.dir")).toAbsolutePath().normalize();
    public static final Path MINECRAFT_DIRECTORY = OperatingSystem.getWorkingDirectory("minecraft");
    public static final Path HMCL_GLOBAL_DIRECTORY;
    public static final Path HMCL_CURRENT_DIRECTORY;
    public static final Path DEPENDENCIES_DIRECTORY;

    static {
-        String hmclHome = System.getProperty("hmcl.home");
-        if (hmclHome == null) {
+        String hmclHome = System.getProperty("hmcl.home", System.getenv("HMCL_USER_HOME"));
+        if (StringUtils.isBlank(hmclHome)) {
            if (OperatingSystem.CURRENT_OS.isLinuxOrBSD()) {
                String xdgData = System.getenv("XDG_DATA_HOME");
                if (StringUtils.isNotBlank(xdgData)) {
-                    HMCL_GLOBAL_DIRECTORY = Paths.get(xdgData, "hmcl").toAbsolutePath().normalize();
+                    HMCL_GLOBAL_DIRECTORY = Path.of(xdgData, "hmcl").toAbsolutePath().normalize();
                } else {
-                    HMCL_GLOBAL_DIRECTORY = Paths.get(System.getProperty("user.home"), ".local", "share", "hmcl").toAbsolutePath().normalize();
+                    HMCL_GLOBAL_DIRECTORY = Path.of(System.getProperty("user.home"), ".local", "share", "hmcl").toAbsolutePath().normalize();
                }
            } else {
                HMCL_GLOBAL_DIRECTORY = OperatingSystem.getWorkingDirectory("hmcl");
            }
        } else {
-            HMCL_GLOBAL_DIRECTORY = Paths.get(hmclHome).toAbsolutePath().normalize();
+            HMCL_GLOBAL_DIRECTORY = Path.of(hmclHome).toAbsolutePath().normalize();
        }

-        String hmclCurrentDir = System.getProperty("hmcl.dir");
-        HMCL_CURRENT_DIRECTORY = hmclCurrentDir != null
-                ? Paths.get(hmclCurrentDir).toAbsolutePath().normalize()
+        String hmclCurrentDir = System.getProperty("hmcl.dir", System.getenv("HMCL_LOCAL_HOME"));
+        HMCL_CURRENT_DIRECTORY = StringUtils.isNotBlank(hmclCurrentDir)
+                ? Path.of(hmclCurrentDir).toAbsolutePath().normalize()
                : CURRENT_DIRECTORY.resolve(".hmcl");
-        DEPENDENCIES_DIRECTORY = HMCL_CURRENT_DIRECTORY.resolve("dependencies");
+
+        String hmclDependencies = System.getProperty("hmcl.dependencies.dir", System.getenv("HMCL_DEPENDENCIES_DIR"));
+        DEPENDENCIES_DIRECTORY = StringUtils.isNotBlank(hmclDependencies)
+                ? Path.of(hmclDependencies).toAbsolutePath().normalize()
+                : HMCL_CURRENT_DIRECTORY.resolve("dependencies");
    }

    public static boolean isStable() {
@@ -1,3 +1,20 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2026 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.countly;

 import org.jackhuang.hmcl.Metadata;
@@ -21,12 +21,16 @@ import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.auth.AuthInfo;
 import org.jackhuang.hmcl.launch.DefaultLauncher;
 import org.jackhuang.hmcl.launch.ProcessListener;
+import org.jackhuang.hmcl.util.NativePatcher;
 import org.jackhuang.hmcl.util.i18n.LocaleUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.util.io.JarUtils;
+import org.jackhuang.hmcl.util.platform.CommandBuilder;
 import org.jackhuang.hmcl.util.platform.ManagedProcess;
 import org.jackhuang.hmcl.util.versioning.GameVersionNumber;

 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.file.*;
 import java.util.*;
 import java.util.stream.Stream;
@@ -150,4 +154,60 @@ public final class HMCLGameLauncher extends DefaultLauncher {
        generateOptionsTxt();
        super.makeLaunchScript(scriptFile);
    }
+
+    @Override
+    protected void appendJvmArgs(CommandBuilder result) {
+        super.appendJvmArgs(result);
+
+        if (config().getAllowAutoAgent()
+                && !options.isNoGeneratedJVMArgs()
+                && !options.isNoGeneratedOptimizingJVMArgs()
+                && NativePatcher.needPatchMemoryUtil(version, options.getJava().getParsedVersion())) {
+            LOG.info("Attempting to patch game with lwjgl-unsafe-agent");
+            try {
+                result.add("-javaagent:" + extractLwjglUnsafeAgent());
+            } catch (Exception e) {
+                LOG.warning("Failed to extract lwjgl-unsafe-agent", e);
+            }
+        }
+    }
+
+    private Path extractLwjglUnsafeAgent() throws IOException {
+        String agentVersion = JarUtils.getAttribute("hmcl.lwjgl-unsafe-agent.version", null);
+        if (agentVersion == null) {
+            throw new IOException("Missing hmcl.lwjgl-unsafe-agent.version attribute");
+        }
+
+        Library library = new Library(new Artifact("org.glavo", "lwjgl-unsafe-agent", agentVersion));
+        String fileName = library.getArtifact().getFileName();
+
+        Path agentPath = repository.getLibraryFile(version, library).toAbsolutePath().normalize();
+        if (agentPath.toString().contains("=")) {
+            throw new IOException("Invalid library path: " + agentPath);
+        }
+
+        byte[] bytes;
+        try (InputStream input = DefaultLauncher.class.getResourceAsStream("/assets/" + fileName)) {
+            if (input == null) {
+                throw new IOException("/assets/" + fileName + " not found");
+            }
+
+            bytes = input.readAllBytes();
+        }
+
+        if (Files.isRegularFile(agentPath)) {
+            try {
+                if (Files.size(agentPath) == bytes.length) {
+                    return agentPath;
+                }
+            } catch (IOException e) {
+                LOG.warning("Failed to check size of " + agentPath, e);
+            }
+        }
+
+        Files.createDirectories(agentPath.getParent());
+        FileUtils.saveSafely(agentPath, output -> output.write(bytes));
+        return agentPath;
+    }
+
 }
@@ -46,6 +46,7 @@ import org.jackhuang.hmcl.util.versioning.VersionNumber;
 import org.jetbrains.annotations.Nullable;

 import java.io.IOException;
+import java.net.Proxy;
 import java.nio.file.Files;
 import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
@@ -174,7 +175,7 @@ public final class HMCLGameRepository extends DefaultGameRepository {
        }
        Files.copy(fromJson, toJson);

-        JsonUtils.writeToJsonFile(toJson, fromVersion.setId(dstId));
+        JsonUtils.writeToJsonFile(toJson, fromVersion.setId(dstId).setJar(dstId));

        VersionSetting oldVersionSetting = getVersionSetting(srcId).clone();
        GameDirectoryType originalGameDirType = oldVersionSetting.getGameDirType();
@@ -309,7 +310,7 @@ public final class HMCLGameRepository extends DefaultGameRepository {
            Optional<Path> iconFile = getVersionIconFile(id);
            if (iconFile.isPresent()) {
                try {
-                    return FXUtils.loadImage(iconFile.get());
+                    return FXUtils.loadImage(iconFile.get(), 64, 64, true, true);
                } catch (Exception e) {
                    LOG.warning("Failed to load version icon of " + id, e);
                }
@@ -321,6 +322,8 @@ public final class HMCLGameRepository extends DefaultGameRepository {
                    return VersionIconType.FABRIC.getIcon();
                else if (libraryAnalyzer.has(LibraryAnalyzer.LibraryType.QUILT))
                    return VersionIconType.QUILT.getIcon();
+                else if (libraryAnalyzer.has(LibraryAnalyzer.LibraryType.LEGACY_FABRIC))
+                    return VersionIconType.LEGACY_FABRIC.getIcon();
                else if (libraryAnalyzer.has(LibraryAnalyzer.LibraryType.NEO_FORGE))
                    return VersionIconType.NEO_FORGE.getIcon();
                else if (libraryAnalyzer.has(LibraryAnalyzer.LibraryType.FORGE))
@@ -419,6 +422,7 @@ public final class HMCLGameRepository extends DefaultGameRepository {
                .setHeight(vs.getHeight())
                .setFullscreen(vs.isFullscreen())
                .setWrapper(vs.getWrapper())
+                .setProxyOption(getProxyOption())
                .setPreLaunchCommand(vs.getPreLaunchCommand())
                .setPostExitCommand(vs.getPostExitCommand())
                .setNoGeneratedJVMArgs(vs.isNoJVMArgs())
@@ -426,6 +430,7 @@ public final class HMCLGameRepository extends DefaultGameRepository {
                .setNativesDirType(vs.getNativesDirType())
                .setNativesDir(vs.getNativesDir())
                .setProcessPriority(vs.getProcessPriority())
+                .setGraphicsBackend(vs.getGraphicsBackend())
                .setRenderer(vs.getRenderer())
                .setEnableDebugLogOutput(vs.isEnableDebugLogOutput())
                .setUseNativeGLFW(vs.isUseNativeGLFW())
@@ -438,17 +443,6 @@ public final class HMCLGameRepository extends DefaultGameRepository {
            builder.setQuickPlayOption(new QuickPlayOption.MultiPlayer(vs.getServerIp()));
        }

-        if (config().hasProxy()) {
-            builder.setProxyType(config().getProxyType());
-            builder.setProxyHost(config().getProxyHost());
-            builder.setProxyPort(config().getProxyPort());
-
-            if (config().hasProxyAuth()) {
-                builder.setProxyUser(config().getProxyUser());
-                builder.setProxyPass(config().getProxyPass());
-            }
-        }
-
        Path json = getModpackConfiguration(version);
        if (Files.exists(json)) {
            try {
@@ -521,7 +515,7 @@ public final class HMCLGameRepository extends DefaultGameRepository {
                FORBIDDEN_VERSION_IDS.contains(id.toLowerCase(Locale.ROOT)))
            return false;

-        return FileUtils.isNameValid(id);
+        return FileUtils.isNameValidForJar(id);
    }

    /**
@@ -558,4 +552,39 @@ public final class HMCLGameRepository extends DefaultGameRepository {
            return minimum;
        }
    }
+
+    public static ProxyOption getProxyOption() {
+        if (!config().hasProxy() || config().getProxyType() == null) {
+            return ProxyOption.Default.INSTANCE;
+        }
+
+        return switch (config().getProxyType()) {
+            case DIRECT -> ProxyOption.Direct.INSTANCE;
+            case HTTP, SOCKS -> {
+                String proxyHost = config().getProxyHost();
+                int proxyPort = config().getProxyPort();
+
+                if (StringUtils.isBlank(proxyHost) || proxyPort < 0 || proxyPort > 0xFFFF) {
+                    yield ProxyOption.Default.INSTANCE;
+                }
+
+                String proxyUser = config().getProxyUser();
+                String proxyPass = config().getProxyPass();
+
+                if (StringUtils.isBlank(proxyUser)) {
+                    proxyUser = null;
+                    proxyPass = null;
+                } else if (proxyPass == null) {
+                    proxyPass = "";
+                }
+
+                if (config().getProxyType() == Proxy.Type.HTTP) {
+                    yield new ProxyOption.Http(proxyHost, proxyPort, proxyUser, proxyPass);
+                } else {
+                    yield new ProxyOption.Socks(proxyHost, proxyPort, proxyUser, proxyPass);
+                }
+            }
+            default -> ProxyOption.Default.INSTANCE;
+        };
+    }
 }
@@ -79,7 +79,7 @@ public final class HMCLModpackProvider implements ModpackProvider {

    private final static class HMCLModpack extends Modpack {
        @Override
-        public Task<?> getInstallTask(DefaultDependencyManager dependencyManager, Path zipFile, String name) {
+        public Task<?> getInstallTask(DefaultDependencyManager dependencyManager, Path zipFile, String name, String iconUrl) {
            return new HMCLModpackInstallTask(((HMCLGameRepository) dependencyManager.getGameRepository()).getProfile(), zipFile, this, name);
        }
    }
@@ -65,16 +65,18 @@ import java.util.stream.Collectors;

 import static javafx.application.Platform.runLater;
 import static javafx.application.Platform.setImplicitExit;
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.DataSizeUnit.MEGABYTES;
 import static org.jackhuang.hmcl.util.Lang.resolveException;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 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 {

+    private static final String LWJGL_3_4_1_TIP = "lwjgl3.4.1-ffm";
+
    private final Profile profile;
    private Account account;
    private final String selectedVersion;
@@ -170,33 +172,55 @@ public final class LauncherHelper {
                                }
                            }),
                            Task.composeAsync(() -> {
-                                Renderer renderer = setting.getRenderer();
-                                if (renderer != Renderer.DEFAULT && OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
-                                    Library lib = NativePatcher.getWindowsMesaLoader(java, renderer, OperatingSystem.SYSTEM_VERSION);
-                                    if (lib == null)
-                                        return null;
-                                    Path file = dependencyManager.getGameRepository().getLibraryFile(version.get(), lib);
-                                    if (file.toAbsolutePath().toString().indexOf('=') >= 0) {
-                                        LOG.warning("Invalid character '=' in the libraries directory path, unable to attach software renderer loader");
-                                        return null;
-                                    }
+                                if (OperatingSystem.CURRENT_OS != OperatingSystem.WINDOWS
+                                        || !(setting.getRenderer() instanceof Renderer.Driver renderer)
+                                        || renderer.mesaDriverName() == null)
+                                    return null;

-                                    String agent = FileUtils.getAbsolutePath(file) + "=" + renderer.name().toLowerCase(Locale.ROOT);
+                                Library lib = NativePatcher.getWindowsMesaLoader(java, renderer, OperatingSystem.SYSTEM_VERSION);
+                                if (lib == null)
+                                    return null;
+                                Path file = dependencyManager.getGameRepository().getLibraryFile(version.get(), lib);
+                                if (file.toAbsolutePath().toString().indexOf('=') >= 0) {
+                                    LOG.warning("Invalid character '=' in the libraries directory path, unable to attach software renderer loader");
+                                    return null;
+                                }

-                                    if (GameLibrariesTask.shouldDownloadLibrary(repository, version.get(), lib, integrityCheck)) {
-                                        return new LibraryDownloadTask(dependencyManager, file, lib)
-                                                .thenRunAsync(() -> javaAgents.add(agent));
-                                    } else {
-                                        javaAgents.add(agent);
-                                        return null;
-                                    }
+                                String agent = FileUtils.getAbsolutePath(file) + "=" + renderer.mesaDriverName();
+
+                                if (GameLibrariesTask.shouldDownloadLibrary(repository, version.get(), lib, integrityCheck)) {
+                                    return new LibraryDownloadTask(dependencyManager, file, lib)
+                                            .thenRunAsync(() -> javaAgents.add(agent));
                                } else {
+                                    javaAgents.add(agent);
                                    return null;
                                }
                            })
                    );
                }).withStage("launch.state.dependencies")
                .thenComposeAsync(() -> gameVersion.map(s -> new GameVerificationFixTask(dependencyManager, s, version.get())).orElse(null))
+                .thenComposeAsync(() -> {
+                    if (config().getAllowAutoAgent()
+                            || setting.isNoJVMArgs()
+                            || setting.isNoOptimizingJVMArgs()
+                            || Boolean.TRUE.equals(config().getShownTips().get(LWJGL_3_4_1_TIP))
+                            || !NativePatcher.needPatchMemoryUtil(version.get(), javaVersionRef.get().getParsedVersion())) {
+                        return Task.completed(null);
+                    } else {
+                        CompletableFuture<Void> future = new CompletableFuture<>();
+                        runInFX(() -> {
+                            Controllers.confirm(i18n("launch.advice.lwjgl_3_4_1"), i18n("launch.advice.lwjgl_3_4_1.title"), MessageType.QUESTION, () -> {
+                                config().getShownTips().put(LWJGL_3_4_1_TIP, true);
+                                config().setAllowAutoAgent(true);
+                                future.complete(null);
+                            }, () -> {
+                                config().getShownTips().put(LWJGL_3_4_1_TIP, true);
+                                future.complete(null);
+                            });
+                        });
+                        return Task.fromCompletableFuture(future);
+                    }
+                })
                .thenComposeAsync(() -> logIn(account).withStage("launch.state.logging_in"))
                .thenComposeAsync(authInfo -> Task.supplyAsync(() -> {
                    LaunchOptions.Builder launchOptionsBuilder = repository.getLaunchOptions(
@@ -207,6 +231,7 @@ public final class LauncherHelper {
                    if (quickPlayOption != null) {
                        launchOptionsBuilder.setQuickPlayOption(quickPlayOption);
                    }
+
                    LaunchOptions launchOptions = launchOptionsBuilder.create();

                    LOG.info("Here's the structure of game mod directory:\n" + FileUtils.printFileStructure(repository.getModsDirectory(selectedVersion), 10));
@@ -249,11 +274,11 @@ public final class LauncherHelper {
                        i18n("message.doing"),
                        () -> launchingLatch.getCount() == 0, 6.95
                ).withStage("launch.state.waiting_launching"))
-                .withStagesHint(Lang.immutableListOf(
-                        "launch.state.java",
-                        "launch.state.dependencies",
-                        "launch.state.logging_in",
-                        "launch.state.waiting_launching"))
+                .withStagesHints(
+                        new Task.StagesHint("launch.state.java"),
+                        new Task.StagesHint("launch.state.dependencies", List.of("hmcl.install.assets", "hmcl.install.libraries", "hmcl.modpack.download")),
+                        new Task.StagesHint("launch.state.logging_in"),
+                        new Task.StagesHint("launch.state.waiting_launching"))
                .executor();
        launchingStepsPane.setExecutor(executor, false);
        executor.addTaskListener(new TaskListener() {
@@ -325,13 +350,13 @@ public final class LauncherHelper {
                                    message = i18n("launch.failed.command_too_long");
                                } else if (ex instanceof ExecutionPolicyLimitException) {
                                    Controllers.prompt(new PromptDialogPane.Builder(i18n("launch.failed.execution_policy"),
-                                            (result, resolve, reject) -> {
+                                            (result, handler) -> {
                                                if (CommandBuilder.setExecutionPolicy()) {
                                                    LOG.info("Set the ExecutionPolicy for the scope 'CurrentUser' to 'RemoteSigned'");
-                                                    resolve.run();
+                                                    handler.resolve();
                                                } else {
                                                    LOG.warning("Failed to set ExecutionPolicy");
-                                                    reject.accept(i18n("launch.failed.execution_policy.failed_to_set"));
+                                                    handler.reject(i18n("launch.failed.execution_policy.failed_to_set"));
                                                }
                                            })
                                            .addQuestion(new PromptDialogPane.Builder.HintQuestion(i18n("launch.failed.execution_policy.hint")))
@@ -387,9 +412,18 @@ public final class LauncherHelper {
                if (setting.getJavaVersionType() == JavaVersionType.VERSION) {
                    try {
                        int targetJavaVersionMajor = Integer.parseInt(setting.getJavaVersion());
-                        GameJavaVersion minimumJavaVersion = GameJavaVersion.getMinimumJavaVersion(gameVersion);
+                        GameJavaVersion minimumJavaVersion = null;
+                        if (gameVersion.compareTo("1.12.2") == 0) {
+                            Optional<String> cleanroomVersion = analyzer.getVersion(LibraryAnalyzer.LibraryType.CLEANROOM);
+                            if (cleanroomVersion.isPresent()) {
+                                minimumJavaVersion = GameJavaVersion.getCleanroomJavaVersion(cleanroomVersion.get());
+                            }
+                        }

-                        if (minimumJavaVersion != null && targetJavaVersionMajor < minimumJavaVersion.getMajorVersion()) {
+                        if (minimumJavaVersion == null)
+                            minimumJavaVersion = GameJavaVersion.getMinimumJavaVersion(gameVersion);
+
+                        if (minimumJavaVersion != null && targetJavaVersionMajor < minimumJavaVersion.majorVersion()) {
                            Controllers.dialog(
                                    i18n("launch.failed.java_version_too_low"),
                                    i18n("message.error"),
@@ -402,8 +436,17 @@ public final class LauncherHelper {
                        targetJavaVersion = GameJavaVersion.get(targetJavaVersionMajor);
                    } catch (NumberFormatException ignored) {
                    }
-                } else
-                    targetJavaVersion = version.getJavaVersion();
+                } else {
+                    if (gameVersion.compareTo("1.12.2") == 0) {
+                        Optional<String> cleanroomVersion = analyzer.getVersion(LibraryAnalyzer.LibraryType.CLEANROOM);
+                        if (cleanroomVersion.isPresent()) {
+                            targetJavaVersion = GameJavaVersion.getCleanroomJavaVersion(cleanroomVersion.get());
+                        }
+                    }
+
+                    if (targetJavaVersion == null)
+                        targetJavaVersion = version.getJavaVersion();
+                }

                if (targetJavaVersion != null && supportedVersions.contains(targetJavaVersion)) {
                    downloadJava(targetJavaVersion, profile)
@@ -433,7 +476,7 @@ public final class LauncherHelper {
                if (java != null) {
                    for (JavaVersionConstraint constraint : JavaVersionConstraint.ALL) {
                        if (constraint.appliesToVersion(gameVersion, version, java, analyzer)) {
-                            if (!constraint.checkJava(gameVersion, version, java)) {
+                            if (!constraint.checkJava(gameVersion, version, java, analyzer)) {
                                if (constraint.isMandatory()) {
                                    violatedMandatoryConstraints.add(constraint);
                                } else {
@@ -468,9 +511,14 @@ public final class LauncherHelper {
                        return result;
                    } else {
                        GameJavaVersion gameJavaVersion;
-                        if (violatedMandatoryConstraints.contains(JavaVersionConstraint.CLEANROOM_JAVA_21))
-                            gameJavaVersion = GameJavaVersion.JAVA_21;
-                        else if (violatedMandatoryConstraints.contains(JavaVersionConstraint.GAME_JSON))
+                        if (violatedMandatoryConstraints.contains(JavaVersionConstraint.CLEANROOM)) {
+                            String cleanroomVersion = analyzer.getVersion(LibraryAnalyzer.LibraryType.CLEANROOM)
+                                    .orElse("");
+
+                            gameJavaVersion = !cleanroomVersion.isEmpty()
+                                    ? GameJavaVersion.getCleanroomJavaVersion(cleanroomVersion)
+                                    : GameJavaVersion.JAVA_21;
+                        } else if (violatedMandatoryConstraints.contains(JavaVersionConstraint.GAME_JSON))
                            gameJavaVersion = version.getJavaVersion();
                        else if (violatedMandatoryConstraints.contains(JavaVersionConstraint.VANILLA))
                            gameJavaVersion = GameJavaVersion.getMinimumJavaVersion(gameVersion);
@@ -560,9 +608,14 @@ public final class LauncherHelper {
                        case MODDED_JAVA_21:
                            suggestions.add(i18n("launch.advice.modded_java", 21, gameVersion));
                            break;
-                        case CLEANROOM_JAVA_21:
-                            suggestions.add(i18n("launch.advice.cleanroom"));
+                        case CLEANROOM: {
+                            String cleanroomVersion = analyzer.getVersion(LibraryAnalyzer.LibraryType.CLEANROOM).orElse("");
+                            if (!cleanroomVersion.isEmpty())
+                                suggestions.add(i18n("launch.advice.cleanroom", GameJavaVersion.getCleanroomJavaVersion(cleanroomVersion).majorVersion(), cleanroomVersion));
+                            else
+                                suggestions.add(i18n("launch.advice.cleanroom", 21, ""));
                            break;
+                        }
                        case VANILLA_JAVA_8_51:
                            suggestions.add(i18n("launch.advice.java8_51_1_13"));
                            break;
@@ -571,7 +624,7 @@ public final class LauncherHelper {
                            break;
                        case VANILLA_X86:
                            if (setting.getNativesDirType() == NativesDirectoryType.VERSION_FOLDER
-                                    && isCompatibleWithX86Java()) {
+                                    && Platform.isSupportedTranslationX86_64()) {
                                suggestions.add(i18n("launch.advice.vanilla_x86.translation"));
                            }
                            break;
@@ -634,7 +687,7 @@ public final class LauncherHelper {
    private static CompletableFuture<JavaRuntime> downloadJava(GameJavaVersion javaVersion, Profile profile) {
        CompletableFuture<JavaRuntime> future = new CompletableFuture<>();
        Controllers.dialog(new MessageDialogPane.Builder(
-                i18n("launch.advice.require_newer_java_version", javaVersion.getMajorVersion()),
+                i18n("launch.advice.require_newer_java_version", javaVersion.majorVersion()),
                i18n("message.warning"),
                MessageType.QUESTION)
                .yesOrNo(() -> {
@@ -18,7 +18,6 @@
 package org.jackhuang.hmcl.game;

 import org.jackhuang.hmcl.download.DownloadProvider;
-import org.jackhuang.hmcl.mod.LocalModFile;
 import org.jackhuang.hmcl.mod.RemoteMod;
 import org.jackhuang.hmcl.mod.RemoteModRepository;
 import org.jackhuang.hmcl.ui.versions.ModTranslations;
@@ -47,33 +46,42 @@ public abstract class LocalizedRemoteModRepository implements RemoteModRepositor
            return getBackedRemoteModRepository().search(downloadProvider, gameVersion, category, pageOffset, pageSize, searchFilter, sort, sortOrder);
        }

-        Set<String> englishSearchFiltersSet = new HashSet<>(INITIAL_CAPACITY);
+        Set<String> englishSearchFiltersSet = new LinkedHashSet<>(INITIAL_CAPACITY);

        int count = 0;
        for (ModTranslations.Mod mod : ModTranslations.getTranslationsByRepositoryType(getType()).searchMod(searchFilter)) {
-            for (String englishWord : StringUtils.tokenize(StringUtils.isNotBlank(mod.getSubname()) ? mod.getSubname() : mod.getName())) {
-                if (englishSearchFiltersSet.contains(englishWord)) {
-                    continue;
-                }
-
-                englishSearchFiltersSet.add(englishWord);
+            String englishSearchFilter = String.join(" ", StringUtils.tokenize(StringUtils.isNotBlank(mod.getSubname()) ? mod.getSubname() : mod.getName()));
+            if (StringUtils.isNotBlank(englishSearchFilter)) {
+                englishSearchFiltersSet.add(englishSearchFilter);
            }

            count++;
            if (count >= 3) break;
        }

+        if (englishSearchFiltersSet.isEmpty()) {
+            return getBackedRemoteModRepository().search(downloadProvider, gameVersion, category, pageOffset, pageSize, searchFilter, sort, sortOrder);
+        }
+
        RemoteMod[] searchResultArray = new RemoteMod[pageSize];
        int totalPages, chineseIndex = 0, englishIndex = pageSize - 1;
        {
-            SearchResult searchResult = getBackedRemoteModRepository().search(downloadProvider, gameVersion, category, pageOffset, pageSize, String.join(" ", englishSearchFiltersSet), getBackedRemoteModRepositorySortOrder(), sortOrder);
-            for (Iterator<RemoteMod> iterator = searchResult.getUnsortedResults().iterator(); iterator.hasNext(); ) {
+            SearchResult searchResult = null;
+            List<RemoteMod> remoteMods = List.of();
+            for (String englishSearchFilter : englishSearchFiltersSet) {
+                searchResult = getBackedRemoteModRepository().search(downloadProvider, gameVersion, category, pageOffset, pageSize, englishSearchFilter, getBackedRemoteModRepositorySortOrder(), sortOrder);
+                remoteMods = searchResult.getUnsortedResults().toList();
+                if (!remoteMods.isEmpty()) {
+                    break;
+                }
+            }
+
+            for (RemoteMod remoteMod : remoteMods) {
                if (chineseIndex > englishIndex) {
                    LOG.warning("Too many search results! Are the backed remote mod repository broken? Or are the API broken?");
                    continue;
                }

-                RemoteMod remoteMod = iterator.next();
                ModTranslations.Mod chineseTranslation = ModTranslations.getTranslationsByRepositoryType(getType()).getModByCurseForgeId(remoteMod.getSlug());
                if (chineseTranslation != null && !StringUtils.isBlank(chineseTranslation.getName()) && StringUtils.containsChinese(chineseTranslation.getName())) {
                    searchResultArray[chineseIndex++] = remoteMod;
@@ -110,13 +118,13 @@ public abstract class LocalizedRemoteModRepository implements RemoteModRepositor
    }

    @Override
-    public Optional<RemoteMod.Version> getRemoteVersionByLocalFile(LocalModFile localModFile, Path file) throws IOException {
-        return getBackedRemoteModRepository().getRemoteVersionByLocalFile(localModFile, file);
+    public Optional<RemoteMod.Version> getRemoteVersionByLocalFile(Path file) throws IOException {
+        return getBackedRemoteModRepository().getRemoteVersionByLocalFile(file);
    }

    @Override
-    public RemoteMod getModById(String id) throws IOException {
-        return getBackedRemoteModRepository().getModById(id);
+    public RemoteMod getModById(DownloadProvider downloadProvider, String id) throws IOException {
+        return getBackedRemoteModRepository().getModById(downloadProvider, id);
    }

    @Override
@@ -125,7 +133,7 @@ public abstract class LocalizedRemoteModRepository implements RemoteModRepositor
    }

    @Override
-    public Stream<RemoteMod.Version> getRemoteVersionsById(String id) throws IOException {
-        return getBackedRemoteModRepository().getRemoteVersionsById(id);
+    public Stream<RemoteMod.Version> getRemoteVersionsById(DownloadProvider downloadProvider, String id) throws IOException {
+        return getBackedRemoteModRepository().getRemoteVersionsById(downloadProvider, id);
    }
 }
@@ -31,7 +31,6 @@ public final class Log {

    private final String log;
    private Log4jLevel level;
-    private boolean selected = false;

    public Log(String log) {
        this.log = log;
@@ -57,14 +56,6 @@ public final class Log {
        return level;
    }

-    public boolean isSelected() {
-        return selected;
-    }
-
-    public void setSelected(boolean selected) {
-        this.selected = selected;
-    }
-
    @Override
    public String toString() {
        return log;
@@ -17,21 +17,19 @@
 */
 package org.jackhuang.hmcl.game;

-import org.jackhuang.hmcl.util.io.IOUtils;
-import org.jackhuang.hmcl.util.logging.Logger;
 import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.io.IOUtils;
 import org.jackhuang.hmcl.util.io.Zipper;
+import org.jackhuang.hmcl.util.logging.Logger;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;

 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.UncheckedIOException;
-import java.lang.management.ManagementFactory;
 import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.nio.file.attribute.FileTime;
+import java.nio.file.PathMatcher;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -43,7 +41,9 @@ public final class LogExporter {
    private LogExporter() {
    }

-    public static CompletableFuture<Void> exportLogs(Path zipFile, DefaultGameRepository gameRepository, String versionId, String logs, String launchScript) {
+    public static CompletableFuture<Void> exportLogs(
+            Path zipFile, DefaultGameRepository gameRepository, String versionId, String logs, String launchScript,
+            PathMatcher logMatcher) {
        Path runDirectory = gameRepository.getRunDirectory(versionId);
        Path baseDirectory = gameRepository.getBaseDirectory();
        List<String> versions = new ArrayList<>();
@@ -64,11 +64,11 @@ public final class LogExporter {
        }

        return CompletableFuture.runAsync(() -> {
-            try (Zipper zipper = new Zipper(zipFile)) {
-                processLogs(runDirectory.resolve("liteconfig"), "*.log", "liteconfig", zipper);
-                processLogs(runDirectory.resolve("logs"), "*.log", "logs", zipper);
-                processLogs(runDirectory, "*.log", "runDirectory", zipper);
-                processLogs(runDirectory.resolve("crash-reports"), "*.txt", "crash-reports", zipper);
+            try (Zipper zipper = new Zipper(zipFile, true)) {
+                processLogs(runDirectory.resolve("liteconfig"), "*.log", "liteconfig", zipper, logMatcher);
+                processLogs(runDirectory.resolve("logs"), "*.log", "logs", zipper, logMatcher);
+                processLogs(runDirectory, "*.log", "runDirectory", zipper, logMatcher);
+                processLogs(runDirectory.resolve("crash-reports"), "*.txt", "crash-reports", zipper, logMatcher);

                zipper.putTextFile(LOG.getLogs(), "hmcl.log");
                zipper.putTextFile(logs, "minecraft.log");
@@ -86,14 +86,11 @@ public final class LogExporter {
        });
    }

-    private static void processLogs(Path directory, String fileExtension, String logDirectory, Zipper zipper) {
+    private static void processLogs(Path directory, String fileExtension, String logDirectory, Zipper zipper, PathMatcher logMatcher) {
        try (DirectoryStream<Path> stream = Files.newDirectoryStream(directory, fileExtension)) {
-            long processStartTime = ManagementFactory.getRuntimeMXBean().getStartTime();
-
            for (Path file : stream) {
                if (Files.isRegularFile(file)) {
-                    FileTime time = Files.readAttributes(file, BasicFileAttributes.class).lastModifiedTime();
-                    if (time.toMillis() >= processStartTime) {
+                    if (logMatcher == null || logMatcher.matches(file)) {
                        try (BufferedReader reader = IOUtils.newBufferedReaderMaybeNativeEncoding(file)) {
                            zipper.putLines(reader.lines().map(Logger::filterForbiddenToken), file.getFileName().toString());
                        } catch (IOException e) {
@@ -51,7 +51,10 @@ import java.nio.file.FileSystem;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.stream.Stream;

 import static org.jackhuang.hmcl.util.Lang.mapOf;
@@ -167,7 +170,7 @@ public final class ModpackHelper {

        return new ServerModpackRemoteInstallTask(profile.getDependency(), manifest, name)
                .whenComplete(Schedulers.defaultScheduler(), success, failure)
-                .withStagesHint(Arrays.asList("hmcl.modpack", "hmcl.modpack.download"));
+                .withStagesHints(new Task.StagesHint("hmcl.modpack"), new Task.StagesHint("hmcl.modpack.download", List.of("hmcl.install.assets", "hmcl.install.libraries")));
    }

    public static boolean isExternalGameNameConflicts(String name) {
@@ -188,7 +191,7 @@ public final class ModpackHelper {
                });
    }

-    public static Task<?> getInstallTask(Profile profile, Path zipFile, String name, Modpack modpack) {
+    public static Task<?> getInstallTask(Profile profile, Path zipFile, String name, Modpack modpack, String iconUrl) {
        profile.getRepository().markVersionAsModpack(name);

        ExceptionalRunnable<?> success = () -> {
@@ -208,26 +211,27 @@ public final class ModpackHelper {
        };

        if (modpack.getManifest() instanceof MultiMCInstanceConfiguration)
-            return modpack.getInstallTask(profile.getDependency(), zipFile, name)
+            return modpack.getInstallTask(profile.getDependency(), zipFile, name, iconUrl)
                    .whenComplete(Schedulers.defaultScheduler(), success, failure)
                    .thenComposeAsync(createMultiMCPostInstallTask(profile, (MultiMCInstanceConfiguration) modpack.getManifest(), name))
-                    .withStagesHint(List.of("hmcl.modpack", "hmcl.modpack.download"));
+                    .withStagesHints(new Task.StagesHint("hmcl.modpack"), new Task.StagesHint("hmcl.modpack.download", List.of("hmcl.install.assets", "hmcl.install.libraries")));
        else if (modpack.getManifest() instanceof McbbsModpackManifest)
-            return modpack.getInstallTask(profile.getDependency(), zipFile, name)
+            return modpack.getInstallTask(profile.getDependency(), zipFile, name, iconUrl)
                    .whenComplete(Schedulers.defaultScheduler(), success, failure)
                    .thenComposeAsync(createMcbbsPostInstallTask(profile, (McbbsModpackManifest) modpack.getManifest(), name))
-                    .withStagesHint(List.of("hmcl.modpack", "hmcl.modpack.download"));
+                    .withStagesHints(new Task.StagesHint("hmcl.modpack"), new Task.StagesHint("hmcl.modpack.download", List.of("hmcl.install.assets", "hmcl.install.libraries")));
        else
-            return modpack.getInstallTask(profile.getDependency(), zipFile, name)
+            return modpack.getInstallTask(profile.getDependency(), zipFile, name, iconUrl)
                    .whenComplete(Schedulers.javafx(), success, failure)
-                    .withStagesHint(List.of("hmcl.modpack", "hmcl.modpack.download"));
+                    .withStagesHints(new Task.StagesHint("hmcl.modpack"), new Task.StagesHint("hmcl.modpack.download", List.of("hmcl.install.assets", "hmcl.install.libraries")));
    }

    public static Task<Void> getUpdateTask(Profile profile, ServerModpackManifest manifest, Charset charset, String name, ModpackConfiguration<?> configuration) throws UnsupportedModpackException {
        switch (configuration.getType()) {
            case ServerModpackRemoteInstallTask.MODPACK_TYPE:
                return new ModpackUpdateTask(profile.getRepository(), name, new ServerModpackRemoteInstallTask(profile.getDependency(), manifest, name))
-                        .withStagesHint(Arrays.asList("hmcl.modpack", "hmcl.modpack.download"));
+                        .thenComposeAsync(profile.getRepository().refreshVersionsAsync())
+                        .withStagesHints(new Task.StagesHint("hmcl.modpack"), new Task.StagesHint("hmcl.modpack.download", List.of("hmcl.install.assets", "hmcl.install.libraries")));
            default:
                throw new UnsupportedModpackException();
        }
@@ -241,9 +245,11 @@ public final class ModpackHelper {
        }
        if (modpack.getManifest() instanceof MultiMCInstanceConfiguration)
            return provider.createUpdateTask(profile.getDependency(), name, zipFile, modpack)
-                    .thenComposeAsync(() -> createMultiMCPostUpdateTask(profile, (MultiMCInstanceConfiguration) modpack.getManifest(), name));
+                    .thenComposeAsync(() -> createMultiMCPostUpdateTask(profile, (MultiMCInstanceConfiguration) modpack.getManifest(), name))
+                    .thenComposeAsync(profile.getRepository().refreshVersionsAsync());
        else
-            return provider.createUpdateTask(profile.getDependency(), name, zipFile, modpack);
+            return provider.createUpdateTask(profile.getDependency(), name, zipFile, modpack)
+                    .thenComposeAsync(profile.getRepository().refreshVersionsAsync());
    }

    public static void toVersionSetting(MultiMCInstanceConfiguration c, VersionSetting vs) {
@@ -22,13 +22,15 @@ import org.jackhuang.hmcl.auth.AuthenticationException;
 import org.jackhuang.hmcl.auth.OAuth;
 import org.jackhuang.hmcl.event.Event;
 import org.jackhuang.hmcl.event.EventManager;
-import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.theme.Themes;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.io.IOUtils;
 import org.jackhuang.hmcl.util.io.JarUtils;
 import org.jackhuang.hmcl.util.io.NetworkUtils;

 import java.io.IOException;
+import java.security.SecureRandom;
+import java.util.Base64;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -37,12 +39,14 @@ import java.util.concurrent.ExecutionException;

 import static org.jackhuang.hmcl.util.Lang.mapOf;
 import static org.jackhuang.hmcl.util.Lang.thread;
-import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;

 public final class OAuthServer extends NanoHTTPD implements OAuth.Session {
    private final int port;
    private final CompletableFuture<String> future = new CompletableFuture<>();
+    private final String codeVerifier;
+    private final String state;

    public static String lastlyOpenedURL;

@@ -52,6 +56,34 @@ public final class OAuthServer extends NanoHTTPD implements OAuth.Session {
        super(port);

        this.port = port;
+
+        var encoder = Base64.getUrlEncoder().withoutPadding();
+        var random = new SecureRandom();
+
+        {
+            // https://datatracker.ietf.org/doc/html/rfc6749#section-4.1.1
+            // https://datatracker.ietf.org/doc/html/rfc6749#section-10.12
+            byte[] bytes = new byte[32];
+            random.nextBytes(bytes);
+            this.state = encoder.encodeToString(bytes);
+        }
+
+        {
+            // https://datatracker.ietf.org/doc/html/rfc7636#section-4.1
+            byte[] bytes = new byte[64];
+            random.nextBytes(bytes);
+            this.codeVerifier = encoder.encodeToString(bytes);
+        }
+    }
+
+    @Override
+    public String getCodeVerifier() {
+        return codeVerifier;
+    }
+
+    @Override
+    public String getState() {
+        return state;
    }

    @Override
@@ -93,19 +125,32 @@ public final class OAuthServer extends NanoHTTPD implements OAuth.Session {
        String parameters = session.getQueryParameterString();

        Map<String, String> query = mapOf(NetworkUtils.parseQuery(parameters));
-        if (query.containsKey("code")) {
-            idToken = query.get("id_token");
-            future.complete(query.get("code"));
+
+        String code = query.get("code");
+        if (code != null) {
+            if (this.state.equals(query.get("state"))) {
+                idToken = query.get("id_token");
+                future.complete(code);
+            } else if (query.containsKey("state")) {
+                LOG.warning("Failed to authenticate: invalid state in parameters");
+                future.completeExceptionally(new AuthenticationException("Failed to authenticate: invalid state"));
+            } else {
+                LOG.warning("Failed to authenticate: missing state in parameters");
+                future.completeExceptionally(new AuthenticationException("Failed to authenticate: missing state"));
+            }
        } else {
-            LOG.warning("Error: " + parameters);
-            future.completeExceptionally(new AuthenticationException("failed to authenticate"));
+            LOG.warning("Failed to authenticate: missing authorization code in parameters");
+            future.completeExceptionally(new AuthenticationException("Failed to authenticate: missing authorization code"));
        }

        String html;
        try {
            html = IOUtils.readFullyAsString(OAuthServer.class.getResourceAsStream("/assets/microsoft_auth.html"))
+                    .replace("%style%", Themes.getTheme().toColorScheme().toStyleSheet().replace("-monet", "--monet"))
                    .replace("%lang%", Locale.getDefault().toLanguageTag())
-                    .replace("%close-page%", i18n("account.methods.microsoft.close_page"));
+                    .replace("%success%", i18n("message.success"))
+                    .replace("%ok%", i18n("button.ok"))
+                    .replace("%close_page%", i18n("account.methods.microsoft.close_page"));
        } catch (IOException e) {
            LOG.error("Failed to load html", e);
            return newFixedLengthResponse(Response.Status.INTERNAL_ERROR, MIME_HTML, "");
@@ -121,9 +166,18 @@ public final class OAuthServer extends NanoHTTPD implements OAuth.Session {
        return newFixedLengthResponse(Response.Status.OK, "text/html; charset=UTF-8", html);
    }

+    @Override
+    public void close() {
+        if (!future.isDone())
+            future.completeExceptionally(new AuthenticationException("OAuth server is closing"));
+        stop();
+    }
+
    public static class Factory implements OAuth.Callback {
        public final EventManager<GrantDeviceCodeEvent> onGrantDeviceCode = new EventManager<>();
-        public final EventManager<OpenBrowserEvent> onOpenBrowser = new EventManager<>();
+        public final EventManager<LoginCompletedDeviceCodeEvent> onLoginCompletedDeviceCode = new EventManager<>();
+        public final EventManager<OpenBrowserEvent> onOpenBrowserAuthorizationCode = new EventManager<>();
+        public final EventManager<OpenBrowserEvent> onOpenBrowserDevice = new EventManager<>();

        @Override
        public OAuth.Session startServer() throws IOException, AuthenticationException {
@@ -150,11 +204,18 @@ public final class OAuthServer extends NanoHTTPD implements OAuth.Session {
        }

        @Override
-        public void openBrowser(String url) throws IOException {
-            lastlyOpenedURL = url;
-            FXUtils.openLink(url);
+        public void loginCompletedDeviceCode() {
+            onLoginCompletedDeviceCode.fireEvent(new LoginCompletedDeviceCodeEvent(this));
+        }

-            onOpenBrowser.fireEvent(new OpenBrowserEvent(this, url));
+        @Override
+        public void openBrowser(OAuth.GrantFlow grantFlow, String url) throws IOException {
+            lastlyOpenedURL = url;
+
+            switch (grantFlow) {
+                case AUTHORIZATION_CODE -> onOpenBrowserAuthorizationCode.fireEvent(new OpenBrowserEvent(this, url));
+                case DEVICE -> onOpenBrowserDevice.fireEvent(new OpenBrowserEvent(this, url));
+            }
        }

        @Override
@@ -162,17 +223,6 @@ public final class OAuthServer extends NanoHTTPD implements OAuth.Session {
            return System.getProperty("hmcl.microsoft.auth.id",
                    JarUtils.getAttribute("hmcl.microsoft.auth.id", ""));
        }
-
-        @Override
-        public String getClientSecret() {
-            return System.getProperty("hmcl.microsoft.auth.secret",
-                    JarUtils.getAttribute("hmcl.microsoft.auth.secret", ""));
-        }
-
-        @Override
-        public boolean isPublicClient() {
-            return true; // We have turned on the device auth flow.
-        }
    }

    public static class GrantDeviceCodeEvent extends Event {
@@ -194,6 +244,12 @@ public final class OAuthServer extends NanoHTTPD implements OAuth.Session {
        }
    }

+    public static class LoginCompletedDeviceCodeEvent extends Event {
+        public LoginCompletedDeviceCodeEvent(Object source) {
+            super(source);
+        }
+    }
+
    public static class OpenBrowserEvent extends Event {
        private final String url;

@@ -30,7 +30,9 @@ import org.jackhuang.hmcl.util.platform.Platform;
 import org.jetbrains.annotations.Nullable;

 import java.io.IOException;
-import java.nio.file.*;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.*;

 import static org.jackhuang.hmcl.util.logging.Logger.LOG;
@@ -57,7 +59,7 @@ public final class HMCLJavaRepository implements JavaRepository {
    }

    public Path getJavaDir(Platform platform, GameJavaVersion gameJavaVersion) {
-        return getJavaDir(platform, MOJANG_JAVA_PREFIX + gameJavaVersion.getComponent());
+        return getJavaDir(platform, MOJANG_JAVA_PREFIX + gameJavaVersion.component());
    }

    @Override
@@ -66,7 +68,7 @@ public final class HMCLJavaRepository implements JavaRepository {
    }

    public Path getManifestFile(Platform platform, GameJavaVersion gameJavaVersion) {
-        return getManifestFile(platform, MOJANG_JAVA_PREFIX + gameJavaVersion.getComponent());
+        return getManifestFile(platform, MOJANG_JAVA_PREFIX + gameJavaVersion.component());
    }

    public boolean isInstalled(Platform platform, String name) {
@@ -74,7 +76,7 @@ public final class HMCLJavaRepository implements JavaRepository {
    }

    public boolean isInstalled(Platform platform, GameJavaVersion gameJavaVersion) {
-        return isInstalled(platform, MOJANG_JAVA_PREFIX + gameJavaVersion.getComponent());
+        return isInstalled(platform, MOJANG_JAVA_PREFIX + gameJavaVersion.component());
    }

    public @Nullable Path getJavaExecutable(Platform platform, String name) {
@@ -94,10 +96,10 @@ public final class HMCLJavaRepository implements JavaRepository {
    }

    public @Nullable Path getJavaExecutable(Platform platform, GameJavaVersion gameJavaVersion) {
-        return getJavaExecutable(platform, MOJANG_JAVA_PREFIX + gameJavaVersion.getComponent());
+        return getJavaExecutable(platform, MOJANG_JAVA_PREFIX + gameJavaVersion.component());
    }

-    private static void getAllJava(List<JavaRuntime> list, Platform platform, Path platformRoot, boolean isManaged) {
+    private static void getAllJava(List<Path> list, Platform platform, Path platformRoot) {
        try (DirectoryStream<Path> stream = Files.newDirectoryStream(platformRoot)) {
            for (Path file : stream) {
                try {
@@ -115,8 +117,7 @@ public final class HMCLJavaRepository implements JavaRepository {
                        }

                        if (Files.isDirectory(javaDir)) {
-                            JavaManifest manifest = JsonUtils.fromJsonFile(file, JavaManifest.class);
-                            list.add(JavaRuntime.of(executable, manifest.getInfo(), isManaged));
+                            list.add(executable);
                        }
                    }
                } catch (Throwable e) {
@@ -129,28 +130,23 @@ public final class HMCLJavaRepository implements JavaRepository {
    }

    @Override
-    public Collection<JavaRuntime> getAllJava(Platform platform) {
+    public Collection<Path> getAllJava(Platform platform) {
        Path platformRoot = getPlatformRoot(platform);
        if (!Files.isDirectory(platformRoot))
            return Collections.emptyList();

-        ArrayList<JavaRuntime> list = new ArrayList<>();
-
-        getAllJava(list, platform, platformRoot, true);
-        if (platform.getOperatingSystem() == OperatingSystem.MACOS) {
-            platformRoot = root.resolve(platform.getOperatingSystem().getMojangName() + "-" + platform.getArchitecture().getCheckedName());
-            if (Files.isDirectory(platformRoot))
-                getAllJava(list, platform, platformRoot, false);
-        }
+        ArrayList<Path> list = new ArrayList<>();

+        getAllJava(list, platform, platformRoot);
        return list;
    }

    @Override
    public Task<JavaRuntime> getDownloadJavaTask(DownloadProvider downloadProvider, Platform platform, GameJavaVersion gameJavaVersion) {
        Path javaDir = getJavaDir(platform, gameJavaVersion);
+        Path tempDir = getPlatformRoot(platform).resolve(".tmp").resolve(javaDir.getFileName());

-        return new MojangJavaDownloadTask(downloadProvider, javaDir, gameJavaVersion, JavaManager.getMojangJavaPlatform(platform)).thenApplyAsync(result -> {
+        return new MojangJavaDownloadTask(downloadProvider, javaDir, tempDir, gameJavaVersion, JavaManager.getMojangJavaPlatform(platform)).thenApplyAsync(result -> {
            Path executable;
            try {
                executable = JavaManager.getExecutable(javaDir).toRealPath();
@@ -163,16 +159,16 @@ public final class HMCLJavaRepository implements JavaRepository {

            JavaInfo info;
            if (JavaManager.isCompatible(platform))
-                info = JavaInfoUtils.fromExecutable(executable, false);
+                info = JavaInfoUtils.fromExecutable(executable);
            else
-                info = new JavaInfo(platform, result.download.getVersion().getName(), null);
+                info = new JavaInfo(platform, result.download().version().name(), null);

            Map<String, Object> update = new LinkedHashMap<>();
            update.put("provider", "mojang");
-            update.put("component", gameJavaVersion.getComponent());
+            update.put("component", gameJavaVersion.component());

            Map<String, JavaLocalFiles.Local> files = new LinkedHashMap<>();
-            result.remoteFiles.getFiles().forEach((path, file) -> {
+            result.remoteFiles().getFiles().forEach((path, file) -> {
                if (file instanceof MojangJavaRemoteFiles.RemoteFile) {
                    DownloadInfo downloadInfo = ((MojangJavaRemoteFiles.RemoteFile) file).getDownloads().get("raw");
                    if (downloadInfo != null) {
@@ -18,6 +18,7 @@
 package org.jackhuang.hmcl.java;

 import com.google.gson.annotations.SerializedName;
+import org.jackhuang.hmcl.util.gson.JsonSerializable;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.io.JarUtils;
 import org.jackhuang.hmcl.util.platform.Architecture;
@@ -27,7 +28,6 @@ import org.jackhuang.hmcl.util.platform.SystemUtils;
 import org.jetbrains.annotations.NotNull;

 import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.file.Path;

 /**
@@ -39,35 +39,10 @@ public final class JavaInfoUtils {
    private JavaInfoUtils() {
    }

-    private static Path tryFindReleaseFile(Path executable) {
-        Path parent = executable.getParent();
-        if (parent != null && parent.getFileName() != null && parent.getFileName().toString().equals("bin")) {
-            Path javaHome = parent.getParent();
-            if (javaHome != null && javaHome.getFileName() != null) {
-                Path releaseFile = javaHome.resolve("release");
-                String javaHomeName = javaHome.getFileName().toString();
-                if ((javaHomeName.contains("jre") || javaHomeName.contains("jdk") || javaHomeName.contains("openj9"))
-                        && Files.isRegularFile(releaseFile)) {
-                    return releaseFile;
-                }
-            }
-        }
-        return null;
-    }
-
-    public static @NotNull JavaInfo fromExecutable(Path executable, boolean tryFindReleaseFile) throws IOException {
+    public static @NotNull JavaInfo fromExecutable(Path executable) throws IOException {
        assert executable.isAbsolute();

-        Path releaseFile;
-        if (tryFindReleaseFile && (releaseFile = tryFindReleaseFile(executable)) != null) {
-            try {
-                return JavaInfo.fromReleaseFile(releaseFile);
-            } catch (IOException ignored) {
-            }
-        }
-
        Path thisPath = JarUtils.thisJarPath();
-
        if (thisPath == null) {
            throw new IOException("Failed to find current HMCL location");
        }
@@ -94,7 +69,6 @@ public final class JavaInfoUtils {
                            ? architecture
                            : Architecture.SYSTEM_ARCH);

-
            return new JavaInfo(platform, result.javaVersion, result.javaVendor);
        } catch (IOException e) {
            throw e;
@@ -103,14 +77,9 @@ public final class JavaInfoUtils {
        }
    }

-    private static final class Result {
-        @SerializedName("os.name")
-        public String osName;
-        @SerializedName("os.arch")
-        public String osArch;
-        @SerializedName("java.version")
-        public String javaVersion;
-        @SerializedName("java.vendor")
-        public String javaVendor;
+    @JsonSerializable
+    private record Result(@SerializedName("os.name") String osName, @SerializedName("os.arch") String osArch,
+                          @SerializedName("java.version") String javaVersion,
+                          @SerializedName("java.vendor") String javaVendor) {
    }
 }
@@ -17,6 +17,8 @@
 */
 package org.jackhuang.hmcl.java;

+import com.google.gson.*;
+import com.google.gson.stream.JsonWriter;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import org.jackhuang.hmcl.Metadata;
@@ -30,7 +32,9 @@ import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.util.CacheRepository;
+import org.jackhuang.hmcl.util.DigestUtils;
 import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.platform.*;
 import org.jackhuang.hmcl.util.platform.windows.WinReg;
@@ -40,9 +44,14 @@ import org.jetbrains.annotations.Nullable;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.*;
+import java.nio.file.attribute.BasicFileAttributes;
 import java.util.*;
 import java.util.concurrent.CountDownLatch;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;

 import static org.jackhuang.hmcl.util.logging.Logger.LOG;
@@ -55,6 +64,16 @@ public final class JavaManager {
    private JavaManager() {
    }

+    private static final String[] KNOWN_VENDOR_DIRECTORIES = {
+            "Java",
+            "BellSoft",
+            "AdoptOpenJDK",
+            "Zulu",
+            "Microsoft",
+            "Eclipse Foundation",
+            "Semeru"
+    };
+
    public static final HMCLJavaRepository REPOSITORY = new HMCLJavaRepository(Metadata.HMCL_GLOBAL_DIRECTORY.resolve("java"));
    public static final HMCLJavaRepository LOCAL_REPOSITORY = new HMCLJavaRepository(Metadata.HMCL_CURRENT_DIRECTORY.resolve("java"));

@@ -103,16 +122,27 @@ public final class JavaManager {
        switch (OperatingSystem.CURRENT_OS) {
            case WINDOWS:
                if (Architecture.SYSTEM_ARCH == Architecture.X86_64)
+                    // Windows x86-64 platform is compatible with x86 programs
                    return architecture == Architecture.X86;
-                if (Architecture.SYSTEM_ARCH == Architecture.ARM64)
-                    return OperatingSystem.SYSTEM_BUILD_NUMBER >= 21277 && architecture == Architecture.X86_64 || architecture == Architecture.X86;
+                if (Architecture.SYSTEM_ARCH == Architecture.ARM64) {
+
+                    // Since Windows 10 Build 21277, Windows Arm64 has been compatible with x86-64 programs via translation
+                    if (architecture == Architecture.X86_64 && Platform.isSupportedTranslationX86_64())
+                        return true;
+
+                    // Windows Arm64 is compatible with x86 programs via translation
+                    if (architecture == Architecture.X86)
+                        return true;
+                    return false;
+                }
                break;
            case LINUX:
                if (Architecture.SYSTEM_ARCH == Architecture.X86_64)
                    return architecture == Architecture.X86;
                break;
            case MACOS:
-                if (Architecture.SYSTEM_ARCH == Architecture.ARM64)
+                // macOS Arm64 compatible with x86-64 programs via Rosetta 2.
+                if (Architecture.SYSTEM_ARCH == Architecture.ARM64 && Platform.isSupportedTranslationX86_64())
                    return architecture == Architecture.X86_64;
                break;
        }
@@ -160,12 +190,12 @@ public final class JavaManager {
            return javaRuntime;
        }

-        JavaInfo info = JavaInfoUtils.fromExecutable(executable, true);
+        JavaInfo info = JavaInfoUtils.fromExecutable(executable);
        return JavaRuntime.of(executable, info, false);
    }

    public static void refresh() {
-        Task.supplyAsync(JavaManager::searchPotentialJavaExecutables).whenComplete(Schedulers.javafx(), (result, exception) -> {
+        Task.supplyAsync(() -> searchPotentialJavaExecutables(false)).whenComplete(Schedulers.javafx(), (result, exception) -> {
            if (result != null) {
                LATCH.await();
                allJava = result;
@@ -304,7 +334,7 @@ public final class JavaManager {

            for (JavaVersionConstraint constraint : JavaVersionConstraint.ALL) {
                if (constraint.appliesToVersion(gameVersion, version, java, analyzer)) {
-                    if (!constraint.checkJava(gameVersion, version, java)) {
+                    if (!constraint.checkJava(gameVersion, version, java, analyzer)) {
                        if (constraint.isMandatory()) {
                            violationMandatory = true;
                        } else {
@@ -326,7 +356,7 @@ public final class JavaManager {
    }

    public static void initialize() {
-        Map<Path, JavaRuntime> allJava = searchPotentialJavaExecutables();
+        Map<Path, JavaRuntime> allJava = searchPotentialJavaExecutables(true);
        JavaManager.allJava = allJava;
        LATCH.countDown();
        FXUtils.runInFX(() -> updateAllJavaProperty(allJava));
@@ -334,56 +364,56 @@ public final class JavaManager {

    // search java

-    private static Map<Path, JavaRuntime> searchPotentialJavaExecutables() {
-        Map<Path, JavaRuntime> javaRuntimes = new HashMap<>();
-        searchAllJavaInRepository(javaRuntimes, Platform.SYSTEM_PLATFORM);
+    private static Map<Path, JavaRuntime> searchPotentialJavaExecutables(boolean useCache) {
+        Searcher searcher = new Searcher(Metadata.HMCL_GLOBAL_DIRECTORY.resolve("javaCache.json"));
+        if (useCache)
+            searcher.loadCache();
+
+        searcher.searchAllJavaInRepository(Platform.SYSTEM_PLATFORM);
        switch (OperatingSystem.CURRENT_OS) {
            case WINDOWS:
                if (Architecture.SYSTEM_ARCH == Architecture.X86_64)
-                    searchAllJavaInRepository(javaRuntimes, Platform.WINDOWS_X86);
+                    searcher.searchAllJavaInRepository(Platform.WINDOWS_X86);
                if (Architecture.SYSTEM_ARCH == Architecture.ARM64) {
-                    if (OperatingSystem.SYSTEM_BUILD_NUMBER >= 21277)
-                        searchAllJavaInRepository(javaRuntimes, Platform.WINDOWS_X86_64);
-                    searchAllJavaInRepository(javaRuntimes, Platform.WINDOWS_X86);
+                    if (Platform.isSupportedTranslationX86_64())
+                        searcher.searchAllJavaInRepository(Platform.WINDOWS_X86_64);
+                    searcher.searchAllJavaInRepository(Platform.WINDOWS_X86);
                }
                break;
            case MACOS:
-                if (Architecture.SYSTEM_ARCH == Architecture.ARM64)
-                    searchAllJavaInRepository(javaRuntimes, Platform.MACOS_X86_64);
+                if (Architecture.SYSTEM_ARCH == Architecture.ARM64 && Platform.isSupportedTranslationX86_64())
+                    searcher.searchAllJavaInRepository(Platform.MACOS_X86_64);
                break;
        }

        switch (OperatingSystem.CURRENT_OS) {
            case WINDOWS:
-                queryJavaInRegistryKey(javaRuntimes, WinReg.HKEY.HKEY_LOCAL_MACHINE, "SOFTWARE\\JavaSoft\\Java Runtime Environment");
-                queryJavaInRegistryKey(javaRuntimes, WinReg.HKEY.HKEY_LOCAL_MACHINE, "SOFTWARE\\JavaSoft\\Java Development Kit");
-                queryJavaInRegistryKey(javaRuntimes, WinReg.HKEY.HKEY_LOCAL_MACHINE, "SOFTWARE\\JavaSoft\\JRE");
-                queryJavaInRegistryKey(javaRuntimes, WinReg.HKEY.HKEY_LOCAL_MACHINE, "SOFTWARE\\JavaSoft\\JDK");
+                searcher.queryJavaInRegistryKey(WinReg.HKEY.HKEY_LOCAL_MACHINE, "SOFTWARE\\JavaSoft\\Java Runtime Environment");
+                searcher.queryJavaInRegistryKey(WinReg.HKEY.HKEY_LOCAL_MACHINE, "SOFTWARE\\JavaSoft\\Java Development Kit");
+                searcher.queryJavaInRegistryKey(WinReg.HKEY.HKEY_LOCAL_MACHINE, "SOFTWARE\\JavaSoft\\JRE");
+                searcher.queryJavaInRegistryKey(WinReg.HKEY.HKEY_LOCAL_MACHINE, "SOFTWARE\\JavaSoft\\JDK");

-                searchJavaInProgramFiles(javaRuntimes, "ProgramFiles", "C:\\Program Files");
-                searchJavaInProgramFiles(javaRuntimes, "ProgramFiles(x86)", "C:\\Program Files (x86)");
-                if (Architecture.SYSTEM_ARCH == Architecture.ARM64) {
-                    searchJavaInProgramFiles(javaRuntimes, "ProgramFiles(ARM)", "C:\\Program Files (ARM)");
-                }
+                searcher.searchJavaInProgramFiles("ProgramFiles", "C:\\Program Files");
+                searcher.searchJavaInProgramFiles("ProgramFiles(x86)", "C:\\Program Files (x86)");
                break;
            case LINUX:
-                searchAllJavaInDirectory(javaRuntimes, Paths.get("/usr/java"));      // Oracle RPMs
-                searchAllJavaInDirectory(javaRuntimes, Paths.get("/usr/lib/jvm"));   // General locations
-                searchAllJavaInDirectory(javaRuntimes, Paths.get("/usr/lib32/jvm")); // General locations
-                searchAllJavaInDirectory(javaRuntimes, Paths.get("/usr/lib64/jvm")); // General locations
-                searchAllJavaInDirectory(javaRuntimes, Paths.get(System.getProperty("user.home"), "/.sdkman/candidates/java")); // SDKMAN!
+                searcher.searchAllJavaInDirectory(Path.of("/usr/java"));      // Oracle RPMs
+                searcher.searchAllJavaInDirectory(Path.of("/usr/lib/jvm"));   // General locations
+                searcher.searchAllJavaInDirectory(Path.of("/usr/lib32/jvm")); // General locations
+                searcher.searchAllJavaInDirectory(Path.of("/usr/lib64/jvm")); // General locations
+                searcher.searchAllJavaInDirectory(Path.of(System.getProperty("user.home"), "/.sdkman/candidates/java")); // SDKMAN!
                break;
            case MACOS:
-                searchJavaInMacJavaVirtualMachines(javaRuntimes, Paths.get("/Library/Java/JavaVirtualMachines"));
-                searchJavaInMacJavaVirtualMachines(javaRuntimes, Paths.get(System.getProperty("user.home"), "/Library/Java/JavaVirtualMachines"));
-                tryAddJavaExecutable(javaRuntimes, Paths.get("/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/java"));
-                tryAddJavaExecutable(javaRuntimes, Paths.get("/Applications/Xcode.app/Contents/Applications/Application Loader.app/Contents/MacOS/itms/java/bin/java"));
+                searcher.searchJavaInMacJavaVirtualMachines(Path.of("/Library/Java/JavaVirtualMachines"));
+                searcher.searchJavaInMacJavaVirtualMachines(Path.of(System.getProperty("user.home"), "/Library/Java/JavaVirtualMachines"));
+                searcher.tryAddJavaExecutable(Path.of("/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/java"));
+                searcher.tryAddJavaExecutable(Path.of("/Applications/Xcode.app/Contents/Applications/Application Loader.app/Contents/MacOS/itms/java/bin/java"));
                // Homebrew
-                tryAddJavaExecutable(javaRuntimes, Paths.get("/opt/homebrew/opt/java/bin/java"));
-                searchAllJavaInDirectory(javaRuntimes, Paths.get("/opt/homebrew/Cellar/openjdk"));
-                try (DirectoryStream<Path> dirs = Files.newDirectoryStream(Paths.get("/opt/homebrew/Cellar"), "openjdk@*")) {
+                searcher.tryAddJavaExecutable(Path.of("/opt/homebrew/opt/java/bin/java"));
+                searcher.searchAllJavaInDirectory(Path.of("/opt/homebrew/Cellar/openjdk"));
+                try (DirectoryStream<Path> dirs = Files.newDirectoryStream(Path.of("/opt/homebrew/Cellar"), "openjdk@*")) {
                    for (Path dir : dirs) {
-                        searchAllJavaInDirectory(javaRuntimes, dir);
+                        searcher.searchAllJavaInDirectory(dir);
                    }
                } catch (IOException e) {
                    LOG.warning("Failed to get subdirectories of /opt/homebrew/Cellar");
@@ -397,16 +427,16 @@ public final class JavaManager {
        // Search Minecraft bundled runtimes
        if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS && Architecture.SYSTEM_ARCH.isX86()) {
            FileUtils.tryGetPath(System.getenv("localappdata"), "Packages\\Microsoft.4297127D64EC6_8wekyb3d8bbwe\\LocalCache\\Local\\runtime")
-                    .ifPresent(it -> searchAllOfficialJava(javaRuntimes, it, false));
+                    .ifPresent(it -> searcher.searchAllOfficialJava(it, false));

            FileUtils.tryGetPath(Lang.requireNonNullElse(System.getenv("ProgramFiles(x86)"), "C:\\Program Files (x86)"), "Minecraft Launcher\\runtime")
-                    .ifPresent(it -> searchAllOfficialJava(javaRuntimes, it, false));
+                    .ifPresent(it -> searcher.searchAllOfficialJava(it, false));
        } else if (OperatingSystem.CURRENT_OS == OperatingSystem.LINUX && Architecture.SYSTEM_ARCH == Architecture.X86_64) {
-            searchAllOfficialJava(javaRuntimes, Paths.get(System.getProperty("user.home"), ".minecraft/runtime"), false);
+            searcher.searchAllOfficialJava(Path.of(System.getProperty("user.home"), ".minecraft/runtime"), false);
        } else if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS) {
-            searchAllOfficialJava(javaRuntimes, Paths.get(System.getProperty("user.home"), "Library/Application Support/minecraft/runtime"), false);
+            searcher.searchAllOfficialJava(Path.of(System.getProperty("user.home"), "Library/Application Support/minecraft/runtime"), false);
        }
-        searchAllOfficialJava(javaRuntimes, CacheRepository.getInstance().getCacheDirectory().resolve("java"), true);
+        searcher.searchAllOfficialJava(CacheRepository.getInstance().getCacheDirectory().resolve("java"), true);

        // Search in PATH.
        if (System.getenv("PATH") != null) {
@@ -420,7 +450,7 @@ public final class JavaManager {
                }

                try {
-                    tryAddJavaExecutable(javaRuntimes, Path.of(path, OperatingSystem.CURRENT_OS.getJavaExecutable()));
+                    searcher.tryAddJavaExecutable(Path.of(path, OperatingSystem.CURRENT_OS.getJavaExecutable()));
                } catch (InvalidPathException ignored) {
                }
            }
@@ -430,16 +460,17 @@ public final class JavaManager {
            String[] paths = System.getenv("HMCL_JRES").split(File.pathSeparator);
            for (String path : paths) {
                try {
-                    tryAddJavaHome(javaRuntimes, Paths.get(path));
+                    searcher.tryAddJavaHome(Path.of(path));
                } catch (InvalidPathException ignored) {
                }
            }
        }
-        searchAllJavaInDirectory(javaRuntimes, Paths.get(System.getProperty("user.home"), ".jdks"));
+
+        searcher.searchAllJavaInDirectory(Path.of(System.getProperty("user.home"), ".jdks"));

        for (String javaPath : ConfigHolder.globalConfig().getUserJava()) {
            try {
-                tryAddJavaExecutable(javaRuntimes, Paths.get(javaPath));
+                searcher.tryAddJavaExecutable(Path.of(javaPath));
            } catch (InvalidPathException e) {
                LOG.warning("Invalid Java path: " + javaPath);
            }
@@ -447,233 +478,406 @@ public final class JavaManager {

        JavaRuntime currentJava = JavaRuntime.CURRENT_JAVA;
        if (currentJava != null
-                && !javaRuntimes.containsKey(currentJava.getBinary())
+                && !searcher.javaRuntimes.containsKey(currentJava.getBinary())
                && !ConfigHolder.globalConfig().getDisabledJava().contains(currentJava.getBinary().toString())) {
-            javaRuntimes.put(currentJava.getBinary(), currentJava);
+            searcher.addResult(currentJava.getBinary(), currentJava);
        }

-        LOG.trace(javaRuntimes.values().stream().sorted()
+        searcher.saveCache();
+
+        LOG.trace(searcher.javaRuntimes.values().stream().sorted()
                .map(it -> String.format(" - %s %s (%s, %s): %s",
                        it.isJDK() ? "JDK" : "JRE",
                        it.getVersion(),
                        it.getPlatform().getArchitecture().getDisplayName(),
                        Lang.requireNonNullElse(it.getVendor(), "Unknown"),
                        it.getBinary()))
-                .collect(Collectors.joining("\n", "Finished Java lookup, found " + javaRuntimes.size() + "\n", "")));
-
-        return javaRuntimes;
+                .collect(Collectors.joining("\n", "Finished Java lookup, found " + searcher.javaRuntimes.size() + "\n", "")));
+        return searcher.javaRuntimes;
    }

-    private static void tryAddJavaHome(Map<Path, JavaRuntime> javaRuntimes, Path javaHome) {
-        Path executable = getExecutable(javaHome);
-        if (!Files.isRegularFile(executable)) {
-            return;
+    private static final class Searcher {
+        private final Path cacheFile;
+        final Map<Path, JavaRuntime> javaRuntimes = new HashMap<>();
+        private final LinkedHashMap<Path, JavaInfoCache> caches = new LinkedHashMap<>();
+        private final Set<Path> failed = new HashSet<>();
+        private boolean needRefreshCache = false;
+
+        Searcher(Path cacheFile) {
+            this.cacheFile = cacheFile;
        }

-        try {
-            executable = executable.toRealPath();
-        } catch (IOException e) {
-            LOG.warning("Failed to resolve path " + executable, e);
-            return;
+        private static final Pattern CACHE_VERSION_PATTERN = Pattern.compile("(?<major>\\d+)(?:\\.(?<minor>\\d+))?");
+        private static final int CACHE_MAJOR_VERSION = 0;
+        private static final int CACHE_MINOR_VERSION = 0;
+
+        private record JavaInfoCache(String key, JavaInfo info) {
        }

-        if (javaRuntimes.containsKey(executable) || ConfigHolder.globalConfig().getDisabledJava().contains(executable.toString())) {
-            return;
-        }
+        void loadCache() {
+            if (Files.notExists(cacheFile))
+                return;

-        JavaInfo info = null;
-
-        Path releaseFile = javaHome.resolve("release");
-        if (Files.exists(releaseFile)) {
            try {
-                info = JavaInfo.fromReleaseFile(releaseFile);
-            } catch (IOException e) {
-                LOG.warning("Failed to read release file " + releaseFile, e);
+                JsonObject jsonFile = JsonUtils.fromJsonFile(cacheFile, JsonObject.class);
+                JsonElement fileVersion = jsonFile.get("version");
+
+                Matcher matcher;
+                if (fileVersion instanceof JsonPrimitive version
+                        && (matcher = CACHE_VERSION_PATTERN.matcher(version.getAsString())).matches()) {
+                    int major = Integer.parseInt(matcher.group("major"));
+
+                    String minorString = matcher.group("minor");
+                    int minor = minorString != null ? Integer.parseInt(minorString) : 0;
+
+                    if (major != CACHE_MAJOR_VERSION || minor < CACHE_MINOR_VERSION)
+                        throw new IOException("Unsupported cache file, version: %s".formatted(version.getAsString()));
+                } else
+                    throw new IOException("Invalid version JSON: " + fileVersion);
+
+                JsonArray cachesArray = jsonFile.getAsJsonArray("caches");
+
+                for (JsonElement element : cachesArray) {
+                    try {
+                        var obj = (JsonObject) element;
+
+                        Path realPath = Path.of(obj.getAsJsonPrimitive("path").getAsString()).toRealPath();
+                        String key = obj.getAsJsonPrimitive("key").getAsString();
+
+                        OperatingSystem osName = OperatingSystem.parseOSName(obj.getAsJsonPrimitive("os.name").getAsString());
+                        Architecture osArch = Architecture.parseArchName(obj.getAsJsonPrimitive("os.arch").getAsString());
+                        String javaVersion = obj.getAsJsonPrimitive("java.version").getAsString();
+
+                        JavaInfo.Builder infoBuilder = JavaInfo.newBuilder(Platform.getPlatform(osName, osArch), javaVersion);
+
+                        if (obj.get("java.vendor") instanceof JsonPrimitive vendor)
+                            infoBuilder.setVendor(vendor.getAsString());
+
+                        caches.put(realPath, new JavaInfoCache(key, infoBuilder.build()));
+                    } catch (Exception e) {
+                        LOG.warning("Invalid cache: " + element);
+                        needRefreshCache = true;
+                    }
+                }
+            } catch (Exception ex) {
+                LOG.warning("Failed to load cache file: " + cacheFile);
+                needRefreshCache = true;
            }
        }

-        if (info == null) {
+        void saveCache() {
+            if (!needRefreshCache)
+                return;
+
+            needRefreshCache = false;
            try {
-                info = JavaInfoUtils.fromExecutable(executable, false);
+                FileUtils.saveSafely(cacheFile, output -> {
+                    try (var writer = new JsonWriter(new OutputStreamWriter(output, StandardCharsets.UTF_8))) {
+                        writer.beginObject();
+
+                        writer.name("version").value("%d.%d".formatted(CACHE_MAJOR_VERSION, CACHE_MINOR_VERSION));
+
+                        writer.name("caches");
+                        writer.beginArray();
+                        for (Map.Entry<Path, JavaInfoCache> entry : caches.entrySet()) {
+                            Path path = entry.getKey();
+                            JavaInfoCache cache = entry.getValue();
+                            JavaInfo info = cache.info();
+
+                            writer.beginObject();
+
+                            writer.name("path").value(path.toString());
+                            writer.name("key").value(cache.key());
+
+                            writer.name("os.name").value(info.getPlatform().os().getCheckedName());
+                            writer.name("os.arch").value(info.getPlatform().arch().getCheckedName());
+                            writer.name("java.version").value(info.getVersion());
+                            if (info.getVendor() != null)
+                                writer.name("java.vendor").value(info.getVendor());
+
+                            writer.endObject();
+                        }
+                        writer.endArray();
+
+                        writer.endObject();
+                    }
+                });
+            } catch (Exception e) {
+                LOG.warning("Failed to save cache file: " + cacheFile);
+            }
+        }
+
+        private static @Nullable String createCacheKey(Path realPath) {
+            Path binDir = realPath.getParent();
+            if (binDir == null || !FileUtils.getName(binDir).equals("bin"))
+                return null;
+
+            if (Files.isRegularFile(realPath.resolveSibling("ikvm.properties")))
+                return null;
+
+            Path javaHome = binDir.getParent();
+            if (javaHome == null)
+                return null;
+
+            Path libDir = javaHome.resolve("lib");
+            if (!Files.isDirectory(libDir))
+                return null;
+
+            BasicFileAttributes launcherAttributes;
+            String releaseHash = null;
+            BasicFileAttributes coreLibsAttributes = null;
+
+            try {
+                launcherAttributes = Files.readAttributes(realPath, BasicFileAttributes.class);
+
+                Path releaseFile = javaHome.resolve("release");
+                if (Files.exists(releaseFile)) {
+                    releaseHash = DigestUtils.digestToString("SHA-1", releaseFile);
+                } else {
+                    Path coreLibsFile = libDir.resolve("rt.jar");
+                    if (!Files.isRegularFile(coreLibsFile)) {
+                        coreLibsFile = javaHome.resolve("jre/lib/rt.jar");
+                        if (!Files.isRegularFile(coreLibsFile))
+                            return null;
+
+                        coreLibsAttributes = Files.readAttributes(coreLibsFile, BasicFileAttributes.class);
+                    }
+                }
+            } catch (Exception e) {
+                LOG.warning("Failed to create cache key for " + realPath, e);
+                return null;
+            }
+
+            StringJoiner joiner = new StringJoiner(",");
+
+            joiner.add("sz:" + launcherAttributes.size());
+            joiner.add("lm:" + launcherAttributes.lastModifiedTime().toMillis());
+
+            if (releaseHash != null)
+                joiner.add(releaseHash);
+
+            if (coreLibsAttributes != null) {
+                joiner.add("rsz:" + coreLibsAttributes.size());
+                joiner.add("rlm:" + coreLibsAttributes.lastModifiedTime().toMillis());
+            }
+
+            return joiner.toString();
+        }
+
+        void addResult(Path realPath, JavaRuntime javaRuntime) {
+            javaRuntimes.put(realPath, javaRuntime);
+        }
+
+        void tryAddJavaHome(Path javaHome) {
+            tryAddJavaExecutable(getExecutable(javaHome));
+        }
+
+        void tryAddJavaExecutable(Path executable) {
+            tryAddJavaExecutable(executable, false);
+        }
+
+        void tryAddJavaExecutable(Path executable, boolean isManaged) {
+            try {
+                executable = executable.toRealPath();
+            } catch (IOException e) {
+                return;
+            }
+
+            if (javaRuntimes.containsKey(executable)
+                    || failed.contains(executable)
+                    || ConfigHolder.globalConfig().getDisabledJava().contains(executable.toString())) {
+                return;
+            }
+
+            String cacheKey = createCacheKey(executable);
+            if (cacheKey != null) {
+                JavaInfoCache cache = caches.get(executable);
+                if (cache != null) {
+                    if (isCompatible(cache.info().getPlatform()) && cacheKey.equals(cache.key())) {
+                        javaRuntimes.put(executable, JavaRuntime.of(executable, cache.info(), isManaged));
+                        return;
+                    } else {
+                        caches.remove(executable);
+                        needRefreshCache = true;
+                    }
+                }
+            } else if (caches.remove(executable) != null) {
+                needRefreshCache = true;
+            }
+
+            JavaInfo info;
+            try {
+                info = JavaInfoUtils.fromExecutable(executable);
            } catch (IOException e) {
                LOG.warning("Failed to lookup Java executable at " + executable, e);
+                failed.add(executable);
+                return;
+            }
+
+            if (cacheKey != null) {
+                caches.put(executable, new JavaInfoCache(cacheKey, info));
+                needRefreshCache = true;
+            }
+
+            javaRuntimes.put(executable, JavaRuntime.of(executable, info, isManaged));
+        }
+
+        void tryAddJavaInComponentDir(String platform, Path component, boolean verify) {
+            Path sha1File = component.resolve(platform).resolve(component.getFileName() + ".sha1");
+            if (!Files.isRegularFile(sha1File))
+                return;
+
+            Path dir = component.resolve(platform).resolve(component.getFileName());
+
+            if (verify) {
+                try (BufferedReader reader = Files.newBufferedReader(sha1File)) {
+                    String line;
+                    while ((line = reader.readLine()) != null) {
+                        if (line.isEmpty()) continue;
+
+                        int idx = line.indexOf(" /#//");
+                        if (idx <= 0)
+                            throw new IOException("Illegal line: " + line);
+
+                        Path file = dir.resolve(line.substring(0, idx));
+
+                        // Should we check the sha1 of files? This will take a lot of time.
+                        if (Files.notExists(file))
+                            throw new NoSuchFileException(file.toAbsolutePath().toString());
+                    }
+                } catch (IOException e) {
+                    LOG.warning("Failed to verify Java in " + component, e);
+                    return;
+                }
+            }
+
+            if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS) {
+                Path macPath = dir.resolve("jre.bundle/Contents/Home");
+                if (Files.exists(macPath)) {
+                    tryAddJavaHome(macPath);
+                    return;
+                } else
+                    LOG.warning("The Java is not in 'jre.bundle/Contents/Home'");
+            }
+
+            tryAddJavaHome(dir);
+        }
+
+        void searchAllJavaInRepository(Platform platform) {
+            for (Path java : REPOSITORY.getAllJava(platform)) {
+                tryAddJavaExecutable(java, true);
+            }
+
+            for (Path java : LOCAL_REPOSITORY.getAllJava(platform)) {
+                tryAddJavaExecutable(java, true);
+            }
+
+            if (platform.os() == OperatingSystem.MACOS) {
+                // In the past, we used 'osx' as the checked name for macOS
+                Path platformRoot = REPOSITORY.getPlatformRoot(platform).resolveSibling("osx-" + platform.getArchitecture().getCheckedName());
+                searchAllJavaInDirectory(platformRoot);
            }
        }

-        if (info != null && isCompatible(info.getPlatform()))
-            javaRuntimes.put(executable, JavaRuntime.of(executable, info, false));
-    }
+        void searchAllOfficialJava(Path directory, boolean verify) {
+            if (!Files.isDirectory(directory))
+                return;
+            // Examples:
+            // $HOME/Library/Application Support/minecraft/runtime/java-runtime-beta/mac-os/java-runtime-beta/jre.bundle/Contents/Home
+            // $HOME/.minecraft/runtime/java-runtime-beta/linux/java-runtime-beta

-    private static void tryAddJavaExecutable(Map<Path, JavaRuntime> javaRuntimes, Path executable) {
-        try {
-            executable = executable.toRealPath();
-        } catch (IOException e) {
-            return;
+            String javaPlatform = getMojangJavaPlatform(Platform.SYSTEM_PLATFORM);
+            if (javaPlatform != null) {
+                searchAllOfficialJava(directory, javaPlatform, verify);
+            }
+
+            if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
+                if (Architecture.SYSTEM_ARCH == Architecture.X86_64) {
+                    searchAllOfficialJava(directory, getMojangJavaPlatform(Platform.WINDOWS_X86), verify);
+                } else if (Architecture.SYSTEM_ARCH == Architecture.ARM64) {
+                    if (Platform.isSupportedTranslationX86_64()) {
+                        searchAllOfficialJava(directory, getMojangJavaPlatform(Platform.WINDOWS_X86_64), verify);
+                    }
+                    searchAllOfficialJava(directory, getMojangJavaPlatform(Platform.WINDOWS_X86), verify);
+                }
+            } else if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS) {
+                if (Architecture.SYSTEM_ARCH == Architecture.ARM64 && Platform.isSupportedTranslationX86_64()) {
+                    searchAllOfficialJava(directory, getMojangJavaPlatform(Platform.MACOS_X86_64), verify);
+                }
+            }
        }

-        if (javaRuntimes.containsKey(executable) || ConfigHolder.globalConfig().getDisabledJava().contains(executable.toString())) {
-            return;
-        }
-
-        JavaInfo info = null;
-        try {
-            info = JavaInfoUtils.fromExecutable(executable, true);
-        } catch (IOException e) {
-            LOG.warning("Failed to lookup Java executable at " + executable, e);
-        }
-
-        if (info != null && isCompatible(info.getPlatform())) {
-            javaRuntimes.put(executable, JavaRuntime.of(executable, info, false));
-        }
-    }
-
-    private static void tryAddJavaInComponentDir(Map<Path, JavaRuntime> javaRuntimes, String platform, Path component, boolean verify) {
-        Path sha1File = component.resolve(platform).resolve(component.getFileName() + ".sha1");
-        if (!Files.isRegularFile(sha1File))
-            return;
-
-        Path dir = component.resolve(platform).resolve(component.getFileName());
-
-        if (verify) {
-            try (BufferedReader reader = Files.newBufferedReader(sha1File)) {
-                String line;
-                while ((line = reader.readLine()) != null) {
-                    if (line.isEmpty()) continue;
-
-                    int idx = line.indexOf(" /#//");
-                    if (idx <= 0)
-                        throw new IOException("Illegal line: " + line);
-
-                    Path file = dir.resolve(line.substring(0, idx));
-
-                    // Should we check the sha1 of files? This will take a lot of time.
-                    if (Files.notExists(file))
-                        throw new NoSuchFileException(file.toAbsolutePath().toString());
+        void searchAllOfficialJava(Path directory, String platform, boolean verify) {
+            try (DirectoryStream<Path> dir = Files.newDirectoryStream(directory)) {
+                // component can be jre-legacy, java-runtime-alpha, java-runtime-beta, java-runtime-gamma or any other being added in the future.
+                for (Path component : dir) {
+                    tryAddJavaInComponentDir(platform, component, verify);
                }
            } catch (IOException e) {
-                LOG.warning("Failed to verify Java in " + component, e);
-                return;
+                LOG.warning("Failed to list java-runtime directory " + directory, e);
            }
        }

-        if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS) {
-            Path macPath = dir.resolve("jre.bundle/Contents/Home");
-            if (Files.exists(macPath)) {
-                tryAddJavaHome(javaRuntimes, macPath);
+        void searchAllJavaInDirectory(Path directory) {
+            if (!Files.isDirectory(directory)) {
                return;
-            } else
-                LOG.warning("The Java is not in 'jre.bundle/Contents/Home'");
-        }
+            }

-        tryAddJavaHome(javaRuntimes, dir);
-    }
-
-    private static void searchAllJavaInRepository(Map<Path, JavaRuntime> javaRuntimes, Platform platform) {
-        for (JavaRuntime java : REPOSITORY.getAllJava(platform)) {
-            javaRuntimes.put(java.getBinary(), java);
-        }
-
-        for (JavaRuntime java : LOCAL_REPOSITORY.getAllJava(platform)) {
-            javaRuntimes.put(java.getBinary(), java);
-        }
-    }
-
-    private static void searchAllOfficialJava(Map<Path, JavaRuntime> javaRuntimes, Path directory, boolean verify) {
-        if (!Files.isDirectory(directory))
-            return;
-        // Examples:
-        // $HOME/Library/Application Support/minecraft/runtime/java-runtime-beta/mac-os/java-runtime-beta/jre.bundle/Contents/Home
-        // $HOME/.minecraft/runtime/java-runtime-beta/linux/java-runtime-beta
-
-        String javaPlatform = getMojangJavaPlatform(Platform.SYSTEM_PLATFORM);
-        if (javaPlatform != null) {
-            searchAllOfficialJava(javaRuntimes, directory, javaPlatform, verify);
-        }
-
-        if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
-            if (Architecture.SYSTEM_ARCH == Architecture.X86_64) {
-                searchAllOfficialJava(javaRuntimes, directory, getMojangJavaPlatform(Platform.WINDOWS_X86), verify);
-            } else if (Architecture.SYSTEM_ARCH == Architecture.ARM64) {
-                if (OperatingSystem.SYSTEM_BUILD_NUMBER >= 21277) {
-                    searchAllOfficialJava(javaRuntimes, directory, getMojangJavaPlatform(Platform.WINDOWS_X86_64), verify);
+            try (DirectoryStream<Path> stream = Files.newDirectoryStream(directory)) {
+                for (Path subDir : stream) {
+                    tryAddJavaHome(subDir);
                }
-                searchAllOfficialJava(javaRuntimes, directory, getMojangJavaPlatform(Platform.WINDOWS_X86), verify);
+            } catch (IOException e) {
+                LOG.warning("Failed to find Java in " + directory, e);
            }
-        } else if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS && Architecture.CURRENT_ARCH == Architecture.ARM64) {
-            searchAllOfficialJava(javaRuntimes, directory, getMojangJavaPlatform(Platform.MACOS_X86_64), verify);
        }
-    }

-    private static void searchAllOfficialJava(Map<Path, JavaRuntime> javaRuntimes, Path directory, String platform, boolean verify) {
-        try (DirectoryStream<Path> dir = Files.newDirectoryStream(directory)) {
-            // component can be jre-legacy, java-runtime-alpha, java-runtime-beta, java-runtime-gamma or any other being added in the future.
-            for (Path component : dir) {
-                tryAddJavaInComponentDir(javaRuntimes, platform, component, verify);
+        void searchJavaInProgramFiles(String env, String defaultValue) {
+            String programFiles = Lang.requireNonNullElse(System.getenv(env), defaultValue);
+            Path path;
+            try {
+                path = Path.of(programFiles);
+            } catch (InvalidPathException ignored) {
+                return;
            }
-        } catch (IOException e) {
-            LOG.warning("Failed to list java-runtime directory " + directory, e);
-        }
-    }

-    private static void searchAllJavaInDirectory(Map<Path, JavaRuntime> javaRuntimes, Path directory) {
-        if (!Files.isDirectory(directory)) {
-            return;
-        }
-
-        try (DirectoryStream<Path> stream = Files.newDirectoryStream(directory)) {
-            for (Path subDir : stream) {
-                tryAddJavaHome(javaRuntimes, subDir);
+            for (String vendor : KNOWN_VENDOR_DIRECTORIES) {
+                searchAllJavaInDirectory(path.resolve(vendor));
            }
-        } catch (IOException e) {
-            LOG.warning("Failed to find Java in " + directory, e);
-        }
-    }
-
-    private static void searchJavaInProgramFiles(Map<Path, JavaRuntime> javaRuntimes, String env, String defaultValue) {
-        String programFiles = Lang.requireNonNullElse(System.getenv(env), defaultValue);
-        Path path;
-        try {
-            path = Paths.get(programFiles);
-        } catch (InvalidPathException ignored) {
-            return;
        }

-        for (String vendor : new String[]{"Java", "BellSoft", "AdoptOpenJDK", "Zulu", "Microsoft", "Eclipse Foundation", "Semeru"}) {
-            searchAllJavaInDirectory(javaRuntimes, path.resolve(vendor));
-        }
-    }
-
-    private static void searchJavaInMacJavaVirtualMachines(Map<Path, JavaRuntime> javaRuntimes, Path directory) {
-        if (!Files.isDirectory(directory)) {
-            return;
-        }
-
-        try (DirectoryStream<Path> stream = Files.newDirectoryStream(directory)) {
-            for (Path subDir : stream) {
-                tryAddJavaHome(javaRuntimes, subDir.resolve("Contents/Home"));
+        void searchJavaInMacJavaVirtualMachines(Path directory) {
+            if (!Files.isDirectory(directory)) {
+                return;
+            }
+
+            try (DirectoryStream<Path> stream = Files.newDirectoryStream(directory)) {
+                for (Path subDir : stream) {
+                    tryAddJavaHome(subDir.resolve("Contents/Home"));
+                }
+            } catch (IOException e) {
+                LOG.warning("Failed to find Java in " + directory, e);
            }
-        } catch (IOException e) {
-            LOG.warning("Failed to find Java in " + directory, e);
        }
-    }

-    // ==== Windows Registry Support ====
-    private static void queryJavaInRegistryKey(Map<Path, JavaRuntime> javaRuntimes, WinReg.HKEY hkey, String location) {
-        WinReg reg = WinReg.INSTANCE;
-        if (reg == null)
-            return;
+        // ==== Windows Registry Support ====
+        void queryJavaInRegistryKey(WinReg.HKEY hkey, String location) {
+            WinReg reg = WinReg.INSTANCE;
+            if (reg == null)
+                return;

-        for (String java : reg.querySubKeys(hkey, location)) {
-            if (!reg.querySubKeys(hkey, java).contains(java + "\\MSI"))
-                continue;
-            Object home = reg.queryValue(hkey, java, "JavaHome");
-            if (home instanceof String) {
-                try {
-                    tryAddJavaHome(javaRuntimes, Paths.get((String) home));
-                } catch (InvalidPathException e) {
-                    LOG.warning("Invalid Java path in system registry: " + home);
+            for (String java : reg.querySubKeys(hkey, location)) {
+                if (!reg.querySubKeys(hkey, java).contains(java + "\\MSI"))
+                    continue;
+                if (reg.queryValue(hkey, java, "JavaHome") instanceof String home) {
+                    try {
+                        tryAddJavaHome(Path.of(home));
+                    } catch (InvalidPathException e) {
+                        LOG.warning("Invalid Java path in system registry: " + home);
+                    }
                }
            }
        }
+
    }
 }
@@ -414,6 +414,12 @@ public final class Accounts {
            return i18n("account.failed.no_character");
        } else if (exception instanceof ServerDisconnectException) {
            if (exception.getCause() instanceof SSLException) {
+                if (exception.getCause().getMessage() != null && exception.getCause().getMessage().contains("Remote host terminated")) {
+                    return i18n("account.failed.connect_authentication_server");
+                }
+                if (exception.getCause().getMessage() != null && (exception.getCause().getMessage().contains("No name matching") || exception.getCause().getMessage().contains("No subject alternative DNS name matching"))) {
+                    return i18n("account.failed.dns");
+                }
                return i18n("account.failed.ssl");
            } else {
                return i18n("account.failed.connect_authentication_server");
@@ -462,10 +468,12 @@ public final class Accounts {
            }
        } else if (exception instanceof MicrosoftService.XBox400Exception) {
            return i18n("account.methods.microsoft.error.wrong_verify_method");
-        } else if (exception instanceof MicrosoftService.NoMinecraftJavaEditionProfileException) {
+        } else if (exception instanceof MicrosoftService.MinecraftJavaEditionLicenseNotFoundException) {
+            return i18n("account.methods.microsoft.error.no_license");
+        } else if (exception instanceof MicrosoftService.MinecraftJavaEditionProfileNotFoundException) {
            return i18n("account.methods.microsoft.error.no_character");
        } else if (exception instanceof MicrosoftService.NoXuiException) {
-            return i18n("account.methods.microsoft.error.add_family_probably");
+            return i18n("account.methods.microsoft.error.add_family");
        } else if (exception instanceof OAuthServer.MicrosoftAuthenticationNotSupportedException) {
            return i18n("account.methods.microsoft.snapshot");
        } else if (exception instanceof OAuthAccount.WrongAccountException) {
@@ -222,6 +222,36 @@ public final class Config extends ObservableSetting {
        this.acceptPreviewUpdate.set(acceptPreviewUpdate);
    }

+    @SerializedName("disableAutoShowUpdateDialog")
+    private final BooleanProperty disableAutoShowUpdateDialog = new SimpleBooleanProperty(false);
+
+    public BooleanProperty disableAutoShowUpdateDialogProperty() {
+        return disableAutoShowUpdateDialog;
+    }
+
+    public boolean isDisableAutoShowUpdateDialog() {
+        return disableAutoShowUpdateDialog.get();
+    }
+
+    public void setDisableAutoShowUpdateDialog(boolean disableAutoShowUpdateDialog) {
+        this.disableAutoShowUpdateDialog.set(disableAutoShowUpdateDialog);
+    }
+
+    @SerializedName("disableAprilFools")
+    private final BooleanProperty disableAprilFools = new SimpleBooleanProperty(false);
+
+    public BooleanProperty disableAprilFoolsProperty() {
+        return disableAprilFools;
+    }
+
+    public boolean isDisableAprilFools() {
+        return disableAprilFools.get();
+    }
+
+    public void setDisableAprilFools(boolean disableAprilFools) {
+        this.disableAprilFools.set(disableAprilFools);
+    }
+
    @SerializedName("shownTips")
    private final ObservableMap<String, Object> shownTips = FXCollections.observableHashMap();

@@ -537,6 +567,21 @@ public final class Config extends ObservableSetting {
        this.versionListSource.set(versionListSource);
    }

+    @SerializedName("defaultAddonSource")
+    private final StringProperty defaultAddonSource = new SimpleStringProperty("modrinth");
+
+    public StringProperty defaultAddonSourceProperty() {
+        return defaultAddonSource;
+    }
+
+    public String getDefaultAddonSource() {
+        return defaultAddonSource.get();
+    }
+
+    public void setDefaultAddonSource(String defaultAddonSource) {
+        this.defaultAddonSource.set(defaultAddonSource);
+    }
+
    @SerializedName("hasProxy")
    private final BooleanProperty hasProxy = new SimpleBooleanProperty();

@@ -659,6 +704,21 @@ public final class Config extends ObservableSetting {
        this.disableAutoGameOptions.set(disableAutoGameOptions);
    }

+    @SerializedName("allowAutoAgent")
+    private final BooleanProperty allowAutoAgent = new SimpleBooleanProperty(false);
+
+    public BooleanProperty allowAutoAgentProperty() {
+        return allowAutoAgent;
+    }
+
+    public boolean getAllowAutoAgent() {
+        return allowAutoAgent.get();
+    }
+
+    public void setAllowAutoAgent(boolean allowAutoAgent) {
+        this.allowAutoAgent.set(allowAutoAgent);
+    }
+
    // Accounts

    @SerializedName("authlibInjectorServers")
@@ -134,7 +134,10 @@ public final class DownloadProviders {
                return i18n("install.failed.downloading.detail", uri) + "\n" + i18n("exception.access_denied", ((AccessDeniedException) exception.getCause()).getFile());
            } else if (exception.getCause() instanceof ArtifactMalformedException) {
                return i18n("install.failed.downloading.detail", uri) + "\n" + i18n("exception.artifact_malformed");
-            } else if (exception.getCause() instanceof SSLHandshakeException) {
+            } else if (exception.getCause() instanceof SSLHandshakeException && !(exception.getCause().getMessage() != null && exception.getCause().getMessage().contains("Remote host terminated"))) {
+                if (exception.getCause().getMessage() != null && (exception.getCause().getMessage().contains("No name matching") || exception.getCause().getMessage().contains("No subject alternative DNS name matching"))) {
+                    return i18n("install.failed.downloading.detail", uri) + "\n" + i18n("exception.dns.pollution");
+                }
                return i18n("install.failed.downloading.detail", uri) + "\n" + i18n("exception.ssl_handshake");
            } else {
                return i18n("install.failed.downloading.detail", uri) + "\n" + StringUtils.getStackTrace(exception.getCause());
@@ -18,6 +18,7 @@
 package org.jackhuang.hmcl.setting;

 import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.text.Font;
 import org.jackhuang.hmcl.Metadata;
@@ -94,31 +95,26 @@ public final class FontManager {
            return null;
    });

-    private static final ObjectProperty<FontReference> fontProperty;
+    private static final ObjectProperty<FontReference> font = new SimpleObjectProperty<>();

    static {
+        updateFont();
+        LOG.info("Font: " + (font.get() != null ? font.get().family() : "System"));
+    }
+
+    private static void updateFont() {
        String fontFamily = config().getLauncherFontFamily();
        if (fontFamily == null)
            fontFamily = System.getProperty("hmcl.font.override");
        if (fontFamily == null)
            fontFamily = System.getenv("HMCL_FONT");

-        FontReference fontReference;
        if (fontFamily == null) {
            Font defaultFont = DEFAULT_FONT.get();
-            fontReference = defaultFont != null ? new FontReference(defaultFont) : null;
-        } else
-            fontReference = new FontReference(fontFamily);
-
-        fontProperty = new SimpleObjectProperty<>(fontReference);
-
-        LOG.info("Font: " + (fontReference != null ? fontReference.getFamily() : "System"));
-        fontProperty.addListener((obs, oldValue, newValue) -> {
-            if (newValue != null)
-                config().setLauncherFontFamily(newValue.getFamily());
-            else
-                config().setLauncherFontFamily(null);
-        });
+            font.set(defaultFont != null ? new FontReference(defaultFont) : null);
+        } else {
+            font.set(new FontReference(fontFamily));
+        }
    }

    private static Font tryLoadDefaultFont(Path dir) {
@@ -231,64 +227,35 @@ public final class FontManager {
        }
    }

-    public static ObjectProperty<FontReference> fontProperty() {
-        return fontProperty;
+    public static ReadOnlyObjectProperty<FontReference> fontProperty() {
+        return font;
    }

    public static FontReference getFont() {
-        return fontProperty.get();
-    }
-
-    public static void setFont(FontReference font) {
-        fontProperty.set(font);
+        return font.get();
    }

    public static void setFontFamily(String fontFamily) {
-        setFont(fontFamily != null ? new FontReference(fontFamily) : null);
+        config().setLauncherFontFamily(fontFamily);
+        updateFont();
    }

    // https://github.com/HMCL-dev/HMCL/issues/4072
-    public static final class FontReference {
-        private final @NotNull String family;
-        private final @Nullable String style;
+    public record FontReference(@NotNull String family, @Nullable String style) {
+        public FontReference {
+            Objects.requireNonNull(family);
+        }

        public FontReference(@NotNull String family) {
-            this.family = Objects.requireNonNull(family);
-            this.style = null;
+            this(family, null);
        }

        public FontReference(@NotNull Font font) {
-            this.family = font.getFamily();
-            this.style = font.getStyle();
-        }
-
-        public @NotNull String getFamily() {
-            return family;
-        }
-
-        public @Nullable String getStyle() {
-            return style;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (!(o instanceof FontReference))
-                return false;
-            FontReference that = (FontReference) o;
-            return Objects.equals(family, that.family) && Objects.equals(style, that.style);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(family, style);
-        }
-
-        @Override
-        public String toString() {
-            return String.format("FontReference[family='%s', style='%s']", family, style);
+            this(font.getFamily(), font.getStyle());
        }
    }

    private FontManager() {
    }
 }
+
@@ -19,131 +19,109 @@ package org.jackhuang.hmcl.setting;

 import com.google.gson.*;
 import com.google.gson.annotations.JsonAdapter;
-import javafx.beans.InvalidationListener;
-import javafx.beans.Observable;
+import com.google.gson.annotations.SerializedName;
 import javafx.beans.property.*;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableSet;
-import org.jackhuang.hmcl.util.javafx.ObservableHelper;
-import org.jackhuang.hmcl.util.javafx.PropertyUtils;
+import org.jackhuang.hmcl.util.gson.ObservableSetting;
 import org.jetbrains.annotations.Nullable;

-import java.lang.reflect.Type;
 import java.util.*;

-@JsonAdapter(GlobalConfig.Serializer.class)
-public final class GlobalConfig implements Observable {
+@JsonAdapter(GlobalConfig.Adapter.class)
+public final class GlobalConfig extends ObservableSetting {

    @Nullable
    public static GlobalConfig fromJson(String json) throws JsonParseException {
-        GlobalConfig loaded = Config.CONFIG_GSON.fromJson(json, GlobalConfig.class);
-        if (loaded == null) {
-            return null;
-        }
-        GlobalConfig instance = new GlobalConfig();
-        PropertyUtils.copyProperties(loaded, instance);
-        instance.unknownFields.putAll(loaded.unknownFields);
-        return instance;
+        return Config.CONFIG_GSON.fromJson(json, GlobalConfig.class);
    }

-    private final IntegerProperty agreementVersion = new SimpleIntegerProperty();
-
-    private final IntegerProperty terracottaAgreementVersion = new SimpleIntegerProperty();
-
-    private final IntegerProperty platformPromptVersion = new SimpleIntegerProperty();
-
-    private final IntegerProperty logRetention = new SimpleIntegerProperty();
-
-    private final BooleanProperty enableOfflineAccount = new SimpleBooleanProperty(false);
-
-    private final StringProperty fontAntiAliasing = new SimpleStringProperty();
-
-    private final ObservableSet<String> userJava = FXCollections.observableSet(new LinkedHashSet<>());
-
-    private final ObservableSet<String> disabledJava = FXCollections.observableSet(new LinkedHashSet<>());
-
-    private final Map<String, Object> unknownFields = new HashMap<>();
-
-    private final transient ObservableHelper helper = new ObservableHelper(this);
-
    public GlobalConfig() {
-        PropertyUtils.attachListener(this, helper);
-    }
-
-    @Override
-    public void addListener(InvalidationListener listener) {
-        helper.addListener(listener);
-    }
-
-    @Override
-    public void removeListener(InvalidationListener listener) {
-        helper.removeListener(listener);
+        register();
    }

    public String toJson() {
        return Config.CONFIG_GSON.toJson(this);
    }

-    public int getAgreementVersion() {
-        return agreementVersion.get();
-    }
+    @SerializedName("agreementVersion")
+    private final IntegerProperty agreementVersion = new SimpleIntegerProperty();

    public IntegerProperty agreementVersionProperty() {
        return agreementVersion;
    }

+    public int getAgreementVersion() {
+        return agreementVersion.get();
+    }
+
    public void setAgreementVersion(int agreementVersion) {
        this.agreementVersion.set(agreementVersion);
    }

-    public int getTerracottaAgreementVersion() {
-        return terracottaAgreementVersion.get();
-    }
+    @SerializedName("terracottaAgreementVersion")
+    private final IntegerProperty terracottaAgreementVersion = new SimpleIntegerProperty();

    public IntegerProperty terracottaAgreementVersionProperty() {
        return terracottaAgreementVersion;
    }

+    public int getTerracottaAgreementVersion() {
+        return terracottaAgreementVersion.get();
+    }
+
    public void setTerracottaAgreementVersion(int terracottaAgreementVersion) {
        this.terracottaAgreementVersion.set(terracottaAgreementVersion);
    }

-    public int getPlatformPromptVersion() {
-        return platformPromptVersion.get();
-    }
+    @SerializedName("platformPromptVersion")
+    private final IntegerProperty platformPromptVersion = new SimpleIntegerProperty();

    public IntegerProperty platformPromptVersionProperty() {
        return platformPromptVersion;
    }

+    public int getPlatformPromptVersion() {
+        return platformPromptVersion.get();
+    }
+
    public void setPlatformPromptVersion(int platformPromptVersion) {
        this.platformPromptVersion.set(platformPromptVersion);
    }

-    public int getLogRetention() {
-        return logRetention.get();
-    }
+    @SerializedName("logRetention")
+    private final IntegerProperty logRetention = new SimpleIntegerProperty(20);

    public IntegerProperty logRetentionProperty() {
        return logRetention;
    }

+    public int getLogRetention() {
+        return logRetention.get();
+    }
+
    public void setLogRetention(int logRetention) {
        this.logRetention.set(logRetention);
    }

-    public boolean isEnableOfflineAccount() {
-        return enableOfflineAccount.get();
-    }
+    @SerializedName("enableOfflineAccount")
+    private final BooleanProperty enableOfflineAccount = new SimpleBooleanProperty(false);

    public BooleanProperty enableOfflineAccountProperty() {
        return enableOfflineAccount;
    }

+    public boolean isEnableOfflineAccount() {
+        return enableOfflineAccount.get();
+    }
+
    public void setEnableOfflineAccount(boolean value) {
        enableOfflineAccount.set(value);
    }

+    @SerializedName("fontAntiAliasing")
+    private final StringProperty fontAntiAliasing = new SimpleStringProperty();
+
    public StringProperty fontAntiAliasingProperty() {
        return fontAntiAliasing;
    }
@@ -156,89 +134,24 @@ public final class GlobalConfig implements Observable {
        this.fontAntiAliasing.set(value);
    }

+    @SerializedName("userJava")
+    private final ObservableSet<String> userJava = FXCollections.observableSet(new LinkedHashSet<>());
+
    public ObservableSet<String> getUserJava() {
        return userJava;
    }

+    @SerializedName("disabledJava")
+    private final ObservableSet<String> disabledJava = FXCollections.observableSet(new LinkedHashSet<>());
+
    public ObservableSet<String> getDisabledJava() {
        return disabledJava;
    }

-    public static final class Serializer implements JsonSerializer<GlobalConfig>, JsonDeserializer<GlobalConfig> {
-        private static final Set<String> knownFields = new HashSet<>(Arrays.asList(
-                "agreementVersion",
-                "terracottaAgreementVersion",
-                "platformPromptVersion",
-                "logRetention",
-                "userJava",
-                "disabledJava",
-                "enableOfflineAccount",
-                "fontAntiAliasing"
-        ));
-
+    static final class Adapter extends ObservableSetting.Adapter<GlobalConfig> {
        @Override
-        public JsonElement serialize(GlobalConfig src, Type typeOfSrc, JsonSerializationContext context) {
-            if (src == null) {
-                return JsonNull.INSTANCE;
-            }
-
-            JsonObject jsonObject = new JsonObject();
-            jsonObject.add("agreementVersion", context.serialize(src.getAgreementVersion()));
-            jsonObject.add("terracottaAgreementVersion", context.serialize(src.getTerracottaAgreementVersion()));
-            jsonObject.add("platformPromptVersion", context.serialize(src.getPlatformPromptVersion()));
-            jsonObject.add("logRetention", context.serialize(src.getLogRetention()));
-            jsonObject.add("fontAntiAliasing", context.serialize(src.getFontAntiAliasing()));
-            if (src.enableOfflineAccount.get())
-                jsonObject.addProperty("enableOfflineAccount", true);
-
-            if (!src.getUserJava().isEmpty())
-                jsonObject.add("userJava", context.serialize(src.getUserJava()));
-
-            if (!src.getDisabledJava().isEmpty())
-                jsonObject.add("disabledJava", context.serialize(src.getDisabledJava()));
-
-            for (Map.Entry<String, Object> entry : src.unknownFields.entrySet()) {
-                jsonObject.add(entry.getKey(), context.serialize(entry.getValue()));
-            }
-
-            return jsonObject;
-        }
-
-        @Override
-        public GlobalConfig deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-            if (!(json instanceof JsonObject)) return null;
-
-            JsonObject obj = (JsonObject) json;
-
-            GlobalConfig config = new GlobalConfig();
-            config.setAgreementVersion(Optional.ofNullable(obj.get("agreementVersion")).map(JsonElement::getAsInt).orElse(0));
-            config.setTerracottaAgreementVersion(Optional.ofNullable(obj.get("terracottaAgreementVersion")).map(JsonElement::getAsInt).orElse(0));
-            config.setPlatformPromptVersion(Optional.ofNullable(obj.get("platformPromptVersion")).map(JsonElement::getAsInt).orElse(0));
-            config.setLogRetention(Optional.ofNullable(obj.get("logRetention")).map(JsonElement::getAsInt).orElse(20));
-            config.setEnableOfflineAccount(Optional.ofNullable(obj.get("enableOfflineAccount")).map(JsonElement::getAsBoolean).orElse(false));
-            config.setFontAntiAliasing(Optional.ofNullable(obj.get("fontAntiAliasing")).map(JsonElement::getAsString).orElse(null));
-
-            JsonElement userJava = obj.get("userJava");
-            if (userJava != null && userJava.isJsonArray()) {
-                for (JsonElement element : userJava.getAsJsonArray()) {
-                    config.userJava.add(element.getAsString());
-                }
-            }
-
-            JsonElement disabledJava = obj.get("disabledJava");
-            if (disabledJava != null && disabledJava.isJsonArray()) {
-                for (JsonElement element : disabledJava.getAsJsonArray()) {
-                    config.disabledJava.add(element.getAsString());
-                }
-            }
-
-            for (Map.Entry<String, JsonElement> entry : obj.entrySet()) {
-                if (!knownFields.contains(entry.getKey())) {
-                    config.unknownFields.put(entry.getKey(), context.deserialize(entry.getValue(), Object.class));
-                }
-            }
-
-            return config;
+        protected GlobalConfig createInstance() {
+            return new GlobalConfig();
        }
    }
 }
@@ -18,6 +18,7 @@
 package org.jackhuang.hmcl.setting;

 import javafx.beans.InvalidationListener;
+import org.jackhuang.hmcl.task.FetchTask;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.io.NetworkUtils;
 import org.jetbrains.annotations.NotNull;
@@ -114,6 +115,8 @@ public final class ProxyManager {
        config().hasProxyAuthProperty().addListener(updateAuthenticator);
        config().proxyUserProperty().addListener(updateAuthenticator);
        config().proxyPassProperty().addListener(updateAuthenticator);
+
+        FetchTask.notifyInitialized();
    }

    private static abstract class AbstractProxySelector extends ProxySelector {
@@ -1,3 +1,20 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2026 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.setting;

 public final class SambaException extends RuntimeException {
@@ -90,11 +90,11 @@ public final class StyleSheets {
        final String defaultCss = "/assets/css/font.css";
        final FontManager.FontReference font = FontManager.getFont();

-        if (font == null || "System".equals(font.getFamily()))
+        if (font == null || "System".equals(font.family()))
            return defaultCss;

-        String fontFamily = font.getFamily();
-        String style = font.getStyle();
+        String fontFamily = font.family();
+        String style = font.style();
        String weight = null;
        String posture = null;

@@ -36,14 +36,16 @@ public enum VersionIconType {
    FURNACE("/assets/img/furnace.png"),
    QUILT("/assets/img/quilt.png"),
    APRIL_FOOLS("/assets/img/april_fools.png"),
-    CLEANROOM("/assets/img/cleanroom.png");
+    CLEANROOM("/assets/img/cleanroom.png"),
+    LEGACY_FABRIC("/assets/img/legacyfabric.png")
+    ;

    // Please append new items at last

    public static VersionIconType getIconType(ModLoaderType modLoaderType) {
        return switch (modLoaderType) {
            case FORGE -> VersionIconType.FORGE;
-            case NEO_FORGED -> VersionIconType.NEO_FORGE;
+            case NEO_FORGE -> VersionIconType.NEO_FORGE;
            case FABRIC -> VersionIconType.FABRIC;
            case QUILT -> VersionIconType.QUILT;
            case LITE_LOADER -> VersionIconType.CHICKEN;
@@ -603,6 +603,20 @@ public final class VersionSetting implements Cloneable, Observable {
        processPriorityProperty.set(processPriority);
    }

+    private final ObjectProperty<GraphicsAPI> graphicsBackend = new SimpleObjectProperty<>(this, "graphicsBackend", GraphicsAPI.DEFAULT);
+
+    public ObjectProperty<GraphicsAPI> graphicsBackendProperty() {
+        return graphicsBackend;
+    }
+
+    public GraphicsAPI getGraphicsBackend() {
+        return graphicsBackendProperty().get();
+    }
+
+    public void setGraphicsBackend(GraphicsAPI api) {
+        graphicsBackendProperty().set(api);
+    }
+
    private final ObjectProperty<Renderer> rendererProperty = new SimpleObjectProperty<>(this, "renderer", Renderer.DEFAULT);

    public Renderer getRenderer() {
@@ -820,8 +834,9 @@ public final class VersionSetting implements Cloneable, Observable {
            }
            obj.addProperty("java", java);

+            obj.addProperty("graphicsBackend", src.getGraphicsBackend().name());
            obj.addProperty("renderer", src.getRenderer().name());
-            if (src.getRenderer() == Renderer.LLVMPIPE)
+            if (src.getRenderer() == Renderer.OpenGL.LLVMPIPE)
                obj.addProperty("useSoftwareRenderer", true);

            return obj;
@@ -894,16 +909,19 @@ public final class VersionSetting implements Cloneable, Observable {
            }

            vs.setRenderer(Optional.ofNullable(obj.get("renderer")).map(JsonElement::getAsString)
+                    .map(Renderer::of).orElseGet(() -> {
+                        boolean useSoftwareRenderer = Optional.ofNullable(obj.get("useSoftwareRenderer")).map(JsonElement::getAsBoolean).orElse(false);
+                        return useSoftwareRenderer ? Renderer.OpenGL.LLVMPIPE : Renderer.DEFAULT;
+                    }));
+
+            vs.setGraphicsBackend(Optional.ofNullable(obj.get("graphicsBackend")).map(JsonElement::getAsString)
                    .flatMap(name -> {
                        try {
-                            return Optional.of(Renderer.valueOf(name.toUpperCase(Locale.ROOT)));
+                            return Optional.of(GraphicsAPI.valueOf(name.toUpperCase(Locale.ROOT)));
                        } catch (IllegalArgumentException ignored) {
                            return Optional.empty();
                        }
-                    }).orElseGet(() -> {
-                        boolean useSoftwareRenderer = Optional.ofNullable(obj.get("useSoftwareRenderer")).map(JsonElement::getAsBoolean).orElse(false);
-                        return useSoftwareRenderer ? Renderer.LLVMPIPE : Renderer.DEFAULT;
-                    }));
+                    }).orElseGet(() -> vs.getRenderer() instanceof Renderer.Driver renderer ? renderer.api() : GraphicsAPI.DEFAULT));

            return vs;
        }
@@ -0,0 +1,198 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2025  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.terracotta;
+
+import kala.compress.archivers.tar.TarArchiveEntry;
+import org.jackhuang.hmcl.download.ArtifactMalformedException;
+import org.jackhuang.hmcl.task.FetchTask;
+import org.jackhuang.hmcl.task.FileDownloadTask;
+import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.terracotta.provider.AbstractTerracottaProvider;
+import org.jackhuang.hmcl.util.DigestUtils;
+import org.jackhuang.hmcl.util.io.ChecksumMismatchException;
+import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.util.io.UrlResponseInfo;
+import org.jackhuang.hmcl.util.logging.Logger;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;
+import org.jetbrains.annotations.Nullable;
+import org.jackhuang.hmcl.util.tree.TarFileTree;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.security.DigestInputStream;
+import java.security.DigestOutputStream;
+import java.security.MessageDigest;
+import java.util.HexFormat;
+import java.util.List;
+import java.util.Map;
+
+public final class TerracottaBundle {
+    private final Path root;
+
+    private final List<URI> links;
+
+    private final FileDownloadTask.IntegrityCheck hash;
+
+    private final Map<String, FileDownloadTask.IntegrityCheck> files;
+
+    public TerracottaBundle(Path root, List<URI> links, FileDownloadTask.IntegrityCheck hash, Map<String, FileDownloadTask.IntegrityCheck> files) {
+        this.root = root;
+        this.links = links;
+        this.hash = hash;
+        this.files = files;
+    }
+
+    public Task<Path> download(AbstractTerracottaProvider.DownloadContext context) {
+        return Task.supplyAsync(() -> Files.createTempFile("terracotta-", ".tar.gz"))
+                .thenComposeAsync(Schedulers.javafx(), pkg -> {
+                    FileDownloadTask download = new FileDownloadTask(links, pkg, hash) {
+                        @Override
+                        protected Context getContext(@Nullable UrlResponseInfo response, boolean checkETag, @Nullable String bmclapiHash) throws IOException {
+                            FetchTask.Context delegate = super.getContext(response, checkETag, bmclapiHash);
+                            return new Context() {
+                                @Override
+                                public void withResult(boolean success) {
+                                    super.withResult(success);
+                                    delegate.withResult(success);
+                                }
+
+                                @Override
+                                public void reset() throws IOException {
+                                    delegate.reset();
+                                }
+
+                                @Override
+                                public void write(byte[] buffer, int offset, int len) throws IOException {
+                                    context.checkCancellation();
+                                    delegate.write(buffer, offset, len);
+                                }
+
+                                @Override
+                                public void close() throws IOException {
+                                    if (isSuccess()) {
+                                        context.checkCancellation();
+                                    }
+
+                                    delegate.close();
+                                }
+                            };
+                        }
+                    };
+
+                    context.bindProgress(download.progressProperty());
+                    return download.thenSupplyAsync(() -> pkg);
+                });
+    }
+
+    public Task<?> install(Path pkg) {
+        return Task.runAsync(() -> {
+            Files.createDirectories(root);
+            FileUtils.cleanDirectory(root);
+
+            try (TarFileTree tree = TarFileTree.open(pkg)) {
+                for (Map.Entry<String, FileDownloadTask.IntegrityCheck> entry : files.entrySet()) {
+                    String file = entry.getKey();
+                    FileDownloadTask.IntegrityCheck check = entry.getValue();
+
+                    Path path = root.resolve(file);
+                    TarArchiveEntry archive = tree.getEntry("/" + file);
+                    if (archive == null) {
+                        throw new ArtifactMalformedException(String.format("Expecting %s file in terracotta bundle.", file));
+                    }
+
+                    MessageDigest digest = DigestUtils.getDigest(check.algorithm());
+                    try (
+                            InputStream is = tree.getInputStream(archive);
+                            OutputStream os = new DigestOutputStream(Files.newOutputStream(path), digest)
+                    ) {
+                        is.transferTo(os);
+                    }
+
+                    String hash = HexFormat.of().formatHex(digest.digest());
+                    if (!check.checksum().equalsIgnoreCase(hash)) {
+                        throw new ChecksumMismatchException(check.algorithm(), check.checksum(), hash);
+                    }
+
+                    switch (OperatingSystem.CURRENT_OS) {
+                        case LINUX, MACOS, FREEBSD -> Files.setPosixFilePermissions(path, FileUtils.parsePosixFilePermission(archive.getMode()));
+                    }
+                }
+            }
+        }).whenComplete(exception -> {
+            if (exception != null) {
+                FileUtils.deleteDirectory(root);
+            }
+        });
+    }
+
+    public Path locate(String file) {
+        FileDownloadTask.IntegrityCheck check = files.get(file);
+        if (check == null) {
+            throw new AssertionError(String.format("Expecting %s file in terracotta bundle.", file));
+        }
+        return root.resolve(file).toAbsolutePath();
+    }
+
+    public AbstractTerracottaProvider.Status status() throws IOException {
+        if (Files.exists(root) && isLocalBundleValid()) {
+            return AbstractTerracottaProvider.Status.READY;
+        }
+
+        try {
+            if (TerracottaMetadata.hasLegacyVersionFiles()) {
+                return AbstractTerracottaProvider.Status.LEGACY_VERSION;
+            }
+        } catch (IOException e) {
+            Logger.LOG.warning("Cannot determine whether legacy versions exist.", e);
+        }
+        return AbstractTerracottaProvider.Status.NOT_EXIST;
+    }
+
+    private boolean isLocalBundleValid() throws IOException { // FIXME: Make control flow clearer.
+        long total = 0;
+        byte[] buffer = new byte[8192];
+
+        for (Map.Entry<String, FileDownloadTask.IntegrityCheck> entry : files.entrySet()) {
+            Path path = root.resolve(entry.getKey());
+            FileDownloadTask.IntegrityCheck check = entry.getValue();
+            if (!Files.isReadable(path)) {
+                return false;
+            }
+
+            MessageDigest digest = DigestUtils.getDigest(check.algorithm());
+            try (InputStream is = new DigestInputStream(Files.newInputStream(path), digest)) {
+                int n;
+                while ((n = is.read(buffer)) >= 0) {
+                    total += n;
+                    if (total >= 50 * 1024 * 1024) { // >=50MB
+                        return false;
+                    }
+                }
+            }
+            if (!HexFormat.of().formatHex(digest.digest()).equalsIgnoreCase(check.checksum())) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
@@ -18,7 +18,6 @@
 package org.jackhuang.hmcl.terracotta;

 import com.google.gson.JsonObject;
-import com.google.gson.reflect.TypeToken;
 import javafx.application.Platform;
 import javafx.beans.property.ReadOnlyDoubleWrapper;
 import javafx.beans.property.ReadOnlyObjectProperty;
@@ -29,27 +28,32 @@ import org.jackhuang.hmcl.task.DownloadException;
 import org.jackhuang.hmcl.task.GetTask;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.terracotta.provider.ITerracottaProvider;
+import org.jackhuang.hmcl.terracotta.provider.AbstractTerracottaProvider;
 import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.util.FXThread;
 import org.jackhuang.hmcl.util.InvocationDispatcher;
 import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.Pair;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.util.io.HttpRequest;
 import org.jackhuang.hmcl.util.io.NetworkUtils;
 import org.jackhuang.hmcl.util.platform.ManagedProcess;
 import org.jackhuang.hmcl.util.platform.SystemUtils;
-import org.jackhuang.hmcl.util.tree.TarFileTree;
-import org.jetbrains.annotations.Nullable;

 import java.io.IOException;
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.locks.LockSupport;

+import static org.jackhuang.hmcl.util.Pair.pair;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 import static org.jackhuang.hmcl.util.logging.Logger.LOG;

@@ -70,9 +74,10 @@ public final class TerracottaManager {
                switch (TerracottaMetadata.PROVIDER.status()) {
                    case NOT_EXIST -> setState(new TerracottaState.Uninitialized(false));
                    case LEGACY_VERSION -> setState(new TerracottaState.Uninitialized(true));
-                    case READY -> launch(setState(new TerracottaState.Launching()));
+                    case READY -> launch(setState(new TerracottaState.Launching()), false);
                }
            } catch (Exception e) {
+                LOG.warning("Cannot initialize Terracotta.", e);
                compareAndSet(TerracottaState.Bootstrap.INSTANCE, new TerracottaState.Fatal(TerracottaState.Fatal.Type.UNKNOWN));
            }
        });
@@ -82,114 +87,145 @@ public final class TerracottaManager {
        return STATE.getReadOnlyProperty();
    }

-    static {
-        Lang.thread(() -> {
-            while (true) {
-                TerracottaState state = STATE_V.get();
-                if (!(state instanceof TerracottaState.PortSpecific portSpecific)) {
-                    LockSupport.parkNanos(500_000);
+    private static final Thread DAEMON = Lang.thread(TerracottaManager::runBackground, "Terracotta Background Daemon", true);
+
+    @FXThread // Written in FXThread, read-only on background daemon
+    private static volatile boolean daemonRunning = false;
+
+    private static void runBackground() {
+        final long ACTIVE = TimeUnit.MILLISECONDS.toNanos(500);
+        final long BACKGROUND = TimeUnit.SECONDS.toMillis(15);
+
+        while (true) {
+            if (daemonRunning) {
+                LockSupport.parkNanos(ACTIVE);
+            } else {
+                long deadline = System.currentTimeMillis() + BACKGROUND;
+                do {
+                    LockSupport.parkUntil(deadline);
+                } while (!daemonRunning && System.currentTimeMillis() < deadline - 100);
+            }
+
+            if (!(STATE_V.get() instanceof TerracottaState.PortSpecific state)) {
+                continue;
+            }
+            int port = state.port;
+            int index = state instanceof TerracottaState.Ready ready ? ready.index : Integer.MIN_VALUE;
+
+            TerracottaState next;
+            try {
+                TerracottaState.Ready object = HttpRequest.GET(String.format("http://127.0.0.1:%d/state", port))
+                        .retry(5)
+                        .getJson(TerracottaState.Ready.class);
+                if (object.index <= index) {
                    continue;
                }
-
-                int port = portSpecific.port;
-                int index = state instanceof TerracottaState.Ready ready ? ready.index : Integer.MIN_VALUE;
-
-                TerracottaState next;
-                try {
-                    next = new GetTask(URI.create(String.format("http://127.0.0.1:%d/state", port)))
-                            .setSignificance(Task.TaskSignificance.MINOR)
-                            .thenApplyAsync(jsonString -> {
-                                TerracottaState.Ready object = JsonUtils.fromNonNullJson(jsonString, TypeToken.get(TerracottaState.Ready.class));
-                                if (object.index <= index) {
-                                    return null;
-                                }
-
-                                object.port = port;
-                                return object;
-                            })
-                            .setSignificance(Task.TaskSignificance.MINOR)
-                            .run();
-                } catch (Exception e) {
-                    LOG.warning("Cannot fetch state from Terracotta.", e);
-                    next = new TerracottaState.Fatal(TerracottaState.Fatal.Type.TERRACOTTA);
-                }
-
-                if (next != null) {
-                    compareAndSet(state, next);
-                }
-
-                LockSupport.parkNanos(500_000);
+                object.port = port;
+                next = object;
+            } catch (Exception e) {
+                LOG.warning("Cannot fetch state from Terracotta.", e);
+                next = new TerracottaState.Fatal(TerracottaState.Fatal.Type.TERRACOTTA);
            }
-        }, "Terracotta Background Daemon", true);
+
+            compareAndSet(state, next);
+        }
    }

-    public static boolean validate(Path file) {
-        return FileUtils.getName(file).equalsIgnoreCase(TerracottaMetadata.PACKAGE_NAME);
-    }
-
-    public static TerracottaState.Preparing install(@Nullable Path file) {
+    @FXThread
+    public static void switchDaemon(boolean active) {
        FXUtils.checkFxUserThread();

-        TerracottaState state = STATE_V.get();
-        if (!(state instanceof TerracottaState.Uninitialized ||
-                state instanceof TerracottaState.Preparing preparing && preparing.hasInstallFence() ||
-                state instanceof TerracottaState.Fatal && ((TerracottaState.Fatal) state).isRecoverable())
-        ) {
-            return null;
-        }
-
-        if (file != null && !FileUtils.getName(file).equalsIgnoreCase(TerracottaMetadata.PACKAGE_NAME)) {
-            return null;
-        }
-
-        TerracottaState.Preparing preparing = new TerracottaState.Preparing(new ReadOnlyDoubleWrapper(-1));
-
-        Task.supplyAsync(Schedulers.io(), () -> {
-            return file != null ? TarFileTree.open(file) : null;
-        }).thenComposeAsync(Schedulers.javafx(), tree -> {
-            return getProvider().install(preparing, tree).whenComplete(exception -> {
-                if (tree != null) {
-                    tree.close();
-                }
-                if (exception != null) {
-                    throw exception;
-                }
-            });
-        }).whenComplete(exception -> {
-            if (exception == null) {
-                try {
-                    TerracottaMetadata.removeLegacyVersionFiles();
-                } catch (IOException e) {
-                    LOG.warning("Unable to remove legacy terracotta files.", e);
-                }
-
-                TerracottaState.Launching launching = new TerracottaState.Launching();
-                if (compareAndSet(preparing, launching)) {
-                    launch(launching);
-                }
-            } else if (exception instanceof CancellationException) {
-            } else if (exception instanceof ITerracottaProvider.ArchiveFileMissingException) {
-                LOG.warning("Cannot install terracotta from local package.", exception);
-                compareAndSet(preparing, new TerracottaState.Fatal(TerracottaState.Fatal.Type.INSTALL));
-            } else if (exception instanceof DownloadException) {
-                compareAndSet(preparing, new TerracottaState.Fatal(TerracottaState.Fatal.Type.NETWORK));
-            } else {
-                compareAndSet(preparing, new TerracottaState.Fatal(TerracottaState.Fatal.Type.INSTALL));
+        boolean dr = daemonRunning;
+        if (dr != active) {
+            daemonRunning = active;
+            if (active) {
+                LockSupport.unpark(DAEMON);
            }
-        }).start();
-
-        return compareAndSet(state, preparing) ? preparing : null;
+        }
    }

-    private static ITerracottaProvider getProvider() {
-        ITerracottaProvider provider = TerracottaMetadata.PROVIDER;
+    private static AbstractTerracottaProvider getProvider() {
+        AbstractTerracottaProvider provider = TerracottaMetadata.PROVIDER;
        if (provider == null) {
            throw new AssertionError("Terracotta Provider must NOT be null.");
        }
        return provider;
    }

-    public static TerracottaState recover(@Nullable Path file) {
+    public static boolean isInvalidBundle(Path file) {
+        return !FileUtils.getName(file).equalsIgnoreCase(TerracottaMetadata.PACKAGE_NAME);
+    }
+
+    @FXThread
+    public static TerracottaState.Preparing download() {
+        FXUtils.checkFxUserThread();
+
+        TerracottaState state = STATE_V.get();
+        if (!(state instanceof TerracottaState.Uninitialized || state instanceof TerracottaState.Fatal && ((TerracottaState.Fatal) state).isRecoverable())
+        ) {
+            return null;
+        }
+
+        TerracottaState.Preparing preparing = new TerracottaState.Preparing(new ReadOnlyDoubleWrapper(-1), true);
+
+        Task.composeAsync(() -> getProvider().download(preparing))
+                .thenComposeAsync(pkg -> {
+                    if (!preparing.requestInstallFence()) {
+                        return null;
+                    }
+
+                    return getProvider().install(pkg).thenRunAsync(() -> {
+                        TerracottaState.Launching launching = new TerracottaState.Launching();
+                        if (compareAndSet(preparing, launching)) {
+                            launch(launching, true);
+                        }
+                    });
+                }).whenComplete(exception -> {
+                    if (exception instanceof CancellationException) {
+                        // no-op
+                    } else if (exception instanceof DownloadException) {
+                        compareAndSet(preparing, new TerracottaState.Fatal(TerracottaState.Fatal.Type.NETWORK));
+                    } else {
+                        compareAndSet(preparing, new TerracottaState.Fatal(TerracottaState.Fatal.Type.INSTALL));
+                    }
+                }).start();
+
+        return compareAndSet(state, preparing) ? preparing : null;
+    }
+
+    @FXThread
+    public static TerracottaState.Preparing install(Path bundle) {
+        FXUtils.checkFxUserThread();
+        if (isInvalidBundle(bundle)) {
+            return null;
+        }
+
+        TerracottaState state = STATE_V.get();
+        TerracottaState.Preparing preparing;
+        if (state instanceof TerracottaState.Preparing previousPreparing && previousPreparing.requestInstallFence()) {
+            preparing = previousPreparing;
+        } else if (state instanceof TerracottaState.Uninitialized || state instanceof TerracottaState.Fatal && ((TerracottaState.Fatal) state).isRecoverable()) {
+            preparing = new TerracottaState.Preparing(new ReadOnlyDoubleWrapper(-1), false);
+        } else {
+            return null;
+        }
+
+        Task.composeAsync(() -> getProvider().install(bundle))
+                .thenRunAsync(() -> {
+                    TerracottaState.Launching launching = new TerracottaState.Launching();
+                    if (compareAndSet(preparing, launching)) {
+                        launch(launching, true);
+                    }
+                })
+                .whenComplete(exception -> {
+                    compareAndSet(preparing, new TerracottaState.Fatal(TerracottaState.Fatal.Type.INSTALL));
+                }).start();
+
+        return state != preparing && compareAndSet(state, preparing) ? preparing : null;
+    }
+
+    @FXThread
+    public static TerracottaState recover() {
        FXUtils.checkFxUserThread();

        TerracottaState state = STATE_V.get();
@@ -198,21 +234,23 @@ public final class TerracottaManager {
        }

        try {
+            // FIXME: A temporary limit has been employed in TerracottaBundle#checkExisting, making
+            //        hash check accept 50MB at most. Calling it on JavaFX should be safe.
            return switch (getProvider().status()) {
-                case NOT_EXIST, LEGACY_VERSION -> install(file);
+                case NOT_EXIST, LEGACY_VERSION -> download();
                case READY -> {
                    TerracottaState.Launching launching = setState(new TerracottaState.Launching());
-                    launch(launching);
+                    launch(launching, false);
                    yield launching;
                }
            };
-        } catch (NullPointerException | IOException e) {
+        } catch (RuntimeException | IOException e) {
            LOG.warning("Cannot determine Terracotta state.", e);
            return setState(new TerracottaState.Fatal(TerracottaState.Fatal.Type.UNKNOWN));
        }
    }

-    private static void launch(TerracottaState.Launching state) {
+    private static void launch(TerracottaState.Launching state, boolean removeLegacy) {
        Task.supplyAsync(() -> {
            Path path = Files.createTempDirectory(String.format("hmcl-terracotta-%d", ThreadLocalRandom.current().nextLong())).resolve("http").toAbsolutePath();
            ManagedProcess process = new ManagedProcess(new ProcessBuilder(getProvider().ofCommandLine(path)));
@@ -230,7 +268,7 @@ public final class TerracottaManager {
                    if (exitTime == -1) {
                        exitTime = System.currentTimeMillis();
                    } else if (System.currentTimeMillis() - exitTime >= 10000) {
-                        throw new IllegalStateException("Process has exited for 10s.");
+                        throw new IllegalStateException(String.format("Process has exited for 10s, code = %s", process.getExitCode()));
                    }
                }
            }
@@ -238,6 +276,9 @@ public final class TerracottaManager {
            TerracottaState next;
            if (exception == null) {
                next = new TerracottaState.Unknown(port);
+                if (removeLegacy) {
+                    TerracottaMetadata.removeLegacyVersionFiles();
+                }
            } else {
                next = new TerracottaState.Fatal(TerracottaState.Fatal.Type.TERRACOTTA);
            }
@@ -272,24 +313,39 @@ public final class TerracottaManager {
    public static TerracottaState.HostScanning setScanning() {
        TerracottaState state = STATE_V.get();
        if (state instanceof TerracottaState.PortSpecific portSpecific) {
-            new GetTask(NetworkUtils.toURI(String.format(
-                    "http://127.0.0.1:%d/state/scanning?player=%s", portSpecific.port, getPlayerName()))
-            ).setSignificance(Task.TaskSignificance.MINOR).start();
+            Task.supplyAsync(Schedulers.io(), TerracottaNodeList::fetch)
+                    .thenComposeAsync(nodes -> {
+                        List<Pair<String, String>> query = new ArrayList<>(nodes.size() + 1);
+                        query.add(pair("player", getPlayerName()));
+                        for (URI node : nodes) {
+                            query.add(pair("public_nodes", node.toString()));
+                        }
+                        return new GetTask(NetworkUtils.withQuery(
+                                "http://127.0.0.1:%d/state/scanning".formatted(portSpecific.port), query
+                        )).setSignificance(Task.TaskSignificance.MINOR);
+                    }).start();

            return new TerracottaState.HostScanning(-1, -1, null);
        }
        return null;
    }

-    public static Task<TerracottaState.GuestStarting> setGuesting(String room) {
+    public static Task<TerracottaState.GuestConnecting> setGuesting(String room) {
        TerracottaState state = STATE_V.get();
        if (state instanceof TerracottaState.PortSpecific portSpecific) {
-            return new GetTask(NetworkUtils.toURI(String.format(
-                    "http://127.0.0.1:%d/state/guesting?room=%s&player=%s", portSpecific.port, room, getPlayerName()
-            )))
-                    .setSignificance(Task.TaskSignificance.MINOR)
-                    .thenSupplyAsync(() -> new TerracottaState.GuestStarting(-1, -1, null))
-                    .setSignificance(Task.TaskSignificance.MINOR);
+            return Task.supplyAsync(Schedulers.io(), TerracottaNodeList::fetch)
+                    .thenComposeAsync(nodes -> {
+                        ArrayList<Pair<String, String>> query = new ArrayList<>(nodes.size() + 2);
+                        query.add(pair("room", room));
+                        query.add(pair("player", getPlayerName()));
+                        for (URI node : nodes) {
+                            query.add(pair("public_nodes", node.toString()));
+                        }
+                        return new GetTask(NetworkUtils.withQuery("http://127.0.0.1:%d/state/guesting".formatted(portSpecific.port), query))
+                                .setSignificance(Task.TaskSignificance.MINOR)
+                                .thenSupplyAsync(() -> new TerracottaState.GuestConnecting(-1, -1, null))
+                                .setSignificance(Task.TaskSignificance.MINOR);
+                    });
        } else {
            return null;
        }
@@ -20,10 +20,10 @@ package org.jackhuang.hmcl.terracotta;
 import com.google.gson.annotations.SerializedName;
 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.task.FileDownloadTask;
+import org.jackhuang.hmcl.terracotta.provider.AbstractTerracottaProvider;
 import org.jackhuang.hmcl.terracotta.provider.GeneralProvider;
-import org.jackhuang.hmcl.terracotta.provider.ITerracottaProvider;
 import org.jackhuang.hmcl.terracotta.provider.MacOSProvider;
-import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.gson.JsonSerializable;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.i18n.LocaleUtils;
 import org.jackhuang.hmcl.util.i18n.LocalizedText;
@@ -32,6 +32,8 @@ import org.jackhuang.hmcl.util.io.NetworkUtils;
 import org.jackhuang.hmcl.util.platform.Architecture;
 import org.jackhuang.hmcl.util.platform.OSVersion;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
+import org.jackhuang.hmcl.util.versioning.VersionNumber;
+import org.jackhuang.hmcl.util.versioning.VersionRange;
 import org.jetbrains.annotations.Nullable;

 import java.io.IOException;
@@ -40,11 +42,11 @@ import java.net.URI;
 import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;

 import static org.jackhuang.hmcl.util.logging.Logger.LOG;

@@ -52,46 +54,60 @@ public final class TerracottaMetadata {
    private TerracottaMetadata() {
    }

-    public record Link(@SerializedName("desc") LocalizedText description, String link) {
+    private record Options(String version, String classifier) {
+        public String replace(String value) {
+            return value.replace("${version}", version).replace("${classifier}", classifier);
+        }
    }

+    @JsonSerializable
+    public record Link(
+            @SerializedName("desc") LocalizedText description,
+            @SerializedName("link") String link
+    ) {
+    }
+
+    @JsonSerializable
+    private record Package(
+            @SerializedName("hash") String hash,
+            @SerializedName("files") Map<String, String> files
+    ) {
+    }
+
+    @JsonSerializable
    private record Config(
-            @SerializedName("version_legacy") String legacy,
-            @SerializedName("version_recent") List<String> recent,
            @SerializedName("version_latest") String latest,

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

-            return new TerracottaNative(
-                    Collections.unmodifiableList(links),
-                    Metadata.DEPENDENCIES_DIRECTORY.resolve(
-                            String.format("terracotta/%s/terracotta-%s-%s", this.latest, this.latest, classifier)
-                    ).toAbsolutePath(),
-                    new FileDownloadTask.IntegrityCheck("SHA-256", hash)
+            Stream<String> stream = downloads.stream(), streamCN = downloadsCN.stream();
+            List<URI> links = (LocaleUtils.IS_CHINA_MAINLAND ? Stream.concat(streamCN, stream) : Stream.concat(stream, streamCN))
+                    .map(link -> URI.create(options.replace(link)))
+                    .toList();
+
+            Map<String, FileDownloadTask.IntegrityCheck> files = pkg.files.entrySet().stream().collect(Collectors.toUnmodifiableMap(
+                    Map.Entry::getKey,
+                    entry -> new FileDownloadTask.IntegrityCheck("SHA-512", entry.getValue())
+            ));
+
+            return new TerracottaBundle(
+                    Metadata.DEPENDENCIES_DIRECTORY.resolve(options.replace("terracotta/${version}")).toAbsolutePath(),
+                    links, new FileDownloadTask.IntegrityCheck("SHA-512", pkg.hash),
+                    files
            );
        }
    }

-    public static final ITerracottaProvider PROVIDER;
+    public static final AbstractTerracottaProvider PROVIDER;
    public static final String PACKAGE_NAME;
    public static final List<Link> PACKAGE_LINKS;
    public static final String FEEDBACK_LINK = NetworkUtils.withQuery("https://docs.hmcl.net/multiplayer/feedback.html", Map.of(
@@ -99,8 +115,6 @@ public final class TerracottaMetadata {
            "launcher_version", Metadata.VERSION
    ));

-    private static final Pattern LEGACY;
-    private static final List<String> RECENT;
    private static final String LATEST;

    static {
@@ -111,95 +125,80 @@ public final class TerracottaMetadata {
            throw new ExceptionInInitializerError(e);
        }

-        LEGACY = Pattern.compile(config.legacy);
-        RECENT = config.recent;
        LATEST = config.latest;

-        ProviderContext context = locateProvider(config);
-        PROVIDER = context != null ? context.provider() : null;
-        PACKAGE_NAME = context != null ? String.format("terracotta-%s-%s-pkg.tar.gz", config.latest, context.branch) : null;
-
-        if (context != null) {
-            List<Link> packageLinks = new ArrayList<>(config.links.size());
-            for (Link link : config.links) {
-                packageLinks.add(new Link(
-                        link.description,
-                        link.link.replace("${version}", LATEST)
-                                .replace("${classifier}", context.branch)
-                ));
-            }
+        Options options = new Options(config.latest, OperatingSystem.CURRENT_OS.getCheckedName() + "-" + Architecture.SYSTEM_ARCH.getCheckedName());
+        TerracottaBundle bundle = config.resolve(options);
+        AbstractTerracottaProvider provider;
+        if (bundle == null || (provider = locateProvider(bundle, options)) == null) {
+            PROVIDER = null;
+            PACKAGE_NAME = null;
+            PACKAGE_LINKS = null;
+        } else {
+            PROVIDER = provider;
+            PACKAGE_NAME = options.replace("terracotta-${version}-${classifier}-pkg.tar.gz");

+            List<Link> packageLinks = config.links.stream()
+                    .map(link -> new Link(link.description, options.replace(link.link)))
+                    .collect(Collectors.toList());
            Collections.shuffle(packageLinks);
            PACKAGE_LINKS = Collections.unmodifiableList(packageLinks);
-        } else {
-            PACKAGE_LINKS = null;
-        }
-    }
-
-    private record ProviderContext(ITerracottaProvider provider, String branch) {
-        ProviderContext(ITerracottaProvider provider, String system, String arch) {
-            this(provider, system + "-" + arch);
        }
    }

    @Nullable
-    private static ProviderContext locateProvider(Config config) {
-        String arch = Architecture.SYSTEM_ARCH.getCheckedName();
+    private static AbstractTerracottaProvider locateProvider(TerracottaBundle bundle, Options options) {
+        String prefix = options.replace("terracotta-${version}-${classifier}");
+
+        // FIXME: As HMCL is a cross-platform application, developers may mistakenly locate
+        //        non-existent files in non-native platform logic without assertion errors during debugging.
        return switch (OperatingSystem.CURRENT_OS) {
            case WINDOWS -> {
                if (!OperatingSystem.SYSTEM_VERSION.isAtLeast(OSVersion.WINDOWS_10))
                    yield null;

-                TerracottaNative target = config.of("windows-%s.exe".formatted(arch));
-                yield target != null
-                        ? new ProviderContext(new GeneralProvider(target), "windows", arch)
-                        : null;
-            }
-            case LINUX -> {
-                TerracottaNative target = config.of("linux-%s".formatted(arch));
-                yield target != null
-                        ? new ProviderContext(new GeneralProvider(target), "linux", arch)
-                        : null;
-            }
-            case MACOS -> {
-                TerracottaNative installer = config.of("macos-%s.pkg".formatted(arch));
-                TerracottaNative binary = config.of("macos-%s".formatted(arch));
-
-                yield installer != null && binary != null
-                        ? new ProviderContext(new MacOSProvider(installer, binary), "macos", arch)
-                        : null;
+                yield new GeneralProvider(bundle, bundle.locate(prefix + ".exe"));
            }
+            case LINUX, FREEBSD -> new GeneralProvider(bundle, bundle.locate(prefix));
+            case MACOS -> new MacOSProvider(
+                    bundle, bundle.locate(prefix), bundle.locate(prefix + ".pkg")
+            );
            default -> null;
        };
    }

-    public static void removeLegacyVersionFiles() throws IOException {
-        try (DirectoryStream<Path> terracotta = Files.newDirectoryStream(Metadata.DEPENDENCIES_DIRECTORY.resolve("terracotta").toAbsolutePath())) {
-            for (Path path : terracotta) {
-                String name = FileUtils.getName(path);
-                if (LATEST.equals(name) || RECENT.contains(name) || !LEGACY.matcher(name).matches()) {
-                    continue;
-                }
+    public static void removeLegacyVersionFiles() {
+        try (DirectoryStream<Path> terracotta = collectLegacyVersionFiles()) {
+            if (terracotta == null)
+                return;

+            for (Path path : terracotta) {
                try {
                    FileUtils.deleteDirectory(path);
                } catch (IOException e) {
                    LOG.warning(String.format("Unable to remove legacy terracotta files: %s", path), e);
                }
            }
+        } catch (IOException e) {
+            LOG.warning("Unable to remove legacy terracotta files.", e);
        }
    }

    public static boolean hasLegacyVersionFiles() throws IOException {
-        try (DirectoryStream<Path> terracotta = Files.newDirectoryStream(Metadata.DEPENDENCIES_DIRECTORY.resolve("terracotta").toAbsolutePath())) {
-            for (Path path : terracotta) {
-                String name = FileUtils.getName(path);
-                if (!LATEST.equals(name) && (RECENT.contains(name) || LEGACY.matcher(name).matches())) {
-                    return true;
-                }
-            }
+        try (DirectoryStream<Path> terracotta = collectLegacyVersionFiles()) {
+            return terracotta != null && terracotta.iterator().hasNext();
        }
+    }

-        return false;
+    private static @Nullable DirectoryStream<Path> collectLegacyVersionFiles() throws IOException {
+        Path terracottaDir = Metadata.DEPENDENCIES_DIRECTORY.resolve("terracotta");
+        if (Files.notExists(terracottaDir))
+            return null;
+
+        VersionRange<VersionNumber> range = VersionNumber.atMost(LATEST);
+        return Files.newDirectoryStream(terracottaDir, path -> {
+            String name = FileUtils.getName(path);
+            return !LATEST.equals(name) && range.contains(VersionNumber.asVersion(name));
+        });
    }
 }
@@ -1,147 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2025  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.terracotta;
-
-import kala.compress.archivers.tar.TarArchiveEntry;
-import org.jackhuang.hmcl.task.FileDownloadTask;
-import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.terracotta.provider.ITerracottaProvider;
-import org.jackhuang.hmcl.util.DigestUtils;
-import org.jackhuang.hmcl.util.io.FileUtils;
-import org.jackhuang.hmcl.util.logging.Logger;
-import org.jackhuang.hmcl.util.tree.TarFileTree;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URI;
-import java.net.http.HttpResponse;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.security.MessageDigest;
-import java.util.HexFormat;
-import java.util.List;
-import java.util.concurrent.CancellationException;
-
-public final class TerracottaNative {
-    private final List<URI> links;
-    private final FileDownloadTask.IntegrityCheck checking;
-    private final Path path;
-
-    public TerracottaNative(List<URI> links, Path path, FileDownloadTask.IntegrityCheck checking) {
-        this.links = links;
-        this.path = path;
-        this.checking = checking;
-    }
-
-    public Path getPath() {
-        return path;
-    }
-
-    public Task<?> install(ITerracottaProvider.Context context, @Nullable TarFileTree tree) {
-        if (tree == null) {
-            return new FileDownloadTask(links, path, checking) {
-                @Override
-                protected Context getContext(HttpResponse<?> response, boolean checkETag, String bmclapiHash) throws IOException {
-                    Context delegate = super.getContext(response, checkETag, bmclapiHash);
-                    return new Context() {
-                        @Override
-                        public void withResult(boolean success) {
-                            delegate.withResult(success);
-                        }
-
-                        @Override
-                        public void write(byte[] buffer, int offset, int len) throws IOException {
-                            if (!context.hasInstallFence()) {
-                                throw new CancellationException("User has installed terracotta from local archives.");
-                            }
-                            delegate.write(buffer, offset, len);
-                        }
-
-                        @Override
-                        public void close() throws IOException {
-                            if (isSuccess() && !context.requestInstallFence()) {
-                                throw new CancellationException();
-                            }
-
-                            delegate.close();
-                        }
-                    };
-                }
-            };
-        }
-
-        return Task.runAsync(() -> {
-            String name = FileUtils.getName(path);
-            TarArchiveEntry entry = tree.getRoot().getFiles().get(name);
-            if (entry == null) {
-                throw new ITerracottaProvider.ArchiveFileMissingException("Cannot exact entry: " + name);
-            }
-
-            if (!context.requestInstallFence()) {
-                throw new CancellationException();
-            }
-
-            Files.createDirectories(path.toAbsolutePath().getParent());
-
-            MessageDigest digest = DigestUtils.getDigest(checking.getAlgorithm());
-            try (
-                    InputStream stream = tree.getInputStream(entry);
-                    OutputStream os = Files.newOutputStream(path)
-            ) {
-                stream.transferTo(new OutputStream() {
-                    @Override
-                    public void write(int b) throws IOException {
-                        os.write(b);
-                        digest.update((byte) b);
-                    }
-
-                    @Override
-                    public void write(byte @NotNull [] buffer, int offset, int len) throws IOException {
-                        os.write(buffer, offset, len);
-                        digest.update(buffer, offset, len);
-                    }
-                });
-            }
-            String checksum = HexFormat.of().formatHex(digest.digest());
-            if (!checksum.equalsIgnoreCase(checking.getChecksum())) {
-                Files.delete(path);
-                throw new ITerracottaProvider.ArchiveFileMissingException("Incorrect checksum (" + checking.getAlgorithm() + "), expected: " + checking.getChecksum() + ", actual: " + checksum);
-            }
-        });
-    }
-
-    public ITerracottaProvider.Status status() throws IOException {
-        if (Files.exists(path)) {
-            if (DigestUtils.digestToString(checking.getAlgorithm(), path).equalsIgnoreCase(checking.getChecksum())) {
-                return ITerracottaProvider.Status.READY;
-            }
-        }
-
-        try {
-            if (TerracottaMetadata.hasLegacyVersionFiles()) {
-                return ITerracottaProvider.Status.LEGACY_VERSION;
-            }
-        } catch (IOException e) {
-            Logger.LOG.warning("Cannot determine whether legacy versions exist.");
-        }
-        return ITerracottaProvider.Status.NOT_EXIST;
-    }
-}
@@ -0,0 +1,103 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2026 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.terracotta;
+
+import com.google.gson.JsonParseException;
+import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.gson.JsonSerializable;
+import org.jackhuang.hmcl.util.gson.JsonUtils;
+import org.jackhuang.hmcl.util.gson.TolerableValidationException;
+import org.jackhuang.hmcl.util.gson.Validation;
+import org.jackhuang.hmcl.util.i18n.LocaleUtils;
+import org.jackhuang.hmcl.util.io.HttpRequest;
+import org.jetbrains.annotations.Nullable;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.List;
+
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
+
+/// @author Glavo
+public final class TerracottaNodeList {
+    private static final String NODE_LIST_URL = "https://terracotta.glavo.site/nodes";
+
+    @JsonSerializable
+    private record TerracottaNode(String url, @Nullable String region) implements Validation {
+        @Override
+        public void validate() throws JsonParseException, TolerableValidationException {
+            Validation.requireNonNull(url, "TerracottaNode.url cannot be null");
+            try {
+                new URI(url);
+            } catch (URISyntaxException e) {
+                throw new JsonParseException("Invalid URL: " + url, e);
+            }
+        }
+    }
+
+    private static volatile List<URI> list;
+
+    public static List<URI> fetch() {
+        List<URI> list = TerracottaNodeList.list;
+        if (list != null)
+            return list;
+
+        synchronized (TerracottaNodeList.class) {
+            list = TerracottaNodeList.list;
+            if (list != null)
+                return list;
+
+            try {
+                List<TerracottaNode> nodes = HttpRequest.GET(NODE_LIST_URL)
+                        .getJson(JsonUtils.listTypeOf(TerracottaNode.class));
+
+                if (nodes == null) {
+                    list = List.of();
+                    LOG.info("No available Terracotta nodes found");
+                } else {
+                    list = nodes.stream()
+                            .filter(node -> {
+                                if (node == null)
+                                    return false;
+
+                                try {
+                                    node.validate();
+                                } catch (Exception e) {
+                                    LOG.warning("Invalid terracotta node: " + node, e);
+                                    return false;
+                                }
+
+                                return StringUtils.isBlank(node.region) || LocaleUtils.IS_CHINA_MAINLAND == "CN".equalsIgnoreCase(node.region);
+                            })
+                            .map(it -> URI.create(it.url()))
+                            .toList();
+                    LOG.info("Terracotta node list: " + list);
+                }
+            } catch (Exception e) {
+                LOG.warning("Failed to fetch terracotta node list", e);
+                list = List.of();
+            }
+
+            TerracottaNodeList.list = list;
+            return list;
+        }
+    }
+
+    private TerracottaNodeList() {
+    }
+}
@@ -21,15 +21,16 @@ import com.google.gson.JsonParseException;
 import com.google.gson.annotations.SerializedName;
 import javafx.beans.property.ReadOnlyDoubleProperty;
 import javafx.beans.property.ReadOnlyDoubleWrapper;
-import javafx.beans.value.ObservableValue;
+import javafx.beans.value.ObservableDoubleValue;
 import org.jackhuang.hmcl.terracotta.profile.TerracottaProfile;
-import org.jackhuang.hmcl.terracotta.provider.ITerracottaProvider;
+import org.jackhuang.hmcl.terracotta.provider.AbstractTerracottaProvider;
 import org.jackhuang.hmcl.util.gson.JsonSubtype;
 import org.jackhuang.hmcl.util.gson.JsonType;
 import org.jackhuang.hmcl.util.gson.TolerableValidationException;
 import org.jackhuang.hmcl.util.gson.Validation;

 import java.util.List;
+import java.util.concurrent.CancellationException;
 import java.util.concurrent.atomic.AtomicBoolean;

 public abstract sealed class TerracottaState {
@@ -63,32 +64,38 @@ public abstract sealed class TerracottaState {
        }
    }

-    public static final class Preparing extends TerracottaState implements ITerracottaProvider.Context {
+    public static final class Preparing extends TerracottaState implements AbstractTerracottaProvider.DownloadContext {
        private final ReadOnlyDoubleWrapper progress;

-        private final AtomicBoolean installFence = new AtomicBoolean(false);
+        private final AtomicBoolean hasInstallFence;

-        Preparing(ReadOnlyDoubleWrapper progress) {
+        Preparing(ReadOnlyDoubleWrapper progress, boolean hasInstallFence) {
            this.progress = progress;
+            this.hasInstallFence = new AtomicBoolean(hasInstallFence);
        }

        public ReadOnlyDoubleProperty progressProperty() {
            return progress.getReadOnlyProperty();
        }

-        @Override
-        public void bindProgress(ObservableValue<? extends Number> value) {
-            progress.bind(value);
-        }
-
-        @Override
        public boolean requestInstallFence() {
-            return installFence.compareAndSet(false, true);
+            return hasInstallFence.compareAndSet(true, false);
+        }
+
+        public boolean hasInstallFence() {
+            return hasInstallFence.get();
        }

        @Override
-        public boolean hasInstallFence() {
-            return !installFence.get();
+        public void bindProgress(ObservableDoubleValue progress) {
+            this.progress.bind(progress);
+        }
+
+        @Override
+        public void checkCancellation() {
+            if (!hasInstallFence()) {
+                throw new CancellationException("User has installed terracotta from local archives.");
+            }
        }
    }

@@ -112,7 +119,7 @@ public abstract sealed class TerracottaState {
                    @JsonSubtype(clazz = HostScanning.class, name = "host-scanning"),
                    @JsonSubtype(clazz = HostStarting.class, name = "host-starting"),
                    @JsonSubtype(clazz = HostOK.class, name = "host-ok"),
-                    @JsonSubtype(clazz = GuestStarting.class, name = "guest-connecting"),
+                    @JsonSubtype(clazz = GuestConnecting.class, name = "guest-connecting"),
                    @JsonSubtype(clazz = GuestStarting.class, name = "guest-starting"),
                    @JsonSubtype(clazz = GuestOK.class, name = "guest-ok"),
                    @JsonSubtype(clazz = Exception.class, name = "exception"),
@@ -202,12 +209,34 @@ public abstract sealed class TerracottaState {
        }
    }

-    public static final class GuestStarting extends Ready {
-        GuestStarting(int port, int index, String state) {
+    public static final class GuestConnecting extends Ready {
+        GuestConnecting(int port, int index, String state) {
            super(port, index, state);
        }
    }

+    public static final class GuestStarting extends Ready {
+        public enum Difficulty {
+            UNKNOWN,
+            EASIEST,
+            SIMPLE,
+            MEDIUM,
+            TOUGH
+        }
+
+        @SerializedName("difficulty")
+        private final Difficulty difficulty;
+
+        GuestStarting(int port, int index, String state, Difficulty difficulty) {
+            super(port, index, state);
+            this.difficulty = difficulty;
+        }
+
+        public Difficulty getDifficulty() {
+            return difficulty;
+        }
+    }
+
    public static final class GuestOK extends Ready implements Validation {
        @SerializedName("url")
        private final String url;
@@ -0,0 +1,63 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2025  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.terracotta.provider;
+
+import javafx.beans.value.ObservableDoubleValue;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.terracotta.TerracottaBundle;
+import org.jackhuang.hmcl.util.FXThread;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.concurrent.CancellationException;
+
+public abstract class AbstractTerracottaProvider {
+    public enum Status {
+        NOT_EXIST,
+        LEGACY_VERSION,
+        READY
+    }
+
+    public interface DownloadContext {
+        @FXThread
+        void bindProgress(ObservableDoubleValue progress);
+
+        void checkCancellation() throws CancellationException;
+    }
+
+    protected final TerracottaBundle bundle;
+
+    protected AbstractTerracottaProvider(TerracottaBundle bundle) {
+        this.bundle = bundle;
+    }
+
+    public Status status() throws IOException {
+        return bundle.status();
+    }
+
+    public final Task<Path> download(DownloadContext progress) {
+        return bundle.download(progress);
+    }
+
+    public Task<?> install(Path pkg) throws IOException {
+        return bundle.install(pkg);
+    }
+
+    public abstract List<String> ofCommandLine(Path portTransfer);
+}
@@ -17,51 +17,21 @@
 */
 package org.jackhuang.hmcl.terracotta.provider;

-import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.terracotta.TerracottaNative;
-import org.jackhuang.hmcl.util.platform.OperatingSystem;
-import org.jackhuang.hmcl.util.tree.TarFileTree;
-import org.jetbrains.annotations.Nullable;
+import org.jackhuang.hmcl.terracotta.TerracottaBundle;

-import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.attribute.PosixFilePermission;
 import java.util.List;
-import java.util.Set;

-public final class GeneralProvider implements ITerracottaProvider {
-    private final TerracottaNative target;
+public final class GeneralProvider extends AbstractTerracottaProvider {
+    private final Path executable;

-    public GeneralProvider(TerracottaNative target) {
-        this.target = target;
+    public GeneralProvider(TerracottaBundle bundle, Path executable) {
+        super(bundle);
+        this.executable = executable;
    }

    @Override
-    public Status status() throws IOException {
-        return target.status();
-    }
-
-    @Override
-    public Task<?> install(Context context, @Nullable TarFileTree tree) throws IOException {
-        Task<?> task = target.install(context, tree);
-        context.bindProgress(task.progressProperty());
-        if (OperatingSystem.CURRENT_OS.isLinuxOrBSD()) {
-            task = task.thenRunAsync(() -> Files.setPosixFilePermissions(target.getPath(), Set.of(
-                    PosixFilePermission.OWNER_READ,
-                    PosixFilePermission.OWNER_WRITE,
-                    PosixFilePermission.OWNER_EXECUTE,
-                    PosixFilePermission.GROUP_READ,
-                    PosixFilePermission.GROUP_EXECUTE,
-                    PosixFilePermission.OTHERS_READ,
-                    PosixFilePermission.OTHERS_EXECUTE
-            )));
-        }
-        return task;
-    }
-
-    @Override
-    public List<String> ofCommandLine(Path path) {
-        return List.of(target.getPath().toString(), "--hmcl", path.toString());
+    public List<String> ofCommandLine(Path portTransfer) {
+        return List.of(executable.toString(), "--hmcl", portTransfer.toString());
    }
 }
@@ -1,77 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2025  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.terracotta.provider;
-
-import javafx.beans.value.ObservableValue;
-import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.util.tree.TarFileTree;
-import org.jetbrains.annotations.Nullable;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.List;
-
-public interface ITerracottaProvider {
-    enum Status {
-        NOT_EXIST,
-        LEGACY_VERSION,
-        READY
-    }
-
-    interface Context {
-        void bindProgress(ObservableValue<? extends Number> value);
-
-        boolean requestInstallFence();
-        
-        boolean hasInstallFence();
-    }
-
-    abstract class ProviderException extends IOException {
-        public ProviderException(String message) {
-            super(message);
-        }
-
-        public ProviderException(String message, Throwable cause) {
-            super(message, cause);
-        }
-
-        public ProviderException(Throwable cause) {
-            super(cause);
-        }
-    }
-
-    final class ArchiveFileMissingException extends ProviderException {
-        public ArchiveFileMissingException(String message) {
-            super(message);
-        }
-
-        public ArchiveFileMissingException(String message, Throwable cause) {
-            super(message, cause);
-        }
-
-        public ArchiveFileMissingException(Throwable cause) {
-            super(cause);
-        }
-    }
-
-    Status status() throws IOException;
-
-    Task<?> install(Context context, @Nullable TarFileTree tree) throws IOException;
-
-    List<String> ofCommandLine(Path path);
-}
@@ -19,103 +19,77 @@ package org.jackhuang.hmcl.terracotta.provider;

 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.terracotta.TerracottaNative;
+import org.jackhuang.hmcl.terracotta.TerracottaBundle;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.platform.ManagedProcess;
 import org.jackhuang.hmcl.util.platform.SystemUtils;
-import org.jackhuang.hmcl.util.tree.TarFileTree;
-import org.jetbrains.annotations.Nullable;

 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
-import java.nio.file.attribute.PosixFilePermission;
 import java.util.List;
-import java.util.Set;

 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 import static org.jackhuang.hmcl.util.logging.Logger.LOG;

-public final class MacOSProvider implements ITerracottaProvider {
-    public final TerracottaNative installer, binary;
+public final class MacOSProvider extends AbstractTerracottaProvider {
+    private final Path executable, installer;

-    public MacOSProvider(TerracottaNative installer, TerracottaNative binary) {
+    public MacOSProvider(TerracottaBundle bundle, Path executable, Path installer) {
+        super(bundle);
+        this.executable = executable;
        this.installer = installer;
-        this.binary = binary;
    }

    @Override
    public Status status() throws IOException {
-        assert binary != null;
-
        if (!Files.exists(Path.of("/Applications/terracotta.app"))) {
            return Status.NOT_EXIST;
        }

-        return binary.status();
+        return bundle.status();
    }

    @Override
-    public Task<?> install(Context context, @Nullable TarFileTree tree) throws IOException {
-        assert installer != null && binary != null;
+    public Task<?> install(Path pkg) throws IOException {
+        return super.install(pkg).thenComposeAsync(() -> {
+            Path osascript = SystemUtils.which("osascript");
+            if (osascript == null) {
+                throw new IllegalStateException("Cannot locate 'osascript' system executable on MacOS for installing Terracotta.");
+            }

-        Task<?> installerTask = installer.install(context, tree);
-        Task<?> binaryTask = binary.install(context, tree);
-        context.bindProgress(installerTask.progressProperty().add(binaryTask.progressProperty()).multiply(0.4)); // (1 + 1) * 0.4 = 0.8
+            Path movedInstaller = Files.createTempDirectory(Metadata.HMCL_GLOBAL_DIRECTORY, "terracotta-pkg")
+                    .toRealPath()
+                    .resolve(FileUtils.getName(installer));
+            Files.copy(installer, movedInstaller, StandardCopyOption.REPLACE_EXISTING);

-        return Task.allOf(
-                installerTask.thenComposeAsync(() -> {
-                    Path osascript = SystemUtils.which("osascript");
-                    if (osascript == null) {
-                        throw new IllegalStateException("Cannot locate 'osascript' system executable on MacOS for installing Terracotta.");
-                    }
+            ManagedProcess process = new ManagedProcess(new ProcessBuilder(
+                    osascript.toString(), "-e", String.format(
+                    "do shell script \"installer -pkg '%s' -target /\" with prompt \"%s\" with administrator privileges",
+                    movedInstaller, i18n("terracotta.sudo_installing")
+            )));
+            process.pumpInputStream(SystemUtils::onLogLine);
+            process.pumpErrorStream(SystemUtils::onLogLine);

-                    Path pkg = Files.createTempDirectory(Metadata.HMCL_GLOBAL_DIRECTORY, "terracotta-pkg")
-                            .toRealPath()
-                            .resolve(FileUtils.getName(installer.getPath()));
-                    Files.copy(installer.getPath(), pkg, StandardCopyOption.REPLACE_EXISTING);
+            return Task.fromCompletableFuture(process.getProcess().onExit()).thenRunAsync(() -> {
+                try {
+                    FileUtils.cleanDirectory(movedInstaller.getParent());
+                } catch (IOException e) {
+                    LOG.warning("Cannot remove temporary Terracotta package file.", e);
+                }

-                    ManagedProcess process = new ManagedProcess(new ProcessBuilder(
-                            osascript.toString(), "-e", String.format(
-                            "do shell script \"installer -pkg '%s' -target /\" with prompt \"%s\" with administrator privileges",
-                            pkg, i18n("terracotta.sudo_installing")
-                    )));
-                    process.pumpInputStream(SystemUtils::onLogLine);
-                    process.pumpErrorStream(SystemUtils::onLogLine);
-
-                    return Task.fromCompletableFuture(process.getProcess().onExit()).thenRunAsync(() -> {
-                        try {
-                            FileUtils.cleanDirectory(pkg.getParent());
-                        } catch (IOException e) {
-                            LOG.warning("Cannot remove temporary Terracotta package file.", e);
-                        }
-
-                        if (process.getExitCode() != 0) {
-                            throw new IllegalStateException(String.format(
-                                    "Cannot install Terracotta %s: system installer exited with code %d",
-                                    pkg,
-                                    process.getExitCode()
-                            ));
-                        }
-                    });
-                }),
-                binaryTask.thenRunAsync(() -> Files.setPosixFilePermissions(binary.getPath(), Set.of(
-                        PosixFilePermission.OWNER_READ,
-                        PosixFilePermission.OWNER_WRITE,
-                        PosixFilePermission.OWNER_EXECUTE,
-                        PosixFilePermission.GROUP_READ,
-                        PosixFilePermission.GROUP_EXECUTE,
-                        PosixFilePermission.OTHERS_READ,
-                        PosixFilePermission.OTHERS_EXECUTE
-                )))
-        );
+                if (process.getExitCode() != 0) {
+                    throw new IllegalStateException(String.format(
+                            "Cannot install Terracotta %s: system installer exited with code %d", movedInstaller, process.getExitCode()
+                    ));
+                }
+            });
+        });
    }

    @Override
    public List<String> ofCommandLine(Path path) {
-        assert binary != null;
-
-        return List.of(binary.getPath().toString(), "--hmcl", path.toString());
+        return List.of(executable.toString(), "--hmcl", path.toString());
    }
 }
@@ -17,6 +17,7 @@
 */
 package org.jackhuang.hmcl.theme;

+import com.sun.jna.Pointer;
 import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
@@ -24,7 +25,10 @@ import javafx.beans.binding.ObjectBinding;
 import javafx.beans.binding.ObjectExpression;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
+import javafx.event.EventHandler;
 import javafx.scene.paint.Color;
+import javafx.stage.Stage;
+import javafx.stage.WindowEvent;
 import org.glavo.monetfx.Brightness;
 import org.glavo.monetfx.ColorScheme;
 import org.glavo.monetfx.Contrast;
@@ -32,13 +36,24 @@ import org.glavo.monetfx.beans.property.ColorSchemeProperty;
 import org.glavo.monetfx.beans.property.ReadOnlyColorSchemeProperty;
 import org.glavo.monetfx.beans.property.SimpleColorSchemeProperty;
 import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.MacOSNativeUtils;
+import org.jackhuang.hmcl.ui.WindowsNativeUtils;
+import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.util.platform.NativeUtils;
+import org.jackhuang.hmcl.util.platform.OSVersion;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;
+import org.jackhuang.hmcl.util.platform.SystemUtils;
+import org.jackhuang.hmcl.util.platform.windows.Dwmapi;
+import org.jackhuang.hmcl.util.platform.windows.WinConstants;
+import org.jackhuang.hmcl.util.platform.windows.WinReg;
+import org.jackhuang.hmcl.util.platform.windows.WinTypes;

-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
+import java.nio.file.Path;
+import java.time.Duration;
+import java.util.*;

 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;

 /// @author Glavo
 public final class Themes {
@@ -65,7 +80,7 @@ public final class Themes {
                    if (FXUtils.DARK_MODE != null) {
                        yield FXUtils.DARK_MODE.get() ? Brightness.DARK : Brightness.LIGHT;
                    } else {
-                        yield Brightness.DEFAULT;
+                        yield getDefaultBrightness();
                    }
                }
                case "dark" -> Brightness.DARK;
@@ -97,6 +112,66 @@ public final class Themes {
        theme.addListener(listener);
    }

+    private static Brightness defaultBrightness;
+
+    private static Brightness getDefaultBrightness() {
+        if (defaultBrightness != null)
+            return defaultBrightness;
+
+        LOG.info("Detecting system theme brightness");
+        Brightness brightness = Brightness.DEFAULT;
+        if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
+            WinReg reg = WinReg.INSTANCE;
+            if (reg != null) {
+                Object appsUseLightTheme = reg.queryValue(WinReg.HKEY.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize", "AppsUseLightTheme");
+                if (appsUseLightTheme instanceof Integer value) {
+                    brightness = value == 0 ? Brightness.DARK : Brightness.LIGHT;
+                }
+            }
+        } else if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS) {
+            try {
+                String result = SystemUtils.run("/usr/bin/defaults", "read", "-g", "AppleInterfaceStyle").trim();
+                brightness = "Dark".equalsIgnoreCase(result) ? Brightness.DARK : Brightness.LIGHT;
+            } catch (Exception e) {
+                // If the key does not exist, it means Light mode is used
+                brightness = Brightness.LIGHT;
+            }
+        } else if (OperatingSystem.CURRENT_OS == OperatingSystem.LINUX) {
+            Path dbusSend = SystemUtils.which("dbus-send");
+            if (dbusSend != null) {
+                try {
+                    String[] result = SystemUtils.run(List.of(
+                            FileUtils.getAbsolutePath(dbusSend),
+                            "--session",
+                            "--print-reply=literal",
+                            "--reply-timeout=1000",
+                            "--dest=org.freedesktop.portal.Desktop",
+                            "/org/freedesktop/portal/desktop",
+                            "org.freedesktop.portal.Settings.Read",
+                            "string:org.freedesktop.appearance",
+                            "string:color-scheme"
+                    ), Duration.ofSeconds(2)).trim().split(" ");
+
+                    if (result.length > 0) {
+                        String value = result[result.length - 1];
+                        // 1: prefer dark
+                        // 2: prefer light
+                        if ("1".equals(value)) {
+                            brightness = Brightness.DARK;
+                        } else if ("2".equals(value)) {
+                            brightness = Brightness.LIGHT;
+                        }
+                    }
+                } catch (Exception e) {
+                    LOG.warning("Failed to get system theme from D-Bus", e);
+                }
+            }
+        }
+        LOG.info("Detected system theme brightness: " + brightness);
+
+        return defaultBrightness = brightness;
+    }
+
    public static ObjectExpression<Theme> themeProperty() {
        return theme;
    }
@@ -129,6 +204,44 @@ public final class Themes {
        return darkMode;
    }

+    public static void applyNativeDarkMode(Stage stage) {
+        if (OperatingSystem.SYSTEM_VERSION.isAtLeast(OSVersion.WINDOWS_11) && NativeUtils.USE_JNA && Dwmapi.INSTANCE != null) {
+            ChangeListener<Boolean> listener = FXUtils.onWeakChange(Themes.darkModeProperty(), darkMode -> {
+                if (stage.isShowing()) {
+                    WindowsNativeUtils.getWindowHandle(stage).ifPresent(handle -> {
+                        if (handle == WinTypes.HANDLE.INVALID_VALUE)
+                            return;
+
+                        Dwmapi.INSTANCE.DwmSetWindowAttribute(
+                                new WinTypes.HANDLE(Pointer.createConstant(handle)),
+                                WinConstants.DWMWA_USE_IMMERSIVE_DARK_MODE,
+                                new WinTypes.BOOLByReference(new WinTypes.BOOL(darkMode)),
+                                WinTypes.BOOL.SIZE
+                        );
+                    });
+                }
+            });
+            stage.getProperties().put("Themes.applyNativeDarkMode.listener", listener);
+
+            if (stage.isShowing()) {
+                listener.changed(null, false, Themes.darkModeProperty().get());
+            } else {
+                stage.addEventFilter(WindowEvent.WINDOW_SHOWN, new EventHandler<>() {
+                    @Override
+                    public void handle(WindowEvent event) {
+                        stage.removeEventFilter(WindowEvent.WINDOW_SHOWN, this);
+                        listener.changed(null, false, Themes.darkModeProperty().get());
+                    }
+                });
+            }
+        } else if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS && MacOSNativeUtils.isSupported()) {
+            MacOSNativeUtils.setAppearance(darkModeProperty().get());
+
+            ChangeListener<Boolean> listener = FXUtils.onWeakChange(Themes.darkModeProperty(), MacOSNativeUtils::setAppearance);
+            stage.getProperties().put("Themes.applyNativeDarkMode.listener", listener);
+        }
+    }
+
    private Themes() {
    }
 }
@@ -19,9 +19,11 @@ package org.jackhuang.hmcl.ui;

 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXDialogLayout;
+import com.jfoenix.validation.base.ValidatorBase;
 import javafx.animation.KeyFrame;
 import javafx.animation.KeyValue;
 import javafx.animation.Timeline;
+import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.WeakInvalidationListener;
 import javafx.beans.property.DoubleProperty;
@@ -63,23 +65,30 @@ import org.jackhuang.hmcl.ui.versions.GameListPage;
 import org.jackhuang.hmcl.ui.versions.VersionPage;
 import org.jackhuang.hmcl.ui.versions.Versions;
 import org.jackhuang.hmcl.util.*;
+import org.jackhuang.hmcl.util.i18n.I18n;
+import org.jackhuang.hmcl.util.i18n.SupportedLocale;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.platform.Architecture;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

+import java.io.IOException;
 import java.nio.file.Path;
+import java.time.LocalDate;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;

-import static org.jackhuang.hmcl.setting.ConfigHolder.*;
-import static org.jackhuang.hmcl.util.logging.Logger.LOG;
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.setting.ConfigHolder.globalConfig;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;

 public final class Controllers {
    public static final String JAVA_VERSION_TIP = "javaVersion";
    public static final String JAVA_INTERPRETED_MODE_TIP = "javaInterpretedMode";
    public static final String SOFTWARE_RENDERING = "softwareRendering";
+    public static final String APRIL_FOOLS = "aprilFools";

    public static final int MIN_WIDTH = 800 + 2 + 16; // bg width + border width*2 + shadow width*2
    public static final int MIN_HEIGHT = 450 + 2 + 40 + 16; // bg height + border width*2 + toolbar height + shadow width*2
@@ -97,9 +106,14 @@ public final class Controllers {
        GameListPage gameListPage = new GameListPage();
        gameListPage.selectedProfileProperty().bindBidirectional(Profiles.selectedProfileProperty());
        gameListPage.profilesProperty().bindContent(Profiles.profilesProperty());
-        FXUtils.applyDragListener(gameListPage, ModpackHelper::isFileModpackByExtension, modpacks -> {
-            Path modpack = modpacks.get(0);
-            Controllers.getDecorator().startWizard(new ModpackInstallWizardProvider(Profiles.getSelectedProfile(), modpack), i18n("install.modpack"));
+        FXUtils.applyDragListener(gameListPage, file -> ModpackHelper.isFileModpackByExtension(file) || "json".equalsIgnoreCase(FileUtils.getNameWithoutExtension(file)), files -> {
+            Path file = files.get(0);
+
+            if (ModpackHelper.isFileModpackByExtension(file)) {
+                Controllers.getDecorator().startWizard(new ModpackInstallWizardProvider(Profiles.getSelectedProfile(), file), i18n("install.modpack"));
+            } else if ("json".equalsIgnoreCase(FileUtils.getExtension(file))) {
+                Versions.installFromJson(Profiles.getSelectedProfile(), file);
+            }
        });
        return gameListPage;
    });
@@ -200,6 +214,21 @@ public final class Controllers {
        return decorator;
    }

+    public static void saveWindowStates() {
+        if (stageX != null) {
+            config().setX(stageX.get() / SCREEN.getBounds().getWidth());
+        }
+        if (stageY != null) {
+            config().setY(stageY.get() / SCREEN.getBounds().getHeight());
+        }
+        if (stageHeight != null) {
+            config().setHeight(stageHeight.get());
+        }
+        if (stageWidth != null) {
+            config().setWidth(stageWidth.get());
+        }
+    }
+
    public static void onApplicationStop() {
        stageSizeChangeListener = null;
        if (stageX != null) {
@@ -223,6 +252,8 @@ public final class Controllers {
    public static void initialize(Stage stage) {
        LOG.info("Start initializing application");

+        LOG.info("April Fools: " + AprilFools.isEnabled());
+
        if (System.getProperty("prism.lcdtext") == null) {
            String fontAntiAliasing = globalConfig().getFontAntiAliasing();
            if ("lcd".equalsIgnoreCase(fontAntiAliasing)) {
@@ -360,7 +391,7 @@ public final class Controllers {
            Runnable continueAction = () -> globalConfig().setPlatformPromptVersion(1);

            if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS && Architecture.SYSTEM_ARCH == Architecture.ARM64) {
-                Controllers.dialog(i18n("fatal.unsupported_platform.macos_arm64"), null, MessageType.INFO, continueAction);
+                continueAction.run();
            } else if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS && Architecture.SYSTEM_ARCH == Architecture.ARM64) {
                Controllers.dialog(i18n("fatal.unsupported_platform.windows_arm64"), null, MessageType.INFO, continueAction);
            } else if (OperatingSystem.CURRENT_OS == OperatingSystem.LINUX &&
@@ -430,6 +461,53 @@ public final class Controllers {
            agreementPane.setActions(agreementLink, yesButton, noButton);
            Controllers.dialog(agreementPane);
        }
+
+        aprilFools:
+        if (AprilFools.isEnabled()) {
+            int currentYear = LocalDate.now().getYear();
+            if (config().getShownTips().get(APRIL_FOOLS) instanceof Number year && year.intValue() >= currentYear)
+                break aprilFools;
+
+            if (!I18n.getLocale().getLocale().getLanguage().equals("zh"))
+                break aprilFools;
+
+            SupportedLocale lzh = SupportedLocale.getSupportedLocales().stream()
+                    .filter(locale -> "lzh".equals(locale.getName()))
+                    .findFirst().orElse(null);
+
+            if (lzh == null) {
+                LOG.warning("No supported locale found for lzh");
+                break aprilFools;
+            }
+
+            Runnable updateShowTips = () -> config().getShownTips().put(APRIL_FOOLS, currentYear);
+
+            Controllers.confirmWithCountdown(i18n("launcher.april_fools.switch_lzh"), null, 10,
+                    MessageType.QUESTION, () -> {
+                        Controllers.confirm(i18n("launcher.april_fools.switch_lzh.confirm"), null, MessageType.QUESTION, () -> {
+                            LOG.info("Switching locale to " + lzh);
+
+                            updateShowTips.run();
+                            config().setLocalization(lzh);
+
+                            Controllers.onApplicationStop();
+
+                            try {
+                                FileSaver.waitForAllSaves();
+                            } catch (InterruptedException ignored) {
+                                // Ignore
+                            }
+
+                            try {
+                                Restarter.restartSelf();
+                            } catch (IOException e) {
+                                LOG.warning("Failed to restart self", e);
+                            }
+
+                            Platform.exit();
+                        }, updateShowTips);
+                    }, updateShowTips);
+        }
    }

    public static void dialog(Region content) {
@@ -505,8 +583,8 @@ public final class Controllers {
        return prompt(title, onResult, "");
    }

-    public static CompletableFuture<String> prompt(String title, FutureCallback<String> onResult, String initialValue) {
-        InputDialogPane pane = new InputDialogPane(title, initialValue, onResult);
+    public static CompletableFuture<String> prompt(String title, FutureCallback<String> onResult, String initialValue, ValidatorBase... validators) {
+        InputDialogPane pane = new InputDialogPane(title, initialValue, onResult, validators);
        dialog(pane);
        return pane.getCompletableFuture();
    }
@@ -517,7 +595,7 @@ public final class Controllers {
        return pane.getCompletableFuture();
    }

-    public static TaskExecutorDialogPane taskDialog(TaskExecutor executor, String title, TaskCancellationAction onCancel) {
+    public static TaskExecutorDialogPane taskDialog(TaskExecutor executor, String title, @NotNull TaskCancellationAction onCancel) {
        TaskExecutorDialogPane pane = new TaskExecutorDialogPane(onCancel);
        pane.setTitle(title);
        pane.setExecutor(executor);
@@ -525,7 +603,7 @@ public final class Controllers {
        return pane;
    }

-    public static TaskExecutorDialogPane taskDialog(Task<?> task, String title, TaskCancellationAction onCancel) {
+    public static TaskExecutorDialogPane taskDialog(Task<?> task, String title, @NotNull TaskCancellationAction onCancel) {
        TaskExecutor executor = task.executor();
        TaskExecutorDialogPane pane = taskDialog(executor, title, onCancel);
        executor.start();
@@ -19,7 +19,7 @@ package org.jackhuang.hmcl.ui;

 import org.jackhuang.hmcl.auth.*;
 import org.jackhuang.hmcl.ui.account.ClassicAccountLoginDialog;
-import org.jackhuang.hmcl.ui.account.OAuthAccountLoginDialog;
+import org.jackhuang.hmcl.ui.account.MicrosoftAccountLoginPane;

 import java.util.Optional;
 import java.util.concurrent.CancellationException;
@@ -49,10 +49,10 @@ public final class DialogController {
            CountDownLatch latch = new CountDownLatch(1);
            AtomicReference<AuthInfo> res = new AtomicReference<>(null);
            runInFX(() -> {
-                OAuthAccountLoginDialog pane = new OAuthAccountLoginDialog((OAuthAccount) account, it -> {
+                MicrosoftAccountLoginPane pane = new MicrosoftAccountLoginPane(account, it -> {
                    res.set(it);
                    latch.countDown();
-                }, latch::countDown);
+                }, latch::countDown, false);
                Controllers.dialog(pane);
            });
            latch.await();
@@ -0,0 +1,155 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2025  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 com.jfoenix.controls.JFXDialog;
+import javafx.application.Platform;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.event.EventHandler;
+import javafx.scene.Node;
+import javafx.scene.layout.StackPane;
+import org.jackhuang.hmcl.ui.animation.AnimationUtils;
+import org.jackhuang.hmcl.ui.construct.DialogAware;
+import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
+import org.jackhuang.hmcl.ui.construct.JFXDialogPane;
+import org.jackhuang.hmcl.ui.decorator.Decorator;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Optional;
+import java.util.function.Consumer;
+
+public final class DialogUtils {
+    private DialogUtils() {
+    }
+
+    public static final String PROPERTY_DIALOG_INSTANCE = DialogUtils.class.getName() + ".dialog.instance";
+    public static final String PROPERTY_DIALOG_PANE_INSTANCE = DialogUtils.class.getName() + ".dialog.pane.instance";
+    public static final String PROPERTY_DIALOG_CLOSE_HANDLER = DialogUtils.class.getName() + ".dialog.closeListener";
+
+    public static final String PROPERTY_PARENT_PANE_REF = DialogUtils.class.getName() + ".dialog.parentPaneRef";
+    public static final String PROPERTY_PARENT_DIALOG_REF = DialogUtils.class.getName() + ".dialog.parentDialogRef";
+
+    public static void show(Decorator decorator, Node content) {
+        if (decorator.getDrawerWrapper() == null) {
+            Platform.runLater(() -> show(decorator, content));
+            return;
+        }
+
+        show(decorator.getDrawerWrapper(), content, (dialog) -> {
+            JFXDialogPane pane = (JFXDialogPane) dialog.getContent();
+            decorator.capableDraggingWindow(dialog);
+            decorator.forbidDraggingWindow(pane);
+            dialog.setDialogContainer(decorator.getDrawerWrapper());
+        });
+    }
+
+    public static void show(StackPane container, Node content) {
+        show(container, content, null);
+    }
+
+    public static void show(StackPane container, Node content, @Nullable Consumer<JFXDialog> onDialogCreated) {
+        FXUtils.checkFxUserThread();
+
+        JFXDialog dialog = (JFXDialog) container.getProperties().get(PROPERTY_DIALOG_INSTANCE);
+        JFXDialogPane dialogPane = (JFXDialogPane) container.getProperties().get(PROPERTY_DIALOG_PANE_INSTANCE);
+
+        if (dialog == null) {
+            dialog = new JFXDialog(AnimationUtils.isAnimationEnabled()
+                    ? JFXDialog.DialogTransition.CENTER
+                    : JFXDialog.DialogTransition.NONE);
+            dialogPane = new JFXDialogPane();
+
+            dialog.setContent(dialogPane);
+            dialog.setDialogContainer(container);
+            dialog.setOverlayClose(false);
+
+            container.getProperties().put(PROPERTY_DIALOG_INSTANCE, dialog);
+            container.getProperties().put(PROPERTY_DIALOG_PANE_INSTANCE, dialogPane);
+
+            if (onDialogCreated != null) {
+                onDialogCreated.accept(dialog);
+            }
+
+            dialog.show();
+        }
+
+        content.getProperties().put(PROPERTY_PARENT_PANE_REF, dialogPane);
+        content.getProperties().put(PROPERTY_PARENT_DIALOG_REF, dialog);
+
+        dialogPane.push(content);
+
+        EventHandler<DialogCloseEvent> handler = event -> close(content);
+        content.getProperties().put(PROPERTY_DIALOG_CLOSE_HANDLER, handler);
+        content.addEventHandler(DialogCloseEvent.CLOSE, handler);
+
+        handleDialogShown(dialog, content);
+    }
+
+    private static void handleDialogShown(JFXDialog dialog, Node node) {
+        if (dialog.isVisible()) {
+            dialog.requestFocus();
+            if (node instanceof DialogAware dialogAware)
+                dialogAware.onDialogShown();
+        } else {
+            dialog.visibleProperty().addListener(new ChangeListener<>() {
+                @Override
+                public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
+                    if (newValue) {
+                        dialog.requestFocus();
+                        if (node instanceof DialogAware dialogAware)
+                            dialogAware.onDialogShown();
+                        observable.removeListener(this);
+                    }
+                }
+            });
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    public static void close(Node content) {
+        FXUtils.checkFxUserThread();
+
+        Optional.ofNullable(content.getProperties().get(PROPERTY_DIALOG_CLOSE_HANDLER))
+                .ifPresent(handler -> content.removeEventHandler(DialogCloseEvent.CLOSE, (EventHandler<DialogCloseEvent>) handler));
+
+        JFXDialogPane pane = (JFXDialogPane) content.getProperties().get(PROPERTY_PARENT_PANE_REF);
+        JFXDialog dialog = (JFXDialog) content.getProperties().get(PROPERTY_PARENT_DIALOG_REF);
+
+        if (dialog != null && pane != null) {
+            if (pane.size() == 1 && pane.peek().orElse(null) == content) {
+                dialog.setOnDialogClosed(e -> pane.pop(content));
+                dialog.close();
+
+                StackPane container = dialog.getDialogContainer();
+                if (container != null) {
+                    container.getProperties().remove(PROPERTY_DIALOG_INSTANCE);
+                    container.getProperties().remove(PROPERTY_DIALOG_PANE_INSTANCE);
+                    container.getProperties().remove(PROPERTY_PARENT_DIALOG_REF);
+                    container.getProperties().remove(PROPERTY_PARENT_PANE_REF);
+                }
+            } else {
+                pane.pop(content);
+            }
+
+            if (content instanceof DialogAware dialogAware) {
+                dialogAware.onDialogClosed();
+            }
+        }
+    }
+}
@@ -18,7 +18,9 @@
 package org.jackhuang.hmcl.ui;

 import com.jfoenix.controls.*;
-import javafx.animation.*;
+import javafx.animation.Animation;
+import javafx.animation.Interpolator;
+import javafx.animation.PauseTransition;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
@@ -26,44 +28,54 @@ import javafx.beans.WeakInvalidationListener;
 import javafx.beans.WeakListener;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.*;
-import javafx.beans.value.*;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableBooleanValue;
+import javafx.beans.value.ObservableValue;
+import javafx.beans.value.WeakChangeListener;
 import javafx.collections.ObservableMap;
 import javafx.event.Event;
 import javafx.event.EventDispatcher;
 import javafx.event.EventHandler;
 import javafx.event.EventType;
 import javafx.geometry.Bounds;
-import javafx.geometry.Pos;
 import javafx.geometry.Rectangle2D;
 import javafx.scene.Cursor;
 import javafx.scene.Node;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
-import javafx.scene.control.Label;
-import javafx.scene.control.ScrollPane;
 import javafx.scene.control.*;
 import javafx.scene.control.skin.VirtualFlow;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.*;
-import javafx.scene.layout.*;
+import javafx.scene.layout.ColumnConstraints;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.Region;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
 import javafx.scene.shape.Rectangle;
 import javafx.scene.text.Text;
 import javafx.scene.text.TextFlow;
-import javafx.stage.*;
+import javafx.stage.FileChooser;
+import javafx.stage.Screen;
+import javafx.stage.Stage;
 import javafx.util.Callback;
 import javafx.util.Duration;
 import javafx.util.StringConverter;
+import org.glavo.url.WebURL;
 import org.jackhuang.hmcl.setting.StyleSheets;
 import org.jackhuang.hmcl.task.CacheFileTask;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.animation.AnimationUtils;
+import org.jackhuang.hmcl.ui.animation.Motion;
+import org.jackhuang.hmcl.ui.construct.IconedMenuItem;
+import org.jackhuang.hmcl.ui.construct.MenuSeparator;
+import org.jackhuang.hmcl.ui.construct.PopupMenu;
 import org.jackhuang.hmcl.ui.image.ImageLoader;
 import org.jackhuang.hmcl.ui.image.ImageUtils;
-import org.jackhuang.hmcl.util.*;
+import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.ResourceNotFoundError;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.io.NetworkUtils;
 import org.jackhuang.hmcl.util.javafx.ExtendedProperties;
@@ -88,12 +100,14 @@ import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.lang.ref.WeakReference;
-import java.net.*;
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URLConnection;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.PathMatcher;
-import java.util.List;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.*;
@@ -102,8 +116,8 @@ import java.util.regex.Pattern;

 import static org.jackhuang.hmcl.util.Lang.thread;
 import static org.jackhuang.hmcl.util.Lang.tryCast;
-import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;

 public final class FXUtils {
    private FXUtils() {
@@ -137,6 +151,7 @@ public final class FXUtils {
    public static final @Nullable ReadOnlyObjectProperty<Color> ACCENT_COLOR;

    public static final @Nullable MethodHandle TEXT_TRUNCATED_PROPERTY;
+    public static final @Nullable MethodHandle FOCUS_VISIBLE_PROPERTY;

    static {
        String jfxVersion = System.getProperty("javafx.version");
@@ -203,12 +218,26 @@ public final class FXUtils {
            }
        }
        TEXT_TRUNCATED_PROPERTY = textTruncatedProperty;
+
+        MethodHandle focusVisibleProperty = null;
+        if (JAVAFX_MAJOR_VERSION >= 19) {
+            try {
+                focusVisibleProperty = MethodHandles.publicLookup().findVirtual(
+                        Node.class,
+                        "focusVisibleProperty",
+                        MethodType.methodType(ReadOnlyBooleanProperty.class)
+                );
+            } catch (Throwable e) {
+                LOG.warning("Failed to lookup focusVisibleProperty", e);
+            }
+        }
+        FOCUS_VISIBLE_PROPERTY = focusVisibleProperty;
    }

    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", "apng"
+    public static final List<String> IMAGE_EXTENSIONS = List.of(
+            "png", "jpg", "jpeg", "bmp", "gif", "webp", "svg", "apng"
    );

    private static final Map<String, Image> builtinImageCache = new ConcurrentHashMap<>();
@@ -389,12 +418,18 @@ public final class FXUtils {
        return region.getMaxHeight();
    }

-    public static Node limitingSize(Node node, double width, double height) {
-        StackPane pane = new StackPane(node);
-        pane.setAlignment(Pos.CENTER);
-        FXUtils.setLimitWidth(pane, width);
-        FXUtils.setLimitHeight(pane, height);
-        return pane;
+    public static void limitCellWidth(ListView<?> listView, ListCell<?> cell) {
+        ReadOnlyDoubleProperty widthProperty;
+
+        if (listView.lookup(".clipped-container") instanceof Region clippedContainer) {
+            widthProperty = clippedContainer.widthProperty();
+        } else {
+            widthProperty = listView.widthProperty();
+        }
+
+        cell.maxWidthProperty().bind(widthProperty);
+        cell.prefWidthProperty().bind(widthProperty);
+        cell.minWidthProperty().bind(widthProperty);
    }

    public static void smoothScrolling(ScrollPane scrollPane) {
@@ -423,6 +458,20 @@ public final class FXUtils {
        }
    }

+    public static @Nullable ReadOnlyBooleanProperty focusVisibleProperty(Node node) {
+        if (FOCUS_VISIBLE_PROPERTY != null) {
+            try {
+                return (ReadOnlyBooleanProperty) FOCUS_VISIBLE_PROPERTY.invokeExact(node);
+            } catch (RuntimeException | Error e) {
+                throw e;
+            } catch (Throwable e) {
+                throw new RuntimeException(e);
+            }
+        } else {
+            return null;
+        }
+    }
+
    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);
@@ -1118,12 +1167,10 @@ public final class FXUtils {
        }
    }

-    public static Image loadImage(String url) throws Exception {
-        URI uri = NetworkUtils.toURI(url);
-
-        URLConnection connection = NetworkUtils.createConnection(uri);
-        if (connection instanceof HttpURLConnection)
-            connection = NetworkUtils.resolveConnection((HttpURLConnection) connection);
+    public static Image loadImage(WebURL url) throws Exception {
+        URLConnection connection = NetworkUtils.createConnection(url);
+        if (connection instanceof HttpURLConnection httpConnection)
+            connection = NetworkUtils.resolveConnection(httpConnection);

        try (BufferedInputStream input = new BufferedInputStream(connection.getInputStream())) {
            String contentType = Objects.requireNonNull(connection.getContentType(), "");
@@ -1188,12 +1235,14 @@ public final class FXUtils {

    public static Task<Image> getRemoteImageTask(String url, int requestedWidth, int requestedHeight, boolean preserveRatio, boolean smooth) {
        return new CacheFileTask(url)
+                .setSignificance(Task.TaskSignificance.MINOR)
                .thenApplyAsync(file -> loadImage(file, requestedWidth, requestedHeight, preserveRatio, smooth))
                .setSignificance(Task.TaskSignificance.MINOR);
    }

-    public static Task<Image> getRemoteImageTask(URI uri, int requestedWidth, int requestedHeight, boolean preserveRatio, boolean smooth) {
-        return new CacheFileTask(uri)
+    public static Task<Image> getRemoteImageTask(List<URI> uris, int requestedWidth, int requestedHeight, boolean preserveRatio, boolean smooth) {
+        return new CacheFileTask(uris)
+                .setSignificance(Task.TaskSignificance.MINOR)
                .thenApplyAsync(file -> loadImage(file, requestedWidth, requestedHeight, preserveRatio, smooth))
                .setSignificance(Task.TaskSignificance.MINOR);
    }
@@ -1208,6 +1257,7 @@ public final class FXUtils {
                        LOG.warning("An exception encountered while loading remote image: " + url, exception);
                    }
                })
+                .setSignificance(Task.TaskSignificance.MINOR)
                .start();
        return image;
    }
@@ -1232,8 +1282,32 @@ public final class FXUtils {
        return button;
    }

-    public static Label newSafeTruncatedLabel(String text) {
-        Label label = new Label(text);
+    public static JFXButton newToggleButton4(SVG icon, int size) {
+        JFXButton button = new JFXButton();
+        button.getStyleClass().add("toggle-icon4");
+        button.setGraphic(icon.createIcon(size));
+        return button;
+    }
+
+    public static void setOnActionWithCooldown(ButtonBase button, Runnable action) {
+        setOnActionWithCooldown(button, action, Motion.SHORT4);
+    }
+
+    public static void setOnActionWithCooldown(ButtonBase button, Runnable action, Duration cooldown) {
+        button.setOnAction(e -> {
+            button.setDisable(true);
+
+            var pause = new PauseTransition(cooldown);
+            pause.setOnFinished(event -> button.setDisable(false));
+            pause.play();
+
+            action.run();
+            e.consume();
+        });
+    }
+
+    public static Label newSafeTruncatedLabel() {
+        Label label = new Label();
        label.setTextOverrun(OverrunStyle.CENTER_WORD_ELLIPSIS);
        showTooltipWhenTruncated(label);
        return label;
@@ -1309,17 +1383,11 @@ public final class FXUtils {
    }

    public static <T> Callback<ListView<T>, ListCell<T>> jfxListCellFactory(Function<T, Node> graphicBuilder) {
-        Holder<Object> lastCell = new Holder<>();
        return view -> new JFXListCell<T>() {
            @Override
            public void updateItem(T item, boolean empty) {
                super.updateItem(item, empty);

-                // https://mail.openjdk.org/pipermail/openjfx-dev/2022-July/034764.html
-                if (this == lastCell.value && !isVisible())
-                    return;
-                lastCell.value = this;
-
                if (!empty) {
                    setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
                    setGraphic(graphicBuilder.apply(item));
@@ -1364,7 +1432,16 @@ 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) {
+            if (e.getButton() == MouseButton.PRIMARY) {
+                action.run();
+                e.consume();
+            }
+        });
+    }
+
+    public static void onSecondaryButtonClicked(Node node, Runnable action) {
+        node.addEventHandler(MouseEvent.MOUSE_CLICKED, e -> {
+            if (e.getButton() == MouseButton.SECONDARY) {
                action.run();
                e.consume();
            }
@@ -1410,16 +1487,6 @@ public final class FXUtils {
        });
    }

-    public static void clearFocus(Node node) {
-        Scene scene = node.getScene();
-        if (scene != null) {
-            Parent root = scene.getRoot();
-            if (root != null) {
-                root.requestFocus();
-            }
-        }
-    }
-
    public static void copyOnDoubleClick(Labeled label) {
        label.addEventHandler(MouseEvent.MOUSE_CLICKED, e -> {
            if (e.getButton() == MouseButton.PRIMARY && e.getClickCount() == 2) {
@@ -1517,9 +1584,8 @@ public final class FXUtils {
    }

    /**
-     * Intelligently determines the popup position to prevent the menu from exceeding screen boundaries.
-     * Supports multi-monitor setups by detecting the current screen where the component is located.
-     * Now handles first-time popup display by forcing layout measurement.
+     * Intelligently determines the popup position to prevent the menu from exceeding screen boundaries,
+     * window boundaries, and clipping containers like ScrollPane.
     *
     * @param root          the root node to calculate position relative to
     * @param popupInstance the popup instance to position
@@ -1528,8 +1594,10 @@ public final class FXUtils {
    public static JFXPopup.PopupVPosition determineOptimalPopupPosition(Node root, JFXPopup popupInstance) {
        // Get the screen bounds in screen coordinates
        Bounds screenBounds = root.localToScreen(root.getBoundsInLocal());
+        if (screenBounds == null) {
+            return JFXPopup.PopupVPosition.TOP; // Fallback
+        }

-        // Convert Bounds to Rectangle2D for getScreensForRectangle method
        Rectangle2D boundsRect = new Rectangle2D(
                screenBounds.getMinX(), screenBounds.getMinY(),
                screenBounds.getWidth(), screenBounds.getHeight()
@@ -1540,13 +1608,36 @@ public final class FXUtils {
        Screen currentScreen = screens.isEmpty() ? Screen.getPrimary() : screens.get(0);
        Rectangle2D visualBounds = currentScreen.getVisualBounds();

-        double screenHeight = visualBounds.getHeight();
-        double screenMinY = visualBounds.getMinY();
-        double itemScreenY = screenBounds.getMinY();
+        // 1. Initial bounds based on the physical Screen limits
+        double clipMinY = visualBounds.getMinY();
+        double clipMaxY = visualBounds.getMaxY();

-        // Calculate available space relative to the current screen
-        double availableSpaceAbove = itemScreenY - screenMinY;
-        double availableSpaceBelow = screenMinY + screenHeight - itemScreenY - root.getBoundsInLocal().getHeight();
+        // 2. Constrain by Window (Stage) bounds so it doesn't overflow the application window
+        if (root.getScene() != null && root.getScene().getWindow() != null) {
+            javafx.stage.Window window = root.getScene().getWindow();
+            clipMinY = Math.max(clipMinY, window.getY());
+            clipMaxY = Math.min(clipMaxY, window.getY() + window.getHeight());
+        }
+
+        // 3. Constrain by parent ScrollPanes to handle clipping within the UI layout
+        Node parent = root.getParent();
+        while (parent != null) {
+            if (parent instanceof ScrollPane) {
+                Bounds spBounds = parent.localToScreen(parent.getBoundsInLocal());
+                if (spBounds != null) {
+                    clipMinY = Math.max(clipMinY, spBounds.getMinY());
+                    clipMaxY = Math.min(clipMaxY, spBounds.getMaxY());
+                }
+            }
+            parent = parent.getParent();
+        }
+
+        double itemScreenY = screenBounds.getMinY();
+        double itemScreenMaxY = screenBounds.getMaxY();
+
+        // Calculate available space relative to the narrowest calculated clipping bounds
+        double availableSpaceAbove = itemScreenY - clipMinY;
+        double availableSpaceBelow = clipMaxY - itemScreenMaxY;

        // Get popup content and ensure it's properly measured
        Region popupContent = popupInstance.getPopupContent();
@@ -1562,8 +1653,7 @@ public final class FXUtils {
            menuHeight = popupContent.getHeight();
            if (menuHeight <= 0) {
                // Fallback: estimate based on number of menu items
-                // Each menu item is roughly 36px height + separators + padding
-                menuHeight = 300; // Conservative estimate for the current menu structure
+                menuHeight = 300;
            }
        } else {
            menuHeight = popupContent.getHeight();
@@ -1572,8 +1662,46 @@ public final class FXUtils {
        // Add some margin for safety
        menuHeight += 20;

-        return (availableSpaceAbove > menuHeight && availableSpaceBelow < menuHeight)
-                ? JFXPopup.PopupVPosition.BOTTOM  // Show menu below the button, expanding downward
-                : JFXPopup.PopupVPosition.TOP;    // Show menu above the button, expanding upward
+        // Logic: if there isn't enough space below, AND there is more space above, open upwards.
+        if (availableSpaceBelow < menuHeight && availableSpaceAbove > availableSpaceBelow) {
+            return JFXPopup.PopupVPosition.BOTTOM;  // Show menu above the button, expanding upward
+        } else {
+            return JFXPopup.PopupVPosition.TOP;     // Show menu below the button, expanding downward
+        }
+    }
+
+    public static void useJFXContextMenu(TextInputControl control) {
+        control.setContextMenu(null);
+
+        PopupMenu menu = new PopupMenu();
+        JFXPopup popup = new JFXPopup(menu);
+        popup.setAutoHide(true);
+
+        control.setOnContextMenuRequested(e -> {
+            boolean hasNoSelection = control.getSelectedText().isEmpty();
+
+            IconedMenuItem undo = new IconedMenuItem(SVG.UNDO, i18n("menu.undo"), control::undo, popup);
+            IconedMenuItem redo = new IconedMenuItem(SVG.REDO, i18n("menu.redo"), control::redo, popup);
+            IconedMenuItem cut = new IconedMenuItem(SVG.CONTENT_CUT, i18n("menu.cut"), control::cut, popup);
+            IconedMenuItem copy = new IconedMenuItem(SVG.CONTENT_COPY, i18n("menu.copy"), control::copy, popup);
+            IconedMenuItem paste = new IconedMenuItem(SVG.CONTENT_PASTE, i18n("menu.paste"), control::paste, popup);
+            IconedMenuItem delete = new IconedMenuItem(SVG.DELETE, i18n("menu.deleteselection"), () -> control.replaceSelection(""), popup);
+            IconedMenuItem selectall = new IconedMenuItem(SVG.SELECT_ALL, i18n("menu.selectall"), control::selectAll, popup);
+
+            menu.getContent().setAll(undo, redo, new MenuSeparator(), cut, copy, paste, delete, new MenuSeparator(), selectall);
+
+            undo.setDisable(!control.isUndoable());
+            redo.setDisable(!control.isRedoable());
+            cut.setDisable(hasNoSelection);
+            delete.setDisable(hasNoSelection);
+            copy.setDisable(hasNoSelection);
+            paste.setDisable(!Clipboard.getSystemClipboard().hasString());
+            selectall.setDisable(control.getText() == null || control.getText().isEmpty());
+
+            JFXPopup.PopupVPosition vPosition = determineOptimalPopupPosition(control, popup);
+            popup.show(control, vPosition, JFXPopup.PopupHPosition.LEFT, e.getX(), vPosition == JFXPopup.PopupVPosition.TOP ? e.getY() : e.getY() - control.getHeight());
+
+            e.consume();
+        });
    }
 }
@@ -24,11 +24,11 @@ import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.Scene;
-import javafx.scene.control.Alert;
 import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
+import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
 import javafx.scene.text.TextFlow;
@@ -40,6 +40,9 @@ import org.jackhuang.hmcl.launch.ProcessListener;
 import org.jackhuang.hmcl.setting.StyleSheets;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.theme.Themes;
+import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
+import org.jackhuang.hmcl.ui.construct.SpinnerPane;
 import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.Log4jLevel;
@@ -50,9 +53,12 @@ import org.jackhuang.hmcl.util.logging.Logger;
 import org.jackhuang.hmcl.util.platform.*;

 import java.io.IOException;
+import java.lang.management.ManagementFactory;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.nio.file.attribute.FileTime;
+import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -81,10 +87,13 @@ public class GameCrashWindow extends Stage {
    private final ProcessListener.ExitType exitType;
    private final LaunchOptions launchOptions;
    private final View view;
+    private final StackPane stackPane;

    private final List<Log> logs;

    public GameCrashWindow(ManagedProcess managedProcess, ProcessListener.ExitType exitType, DefaultGameRepository repository, Version version, LaunchOptions launchOptions, List<Log> logs) {
+        Themes.applyNativeDarkMode(this);
+
        this.managedProcess = managedProcess;
        this.exitType = exitType;
        this.repository = repository;
@@ -93,7 +102,7 @@ public class GameCrashWindow extends Stage {
        this.logs = logs;
        this.analyzer = LibraryAnalyzer.analyze(version, repository.getGameVersion(version).orElse(null));

-        memory = Optional.ofNullable(launchOptions.getMaxMemory()).map(i -> i + " MB").orElse("-");
+        memory = Optional.ofNullable(launchOptions.getMaxMemory()).map(i -> i + " " + i18n("settings.memory.unit.mib")).orElse("-");

        total_memory = MEGABYTES.formatBytes(SystemInfo.getTotalMemorySize());

@@ -103,9 +112,10 @@ public class GameCrashWindow extends Stage {

        this.view = new View();

+        this.stackPane = new StackPane(view);
        this.feedbackTextFlow.getChildren().addAll(FXUtils.parseSegment(i18n("game.crash.feedback"), Controllers::onHyperlinkAction));

-        setScene(new Scene(view, 800, 480));
+        setScene(new Scene(stackPane, 800, 480));
        StyleSheets.init(getScene());
        setTitle(i18n("game.crash.title"));
        FXUtils.setIcon(this);
@@ -264,29 +274,35 @@ public class GameCrashWindow extends Stage {
        logWindow.show();
    }

-    private void exportGameCrashInfo() {
+    private CompletableFuture<Path> exportGameCrashInfo() {
        Path logFile = Paths.get("minecraft-exported-crash-info-" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH-mm-ss")) + ".zip").toAbsolutePath();

-        CompletableFuture.supplyAsync(() ->
+        return CompletableFuture.supplyAsync(() ->
                        logs.stream().map(Log::getLog).collect(Collectors.joining("\n")))
-                .thenComposeAsync(logs ->
-                        LogExporter.exportLogs(logFile, repository, launchOptions.getVersionName(), logs, new CommandBuilder().addAll(managedProcess.getCommands()).toString()))
-                .handleAsync((result, exception) -> {
-                    Alert alert;
+                .thenComposeAsync(logs -> {
+                    long processStartTime = managedProcess.getProcess().info()
+                            .startInstant()
+                            .map(Instant::toEpochMilli).orElseGet(() -> {
+                                try {
+                                    return ManagementFactory.getRuntimeMXBean().getStartTime();
+                                } catch (Throwable e) {
+                                    LOG.warning("Failed to get process start time", e);
+                                    return 0L;
+                                }
+                            });

-                    if (exception == null) {
-                        FXUtils.showFileInExplorer(logFile);
-                        alert = new Alert(Alert.AlertType.INFORMATION, i18n("settings.launcher.launcher_log.export.success", logFile));
-                    } else {
-                        LOG.warning("Failed to export game crash info", exception);
-                        alert = new Alert(Alert.AlertType.WARNING, i18n("settings.launcher.launcher_log.export.failed") + "\n" + StringUtils.getStackTrace(exception));
-                    }
-
-                    alert.setTitle(i18n("settings.launcher.launcher_log.export"));
-                    alert.showAndWait();
-
-                    return null;
-                }, Schedulers.javafx());
+                    return LogExporter.exportLogs(logFile, repository, launchOptions.getVersionName(), logs,
+                            new CommandBuilder().addAll(managedProcess.getCommands()).toString(),
+                            path -> {
+                                try {
+                                    FileTime lastModifiedTime = Files.getLastModifiedTime(path);
+                                    return lastModifiedTime.toMillis() >= processStartTime;
+                                } catch (Throwable e) {
+                                    LOG.warning("Failed to read file attributes", e);
+                                    return false;
+                                }
+                            });
+                }).thenApply(ignored -> logFile);
    }

    private final class View extends VBox {
@@ -416,8 +432,35 @@ public class GameCrashWindow extends Stage {
            HBox toolBar = new HBox();
            VBox.setMargin(toolBar, new Insets(0, 0, 4, 0));
            {
-                JFXButton exportGameCrashInfoButton = FXUtils.newRaisedButton(i18n("logwindow.export_game_crash_logs"));
-                exportGameCrashInfoButton.setOnAction(e -> exportGameCrashInfo());
+                SpinnerPane exportButtonPane = new SpinnerPane();
+                exportButtonPane.getStyleClass().add("small-spinner-pane");
+
+                JFXButton exportButton = FXUtils.newRaisedButton(i18n("logwindow.export_game_crash_logs"));
+                exportButtonPane.setContent(exportButton);
+                exportButton.setOnAction(e -> {
+                    exportButtonPane.showSpinner();
+                    exportGameCrashInfo().whenCompleteAsync((result, exception) -> {
+                        exportButtonPane.hideSpinner();
+
+                        if (exception == null) {
+                            FXUtils.showFileInExplorer(result);
+                            var dialog = new MessageDialogPane.Builder(
+                                    i18n("settings.launcher.launcher_log.export.success", result),
+                                    i18n("message.success"),
+                                    MessageDialogPane.MessageType.SUCCESS
+                            ).ok(null).build();
+                            DialogUtils.show(stackPane, dialog);
+                        } else {
+                            LOG.warning("Failed to export game crash info", exception);
+                            var dialog = new MessageDialogPane.Builder(
+                                    i18n("settings.launcher.launcher_log.export.failed") + "\n" + StringUtils.getStackTrace(exception),
+                                    i18n("message.error"),
+                                    MessageDialogPane.MessageType.ERROR
+                            ).ok(null).build();
+                            DialogUtils.show(stackPane, dialog);
+                        }
+                    }, Schedulers.javafx());
+                });

                JFXButton logButton = FXUtils.newRaisedButton(i18n("logwindow.title"));
                logButton.setOnAction(e -> showLogWindow());
@@ -429,7 +472,7 @@ public class GameCrashWindow extends Stage {
                toolBar.setPadding(new Insets(8));
                toolBar.setSpacing(8);
                toolBar.getStyleClass().add("jfx-tool-bar");
-                toolBar.getChildren().setAll(exportGameCrashInfoButton, logButton, helpButton);
+                toolBar.getChildren().setAll(exportButtonPane, logButton, helpButton);
            }

            getChildren().setAll(titlePane, infoPane, moddedPane, gameDirPane, toolBar);
@@ -37,6 +37,7 @@ import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 * @author Glavo
 */
 public final class HTMLRenderer {
+    private static final String INDENT = "  ";
    private static URI resolveLink(Node linkNode) {
        String href = linkNode.absUrl("href");
        if (href.isEmpty())
@@ -57,6 +58,7 @@ public final class HTMLRenderer {
    private boolean underline;
    private boolean strike;
    private boolean highlight;
+    private int indentLevel;
    private String headerLevel;
    private Node hyperlink;

@@ -218,7 +220,7 @@ public final class HTMLRenderer {
                appendImage(node);
                break;
            case "li":
-                appendText("\n \u2022 ");
+                appendText("\n" + INDENT.repeat(indentLevel) + " \u2022 ");
                break;
            case "dt":
                appendText(" ");
@@ -237,11 +239,14 @@ public final class HTMLRenderer {
        }

        if (node.childNodeSize() > 0) {
+            boolean isLiNode = "li".equals(name);
+            if (isLiNode) indentLevel++;
            pushNode(node);
            for (Node childNode : node.childNodes()) {
                appendNode(childNode);
            }
            popNode();
+            if (isLiNode) indentLevel--;
        }

        switch (name) {
@@ -18,6 +18,7 @@
 package org.jackhuang.hmcl.ui;

 import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXRippler;
 import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.ObjectProperty;
@@ -27,16 +28,15 @@ import javafx.css.PseudoClass;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Cursor;
-import javafx.scene.Node;
 import javafx.scene.control.Control;
 import javafx.scene.control.Label;
 import javafx.scene.control.Skin;
 import javafx.scene.control.SkinBase;
-import javafx.scene.image.ImageView;
 import javafx.scene.input.MouseButton;
 import javafx.scene.layout.*;
 import org.jackhuang.hmcl.download.LibraryAnalyzer;
 import org.jackhuang.hmcl.setting.VersionIconType;
+import org.jackhuang.hmcl.ui.construct.ImageContainer;
 import org.jackhuang.hmcl.ui.construct.RipplerContainer;
 import org.jackhuang.hmcl.util.i18n.I18n;
 import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
@@ -62,7 +62,7 @@ public class InstallerItem extends Control {
    private final ObjectProperty<Runnable> onInstall = new SimpleObjectProperty<>(this, "onInstall");
    private final ObjectProperty<Runnable> onRemove = new SimpleObjectProperty<>(this, "onRemove");

-    public interface State {
+    public sealed interface State {
    }

    public static final class InstallableState implements State {
@@ -72,46 +72,10 @@ public class InstallerItem extends Control {
        }
    }

-    public static final class IncompatibleState implements State {
-        private final String incompatibleItemName;
-        private final String incompatibleItemVersion;
-
-        public IncompatibleState(String incompatibleItemName, String incompatibleItemVersion) {
-            this.incompatibleItemName = incompatibleItemName;
-            this.incompatibleItemVersion = incompatibleItemVersion;
-        }
-
-        public String getIncompatibleItemName() {
-            return incompatibleItemName;
-        }
-
-        public String getIncompatibleItemVersion() {
-            return incompatibleItemVersion;
-        }
+    public record IncompatibleState(String incompatibleItemName, String incompatibleItemVersion) implements State {
    }

-    public static final class InstalledState implements State {
-        private final String version;
-        private final boolean external;
-        private final boolean incompatibleWithGame;
-
-        public InstalledState(String version, boolean external, boolean incompatibleWithGame) {
-            this.version = version;
-            this.external = external;
-            this.incompatibleWithGame = incompatibleWithGame;
-        }
-
-        public String getVersion() {
-            return version;
-        }
-
-        public boolean isExternal() {
-            return external;
-        }
-
-        public boolean isIncompatibleWithGame() {
-            return incompatibleWithGame;
-        }
+    public record InstalledState(String version, boolean external, boolean incompatibleWithGame) implements State {
    }

    public enum Style {
@@ -127,37 +91,18 @@ public class InstallerItem extends Control {
        this.id = id;
        this.style = style;

-        switch (id) {
-            case "game":
-                iconType = VersionIconType.GRASS;
-                break;
-            case "fabric":
-            case "fabric-api":
-                iconType = VersionIconType.FABRIC;
-                break;
-            case "forge":
-                iconType = VersionIconType.FORGE;
-                break;
-            case "cleanroom":
-                iconType = VersionIconType.CLEANROOM;
-                break;
-            case "liteloader":
-                iconType = VersionIconType.CHICKEN;
-                break;
-            case "optifine":
-                iconType = VersionIconType.OPTIFINE;
-                break;
-            case "quilt":
-            case "quilt-api":
-                iconType = VersionIconType.QUILT;
-                break;
-            case "neoforge":
-                iconType = VersionIconType.NEO_FORGE;
-                break;
-            default:
-                iconType = null;
-                break;
-        }
+        iconType = switch (id) {
+            case "game" -> VersionIconType.GRASS;
+            case "fabric", "fabric-api" -> VersionIconType.FABRIC;
+            case "legacyfabric", "legacyfabric-api" -> VersionIconType.LEGACY_FABRIC;
+            case "forge" -> VersionIconType.FORGE;
+            case "cleanroom" -> VersionIconType.CLEANROOM;
+            case "liteloader" -> VersionIconType.CHICKEN;
+            case "optifine" -> VersionIconType.OPTIFINE;
+            case "quilt", "quilt-api" -> VersionIconType.QUILT;
+            case "neoforge" -> VersionIconType.NEO_FORGE;
+            default -> null;
+        };
    }

    public String getLibraryId() {
@@ -236,6 +181,8 @@ public class InstallerItem extends Control {
            InstallerItem fabricApi = new InstallerItem(FABRIC_API, style);
            InstallerItem forge = new InstallerItem(FORGE, style);
            InstallerItem cleanroom = new InstallerItem(CLEANROOM, style);
+            InstallerItem legacyfabric = new InstallerItem(LEGACY_FABRIC, style);
+            InstallerItem legacyfabricApi = new InstallerItem(LEGACY_FABRIC_API, style);
            InstallerItem neoForge = new InstallerItem(NEO_FORGE, style);
            InstallerItem liteLoader = new InstallerItem(LITELOADER, style);
            InstallerItem optiFine = new InstallerItem(OPTIFINE, style);
@@ -243,11 +190,12 @@ public class InstallerItem extends Control {
            InstallerItem quiltApi = new InstallerItem(QUILT_API, style);

            Map<InstallerItem, Set<InstallerItem>> incompatibleMap = new HashMap<>();
-            mutualIncompatible(incompatibleMap, forge, fabric, quilt, neoForge, cleanroom);
-            addIncompatibles(incompatibleMap, liteLoader, fabric, quilt, neoForge, cleanroom);
-            addIncompatibles(incompatibleMap, optiFine, fabric, quilt, neoForge, cleanroom);
-            addIncompatibles(incompatibleMap, fabricApi, forge, quiltApi, neoForge, liteLoader, optiFine, cleanroom);
-            addIncompatibles(incompatibleMap, quiltApi, forge, fabric, fabricApi, neoForge, liteLoader, optiFine, cleanroom);
+            mutualIncompatible(incompatibleMap, forge, fabric, quilt, neoForge, cleanroom, legacyfabric);
+            addIncompatibles(incompatibleMap, liteLoader, fabric, quilt, neoForge, cleanroom, legacyfabric);
+            addIncompatibles(incompatibleMap, optiFine, fabric, quilt, neoForge, cleanroom, liteLoader, legacyfabric);
+            addIncompatibles(incompatibleMap, fabricApi, forge, quiltApi, neoForge, liteLoader, optiFine, cleanroom, legacyfabric, legacyfabricApi);
+            addIncompatibles(incompatibleMap, quiltApi, forge, fabric, fabricApi, neoForge, liteLoader, optiFine, cleanroom, legacyfabric, legacyfabricApi);
+            addIncompatibles(incompatibleMap, legacyfabricApi, forge, fabric, fabricApi, neoForge, liteLoader, optiFine, cleanroom, quilt, quiltApi);

            for (Map.Entry<InstallerItem, Set<InstallerItem>> entry : incompatibleMap.entrySet()) {
                InstallerItem item = entry.getKey();
@@ -281,7 +229,7 @@ public class InstallerItem extends Control {
                game.versionProperty.set(new InstalledState(gameVersion, false, false));
            }

-            InstallerItem[] all = {game, forge, neoForge, liteLoader, optiFine, fabric, fabricApi, quilt, quiltApi, cleanroom};
+            InstallerItem[] all = {game, forge, neoForge, liteLoader, optiFine, fabric, fabricApi, quilt, quiltApi, legacyfabric, legacyfabricApi, cleanroom};

            for (InstallerItem item : all) {
                if (!item.resolvedStateProperty.isBound()) {
@@ -298,9 +246,9 @@ public class InstallerItem extends Control {
            if (gameVersion == null) {
                this.libraries = all;
            } else if (gameVersion.equals("1.12.2")) {
-                this.libraries = new InstallerItem[]{game, forge, cleanroom, liteLoader, optiFine};
-            } else if (GameVersionNumber.compare(gameVersion, "1.13") < 0) {
-                this.libraries = new InstallerItem[]{game, forge, liteLoader, optiFine};
+                this.libraries = new InstallerItem[]{game, forge, cleanroom, liteLoader, legacyfabric, legacyfabricApi, optiFine};
+            } else if (GameVersionNumber.compare(gameVersion, "1.13.2") <= 0) {
+                this.libraries = new InstallerItem[]{game, forge, liteLoader, optiFine, legacyfabric, legacyfabricApi};
            } else {
                this.libraries = new InstallerItem[]{game, forge, neoForge, optiFine, fabric, fabricApi, quilt, quiltApi};
            }
@@ -335,20 +283,25 @@ public class InstallerItem extends Control {
            }
            pane.getStyleClass().add("installer-item");
            RipplerContainer container = new RipplerContainer(pane);
-            getChildren().setAll(container);
+            container.setPosition(JFXRippler.RipplerPos.BACK);
+            StackPane paneWrapper = new StackPane();
+            paneWrapper.getStyleClass().add("installer-item-wrapper");
+            paneWrapper.getChildren().setAll(container);
+            getChildren().setAll(paneWrapper);

            pane.pseudoClassStateChanged(LIST_ITEM, control.style == Style.LIST_ITEM);
            pane.pseudoClassStateChanged(CARD, control.style == Style.CARD);
+            paneWrapper.pseudoClassStateChanged(CARD, control.style == Style.CARD);

            if (control.iconType != null) {
-                ImageView view = new ImageView(control.iconType.getIcon());
-                Node node = FXUtils.limitingSize(view, 32, 32);
-                node.setMouseTransparent(true);
-                node.getStyleClass().add("installer-item-image");
-                pane.getChildren().add(node);
+                var imageContainer = new ImageContainer(32);
+                imageContainer.setImage(control.iconType.getIcon());
+                imageContainer.setMouseTransparent(true);
+                imageContainer.getStyleClass().add("installer-item-image");
+                pane.getChildren().add(imageContainer);

                if (control.style == Style.CARD) {
-                    VBox.setMargin(node, new Insets(8, 0, 16, 0));
+                    VBox.setMargin(imageContainer, new Insets(8, 0, 16, 0));
                }
            }

@@ -367,21 +320,20 @@ public class InstallerItem extends Control {
            statusLabel.textProperty().bind(Bindings.createStringBinding(() -> {
                State state = control.resolvedStateProperty.get();

-                if (state instanceof InstalledState) {
-                    InstalledState s = (InstalledState) state;
-                    if (s.incompatibleWithGame) {
-                        return i18n("install.installer.change_version", s.version);
+                if (state instanceof InstalledState installedState) {
+                    if (installedState.incompatibleWithGame) {
+                        return i18n("install.installer.change_version", installedState.version);
                    }
-                    if (s.external) {
-                        return i18n("install.installer.external_version", s.version);
+                    if (installedState.external) {
+                        return i18n("install.installer.external_version", installedState.version);
                    }
-                    return i18n("install.installer.version", s.version);
+                    return i18n("install.installer.version", installedState.version);
                } else if (state instanceof InstallableState) {
                    return control.style == Style.CARD
                            ? i18n("install.installer.do_not_install")
                            : i18n("install.installer.not_installed");
-                } else if (state instanceof IncompatibleState) {
-                    return i18n("install.installer.incompatible", i18n("install.installer." + ((IncompatibleState) state).incompatibleItemName));
+                } else if (state instanceof IncompatibleState incompatibleState) {
+                    return i18n("install.installer.incompatible", i18n("install.installer." + incompatibleState.incompatibleItemName));
                } else {
                    throw new AssertionError("Unknown state type: " + state.getClass());
                }
@@ -390,19 +342,18 @@ public class InstallerItem extends Control {
            BorderPane.setAlignment(statusLabel, Pos.CENTER_LEFT);

            HBox buttonsContainer = new HBox();
+            buttonsContainer.setPickOnBounds(false);
            buttonsContainer.setSpacing(8);
            buttonsContainer.setAlignment(Pos.CENTER);
            pane.getChildren().add(buttonsContainer);

-            JFXButton removeButton = new JFXButton();
-            removeButton.setGraphic(SVG.CLOSE.createIcon());
-            removeButton.getStyleClass().add("toggle-icon4");
+            JFXButton removeButton = FXUtils.newToggleButton4(SVG.CLOSE);
            if (control.id.equals(MINECRAFT.getPatchId())) {
                removeButton.setVisible(false);
            } else {
                removeButton.visibleProperty().bind(Bindings.createBooleanBinding(() -> {
                    State state = control.resolvedStateProperty.get();
-                    return state instanceof InstalledState && !((InstalledState) state).external;
+                    return state instanceof InstalledState installedState && !installedState.external;
                }, control.resolvedStateProperty));
            }
            removeButton.managedProperty().bind(removeButton.visibleProperty());
@@ -1,49 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * 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
- * 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.beans.property.BooleanProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.scene.Node;
-import javafx.scene.control.Skin;
-
-public abstract class ListPage<T extends Node> extends ListPageBase<T> {
-    private final BooleanProperty refreshable = new SimpleBooleanProperty(this, "refreshable", false);
-
-    public abstract void add();
-
-    public void refresh() {
-    }
-
-    @Override
-    protected Skin<?> createDefaultSkin() {
-        return new ListPageSkin(this);
-    }
-
-    public boolean isRefreshable() {
-        return refreshable.get();
-    }
-
-    public BooleanProperty refreshableProperty() {
-        return refreshable;
-    }
-
-    public void setRefreshable(boolean refreshable) {
-        this.refreshable.set(refreshable);
-    }
-}
@@ -1,108 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * 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
- * 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 com.jfoenix.controls.JFXButton;
-import javafx.beans.binding.Bindings;
-import javafx.geometry.Insets;
-import javafx.geometry.Pos;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.control.SkinBase;
-import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.Pane;
-import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
-import org.jackhuang.hmcl.ui.construct.SpinnerPane;
-
-public class ListPageSkin extends SkinBase<ListPage<?>> {
-
-    public ListPageSkin(ListPage<?> skinnable) {
-        super(skinnable);
-
-        SpinnerPane spinnerPane = new SpinnerPane();
-        spinnerPane.getStyleClass().add("large-spinner-pane");
-        Pane placeholder = new Pane();
-        VBox list = new VBox();
-
-        StackPane contentPane = new StackPane();
-        {
-            ScrollPane scrollPane = new ScrollPane();
-            {
-                scrollPane.setFitToWidth(true);
-
-                list.maxWidthProperty().bind(scrollPane.widthProperty());
-                list.setSpacing(10);
-
-                VBox content = new VBox();
-                content.getChildren().setAll(list, placeholder);
-
-                Bindings.bindContent(list.getChildren(), skinnable.itemsProperty());
-
-                scrollPane.setContent(content);
-                FXUtils.smoothScrolling(scrollPane);
-            }
-            
-            VBox vBox = new VBox();
-            {
-                vBox.getStyleClass().add("card-list");
-                vBox.setAlignment(Pos.BOTTOM_RIGHT);
-                vBox.setPickOnBounds(false);
-
-                JFXButton btnAdd = FXUtils.newRaisedButton("");
-                FXUtils.setLimitWidth(btnAdd, 40);
-                FXUtils.setLimitHeight(btnAdd, 40);
-                btnAdd.setGraphic(SVG.ADD.createIcon());
-                btnAdd.setOnAction(e -> skinnable.add());
-
-                JFXButton btnRefresh = new JFXButton();
-                FXUtils.setLimitWidth(btnRefresh, 40);
-                FXUtils.setLimitHeight(btnRefresh, 40);
-                btnRefresh.getStyleClass().add("jfx-button-raised-round");
-                btnRefresh.setButtonType(JFXButton.ButtonType.RAISED);
-                btnRefresh.setGraphic(SVG.REFRESH.createIcon());
-                btnRefresh.setOnAction(e -> skinnable.refresh());
-
-                vBox.getChildren().setAll(btnAdd);
-
-                FXUtils.onChangeAndOperate(skinnable.refreshableProperty(),
-                        refreshable -> {
-                            if (refreshable) {
-                                list.setPadding(new Insets(10, 10, 15 + 40 + 15 + 40 + 15, 10));
-                                vBox.getChildren().setAll(btnRefresh, btnAdd);
-                            } else {
-                                list.setPadding(new Insets(10, 10, 15 + 40 + 15, 10));
-                                vBox.getChildren().setAll(btnAdd);
-                            }
-                        });
-            }
-
-            // Keep a blank space to prevent buttons from blocking up mod items.
-            BorderPane group = new BorderPane();
-            group.setPickOnBounds(false);
-            group.setBottom(vBox);
-            placeholder.minHeightProperty().bind(vBox.heightProperty());
-
-            contentPane.getChildren().setAll(scrollPane, group);
-        }
-
-        spinnerPane.loadingProperty().bind(skinnable.loadingProperty());
-        spinnerPane.setContent(contentPane);
-
-        getChildren().setAll(spinnerPane);
-    }
-}
@@ -17,11 +17,7 @@
 */
 package org.jackhuang.hmcl.ui;

-import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXCheckBox;
-import com.jfoenix.controls.JFXComboBox;
-import com.jfoenix.controls.JFXListView;
-import com.sun.jna.Pointer;
+import com.jfoenix.controls.*;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.binding.Bindings;
@@ -29,31 +25,26 @@ import javafx.beans.property.*;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.css.PseudoClass;
-import javafx.event.EventHandler;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 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 javafx.stage.WindowEvent;
 import org.jackhuang.hmcl.game.GameDumpGenerator;
 import org.jackhuang.hmcl.game.Log;
 import org.jackhuang.hmcl.setting.StyleSheets;
+import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.theme.Themes;
-import org.jackhuang.hmcl.ui.construct.NoneMultipleSelectionModel;
+import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
 import org.jackhuang.hmcl.ui.construct.SpinnerPane;
-import org.jackhuang.hmcl.util.Holder;
 import org.jackhuang.hmcl.util.CircularArrayList;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.Log4jLevel;
-import org.jackhuang.hmcl.util.platform.*;
-import org.jackhuang.hmcl.util.platform.windows.Dwmapi;
-import org.jackhuang.hmcl.util.platform.windows.WinConstants;
-import org.jackhuang.hmcl.util.platform.windows.WinTypes;
+import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.platform.ManagedProcess;
+import org.jackhuang.hmcl.util.platform.SystemUtils;

 import java.io.IOException;
 import java.nio.file.Files;
@@ -66,8 +57,8 @@ import java.util.stream.Collectors;

 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 import static org.jackhuang.hmcl.util.Lang.thread;
-import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;

 /**
 * @author huangyuhui
@@ -90,41 +81,13 @@ public final class LogWindow extends Stage {
    private final LogWindowImpl impl;
    private final ManagedProcess gameProcess;

-    @SuppressWarnings("unused")
-    private Object windowsDarkModeListenerHolder;
-
-    {
-        if (OperatingSystem.SYSTEM_VERSION.isAtLeast(OSVersion.WINDOWS_11) && NativeUtils.USE_JNA && Dwmapi.INSTANCE != null) {
-            this.addEventFilter(WindowEvent.WINDOW_SHOWN, new EventHandler<>() {
-                @Override
-                public void handle(WindowEvent event) {
-                    LogWindow.this.removeEventFilter(WindowEvent.WINDOW_SHOWN, this);
-
-                    windowsDarkModeListenerHolder = FXUtils.onWeakChangeAndOperate(Themes.darkModeProperty(), darkMode -> {
-                        if (LogWindow.this.isShowing()) {
-                            WindowsNativeUtils.getWindowHandle(LogWindow.this).ifPresent(handle -> {
-                                if (handle == WinTypes.HANDLE.INVALID_VALUE)
-                                    return;
-
-                                Dwmapi.INSTANCE.DwmSetWindowAttribute(
-                                        new WinTypes.HANDLE(Pointer.createConstant(handle)),
-                                        WinConstants.DWMWA_USE_IMMERSIVE_DARK_MODE,
-                                        new WinTypes.BOOLByReference(new WinTypes.BOOL(darkMode)),
-                                        WinTypes.BOOL.SIZE
-                                );
-                            });
-                        }
-                    });
-                }
-            });
-        }
-    }
-
    public LogWindow(ManagedProcess gameProcess) {
        this(gameProcess, new CircularArrayList<>());
    }

    public LogWindow(ManagedProcess gameProcess, CircularArrayList<Log> logs) {
+        Themes.applyNativeDarkMode(this);
+
        this.logs = logs;
        this.impl = new LogWindowImpl();
        setScene(new Scene(impl, 800, 480));
@@ -200,10 +163,13 @@ public final class LogWindow extends Stage {
        private final StringProperty[] buttonText = new StringProperty[LEVELS.length];
        private final BooleanProperty[] showLevel = new BooleanProperty[LEVELS.length];
        private final JFXComboBox<Integer> cboLines = new JFXComboBox<>();
+        private final StackPane stackPane = new StackPane();

        LogWindowImpl() {
            getStyleClass().add("log-window");

+            listView.getStyleClass().add("no-horizontal-scrollbar");
+            listView.getProperties().put("no-smooth-scrolling", true);
            listView.setItems(FXCollections.observableList(new CircularArrayList<>(logs.size())));

            for (int i = 0; i < LEVELS.length; i++) {
@@ -241,9 +207,8 @@ public final class LogWindow extends Stage {
                }

                Platform.runLater(() -> {
-                    Alert alert = new Alert(Alert.AlertType.INFORMATION, i18n("settings.launcher.launcher_log.export.success", logFile));
-                    alert.setTitle(i18n("settings.launcher.launcher_log.export"));
-                    alert.showAndWait();
+                    var dialog = new MessageDialogPane.Builder(i18n("settings.launcher.launcher_log.export.success", logFile), i18n("message.success"), MessageDialogPane.MessageType.SUCCESS).ok(null).build();
+                    DialogUtils.show(stackPane, dialog);
                });

                FXUtils.showFileInExplorer(logFile);
@@ -267,9 +232,8 @@ public final class LogWindow extends Stage {
                    LOG.warning("Failed to create minecraft jstack dump", e);

                    Platform.runLater(() -> {
-                        Alert alert = new Alert(Alert.AlertType.ERROR, i18n("logwindow.export_dump"));
-                        alert.setTitle(i18n("message.error"));
-                        alert.showAndWait();
+                        var dialog = new MessageDialogPane.Builder(i18n("logwindow.export_dump") + "\n" + StringUtils.getStackTrace(e), i18n("message.error"), MessageDialogPane.MessageType.ERROR).ok(null).build();
+                        DialogUtils.show(stackPane, dialog);
                    });
                }

@@ -277,6 +241,10 @@ public final class LogWindow extends Stage {
            });
        }

+        private ManagedProcess getGameProcess() {
+            return gameProcess;
+        }
+
        @Override
        protected Skin<?> createDefaultSkin() {
            return new LogWindowSkin(this);
@@ -291,16 +259,16 @@ public final class LogWindow extends Stage {
        private static final PseudoClass INFO = PseudoClass.getPseudoClass("info");
        private static final PseudoClass DEBUG = PseudoClass.getPseudoClass("debug");
        private static final PseudoClass TRACE = PseudoClass.getPseudoClass("trace");
-        private static final PseudoClass SELECTED = PseudoClass.getPseudoClass("selected");
-
-        private final Set<ListCell<Log>> selected = new HashSet<>();
+        private final JFXSnackbar snackbar = new JFXSnackbar();

        LogWindowSkin(LogWindowImpl control) {
            super(control);

            VBox vbox = new VBox(3);
            vbox.setPadding(new Insets(3, 0, 3, 0));
-            getChildren().setAll(vbox);
+            getSkinnable().stackPane.getChildren().setAll(vbox);
+            getChildren().setAll(getSkinnable().stackPane);
+            snackbar.registerSnackbarContainer(getSkinnable().stackPane);

            {
                BorderPane borderPane = new BorderPane();
@@ -336,6 +304,7 @@ public final class LogWindow extends Stage {

            {
                ListView<Log> listView = control.listView;
+                listView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
                listView.getItems().addListener((InvalidationListener) observable -> {
                    if (!listView.getItems().isEmpty() && control.autoScroll.get())
                        listView.scrollTo(listView.getItems().size() - 1);
@@ -343,10 +312,8 @@ public final class LogWindow extends Stage {

                listView.setStyle("-fx-font-family: \"" + Lang.requireNonNullElse(config().getFontFamily(), FXUtils.DEFAULT_MONOSPACE_FONT)
                        + "\"; -fx-font-size: " + config().getFontSize() + "px;");
-                Holder<Object> lastCell = new Holder<>();
-                listView.setCellFactory(x -> new ListCell<Log>() {
+                listView.setCellFactory(x -> new ListCell<>() {
                    {
-                        x.setSelectionModel(new NoneMultipleSelectionModel<>());
                        getStyleClass().add("log-window-list-cell");
                        Region clippedContainer = (Region) listView.lookup(".clipped-container");
                        if (clippedContainer != null) {
@@ -356,43 +323,12 @@ public final class LogWindow extends Stage {
                        setPadding(new Insets(2));
                        setWrapText(true);
                        setGraphic(null);
-
-                        setOnMouseClicked(event -> {
-                            if (event.getButton() != MouseButton.PRIMARY)
-                                return;
-
-                            if (!event.isControlDown()) {
-                                for (ListCell<Log> logListCell : selected) {
-                                    if (logListCell != this) {
-                                        logListCell.pseudoClassStateChanged(SELECTED, false);
-                                        if (logListCell.getItem() != null) {
-                                            logListCell.getItem().setSelected(false);
-                                        }
-                                    }
-                                }
-
-                                selected.clear();
-                            }
-
-                            selected.add(this);
-                            pseudoClassStateChanged(SELECTED, true);
-                            if (getItem() != null) {
-                                getItem().setSelected(true);
-                            }
-
-                            event.consume();
-                        });
                    }

                    @Override
                    protected void updateItem(Log item, boolean empty) {
                        super.updateItem(item, empty);

-                        // https://mail.openjdk.org/pipermail/openjfx-dev/2022-July/034764.html
-                        if (this == lastCell.value && !isVisible())
-                            return;
-                        lastCell.value = this;
-
                        pseudoClassStateChanged(EMPTY, empty);
                        pseudoClassStateChanged(FATAL, !empty && item.getLevel() == Log4jLevel.FATAL);
                        pseudoClassStateChanged(ERROR, !empty && item.getLevel() == Log4jLevel.ERROR);
@@ -400,7 +336,6 @@ public final class LogWindow extends Stage {
                        pseudoClassStateChanged(INFO, !empty && item.getLevel() == Log4jLevel.INFO);
                        pseudoClassStateChanged(DEBUG, !empty && item.getLevel() == Log4jLevel.DEBUG);
                        pseudoClassStateChanged(TRACE, !empty && item.getLevel() == Log4jLevel.TRACE);
-                        pseudoClassStateChanged(SELECTED, !empty && item.isSelected());

                        if (empty) {
                            setText(null);
@@ -412,17 +347,21 @@ public final class LogWindow extends Stage {

                listView.setOnKeyPressed(event -> {
                    if (event.isControlDown() && event.getCode() == KeyCode.C) {
+                        if (listView.getSelectionModel().isEmpty())
+                            return;
+
                        StringBuilder stringBuilder = new StringBuilder();

-                        for (Log item : listView.getItems()) {
-                            if (item != null && item.isSelected()) {
+                        for (Log item : listView.getSelectionModel().getSelectedItems()) {
+                            if (item != null) {
                                if (item.getLog() != null)
                                    stringBuilder.append(item.getLog());
                                stringBuilder.append('\n');
                            }
                        }

-                        FXUtils.copyText(stringBuilder.toString());
+                        FXUtils.copyText(stringBuilder.toString(), null);
+                        snackbar.fireEvent(new JFXSnackbar.SnackbarEvent(new JFXSnackbarLayout(i18n("message.copied"))));
                    }
                });

@@ -449,11 +388,12 @@ public final class LogWindow extends Stage {
                terminateButton.setOnAction(e -> getSkinnable().onTerminateGame());

                SpinnerPane exportDumpPane = new SpinnerPane();
+                exportDumpPane.getStyleClass().add("small-spinner-pane");
                JFXButton exportDumpButton = new JFXButton(i18n("logwindow.export_dump"));
                if (SystemUtils.supportJVMAttachment()) {
                    exportDumpButton.setOnAction(e -> getSkinnable().onExportDump(exportDumpPane));
                } else {
-                    exportDumpButton.setTooltip(new Tooltip(i18n("logwindow.export_dump.no_dependency")));
+                    FXUtils.installFastTooltip(exportDumpPane, i18n("logwindow.export_dump.no_dependency"));
                    exportDumpButton.setDisable(true);
                }
                exportDumpPane.setContent(exportDumpButton);
@@ -462,6 +402,13 @@ public final class LogWindow extends Stage {
                clearButton.setOnAction(e -> getSkinnable().onClear());
                hBox.getChildren().setAll(autoScrollCheckBox, exportLogsButton, terminateButton, exportDumpPane, clearButton);

+                control.getGameProcess().getProcess()
+                        .onExit()
+                        .thenRunAsync(() -> {
+                            terminateButton.setDisable(true);
+                            exportDumpButton.setDisable(true);
+                        }, Schedulers.javafx());
+
                vbox.getChildren().add(bottom);
            }
        }
@@ -0,0 +1,101 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2026 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 com.sun.jna.Pointer;
+import org.jackhuang.hmcl.util.platform.macos.ObjectiveCRuntime;
+import org.jetbrains.annotations.Nullable;
+
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
+
+public final class MacOSNativeUtils {
+
+    private static final Pointer nsApp = init();
+
+    private static @Nullable Pointer init() {
+        if (ObjectiveCRuntime.INSTANCE == null) {
+            return null;
+        }
+
+        try {
+            var objc = ObjectiveCRuntime.INSTANCE;
+
+            Pointer nsApplication = objc.objc_getClass("NSApplication");
+            if (!isNull(nsApplication)) {
+                Pointer sharedSel = objc.sel_registerName("sharedApplication");
+                if (!isNull(sharedSel))
+                    return objc.objc_msgSend(nsApplication, sharedSel);
+            }
+        } catch (Throwable e) {
+            LOG.warning("Failed to initialize macOS appearance support", e);
+        }
+
+        return null;
+    }
+
+    public static boolean isSupported() {
+        return nsApp != null;
+    }
+
+    private static boolean isNull(Pointer pointer) {
+        return pointer == null || Pointer.nativeValue(pointer) == 0;
+    }
+
+    public static void setAppearance(boolean dark) {
+        setAppearance(dark, false);
+    }
+
+    public static void setAppearance(boolean dark, boolean highContrast) {
+        if (nsApp == null) return;
+
+        try {
+            var objc = ObjectiveCRuntime.INSTANCE;
+
+            Pointer nsAppearance = objc.objc_getClass("NSAppearance");
+            if (isNull(nsAppearance))
+                return;
+
+            Pointer namedSel = objc.sel_registerName("appearanceNamed:");
+            Pointer nsString = objc.objc_getClass("NSString");
+            if (isNull(nsString)) return;
+
+            Pointer sel = objc.sel_registerName("stringWithUTF8String:");
+
+            String appearanceName;
+            if (highContrast) {
+                appearanceName = dark ? "NSAppearanceNameAccessibilityHighContrastDarkAqua" : "NSAppearanceNameAccessibilityHighContrastAqua";
+            } else {
+                appearanceName = dark ? "NSAppearanceNameDarkAqua" : "NSAppearanceNameAqua";
+            }
+
+            Pointer appearanceNamePtr = objc.objc_msgSend(nsString, sel, appearanceName);
+            if (isNull(appearanceNamePtr)) return;
+
+            Pointer appearance = objc.objc_msgSend(nsAppearance, namedSel, appearanceNamePtr);
+            if (isNull(appearance)) return;
+
+            Pointer setSel = objc.sel_registerName("setAppearance:");
+            objc.objc_msgSend(nsApp, setSel, appearance);
+        } catch (Throwable t) {
+            LOG.warning("Failed to set macOS appearance", t);
+        }
+    }
+
+    private MacOSNativeUtils() {
+    }
+}
@@ -0,0 +1,228 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2026 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.application.Platform;
+import javafx.beans.property.*;
+import javafx.geometry.Insets;
+import javafx.scene.Node;
+import javafx.scene.control.Control;
+import javafx.scene.control.SkinBase;
+import javafx.scene.layout.StackPane;
+import javafx.scene.shape.Rectangle;
+import org.jackhuang.hmcl.util.FXThread;
+import org.jackhuang.hmcl.util.MathUtils;
+import org.jackhuang.hmcl.util.platform.SystemInfo;
+import org.jackhuang.hmcl.util.platform.hardware.PhysicalMemoryStatus;
+
+import java.lang.ref.WeakReference;
+
+/// @author Glavo
+public final class MemoryStatusBar extends Control {
+
+    private static final String DEFAULT_STYLE_CLASS = "memory-status-bar";
+
+    public MemoryStatusBar() {
+        this.getStyleClass().add(DEFAULT_STYLE_CLASS);
+
+        setPrefWidth(200);
+    }
+
+    private final ReadOnlyObjectProperty<PhysicalMemoryStatus> memoryStatus = UpdateMemoryStatus.memoryStatusProperty();
+
+    /// The memory status of the system.
+    ///
+    /// The property will be automatically updated.
+    ///
+    /// The property has no bean, because it may share between multiple MemoryStatusBar instances.
+    public ReadOnlyObjectProperty<PhysicalMemoryStatus> memoryStatusProperty() {
+        return memoryStatus;
+    }
+
+    public PhysicalMemoryStatus getMemoryStatus() {
+        return memoryStatus.get();
+    }
+
+    private final DoubleProperty memoryAllocated = new SimpleDoubleProperty();
+
+    public DoubleProperty memoryAllocatedProperty() {
+        return memoryAllocated;
+    }
+
+    public double getMemoryAllocated() {
+        return memoryAllocated.get();
+    }
+
+    public void setMemoryAllocated(double memoryAllocated) {
+        this.memoryAllocated.set(memoryAllocated);
+    }
+
+    @Override
+    protected SkinBase<MemoryStatusBar> createDefaultSkin() {
+        return new Skin(this);
+    }
+
+    private static final class Skin extends SkinBase<MemoryStatusBar> {
+        private static final int HEIGHT = 4;
+
+        private final StackPane track;
+        private final Rectangle memoryUsed;
+        private final Rectangle memoryAllocate;
+
+        private double contentWidth = -1;
+
+        Skin(MemoryStatusBar control) {
+            super(control);
+
+            track = new StackPane();
+            track.getStyleClass().add("track");
+            track.setPadding(new Insets(HEIGHT, 0, 0, 0));
+
+            memoryUsed = new Rectangle();
+            memoryUsed.setManaged(false);
+            memoryUsed.setArcWidth(HEIGHT);
+            memoryUsed.setArcHeight(HEIGHT);
+            memoryUsed.getStyleClass().add("memory-used");
+
+            memoryAllocate = new Rectangle();
+            memoryAllocate.setManaged(false);
+            memoryAllocate.setArcWidth(HEIGHT);
+            memoryAllocate.setArcHeight(HEIGHT);
+            memoryAllocate.getStyleClass().add("memory-allocate");
+
+            this.getChildren().setAll(track, memoryAllocate, memoryUsed);
+
+            registerInvalidationListener(control.memoryStatusProperty(), it -> updateBar());
+            registerInvalidationListener(control.memoryAllocatedProperty(), it -> updateBar());
+        }
+
+        private void updateBar() {
+            if (contentWidth <= 0) {
+                // not yet layout
+                return;
+            }
+
+            PhysicalMemoryStatus status = getSkinnable().getMemoryStatus();
+            double total = status.getTotal();
+            double used = status.getUsed();
+            double allocated = getSkinnable().getMemoryAllocated();
+
+            if (total <= 0) {
+                memoryUsed.setWidth(contentWidth);
+                memoryAllocate.setWidth(contentWidth);
+                return;
+            }
+
+            double usedWidth = MathUtils.clamp(contentWidth * (used / total), 0, contentWidth);
+            double allocatedWidth = MathUtils.clamp(contentWidth * (allocated / total) + usedWidth, 0, contentWidth);
+
+            memoryUsed.setWidth(usedWidth);
+            memoryAllocate.setWidth(allocatedWidth);
+        }
+
+        @Override
+        protected void layoutChildren(double contentX, double contentY, double contentWidth, double contentHeight) {
+            track.resizeRelocate(contentX, contentY, contentWidth, contentHeight);
+            memoryUsed.relocate(contentX, contentY);
+            memoryAllocate.relocate(contentX, contentY);
+
+            this.contentWidth = contentWidth;
+
+            memoryUsed.setHeight(contentHeight);
+            memoryAllocate.setHeight(contentHeight);
+
+            updateBar();
+        }
+
+        @Override
+        public double computeBaselineOffset(double topInset, double rightInset, double bottomInset, double leftInset) {
+            return Node.BASELINE_OFFSET_SAME_AS_HEIGHT;
+        }
+
+        @Override
+        protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+            return leftInset + track.prefWidth(height) + rightInset;
+        }
+
+        @Override
+        protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+            return topInset + HEIGHT + bottomInset;
+        }
+
+        @Override
+        protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+            return computePrefHeight(width, topInset, rightInset, bottomInset, leftInset);
+        }
+    }
+
+    private static final class UpdateMemoryStatus extends Thread {
+
+        private static final int UPDATE_INTERVAL = 3000;
+
+        @FXThread
+        private static WeakReference<ObjectProperty<PhysicalMemoryStatus>> memoryStatusPropertyCache;
+
+        @FXThread
+        static ReadOnlyObjectProperty<PhysicalMemoryStatus> memoryStatusProperty() {
+            if (memoryStatusPropertyCache != null) {
+                var property = memoryStatusPropertyCache.get();
+                if (property != null) {
+                    return property;
+                }
+            }
+
+            ObjectProperty<PhysicalMemoryStatus> property = new SimpleObjectProperty<>(PhysicalMemoryStatus.INVALID);
+            memoryStatusPropertyCache = new WeakReference<>(property);
+            new UpdateMemoryStatus(memoryStatusPropertyCache).start();
+            return property;
+        }
+
+        private final WeakReference<ObjectProperty<PhysicalMemoryStatus>> memoryStatusPropertyRef;
+
+        UpdateMemoryStatus(WeakReference<ObjectProperty<PhysicalMemoryStatus>> memoryStatusPropertyRef) {
+            this.memoryStatusPropertyRef = memoryStatusPropertyRef;
+
+            setName("UpdateMemoryStatus");
+            setDaemon(true);
+            setPriority(Thread.MIN_PRIORITY);
+        }
+
+        @Override
+        public void run() {
+            while (true) {
+                PhysicalMemoryStatus status = SystemInfo.getPhysicalMemoryStatus();
+
+                var memoryStatusProperty = memoryStatusPropertyRef.get();
+                if (memoryStatusProperty == null)
+                    return;
+
+                if (Controllers.isStopped())
+                    return;
+
+                Platform.runLater(() -> memoryStatusProperty.set(status));
+
+                try {
+                    //noinspection BusyWait
+                    Thread.sleep(UPDATE_INTERVAL);
+                } catch (InterruptedException e) {
+                    return;
+                }
+            }
+        }
+    }
+}
@@ -18,22 +18,17 @@
 package org.jackhuang.hmcl.ui;

 import javafx.beans.value.ObservableValue;
-import javafx.geometry.Pos;
-import javafx.scene.Group;
-import javafx.scene.Node;
-import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Paint;
 import javafx.scene.shape.SVGPath;

-/**
- * All vector icons used in the launcher.
- * <p>
- * Unless otherwise stated,
- * these icons are from <a href="https://fonts.google.com/icons?icon.size=24&icon.color=%235f6368&icon.query=list&icon.set=Material+Symbols">Material Symbols</a>,
- * with a style of outlined, a weight of 400, a grade of 0, and an optical size of 24 px.
- * The view boxes of all icons are normalized to {@code 0 0 24 24}.
- */
+/// All vector icons used in the launcher.
+///
+/// Unless otherwise stated,
+/// these icons are from <a href="https://fonts.google.com/icons?icon.size=24&icon.color=%235f6368&icon.query=list&icon.set=Material+Symbols">Material Symbols</a>,
+/// with a style of outlined, a weight of 400, a grade of 0, and an optical size of 24 px.
+/// The view boxes of all icons are normalized to `0 0 24 24`.
 public enum SVG {
+    NONE(""), // Empty Icon
    ADD("M11 13H5V11H11V5H13V11H19V13H13V19H11V13Z"),
    ADD_CIRCLE("M11 17H13V13H17V11H13V7H11V11H7V13H11V17ZM12 22Q9.925 22 8.1 21.2125T4.925 19.075Q3.575 17.725 2.7875 15.9T2 12Q2 9.925 2.7875 8.1T4.925 4.925Q6.275 3.575 8.1 2.7875T12 2Q14.075 2 15.9 2.7875T19.075 4.925Q20.425 6.275 21.2125 8.1T22 12Q22 14.075 21.2125 15.9T19.075 19.075Q17.725 20.425 15.9 21.2125T12 22ZM12 20Q15.35 20 17.675 17.675T20 12Q20 8.65 17.675 6.325T12 4Q8.65 4 6.325 6.325T4 12Q4 15.35 6.325 17.675T12 20ZM12 12Z"),
    ALPHA_CIRCLE("M11,7H13A2,2 0 0,1 15,9V17H13V13H11V17H9V9A2,2 0 0,1 11,7M11,9V11H13V9H11M12,20A8,8 0 0,0 20,12A8,8 0 0,0 12,4A8,8 0 0,0 4,12A8,8 0 0,0 12,20M12,2A10,10 0 0,1 22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2Z"), // Not Material
@@ -50,7 +45,9 @@ public enum SVG {
    CHECKROOM("M3 20Q2.575 20 2.2875 19.7125T2 19Q2 18.75 2.1 18.5375T2.4 18.2L11 11.75V10Q11 9.575 11.3 9.2875T12.025 9Q12.65 9 13.075 8.55T13.5 7.475Q13.5 6.85 13.0625 6.425T12 6Q11.375 6 10.9375 6.4375T10.5 7.5H8.5Q8.5 6.05 9.525 5.025T12 4Q13.45 4 14.475 5.0125T15.5 7.475Q15.5 8.65 14.8125 9.575T13 10.85V11.75L21.6 18.2Q21.8 18.325 21.9 18.5375T22 19Q22 19.425 21.7125 19.7125T21 20H3ZM6 18H18L12 13.5 6 18Z"),
    CHECK_CIRCLE("M10.6 16.6 17.65 9.55 16.25 8.15 10.6 13.8 7.75 10.95 6.35 12.35 10.6 16.6ZM12 22Q9.925 22 8.1 21.2125T4.925 19.075Q3.575 17.725 2.7875 15.9T2 12Q2 9.925 2.7875 8.1T4.925 4.925Q6.275 3.575 8.1 2.7875T12 2Q14.075 2 15.9 2.7875T19.075 4.925Q20.425 6.275 21.2125 8.1T22 12Q22 14.075 21.2125 15.9T19.075 19.075Q17.725 20.425 15.9 21.2125T12 22ZM12 20Q15.35 20 17.675 17.675T20 12Q20 8.65 17.675 6.325T12 4Q8.65 4 6.325 6.325T4 12Q4 15.35 6.325 17.675T12 20ZM12 12Z"),
    CLOSE("M6.4 19 5 17.6 10.6 12 5 6.4 6.4 5 12 10.6 17.6 5 19 6.4 13.4 12 19 17.6 17.6 19 12 13.4 6.4 19Z"),
+    CONTENT_CUT("M19 21l-7-7-2.35 2.35q.2.375.275.8T10 18q0 1.65-1.175 2.825T6 22q-1.65 0-2.825-1.175T2 18t1.175-2.825T6 14q.425 0 .85.075t.8.275L10 12 7.65 9.65q-.375.2-.8.275T6 10q-1.65 0-2.825-1.175T2 6q0-1.65 1.175-2.825T6 2q1.65 0 2.825 1.175T10 6q0 .425-.075.85t-.275.8L22 20v1H19Zm-4-10-2-2 6-6h3v1l-7 7ZM7.4125 7.4125Q8 6.825 8 6t-.5875-1.4125Q6.825 4 6 4t-1.4125.5875Q4 5.175 4 6t.5875 1.4125T6 8t1.4125-.5875ZM12.35 12.35q.15-.15.15-.35t-.15-.35-.35-.15-.35.15-.15.35.15.35.35.15.35-.15ZM7.4125 19.4125Q8 18.825 8 18t-.5875-1.4125Q6.825 16 6 16t-1.4125.5875Q4 17.175 4 18t.5875 1.4125Q5.175 20 6 20t1.4125-.5875Z"),
    CONTENT_COPY("M9 18Q8.175 18 7.5875 17.4125T7 16V4Q7 3.175 7.5875 2.5875T9 2H18Q18.825 2 19.4125 2.5875T20 4V16Q20 16.825 19.4125 17.4125T18 18H9ZM9 16H18V4H9V16ZM5 22Q4.175 22 3.5875 21.4125T3 20V6H5V20H16V22H5ZM9 16V4 16Z"),
+    CONTENT_PASTE("M5 21q-.825 0-1.412-.587T3 19V5q0-.825.588-1.412T5 3h4.175q.275-.875 1.075-1.437T12 1q1 0 1.788.563T14.85 3H19q.825 0 1.413.588T21 5v14q0 .825-.587 1.413T19 21zm0-2h14V5h-2v3H7V5H5zm7-14q.425 0 .713-.288T13 4t-.288-.712T12 3t-.712.288T11 4t.288.713T12 5"),
    CREATE_NEW_FOLDER("M14 16h2V14h2V12H16V10H14v2H12v2h2v2ZM4 20q-.825 0-1.4125-.5875T2 18V6q0-.825.5875-1.4125T4 4h6l2 2h8q.825 0 1.4125.5875T22 8V18q0 .825-.5875 1.4125T20 20H4Zm0-2H20V8H11.175l-2-2H4V18ZV6 18Z"),
    DELETE("M7 21Q6.175 21 5.5875 20.4125T5 19V6H4V4H9V3H15V4H20V6H19V19Q19 19.825 18.4125 20.4125T17 21H7ZM17 6H7V19H17V6ZM9 17H11V8H9V17ZM13 17H15V8H13V17ZM7 6V19 6Z"),
    DELETE_FOREVER("M9.4 16.5 12 13.9 14.6 16.5 16 15.1 13.4 12.5 16 9.9 14.6 8.5 12 11.1 9.4 8.5 8 9.9 10.6 12.5 8 15.1 9.4 16.5ZM7 21Q6.175 21 5.5875 20.4125T5 19V6H4V4H9V3H15V4H20V6H19V19Q19 19.825 18.4125 20.4125T17 21H7ZM17 6H7V19H17V6ZM7 6V19 6Z"),
@@ -63,8 +60,10 @@ public enum SVG {
    EXPLORE("M12 12Zm0 8q-3.325 0-5.6625-2.3375T4 12Q4 8.675 6.3375 6.3375T12 4q3.325-0 5.6625 2.3375T20 12q0 3.325-2.3375 5.6625T12 20Zm0 2q2.075-0 3.9-.7875t3.175-2.1375q1.35-1.35 2.1375-3.175T22 12q-0-2.075-.7875-3.9T19.075 4.925q-1.35-1.35-3.175-2.1375T12 2q-2.075 0-3.9.7875T4.925 4.925Q3.575 6.275 2.7875 8.1T2 12q0 2.075.7875 3.9T4.925 19.075q1.35 1.35 3.175 2.1375T12 22Zm0-8.5q.625 0 1.0625-.4375T13.5 12t-.4375-1.0625T12 10.5t-1.0625.4375T10.5 12t.4375 1.0625T12 13.5Zm-4.5 3 2-7 7-2-2 7-7 2Z"),
    EXTENSION("M8.8 21H5Q4.175 21 3.5875 20.4125T3 19V15.2Q4.2 15.2 5.1 14.4375T6 12.5Q6 11.325 5.1 10.5625T3 9.8V6Q3 5.175 3.5875 4.5875T5 4H9Q9 2.95 9.725 2.225T11.5 1.5Q12.55 1.5 13.275 2.225T14 4H18Q18.825 4 19.4125 4.5875T20 6V10Q21.05 10 21.775 10.725T22.5 12.5Q22.5 13.55 21.775 14.275T20 15V19Q20 19.825 19.4125 20.4125T18 21H14.2Q14.2 19.75 13.4125 18.875T11.5 18Q10.375 18 9.5875 18.875T8.8 21ZM5 19H7.125Q7.725 17.35 9.05 16.675T11.5 16Q12.625 16 13.95 16.675T15.875 19H18V13H20Q20.2 13 20.35 12.85T20.5 12.5Q20.5 12.3 20.35 12.15T20 12H18V6H12V4Q12 3.8 11.85 3.65T11.5 3.5Q11.3 3.5 11.15 3.65T11 4V6H5V8.2Q6.35 8.7 7.175 9.875T8 12.5Q8 13.925 7.175 15.1T5 16.8V19ZM11.5 12.5Z"),
    EXTENSION_FILL("M8.8 21H5q-.825 0-1.4125-.5875T3 19V15.2q1.2 0 2.1-.7625T6 12.5q0-1.175-.9-1.9375T3 9.8V6q0-.825.5875-1.4125T5 4H9q0-1.05.725-1.775T11.5 1.5q1.05 0 1.775.725T14 4h4q.825 0 1.4125.5875T20 6v4q1.05 0 1.775.725T22.5 12.5q0 1.05-.725 1.775T20 15v4q0 .825-.5875 1.4125T18 21H14.2q0-1.25-.7875-2.125T11.5 18q-1.125 0-1.9125.875T8.8 21Z"),
+    FRAME_BUG("M12 19q1.65 0 2.825-1.175T16 15v-4q0-1.65-1.175-2.825T12 7T9.175 8.175T8 11v4q0 1.65 1.175 2.825T12 19m-2-3h4v-2h-4zm0-4h4v-2h-4zm2 9q-1.625 0-3.012-.8T6.8 18H4v-2h2.1q-.075-.5-.088-1T6 14H4v-2h2q0-.5.012-1t.088-1H4V8h2.8q.35-.575.788-1.075T8.6 6.05L7 4.4L8.4 3l2.15 2.15q.7-.225 1.425-.225t1.425.225L15.6 3L17 4.4l-1.65 1.65q.575.375 1.038.862T17.2 8H20v2h-2.1q.075.5.088 1T18 12h2v2h-2q0 .5-.013 1t-.087 1H20v2h-2.8q-.8 1.4-2.187 2.2T12 21M1 6V3q0-.825.588-1.412T3 1h3v2H3v3zm5 17H3q-.825 0-1.412-.587T1 21v-3h2v3h3zm12 0v-2h3v-3h2v3q0 .825-.587 1.413T21 23zm3-17V3h-3V1h3q.825 0 1.413.588T23 3v3z"),
    FEEDBACK("M12 15Q12.425 15 12.7125 14.7125T13 14Q13 13.575 12.7125 13.2875T12 13Q11.575 13 11.2875 13.2875T11 14Q11 14.425 11.2875 14.7125T12 15ZM11 11H13V5H11V11ZM2 22V4Q2 3.175 2.5875 2.5875T4 2H20Q20.825 2 21.4125 2.5875T22 4V16Q22 16.825 21.4125 17.4125T20 18H6L2 22ZM5.15 16H20V4H4V17.125L5.15 16ZM4 16V4 16Z"),
    FEEDBACK_FILL("M2 22V4q0-.825.5875-1.4125T4 2H20q.825 0 1.4125.5875T22 4V16q0 .825-.5875 1.4125T20 18H6L2 22Zm10-7q.425 0 .7125-.2875T13 14t-.2875-.7125T12 13t-.7125.2875T11 14t.2875.7125T12 15Zm-1-4h2V5H11v6Z"),
+    FILE_OPEN("M6 22q-0.825 0-1.4125-0.5875T4 20v-16q0-0.825 0.5875-1.4125T6 2h8l6 6v6h-2v-5H13v-5H6v16h9v2H6Zm15.95 0.375L19 19.425v2.225h-2v-5.65h5.65v2h-2.25l2.95 2.95-1.4 1.425Zm-15.95-2.375v-16 16Z"),
    FOLDER("M4 20Q3.175 20 2.5875 19.4125T2 18V6Q2 5.175 2.5875 4.5875T4 4H10L12 6H20Q20.825 6 21.4125 6.5875T22 8V18Q22 18.825 21.4125 19.4125T20 20H4ZM4 18H20V8H11.175L9.175 6H4V18ZM4 18V6 18Z"),
    FOLDER_COPY("M3 21Q2.175 21 1.5875 20.4125T1 19V6H3V19H20V21H3ZM7 17Q6.175 17 5.5875 16.4125T5 15V4Q5 3.175 5.5875 2.5875T7 2H12L14 4H21Q21.825 4 22.4125 4.5875T23 6V15Q23 15.825 22.4125 16.4125T21 17H7ZM7 15H21V6H13.175L11.175 4H7V15ZM7 15V4 15Z"),
    FOLDER_OPEN("M4 20Q3.175 20 2.5875 19.4125T2 18V6Q2 5.175 2.5875 4.5875T4 4H10L12 6H20Q20.825 6 21.4125 6.5875T22 8H11.175L9.175 6H4V18L6.4 10H23.5L20.925 18.575Q20.725 19.225 20.1875 19.6125T19 20H4ZM6.1 18H19L20.8 12H7.9L6.1 18ZM6.1 18 7.9 12 6.1 18ZM4 8V6 8Z"),
@@ -90,8 +89,7 @@ public enum SVG {
    LOCATION_CITY("M3 21V7H9V5l3-3 3 3v6h6V21H3Zm2-2H7V17H5v2Zm0-4H7V13H5v2Zm0-4H7V9H5v2Zm6 8h2V17H11v2Zm0-4h2V13H11v2Zm0-4h2V9H11v2Zm0-4h2V5H11V7Zm6 12h2V17H17v2Zm0-4h2V13H17v2Z"),
    MENU("M3 18V16H21V18H3ZM3 13V11H21V13H3ZM3 8V6H21V8H3Z"),
    MICROSOFT("M4 20H22v2H4V13H20v7h2V4H20v7H4V4h7V20h2V4h9V2H2V22H4"), // Not Material
-    MINIMIZE("M6 21V19H18V21H6Z"),
-    MOJANG("M13.9658 0C12.9552.828 12.7686 2.195 12.7007 3.418 12.7219 4.4201 14.0423 4.7174 14.6538 4.0082 15.0912 2.6579 14.3692 1.2739 13.9658 0ZM10.913 2.9297C10.7559 3.6983 10.6284 4.4669 10.4925 5.2355 8.9894 3.9913 7.1505 3.0825 5.142 3.2948 3.4944 3.4646.9429 2.6961.1404 4.6452-.1229 8.314.0722 12.0124.034 15.6896-.0891 16.9126.8957 18.1101 2.1781 17.9699 6.3989 18.0039 10.6283 18.0172 14.8491 17.9661 16.1145 18.102 16.8067 16.9554 16.9851 15.8768 13.2696 16.4374 9.1761 16.9296 5.7111 15.1292 2.5986 13.5836 2.246 8.3139 5.5581 6.798 9.3203 5.1759 13.8596 8.0383 14.9424 11.7877 15.6133 12.1105 16.2844 12.4247 16.9596 12.7432 16.6241 10.3483 16.6537 7.8005 15.5793 5.5882 15.0571 4.7474 14.0975 6.2714 13.3799 5.6217 12.416 4.8659 11.7495 3.8129 10.913 2.9297Z"), // Not Material
+    MINIMIZE_CENTER("M6 13v-2h12v2H6Z"), // Not Material
    MORE_HORIZ("M6 14Q5.175 14 4.5875 13.4125T4 12Q4 11.175 4.5875 10.5875T6 10Q6.825 10 7.4125 10.5875T8 12Q8 12.825 7.4125 13.4125T6 14ZM12 14Q11.175 14 10.5875 13.4125T10 12Q10 11.175 10.5875 10.5875T12 10Q12.825 10 13.4125 10.5875T14 12Q14 12.825 13.4125 13.4125T12 14ZM18 14Q17.175 14 16.5875 13.4125T16 12Q16 11.175 16.5875 10.5875T18 10Q18.825 10 19.4125 10.5875T20 12Q20 12.825 19.4125 13.4125T18 14Z"),
    MORE_VERT("M12 20Q11.175 20 10.5875 19.4125T10 18Q10 17.175 10.5875 16.5875T12 16Q12.825 16 13.4125 16.5875T14 18Q14 18.825 13.4125 19.4125T12 20ZM12 14Q11.175 14 10.5875 13.4125T10 12Q10 11.175 10.5875 10.5875T12 10Q12.825 10 13.4125 10.5875T14 12Q14 12.825 13.4125 13.4125T12 14ZM12 8Q11.175 8 10.5875 7.4125T10 6Q10 5.175 10.5875 4.5875T12 4Q12.825 4 13.4125 4.5875T14 6Q14 6.825 13.4125 7.4125T12 8Z"),
    OPEN_IN_NEW("M5 21Q4.175 21 3.5875 20.4125T3 19V5Q3 4.175 3.5875 3.5875T5 3H12V5H5V19H19V12H21V19Q21 19.825 20.4125 20.4125T19 21H5ZM9.7 15.7 8.3 14.3 17.6 5H14V3H21V10H19V6.4L9.7 15.7Z"),
@@ -102,6 +100,7 @@ public enum SVG {
    PERSON("M12 12Q10.35 12 9.175 10.825T8 8Q8 6.35 9.175 5.175T12 4Q13.65 4 14.825 5.175T16 8Q16 9.65 14.825 10.825T12 12ZM4 20V17.2Q4 16.35 4.4375 15.6375T5.6 14.55Q7.15 13.775 8.75 13.3875T12 13Q13.65 13 15.25 13.3875T18.4 14.55Q19.125 14.925 19.5625 15.6375T20 17.2V20H4ZM6 18H18V17.2Q18 16.925 17.8625 16.7T17.5 16.35Q16.15 15.675 14.775 15.3375T12 15Q10.6 15 9.225 15.3375T6.5 16.35Q6.275 16.475 6.1375 16.7T6 17.2V18ZM12 10Q12.825 10 13.4125 9.4125T14 8Q14 7.175 13.4125 6.5875T12 6Q11.175 6 10.5875 6.5875T10 8Q10 8.825 10.5875 9.4125T12 10ZM12 8ZM12 18Z"),
    PUBLIC("M12 22Q9.925 22 8.1 21.2125T4.925 19.075Q3.575 17.725 2.7875 15.9T2 12Q2 9.925 2.7875 8.1T4.925 4.925Q6.275 3.575 8.1 2.7875T12 2Q14.075 2 15.9 2.7875T19.075 4.925Q20.425 6.275 21.2125 8.1T22 12Q22 14.075 21.2125 15.9T19.075 19.075Q17.725 20.425 15.9 21.2125T12 22ZM11 19.95V18Q10.175 18 9.5875 17.4125T9 16V15L4.2 10.2Q4.125 10.65 4.0625 11.1T4 12Q4 15.025 5.9875 17.3T11 19.95ZM17.9 17.4Q18.925 16.275 19.4625 14.8875T20 12Q20 9.55 18.6375 7.525T15 4.6V5Q15 5.825 14.4125 6.4125T13 7H11V9Q11 9.425 10.7125 9.7125T10 10H8V12H14Q14.425 12 14.7125 12.2875T15 13V16H16Q16.65 16 17.175 16.3875T17.9 17.4Z"),
    REFRESH("M12 20Q8.65 20 6.325 17.675T4 12Q4 8.65 6.325 6.325T12 4Q13.725 4 15.3 4.7125T18 6.75V4H20V11H13V9H17.2Q16.4 7.6 15.0125 6.8T12 6Q9.5 6 7.75 7.75T6 12Q6 14.5 7.75 16.25T12 18Q13.925 18 15.475 16.9T17.65 14H19.75Q19.05 16.65 16.9 18.325T12 20Z"),
+    REDO("M9.9 19q-2.425 0-4.163-1.575T4 13.5t1.738-3.925T9.9 8h6.3l-2.6-2.6L15 4l5 5l-5 5l-1.4-1.4l2.6-2.6H9.9q-1.575 0-2.738 1T6 13.5T7.163 16T9.9 17H17v2z"),
    RELEASE_CIRCLE("M9,7H13A2,2 0 0,1 15,9V11C15,11.84 14.5,12.55 13.76,12.85L15,17H13L11.8,13H11V17H9V7M11,9V11H13V9H11M12,2A10,10 0 0,1 22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2M12,4A8,8 0 0,0 4,12C4,16.41 7.58,20 12,20A8,8 0 0,0 20,12A8,8 0 0,0 12,4Z"), // Not Material
    RESTORE("M12 21Q8.55 21 5.9875 18.7125T3.05 13H5.1Q5.45 15.6 7.4125 17.3T12 19Q14.925 19 16.9625 16.9625T19 12Q19 9.075 16.9625 7.0375T12 5Q10.275 5 8.775 5.8T6.25 8H9V10H3V4H5V6.35Q6.275 4.75 8.1125 3.875T12 3Q13.875 3 15.5125 3.7125T18.3625 5.6375Q19.575 6.85 20.2875 8.4875T21 12Q21 13.875 20.2875 15.5125T18.3625 18.3625Q17.15 19.575 15.5125 20.2875T12 21Z"), // Not Material
    ROCKET_LAUNCH("M5.65 10.025 7.6 10.85Q7.95 10.15 8.325 9.5T9.15 8.2L7.75 7.925 5.65 10.025ZM9.2 12.1 12.05 14.925Q13.1 14.525 14.3 13.7T16.55 11.825Q18.3 10.075 19.2875 7.9375T20.15 4Q18.35 3.875 16.2 4.8625T12.3 7.6Q11.25 8.65 10.425 9.85T9.2 12.1ZM13.65 10.475Q13.075 9.9 13.075 9.0625T13.65 7.65Q14.225 7.075 15.075 7.075T16.5 7.65Q17.075 8.225 17.075 9.0625T16.5 10.475Q15.925 11.05 15.075 11.05T13.65 10.475ZM14.125 18.5 16.225 16.4 15.95 15Q15.3 15.45 14.65 15.8125T13.3 16.525L14.125 18.5ZM21.95 2.175Q22.425 5.2 21.3625 8.0625T17.7 13.525L18.2 16Q18.3 16.5 18.15 16.975T17.65 17.8L13.45 22 11.35 17.075 7.075 12.8 2.15 10.7 6.325 6.5Q6.675 6.15 7.1625 6T8.15 5.95L10.625 6.45Q13.225 3.85 16.075 2.775T21.95 2.175ZM3.925 15.975Q4.8 15.1 6.0625 15.0875T8.2 15.95Q9.075 16.825 9.0625 18.0875T8.175 20.225Q7.55 20.85 6.0875 21.3T2.05 22.1Q2.4 19.525 2.85 18.0625T3.925 15.975ZM5.35 17.375Q5.1 17.625 4.85 18.2875T4.5 19.625Q5.175 19.525 5.8375 19.2875T6.75 18.8Q7.05 18.5 7.075 18.075T6.8 17.35Q6.5 17.05 6.075 17.0625T5.35 17.375Z"),
@@ -117,10 +116,12 @@ public enum SVG {
    STADIA_CONTROLLER_FILL("M4.725 20q-1.5 0-2.5625-1.075T1.05 16.325q0-.225.025-.45t.075-.45l2.1-8.4q.35-1.35 1.425-2.1875T7.125 4h9.75q1.375 0 2.45.8375T20.75 7.025l2.1 8.4q.05.225.0875.4625t.0375.4625q0 1.525-1.0875 2.5875T19.275 20q-1.05 0-1.95-.55t-1.35-1.5l-.7-1.45q-.125-.25-.375-.375T14.375 16H9.625q-.275 0-.525.125t-.375.375l-.7 1.45q-.45.95-1.35 1.5T4.725 20ZM13.5 11q.425 0 .7125-.2875T14.5 10t-.2875-.7125T13.5 9t-.7125.2875T12.5 10t.2875.7125T13.5 11Zm2-2q.425 0 .7125-.2875T16.5 8q0-.425-.2875-.7125T15.5 7q-.425 0-.7125.2875T14.5 8t.2875.7125T15.5 9Zm0 4q.425 0 .7125-.2875T16.5 12q0-.425-.2875-.7125T15.5 11q-.425 0-.7125.2875T14.5 12t.2875.7125T15.5 13Zm2-2q.425 0 .7125-.2875T18.5 10q0-.425-.2875-.7125T17.5 9q-.425 0-.7125.2875T16.5 10q0 .425.2875.7125T17.5 11Zm-9 1.5q.325 0 .5375-.2125T9.25 11.75v-1h1q.325 0 .5375-.2125T11 10t-.2125-.5375T10.25 9.25h-1v-1q0-.325-.2125-.5375T8.5 7.5q-.325 0-.5375.2125T7.75 8.25v1h-1q-.325 0-.5375.2125T6 10q0 .325.2125.5375T6.75 10.75h1v1q0 .325.2125.5375T8.5 12.5Z"),
    STYLE("M3.975 19.8 3.125 19.45Q2.35 19.125 2.0875 18.325T2.175 16.75L3.975 12.85V19.8ZM7.975 22Q7.15 22 6.5625 21.4125T5.975 20V14L8.625 21.35Q8.7 21.525 8.775 21.6875T8.975 22H7.975ZM13.125 21.9Q12.325 22.2 11.575 21.825T10.525 20.65L6.075 8.45Q5.775 7.65 6.125 6.8875T7.275 5.85L14.825 3.1Q15.625 2.8 16.375 3.175T17.425 4.35L21.875 16.55Q22.175 17.35 21.825 18.1125T20.675 19.15L13.125 21.9ZM10.975 10Q11.4 10 11.6875 9.7125T11.975 9Q11.975 8.575 11.6875 8.2875T10.975 8Q10.55 8 10.2625 8.2875T9.975 9Q9.975 9.425 10.2625 9.7125T10.975 10ZM12.425 20 19.975 17.25 15.525 5 7.975 7.75 12.425 20ZM7.975 7.75 15.525 5 7.975 7.75Z"),
    STYLE_FILL("M3.975 19.8l-.85-.35q-.775-.325-1.0375-1.125T2.175 16.75l1.8-3.9V19.8Zm4 2.2q-.825 0-1.4125-.5875T5.975 20V14l2.65 7.35q.075.175.15.3375t.2.3125h-1Zm5.15-.1q-.8.3-1.55-.075t-1.05-1.175L6.075 8.45q-.3-.8.05-1.5625T7.275 5.85l7.55-2.75q.8-.3 1.55.075t1.05 1.175l4.45 12.2q.3.8-.05 1.5625T20.675 19.15l-7.55 2.75ZM10.975 10q.425 0 .7125-.2875T11.975 9q0-.425-.2875-.7125T10.975 8t-.7125.2875T9.975 9t.2875.7125T10.975 10Z"),
-    TEXTURE("M4.4-3Q3.925-3.1 3.5125-3.5125T3-4.4L19.6-21Q20.125-20.875 20.5-20.4875T21.025-19.6L4.4-3ZM3-9.3V-12.1L11.9-21H14.7L3-9.3ZM3-17V-19Q3-19.825 3.5875-20.4125T5-21H7L3-17ZM17-3 21-7V-5Q21-4.175 20.4125-3.5875T19-3H17ZM9.3-3 21-14.7V-11.9L12.1-3H9.3Z"),
+    TEXTURE("M4.4 21q-.475-.1-.8875-.5125T3 19.6L19.6 3q.525.125.9.5125t.525.8875L4.4 21ZM3 14.7v-2.8L11.9 3h2.8L3 14.7ZM3 7V5q0-.825.5875-1.4125T5 3h2L3 7Zm14 14 4-4v2q0 .825-.5875 1.4125T19 21h-2Zm-7.7 0L21 9.3v2.8L12.1 21H9.3Z"),
    TRIP("M4 21Q3.175 21 2.5875 20.4125T2 19V8Q2 7.175 2.5875 6.5875T4 6H8V4Q8 3.175 8.5875 2.5875T10 2H14Q14.825 2 15.4125 2.5875T16 4V6H20Q20.825 6 21.4125 6.5875T22 8V19Q22 19.825 21.4125 20.4125T20 21H4ZM10 6H14V4H10V6ZM6 8H4V19H6V8ZM16 19V8H8V19H16ZM18 8V19H20V8H18ZM12 13.5Z"),
    TUNE("M11 21V15H13V17H21V19H13V21H11ZM3 19V17H9V19H3ZM7 15V13H3V11H7V9H9V15H7ZM11 13V11H21V13H11ZM15 9V3H17V5H21V7H17V9H15ZM3 7V5H13V7H3Z"),
+    UNFOLD_MORE("M12 21 7.5 16.5l1.45-1.45L12 18.1l3.05-3.05 1.45 1.45L12 21ZM8.95 9.05 7.5 7.6 12 3.1l4.5 4.5-1.45 1.45L12 6 8.95 9.05Z"),
    UPDATE("M12 21Q10.125 21 8.4875 20.2875T5.6375 18.3625Q4.425 17.15 3.7125 15.5125T3 12Q3 10.125 3.7125 8.4875T5.6375 5.6375Q6.85 4.425 8.4875 3.7125T12 3Q14.05 3 15.8875 3.875T19 6.35V4H21V10H15V8H17.75Q16.725 6.6 15.225 5.8T12 5Q9.075 5 7.0375 7.0375T5 12Q5 14.925 7.0375 16.9625T12 19Q14.625 19 16.5875 17.3T18.9 13H20.95Q20.575 16.425 18.0125 18.7125T12 21ZM14.8 16.2 11 12.4V7H13V11.6L16.2 14.8 14.8 16.2Z"),
+    UNDO("M7 19v-2h7.1q1.575 0 2.738-1T18 13.5T16.838 11T14.1 10H7.8l2.6 2.6L9 14L4 9l5-5l1.4 1.4L7.8 8h6.3q2.425 0 4.163 1.575T20 13.5t-1.737 3.925T14.1 19z"),
    VISIBILITY("M12 16q1.875 0 3.1875-1.3125T16.5 11.5 15.1875 8.3125 12 7 8.8125 8.3125 7.5 11.5t1.3125 3.1875T12 16Zm0-1.8q-1.125 0-1.9125-.7875T9.3 11.5t.7875-1.9125T12 8.8q1.125 0 1.9125.7875T14.7 11.5q0 1.125-.7875 1.9125T12 14.2ZM12 19q-3.65 0-6.65-2.0375T1 11.5Q2.35 8.075 5.35 6.0375T12 4q3.65 0 6.65 2.0375T23 11.5q-1.35 3.425-4.35 5.4625T12 19Zm0-7.5ZM12 17q2.825 0 5.1875-1.4875T20.8 11.5q-1.25-2.525-3.6125-4.0125T12 6 6.8125 7.4875 3.2 11.5q1.25 2.525 3.6125 4.0125T12 17Z"),
    VISIBILITY_OFF("M16.1 13.3l-1.45-1.45q.225-1.175-.675-2.2t-2.325-.8L10.2 7.4q.425-.2.8625-.3T12 7q1.875 0 3.1875 1.3125T16.5 11.5q0 .5-.1.9375t-.3.8625Zm3.2 3.15-1.45-1.4q.95-.725 1.6875-1.5875T20.8 11.5q-1.25-2.525-3.5875-4.0125T12 6q-.725 0-1.425.1T9.2 6.4L7.65 4.85q1.025-.425 2.1-.6375T12 4q3.775 0 6.725 2.0875T23 11.5q-.575 1.475-1.5125 2.7375T19.3 16.45Zm.5 6.15-4.2-4.15q-.875.275-1.7625.4125T12 19q-3.775 0-6.725-2.0875T1 11.5q.525-1.325 1.325-2.4625T4.15 7L1.4 4.2 2.8 2.8 21.2 21.2l-1.4 1.4ZM5.55 8.4q-.725.65-1.325 1.425T3.2 11.5q1.25 2.525 3.5875 4.0125T12 17q.5 0 .975-.0625T13.95 16.8l-.9-.95q-.275.075-.525.1125T12 16q-1.875 0-3.1875-1.3125T7.5 11.5q0-.275.0375-.525T7.65 10.45L5.55 8.4Zm7.975 2.325ZM9.75 12.6Z"),
    WARNING("M1 21 12 2 23 21H1ZM4.45 19H19.55L12 6 4.45 19ZM12 18Q12.425 18 12.7125 17.7125T13 17Q13 16.575 12.7125 16.2875T12 16Q11.575 16 11.2875 16.2875T11 17Q11 17.425 11.2875 17.7125T12 18ZM11 15H13V10H11V15ZM12 12.5Z"),
@@ -130,48 +131,40 @@ public enum SVG {

    public static final double DEFAULT_SIZE = 24;

-    private final String path;
+    static void setSize(SVGPath path, double size) {
+        double scale = size / DEFAULT_SIZE;
+        path.setScaleX(scale);
+        path.setScaleY(scale);
+    }

-    SVG(String path) {
-        this.path = path;
+    private final String rawPath;
+    private String path;
+
+    SVG(String rawPath) {
+        this.rawPath = rawPath;
    }

    public String getPath() {
+        if (path == null)
+            // We move the current point so that SVGPath will treat 0 0 24 24 as the layout bounds
+            path = "M24 24ZM0 0Z" + rawPath;
        return path;
    }

-    private static Node createIcon(SVGPath path, double size) {
-        if (size < 0) {
-            StackPane pane = new StackPane(path);
-            pane.setAlignment(Pos.CENTER);
-            return pane;
-        }
-
-        double scale = size / 24;
-        path.setScaleX(scale);
-        path.setScaleY(scale);
-        return new Group(path);
+    public SVGPath createIcon() {
+        var path = new SVGPath();
+        path.getStyleClass().add("svg");
+        path.setContent(getPath());
+        return path;
    }

-    public Node createIcon(double size) {
-        SVGPath p = new SVGPath();
-        p.setContent(path);
-        p.getStyleClass().add("svg");
-        return createIcon(p, size);
+    public SVGContainer createIcon(double size) {
+        return new SVGContainer(this, size);
    }

-    public Node createIcon() {
-        SVGPath p = new SVGPath();
-        p.setContent(path);
-        p.getStyleClass().add("svg");
-        return createIcon(p, -1);
-    }
-
-    public Node createIcon(ObservableValue<? extends Paint> color) {
-        SVGPath p = new SVGPath();
-        p.setContent(path);
-        p.getStyleClass().add("svg");
-        p.fillProperty().bind(color);
-        return createIcon(p, -1);
+    public SVGPath createIcon(ObservableValue<? extends Paint> color) {
+        SVGPath path = createIcon();
+        path.fillProperty().bind(color);
+        return path;
    }
 }