Bump Mesa to 24.3.2 (#3515 )

* Bump Mesa to 24.3.2 * update
Refine DownloadPage
2025-01-01 05:14:14 +08:00 · 2024-12-31 19:56:38 +08:00 · 2024-12-30 20:14:04 +08:00 · 2024-12-30 19:39:42 +08:00 · 2024-12-30 00:17:00 +08:00 · 2024-12-30 00:07:43 +08:00
556 changed files with 44926 additions and 17499 deletions
@@ -1,32 +1,27 @@
-name: Bug Feedback
+name: Bug 反馈 | Bug Feedback
 description: 
-  反馈一个错误。
-  为了提高反馈效率，请优先在 KOOK、赞助频道或者 Discord 频道中反馈。若确认是 HMCL 问题，请发布 issue。
+  反馈一个 HMCL 错误。| Bug Feedback.
+title: "[Bug] "
 labels: bug
 body:
  - type: markdown
    attributes:
      value: |
-        提交前请确保你的启动器版本是**最新的开发版**，可以在启动器设置中更换更新通道至开发版获取更新。
+        提交前请确认：
+        * 该问题确实是 **HMCL 的错误**，而**不是 Minecraft 非正常退出**，如果你的 Minecraft 非正常退出，请前往 [QQ 群](https://docs.hmcl.net/groups.html)/[Discord 频道](https://discord.gg/jVvC7HfM6U) 中获取帮助。
+        * 你的启动器版本是**最新的快照版本**，可以点击 [此处](https://zkitefly.github.io/HMCL-Snapshot-Update/) 下载最新快照版本。
    
-        我们发现，对于不经常检查邮箱的人来说，GitHub Issues 的反馈效率太低，时隔几个小时甚至一天的情况很多。
-        为了改善反馈效率，并将积极为 HMCL 提供问题反馈和建议的人聚集起来，我们希望在这里反馈的人可以在 
-        [KOOK 频道](https://kook.top/Kx7n3t) 或 [Discord 频道](https://discord.gg/jVvC7HfM6U)中反馈信息，
-        **而不在 GitHub Issues 中反馈问题**。
-
-        如果你希望在 QQ 群中反馈问题，请[赞助 HMCL](https://hmcl.huangyuhui.net/api/redirect/sponsor) 后申请加入群聊，也请将下面的信息表填好直接发在群中，加快我们的沟通速度。
-  - type: input
-    id: hmcl-version
-    attributes:
-      label: 启动器版本 Launcher Version
-      description: 请输入您所使用的的 HMCL 启动器版本。 Please enter the HMCL launcher version you are using. 
-      placeholder: e.g. 3.5.3.211
-    validations:
-      required: true
+        如果你的问题并不属于上述两类，你可以选取另一种 Issue 类型，或者直接前往 [QQ 群](https://docs.hmcl.net/groups.html)/[Discord 频道](https://discord.gg/jVvC7HfM6U) 中获取帮助。
+        
+        Before submitting, please confirm:
+        * The issue is indeed **an error of HMCL**, not **Minecraft abnormal exit**. If your Minecraft exits abnormally, please go to the [QQ group](https://docs.hmcl.net/groups.html) or [Discord channel](https://discord.gg/jVvC7HfM6U) for help.
+        * Your launcher version is **the latest snapshot version**. You can click [here](https://github.com/burningtnt/HMCL-Snapshot-Update/raw/master/datas/HMCL-dev.jar) to download the latest snapshot version.
+        
+        If your issue does not fall into the above two categories, you can choose another type of issue or directly go to the [QQ group](https://docs.hmcl.net/groups.html) or [Discord channel](https://discord.gg/jVvC7HfM6U) for help.
  - type: input
    id: platform
    attributes:
-      label: 平台 Platform 
+      label: 平台 | Platform
      description: 请输入您遇到 BUG 的平台。 Please enter the platform on which you encountered the bug. 
      placeholder: e.g. Windows 11
    validations:
@@ -34,41 +29,25 @@ body:
  - type: textarea
    id: bug-report
    attributes:
-      label: 问题描述 Problem Description
-      description: 请尽可能地详细描述问题，特别是您是怎么遇到这个 BUG 的。 Please describe the problem in as much detail as possible, especially how you encountered this bug.
+      label: 问题描述 | Problem Description
+      description: 请尽可能地详细描述你所遇到的问题，并描述如何重新触发这个问题。 Please describe the problem you met in as much detail as possible. Besides, please describe how to trigger this problem again.
+      placeholder: |
+        1. 点击 HMCL 上的某个按钮 | Click a button named ...
+        2. 向下翻页 | Scroll down
+        3. ...
    validations:
      required: true
-  - type: input
-    id: java-version
-    attributes:
-      label: Java
-      description: 请输入您所使用的 Java 的名称与版本。 Please enter the name and version of Java you are using. 
-      placeholder: e.g. LibericaJDK Full JDK 17.0.1
-  - type: input
-    id: game-version
-    attributes:
-      label: 游戏版本 Game Version
-      description: 如果您是在启动通过 HMCL 启动器自动下载的游戏时遇到了问题，请输入您所启动的游戏版本。If you are having trouble launching a game that was automatically downloaded through the HMCL launcher, please enter the version of the game you are launching.
-      placeholder: e.g. 1.19
-  - type: input
-    id: game-modify
-    attributes:
-      label: 对游戏所做的修改 Modifications Made to the Game 
-      description: 如果您为游戏安装了 OptiFine、Forge，或者是其他的 mod，请将您所做的修改填入下方。 If you have OptiFine, Forge, or other mods installed for the game, please enter your modifications below.
-      placeholder: e.g. OptiFine HD_U_G9, Rift
  - type: textarea
-    id: game-crash-report
+    id: hmcl-crash-report-or-logs
    attributes:
-      label: 游戏崩溃报告 Game Crash Report
-      description: 如果有游戏崩溃报告的话，请填入（或将文件拖入）下方。 If there is a game crash report, please fill in (or drag the file into) below.
-  - type: textarea
-    id: hmcl-crash-report
-    attributes:
-      label: 启动器崩溃报告 Launcher Crash Report
-      description: 如果有启动器崩溃报告的话，请填入（或将文件拖入）下方。 If there is a launcher crash report, please fill it in (or drag the file in) below.
-  - type: textarea
-    id: hmcl-logs
-    attributes:
-      label: 启动器日志文件 Launcher Log File
-      description: 遇到问题后，请在启动器的【设置】>【通用】>【调试】一栏中点击“导出启动器日志”，并将导出的日志拖到下方的输入栏中。 After encountering a problem, please click "Export Launcher Log" in the [Settings] > [General] > [Debug] column of the launcher, and drag the exported log to the input field below.
-
+      label: 启动器崩溃报告 / 启动器日志文件 | Launcher Crash Report / Launcher Log File
+      description: |
+        如果您的启动器崩溃了，请将崩溃报告填入（或将文件拖入）下方。
+        如果您的启动器没有崩溃，请在遇到问题后不要退出启动器，在启动器的【设置】>【通用】>【调试】一栏中点击“导出启动器日志”，并将导出的日志拖到下方的输入栏中。 
+        **请注意：启动器崩溃报告或日志文件是诊断问题的重要依据，请务必上传！**
+        
+        If your launcher crashes, please fill it in (or drag the file in) below.
+        If your launcher doesn't crash, please DO NOT EXIT your launcher, click "Export Launcher Log" in the [Settings] > [General] > [Debug] column of the launcher, and drag the exported log to the input field below.
+        **Attention: The crash report or the log file is the key to solve the problem. Please update it!**
+    validations:
+      required: true
@@ -1,14 +1,11 @@
-blank_issues_enabled: true
+blank_issues_enabled: false
 contact_links:
-  - name: KOOK 频道
-    url: https://kook.top/Kx7n3t
-    about: Hello Minecraft! Launcher 的官方 KOOK 频道。
-  - name: Discord 频道
+  - name: QQ 群 | QQ Groups
+    url: https://docs.hmcl.net/groups.html
+    about: Hello Minecraft! Launcher 的官方 QQ 交流群。| The official QQ groups of Hello Minecraft! Laucher.
+  - name: Discord 频道 | Discord Channel
    url: https://discord.gg/jVvC7HfM6U
-    about: Hello Minecraft! Launcher 的官方 Discord 频道。
-  - name: 赞助通道
-    url: https://afdian.net/@huanghongxun
-    about: 前往爱发电赞助 HMCL。赞助后可以申请加入官方 QQ 群反馈问题。
-  - name: 其他反馈
-    url: https://github.com/huanghongxun/HMCL/issues/new
-    about: 通过 Issue 反馈其他问题。
+    about: Hello Minecraft! Launcher 的官方 Discord 频道。| The official Discord channel of Hello Minecraft! Launcher.
+  - name: 其他反馈 | Others
+    url: https://github.com/HMCL-dev/HMCL/discussions/new/choose
+    about: 通过 Discussions 反馈其他问题。| Report other problems in Discussions.
@@ -0,0 +1,22 @@
+name: 新功能 | Feature Request
+description: 为 HMCL 提出新功能 | A new feature for HMCL
+title: "[Feature] "
+labels: enhancement
+body:
+- type: markdown
+  attributes:
+    value: 请确认 Issues 列表无重复的项目。| Please make sure that no duplicated issues has already been delivered.
+- type: textarea
+  id: description
+  attributes:
+    label: 描述 | Description
+    description: 请详细描述你想加入的新功能。| Please describe the new feature detaily.
+  validations:
+    required: true
+- type: textarea
+  id: reason
+  attributes:
+    label: 原因 | Reason
+    description: 请描述该功能带来的好处及原因。| Please describe why you want to add the feature into HMCL.
+  validations:
+    required: true
@@ -0,0 +1,46 @@
+name: Build HMCLauncher
+
+on:
+  push:
+    paths:
+      - 'HMCLauncher/**'
+      - '.github/workflows/build-launcher.yml'
+  pull_request:
+    paths:
+      - 'HMCLauncher/**'
+      - '.github/workflows/build-launcher.yml'
+
+jobs:
+  build:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Add msbuild to PATH
+        uses: microsoft/setup-msbuild@v2
+        with:
+          msbuild-architecture: x86
+      - name: Build HMCLauncher
+        run: msbuild /p:Configuration=Release /t:Rebuild /verbosity:detailed .\HMCLauncher\
+      - name: Copy HMCLauncher to assets
+        run: Copy-Item .\HMCLauncher\Release\HMCLauncher.exe -Destination .\HMCL\src\main\resources\assets\HMCLauncher.exe
+      - name: Set up JDK 11
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '11'
+          java-package: 'jdk+fx'
+      - name: Build with Gradle
+        run: .\gradlew makeExecutables --no-daemon
+        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 }}".SubString(0, 7))" >> $env:GITHUB_ENV
+      - name: Copy HMCLauncher to libs
+        run: Copy-Item .\HMCLauncher\Release\HMCLauncher.exe -Destination .\HMCL\build\libs\HMCLauncher.exe
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: HMCLauncher-${{ env.SHORT_SHA }}
+          path: HMCL/build/libs/*.exe
@@ -1,21 +1,25 @@
 name: Check Style

-on: [push, pull_request]
+on:
+  push:
+    paths:
+      - '**.java'
+  pull_request:
+    paths:
+      - '**.java'

 jobs:
  build:
-
    runs-on: ubuntu-latest
-
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
        with:
          distribution: 'zulu'
          java-version: '11'
          java-package: 'jdk+fx'
      - name: Check style main
-        run: ./gradlew checkstyleMain
+        run: ./gradlew checkstyleMain --no-daemon
      - name: Check style test
-        run: ./gradlew checkstyleTest
+        run: ./gradlew checkstyleTest --no-daemon
@@ -1,19 +1,23 @@
 name: Check Translations

-on: [push, pull_request]
+on:
+  push:
+    paths:
+      - '**.properties'
+  pull_request:
+    paths:
+      - '**.properties'

 jobs:
  build:
-
    runs-on: ubuntu-latest
-
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
        with:
          distribution: 'zulu'
          java-version: '11'
          java-package: 'jdk+fx'
      - name: Check style test
-        run: ./gradlew checkTranslations
+        run: ./gradlew checkTranslations --no-daemon
@@ -5,12 +5,15 @@ on:
  schedule:
    - cron: '30 * * * *'

+permissions:
+  contents: write
+
 jobs:
-  check-update:
-    if: ${{ github.repository_owner == 'huanghongxun' }}
+  dev-check-update:
+    if: ${{ github.repository_owner == 'HMCL-dev' }}
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - name: Fetch tags
        run: git fetch --all --tags
      - name: Install tools
@@ -36,32 +39,102 @@ jobs:
        if: ${{ env.continue == 'true' }}
        run: |
          wget "$DOWNLOAD_BASE_URL/HMCL-$HMCL_VERSION.exe"
-          wget "$DOWNLOAD_BASE_URL/HMCL-$HMCL_VERSION.exe.sha1"
+          wget "$DOWNLOAD_BASE_URL/HMCL-$HMCL_VERSION.exe.sha256"
          wget "$DOWNLOAD_BASE_URL/HMCL-$HMCL_VERSION.jar"
-          wget "$DOWNLOAD_BASE_URL/HMCL-$HMCL_VERSION.jar.sha1"
+          wget "$DOWNLOAD_BASE_URL/HMCL-$HMCL_VERSION.jar.sha256"
          wget "$DOWNLOAD_BASE_URL/HMCL-$HMCL_VERSION.sh"
-          wget "$DOWNLOAD_BASE_URL/HMCL-$HMCL_VERSION.sh.sha1"
+          wget "$DOWNLOAD_BASE_URL/HMCL-$HMCL_VERSION.sh.sha256"
        env:
          DOWNLOAD_BASE_URL: https://ci.huangyuhui.net/job/HMCL/lastSuccessfulBuild/artifact/HMCL/build/libs
      - name: Generate release note
        if: ${{ env.continue == 'true' }}
        run: |
-          echo "HMCL v$HMCL_VERSION" >> RELEASE_NOTE
-          echo "" >> RELEASE_NOTE
          echo "The full changelogs can be found on the website: https://docs.hmcl.net/changelog/dev.html" >> RELEASE_NOTE
          echo "Notice: changelogs are written in Chinese." >> RELEASE_NOTE
+          echo "" >> RELEASE_NOTE
+          echo "| File Name | SHA-256 Checksum |"  >> RELEASE_NOTE
+          echo "| ---  | --- |" >> RELEASE_NOTE
+          echo "| [HMCL-$HMCL_VERSION.exe]($GH_DOWNLOAD_BASE_URL/v$HMCL_VERSION/HMCL-$HMCL_VERSION.exe) | $(cat HMCL-$HMCL_VERSION.exe.sha256) |" >> RELEASE_NOTE
+          echo "| [HMCL-$HMCL_VERSION.jar]($GH_DOWNLOAD_BASE_URL/v$HMCL_VERSION/HMCL-$HMCL_VERSION.jar) | $(cat HMCL-$HMCL_VERSION.jar.sha256) |" >> RELEASE_NOTE
+          echo "| [HMCL-$HMCL_VERSION.sh]($GH_DOWNLOAD_BASE_URL/v$HMCL_VERSION/HMCL-$HMCL_VERSION.sh)   | $(cat HMCL-$HMCL_VERSION.sh.sha256) |"  >> RELEASE_NOTE
+        env:
+          GH_DOWNLOAD_BASE_URL: https://github.com/HMCL-dev/HMCL/releases/download
      - name: Create release
        if: ${{ env.continue == 'true' }}
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
+        with:
+          body_path: RELEASE_NOTE
+          files: |
+            HMCL-${{ env.HMCL_VERSION }}.exe
+            HMCL-${{ env.HMCL_VERSION }}.jar
+            HMCL-${{ env.HMCL_VERSION }}.sh
+          target_commitish: ${{ env.HMCL_COMMIT_SHA }}
+          name: ${{ env.HMCL_TAG_NAME }}
+          tag_name: ${{ env.HMCL_TAG_NAME }}
+          prerelease: true
+  stable-check-update:
+    if: ${{ github.repository_owner == 'HMCL-dev' }}
+    needs: dev-check-update
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Fetch tags
+        run: git fetch --all --tags
+      - name: Install tools
+        run: sudo apt-get install -y jq
+      - name: Fetch last version
+        run: |
+          wget -O ci.json https://ci.huangyuhui.net/job/HMCL-stable/lastSuccessfulBuild/api/json
+          
+          export HMCL_EXE_FILE_NAME=`cat ci.json | jq -M -r '.artifacts[] | select(.fileName | endswith(".exe")) | .fileName'`
+          if [ -z `echo $HMCL_EXE_FILE_NAME | grep -E "^HMCL-[0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+)?\.exe\$"` ]; then exit 1; fi
+          
+          export HMCL_VERSION=`echo "${HMCL_EXE_FILE_NAME%.exe}" | tail -c +6`
+          export HMCL_COMMIT_SHA=`cat ci.json | jq -M -r '.actions[] | select(._class == "hudson.plugins.git.util.BuildData") | .lastBuiltRevision.SHA1'`
+
+          if [ "${#HMCL_COMMIT_SHA}" != 40 ]; then exit 1; fi
+
+          echo "HMCL_VERSION=$HMCL_VERSION" >> $GITHUB_ENV
+          echo "HMCL_COMMIT_SHA=$HMCL_COMMIT_SHA" >> $GITHUB_ENV
+          echo "HMCL_TAG_NAME=release-$HMCL_VERSION" >> $GITHUB_ENV
+      - name: Check for existing tags
+        run: if ! git tag -l | grep -q "$HMCL_TAG_NAME"; then echo "continue=true" >> $GITHUB_ENV; fi 
+      - name: Download artifacts
+        if: ${{ env.continue == 'true' }}
+        run: |
+          wget "$DOWNLOAD_BASE_URL/HMCL-$HMCL_VERSION.exe"
+          wget "$DOWNLOAD_BASE_URL/HMCL-$HMCL_VERSION.exe.sha256"
+          wget "$DOWNLOAD_BASE_URL/HMCL-$HMCL_VERSION.jar"
+          wget "$DOWNLOAD_BASE_URL/HMCL-$HMCL_VERSION.jar.sha256"
+          wget "$DOWNLOAD_BASE_URL/HMCL-$HMCL_VERSION.sh"
+          wget "$DOWNLOAD_BASE_URL/HMCL-$HMCL_VERSION.sh.sha256"
+        env:
+          DOWNLOAD_BASE_URL: https://ci.huangyuhui.net/job/HMCL-stable/lastSuccessfulBuild/artifact/HMCL/build/libs
+      - name: Generate release note
+        if: ${{ env.continue == 'true' }}
+        run: |
+          echo "**This version is a stable version.**" >> RELEASE_NOTE
+          echo "" >> RELEASE_NOTE
+          echo "The full changelogs can be found on the website: https://docs.hmcl.net/changelog/stable.html" >> RELEASE_NOTE
+          echo "" >> RELEASE_NOTE
+          echo "Notice: changelogs are written in Chinese." >> RELEASE_NOTE
+          echo "" >> RELEASE_NOTE
+          echo "| File Name | SHA-256 Checksum |"  >> RELEASE_NOTE
+          echo "| ---  | --- |" >> RELEASE_NOTE
+          echo "| [HMCL-$HMCL_VERSION.exe]($GH_DOWNLOAD_BASE_URL/release-$HMCL_VERSION/HMCL-$HMCL_VERSION.exe) | $(cat HMCL-$HMCL_VERSION.exe.sha256) |" >> RELEASE_NOTE
+          echo "| [HMCL-$HMCL_VERSION.jar]($GH_DOWNLOAD_BASE_URL/release-$HMCL_VERSION/HMCL-$HMCL_VERSION.jar) | $(cat HMCL-$HMCL_VERSION.jar.sha256) |" >> RELEASE_NOTE
+          echo "| [HMCL-$HMCL_VERSION.sh]($GH_DOWNLOAD_BASE_URL/release-$HMCL_VERSION/HMCL-$HMCL_VERSION.sh)   | $(cat HMCL-$HMCL_VERSION.sh.sha256) |"  >> RELEASE_NOTE
+        env:
+          GH_DOWNLOAD_BASE_URL: https://github.com/HMCL-dev/HMCL/releases/download
+      - name: Create release
+        if: ${{ env.continue == 'true' }}
+        uses: softprops/action-gh-release@v2
        with:
          body_path: RELEASE_NOTE
          files: |
            HMCL-${{ env.HMCL_VERSION }}.exe
-            HMCL-${{ env.HMCL_VERSION }}.exe.sha1
            HMCL-${{ env.HMCL_VERSION }}.jar
-            HMCL-${{ env.HMCL_VERSION }}.jar.sha1
            HMCL-${{ env.HMCL_VERSION }}.sh
-            HMCL-${{ env.HMCL_VERSION }}.sh.sha1
          target_commitish: ${{ env.HMCL_COMMIT_SHA }}
          name: ${{ env.HMCL_TAG_NAME }}
          tag_name: ${{ env.HMCL_TAG_NAME }}
@@ -5,13 +5,13 @@ on:

 jobs:
  run:
-    if: ${{ github.repository_owner == 'huanghongxun' }}
+    if: ${{ github.repository_owner == 'HMCL-dev' }}
    runs-on: ubuntu-latest
    steps:
-      - name: Mirror Github to Gitee
-        uses: Yikun/hub-mirror-action@v1.1
+      - name: Mirror GitHub to Gitee
+        uses: Yikun/hub-mirror-action@v1.4
        with:
-          src: github/huanghongxun
+          src: github/HMCL-dev
          dst: gitee/huanghongxun
          static_list: 'HMCL'
          force_update: true
@@ -1,6 +1,11 @@
 name: Java CI

-on: [push, pull_request]
+on:
+  push:
+  pull_request:
+    paths-ignore:
+      - '**.md'
+      - 'HMCLauncher/**'

 jobs:
  build:
@@ -8,15 +13,15 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 11
-      uses: actions/setup-java@v3
+    - uses: actions/checkout@v4
+    - name: Set up JDK 8
+      uses: actions/setup-java@v4
      with:
        distribution: 'zulu'
-        java-version: '11'
+        java-version: 8
        java-package: 'jdk+fx'
    - name: Build with Gradle
-      run: ./gradlew build
+      run: ./gradlew build --no-daemon
      env:
        MICROSOFT_AUTH_ID: ${{ secrets.MICROSOFT_AUTH_ID }}
        MICROSOFT_AUTH_SECRET: ${{ secrets.MICROSOFT_AUTH_SECRET }}
@@ -24,7 +29,7 @@ jobs:
    - name: Get short SHA
      run: echo "SHORT_SHA=${GITHUB_SHA::7}" >> $GITHUB_ENV
    - name: Upload Artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
      with:
        name: HMCL-${{ env.SHORT_SHA }}
        path: HMCL/build/libs
@@ -46,6 +46,9 @@ minecraft-exported-crash-info*
 # macos
 .DS_Store

+# vscode
+.vscode/
+
 # test
 /hmcl.json
 /.hmcl.json
@@ -12,19 +12,20 @@ plugins {
 }

 val isOfficial = System.getenv("HMCL_SIGNATURE_KEY") != null
-        || (System.getenv("GITHUB_REPOSITORY_OWNER") == "huanghongxun" && System.getenv("GITHUB_BASE_REF").isNullOrEmpty())
+        || (System.getenv("GITHUB_REPOSITORY_OWNER") == "HMCL-dev" && System.getenv("GITHUB_BASE_REF")
+    .isNullOrEmpty())

 val buildNumber = System.getenv("BUILD_NUMBER")?.toInt().let { number ->
    val offset = System.getenv("BUILD_NUMBER_OFFSET")?.toInt() ?: 0
    if (number != null) {
        (number - offset).toString()
    } else {
-        val shortCommit = System.getenv("GITHUB_SHA")?.toLowerCase()?.substring(0, 7)
+        val shortCommit = System.getenv("GITHUB_SHA")?.lowercase()?.substring(0, 7)
        val prefix = if (isOfficial) "dev" else "unofficial"
        if (!shortCommit.isNullOrEmpty()) "$prefix-$shortCommit" else "SNAPSHOT"
    }
 }
-val versionRoot = System.getenv("VERSION_ROOT") ?: "3.5"
+val versionRoot = System.getenv("VERSION_ROOT") ?: "3.6"
 val versionType = System.getenv("VERSION_TYPE") ?: if (isOfficial) "nightly" else "unofficial"

 val microsoftAuthId = System.getenv("MICROSOFT_AUTH_ID") ?: ""
@@ -36,13 +37,13 @@ version = "$versionRoot.$buildNumber"
 dependencies {
    implementation(project(":HMCLCore"))
    implementation("libs:JFoenix")
+    implementation("com.twelvemonkeys.imageio:imageio-webp:3.12.0")
 }

-fun digest(algorithm: String, bytes: ByteArray) = MessageDigest.getInstance(algorithm).digest(bytes)
+fun digest(algorithm: String, bytes: ByteArray): ByteArray = MessageDigest.getInstance(algorithm).digest(bytes)

 fun createChecksum(file: File) {
    val algorithms = linkedMapOf(
-        "MD5" to "md5",
        "SHA-1" to "sha1",
        "SHA-256" to "sha256",
        "SHA-512" to "sha512"
@@ -56,7 +57,12 @@ fun createChecksum(file: File) {
 }

 fun attachSignature(jar: File) {
-    val keyLocation = System.getenv("HMCL_SIGNATURE_KEY") ?: return
+    val keyLocation = System.getenv("HMCL_SIGNATURE_KEY")
+    if (keyLocation == null) {
+        logger.warn("Missing signature key")
+        return
+    }
+
    val privatekey = KeyFactory.getInstance("RSA").generatePrivate(PKCS8EncodedKeySpec(File(keyLocation).readBytes()))
    val signer = Signature.getInstance("SHA512withRSA")
    signer.initSign(privatekey)
@@ -102,15 +108,20 @@ val jarPath = tasks.jar.get().archiveFile.get().asFile
 tasks.getByName<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {
    archiveClassifier.set(null as String?)

+    exclude("**/package-info.class")
+    exclude("META-INF/maven/**")
+
+    exclude("META-INF/services/javax.imageio.spi.ImageReaderSpi")
+    exclude("META-INF/services/javax.imageio.spi.ImageInputStreamSpi")
+
    minimize {
        exclude(dependency("com.google.code.gson:.*:.*"))
-        exclude(dependency("com.github.steveice10:.*:.*"))
        exclude(dependency("libs:JFoenix:.*"))
    }

    manifest {
        attributes(
-            "Created-By" to "Copyright(c) 2013-2023 huangyuhui.",
+            "Created-By" to "Copyright(c) 2013-2024 huangyuhui.",
            "Main-Class" to "org.jackhuang.hmcl.Main",
            "Multi-Release" to "true",
            "Implementation-Version" to project.version,
@@ -131,7 +142,8 @@ tasks.getByName<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("sha
                "javafx.graphics/com.sun.prism",
                "javafx.controls/com.sun.javafx.scene.control",
                "javafx.controls/com.sun.javafx.scene.control.behavior",
-                "javafx.controls/javafx.scene.control.skin"
+                "javafx.controls/javafx.scene.control.skin",
+                "jdk.attach/sun.tools.attach"
            ).joinToString(" ")
        )

@@ -158,33 +170,10 @@ fun createExecutable(suffix: String, header: String) {
 }

 tasks.processResources {
-    fun convertToBSS(resource: String) {
-        doFirst {
-            val cssFile = File(projectDir, "src/main/resources/$resource")
-            val bssFile = File(projectDir, "build/compiled-resources/${resource.substring(0, resource.length - 4)}.bss")
-            bssFile.parentFile.mkdirs()
-            javaexec {
-                classpath = sourceSets["main"].compileClasspath
-                mainClass.set("com.sun.javafx.css.parser.Css2Bin")
-                args(cssFile, bssFile)
-            }
-        }
-    }
-
-    from("build/compiled-resources")
-
-    convertToBSS("assets/css/root.css")
-    convertToBSS("assets/css/blue.css")
-
    into("META-INF/versions/11") {
        from(sourceSets["java11"].output)
    }
    dependsOn(tasks["java11Classes"])
-
-    into("assets") {
-        from(project.buildDir.resolve("openjfx-dependencies.json"))
-    }
-    dependsOn(rootProject.tasks["generateOpenJFXDependencies"])
 }

 val makeExecutables = tasks.create("makeExecutables") {
@@ -199,6 +188,56 @@ tasks.build {
    dependsOn(makeExecutables)
 }

+fun parseToolOptions(options: String?): List<String> {
+    if (options == null)
+        return listOf()
+
+    val builder = StringBuilder()
+    val result = mutableListOf<String>()
+
+    var offset = 0
+
+    loop@ while (offset < options.length) {
+        val ch = options[offset]
+        if (Character.isWhitespace(ch)) {
+            if (builder.isNotEmpty()) {
+                result += builder.toString()
+                builder.clear()
+            }
+
+            while (offset < options.length && Character.isWhitespace(options[offset])) {
+                offset++
+            }
+
+            continue@loop
+        }
+
+        if (ch == '\'' || ch == '"') {
+            offset++
+
+            while (offset < options.length) {
+                val ch2 = options[offset++]
+                if (ch2 != ch) {
+                    builder.append(ch2)
+                } else {
+                    continue@loop
+                }
+            }
+
+            throw GradleException("Unmatched quote in $options")
+        }
+
+        builder.append(ch)
+        offset++
+    }
+
+    if (builder.isNotEmpty()) {
+        result += builder.toString()
+    }
+
+    return result
+}
+
 tasks.create<JavaExec>("run") {
    dependsOn(tasks.jar)

@@ -206,4 +245,11 @@ tasks.create<JavaExec>("run") {

    classpath = files(jarPath)
    workingDir = rootProject.rootDir
+
+    val vmOptions = parseToolOptions(System.getenv("HMCL_JAVA_OPTS"))
+    jvmArgs(vmOptions)
+
+    doFirst {
+        logger.quiet("HMCL_JAVA_OPTS: $vmOptions")
+    }
 }
@@ -27,7 +27,7 @@ S = ';'
 MOD_SEPARATOR = ','

 CURSEFORGE_PATTERN1 = re.compile(
-    r'^/minecraft/(mc-mods|modpacks|customization|mc-addons|customization/configuration)/+(?P<modid>[\w-]+)(/(.*?))?$')
+    r'^/(minecraft|Minecraft|minecraft-bedrock)/(mc-mods|modpacks|customization|mc-addons|texture-packs|customization/configuration|addons)/+(?P<modid>[\w-]+)(/(.*?))?$')
 CURSEFORGE_PATTERN2 = re.compile(
    r'^/projects/(?P<modid>[\w-]+)(/(.*?))?$')
 CURSEFORGE_PATTERN3 = re.compile(
@@ -58,30 +58,6 @@ def parseMcmod(url):
        return match.group('modid')
    return ''

-
-MCBBS_HTML_PATTERN = re.compile(r'/+thread-(?P<modid>\d+)-(\d+)-(\d+).html')
-MCBBS_PHP_PATTERN = re.compile(r'')
-
-
-def parseMcbbs(url):
-    res = urlparse(url)
-    if res.scheme not in ['http', 'https']:
-        return ''
-    if res.netloc != 'www.mcbbs.net':
-        return ''
-    match = MCBBS_HTML_PATTERN.match(res.path)
-    if match:
-        return match.group('modid')
-
-    query = parse_qs(res.query)
-
-    if res.path == '/forum.php':
-        if 'mod' in query and 'tid' in query and query['mod'] == ['viewthread']:
-            return query['tid']
-
-    return ''
-
-
 skip = [
    'Minecraft',
    'The Building Game'
@@ -111,12 +87,11 @@ if __name__ == '__main__':
                exit(1)

            black_lists = [
-                'Master Chef'
+                'Wood Converter'
            ]

            curseforge_id = ''
            mcmod_id = ''
-            mcbbs_id = ''
            links = mod['links']['list']
            if 'curseforge' in links and links['curseforge'] and sub_name not in black_lists and chinese_name not in black_lists:
                for link in links['curseforge']:
@@ -131,11 +106,6 @@ if __name__ == '__main__':
                if mcmod_id == '':
                    print('Error mcmod ' + chinese_name)
                    exit(1)
-            if 'mcbbs' in links and links['mcbbs']:
-                mcbbs_id = parseMcbbs(links['mcbbs'][0]['url'])
-                if mcbbs_id == '':
-                    print('Error mcbbs ' + chinese_name)
-                    exit(1)

            mod_id = []
            if 'modid' in mod and 'list' in mod['modid']:
@@ -148,6 +118,6 @@ if __name__ == '__main__':
            mod_ids = MOD_SEPARATOR.join([str(id) for id in mod_id])

            outfile.write(
-                f'{curseforge_id}{S}{mcmod_id}{S}{mcbbs_id}{S}{mod_ids}{S}{chinese_name}{S}{sub_name}{S}{abbr}\n')
+                f'{curseforge_id}{S}{mcmod_id}{S}{mod_ids}{S}{chinese_name}{S}{sub_name}{S}{abbr}\n')

    print('Success!')
@@ -20,6 +20,7 @@ package org.jackhuang.hmcl;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.control.Alert;
+import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.ButtonType;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.DataFormat;
@@ -50,10 +51,9 @@ import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;

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

 public final class Launcher extends Application {
@@ -70,7 +70,7 @@ public final class Launcher extends Application {
            Object pipeline = Class.forName("com.sun.prism.GraphicsPipeline").getMethod("getPipeline").invoke(null);
            LOG.info("Prism pipeline: " + (pipeline == null ? "null" : pipeline.getClass().getName()));
        } catch (Throwable e) {
-            LOG.log(Level.WARNING, "Failed to get prism pipeline", e);
+            LOG.warning("Failed to get prism pipeline", e);
        }

        try {
@@ -79,18 +79,24 @@ public final class Launcher extends Application {
            } catch (SambaException ignored) {
                Main.showWarningAndContinue(i18n("fatal.samba"));
            } catch (IOException e) {
-                LOG.log(Level.SEVERE, "Failed to load config", e);
+                LOG.error("Failed to load config", e);
                checkConfigInTempDir();
                checkConfigOwner();
                Main.showErrorAndExit(i18n("fatal.config_loading_failure", ConfigHolder.configLocation().getParent()));
            }

-            checkConfigInTempDir();
+            // https://lapcatsoftware.com/articles/app-translocation.html
+            if (OperatingSystem.CURRENT_OS == OperatingSystem.OSX
+                    && 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)
+                    return;
+            } else {
+                checkConfigInTempDir();
+            }
+
            if (ConfigHolder.isOwnerChanged()) {
-                ButtonType res = new Alert(Alert.AlertType.WARNING, i18n("fatal.config_change_owner_root"), ButtonType.YES, ButtonType.NO)
-                        .showAndWait()
-                        .orElse(null);
-                if (res == ButtonType.NO)
+                if (showAlert(AlertType.WARNING, i18n("fatal.config_change_owner_root"), ButtonType.YES, ButtonType.NO) == ButtonType.NO)
                    return;
            }

@@ -114,6 +120,10 @@ public final class Launcher extends Application {
        }
    }

+    private static ButtonType showAlert(AlertType alertType, String contentText, ButtonType... buttons) {
+        return new Alert(alertType, contentText, buttons).showAndWait().orElse(null);
+    }
+
    private static boolean isConfigInTempDir() {
        String configPath = ConfigHolder.configLocation().toString();

@@ -132,7 +142,7 @@ public final class Launcher extends Application {
                    || configPath.contains("\\INetCache\\")
                    || configPath.contains("\\$Recycle.Bin\\")
                    || configPath.contains("\\recycler\\");
-        } else if (OperatingSystem.CURRENT_OS == OperatingSystem.LINUX) {
+        } else if (OperatingSystem.CURRENT_OS.isLinuxOrBSD()) {
            return configPath.startsWith("/tmp/")
                    || configPath.startsWith("/var/tmp/")
                    || configPath.startsWith("/var/cache/")
@@ -152,13 +162,9 @@ public final class Launcher extends Application {
    }

    private static void checkConfigInTempDir() {
-        if (ConfigHolder.isNewlyCreated() && isConfigInTempDir()) {
-            ButtonType res = new Alert(Alert.AlertType.WARNING, i18n("fatal.config_in_temp_dir"), ButtonType.YES, ButtonType.NO)
-                    .showAndWait()
-                    .orElse(null);
-            if (res == ButtonType.NO) {
-                System.exit(0);
-            }
+        if (ConfigHolder.isNewlyCreated() && isConfigInTempDir()
+                && showAlert(AlertType.WARNING, i18n("fatal.config_in_temp_dir"), ButtonType.YES, ButtonType.NO) == ButtonType.NO) {
+            Main.exit(0);
        }
    }

@@ -171,7 +177,7 @@ public final class Launcher extends Application {
        try {
            owner = Files.getOwner(ConfigHolder.configLocation()).getName();
        } catch (IOException ioe) {
-            LOG.log(Level.WARNING, "Failed to get file owner", ioe);
+            LOG.warning("Failed to get file owner", ioe);
            return;
        }

@@ -190,24 +196,24 @@ public final class Launcher extends Application {
        String command = new CommandBuilder().add("sudo", "chown", "-R", userName).addAll(files).toString();
        ButtonType copyAndExit = new ButtonType(i18n("button.copy_and_exit"));

-        ButtonType res = new Alert(Alert.AlertType.ERROR, i18n("fatal.config_loading_failure.unix", owner, command), copyAndExit, ButtonType.CLOSE)
-                .showAndWait()
-                .orElse(null);
-        if (res == copyAndExit) {
+        if (showAlert(AlertType.ERROR,
+                i18n("fatal.config_loading_failure.unix", owner, command),
+                copyAndExit, ButtonType.CLOSE) == copyAndExit) {
            Clipboard.getSystemClipboard()
                    .setContent(Collections.singletonMap(DataFormat.PLAIN_TEXT, command));
        }
-        System.exit(1);
+        Main.exit(1);
    }

    @Override
    public void stop() throws Exception {
-        super.stop();
        Controllers.onApplicationStop();
+        LOG.shutdown();
    }

    public static void main(String[] args) {
        if (UpdateHandler.processArguments(args)) {
+            LOG.shutdown();
            return;
        }

@@ -216,21 +222,29 @@ public final class Launcher extends Application {

        try {
            LOG.info("*** " + Metadata.TITLE + " ***");
-            LOG.info("Operating System: " + OperatingSystem.SYSTEM_NAME + ' ' + OperatingSystem.SYSTEM_VERSION);
+            LOG.info("Operating System: " + (OperatingSystem.OS_RELEASE_PRETTY_NAME == null
+                    ? OperatingSystem.SYSTEM_NAME + ' ' + OperatingSystem.SYSTEM_VERSION
+                    : OperatingSystem.OS_RELEASE_PRETTY_NAME + " (" + OperatingSystem.SYSTEM_NAME + ' ' + OperatingSystem.SYSTEM_VERSION + ')'));
            LOG.info("System Architecture: " + Architecture.SYSTEM_ARCH_NAME);
            LOG.info("Java Architecture: " + Architecture.CURRENT_ARCH_NAME);
            LOG.info("Java Version: " + System.getProperty("java.version") + ", " + System.getProperty("java.vendor"));
            LOG.info("Java VM Version: " + System.getProperty("java.vm.name") + " (" + System.getProperty("java.vm.info") + "), " + System.getProperty("java.vm.vendor"));
            LOG.info("Java Home: " + System.getProperty("java.home"));
-            LOG.info("Current Directory: " + Paths.get("").toAbsolutePath());
+            LOG.info("Current Directory: " + System.getProperty("user.dir"));
            LOG.info("HMCL Directory: " + Metadata.HMCL_DIRECTORY);
-            LOG.info("HMCL Jar Path: " + JarUtils.thisJar().map(it -> it.toAbsolutePath().toString()).orElse("Not Found"));
+            LOG.info("HMCL Jar Path: " + Lang.requireNonNullElse(JarUtils.thisJarPath(), "Not Found"));
+            LOG.info("HMCL Log File: " + Lang.requireNonNullElse(LOG.getLogFile(), "In Memory"));
            LOG.info("Memory: " + Runtime.getRuntime().maxMemory() / 1024 / 1024 + "MB");
+            LOG.info("Physical memory: " + OperatingSystem.TOTAL_MEMORY + " MB");
            LOG.info("Metaspace: " + ManagementFactory.getMemoryPoolMXBeans().stream()
                    .filter(bean -> bean.getName().equals("Metaspace"))
                    .findAny()
                    .map(bean -> bean.getUsage().getUsed() / 1024 / 1024 + "MB")
                    .orElse("Unknown"));
+            if (OperatingSystem.CURRENT_OS.isLinuxOrBSD()) {
+                LOG.info("XDG Session Type: " + System.getenv("XDG_SESSION_TYPE"));
+                LOG.info("XDG Current Desktop: " + System.getenv("XDG_CURRENT_DESKTOP"));
+            }

            launch(Launcher.class, args);
        } catch (Throwable e) { // Fucking JavaFX will suppress the exception and will break our crash reporter.
@@ -20,11 +20,9 @@ package org.jackhuang.hmcl;
 import javafx.application.Platform;
 import javafx.scene.control.Alert;
 import org.jackhuang.hmcl.ui.AwtUtils;
-import org.jackhuang.hmcl.util.Logging;
 import org.jackhuang.hmcl.util.SelfDependencyPatcher;
 import org.jackhuang.hmcl.ui.SwingUtils;
-import org.jackhuang.hmcl.util.platform.Architecture;
-import org.jackhuang.hmcl.util.platform.JavaVersion;
+import org.jackhuang.hmcl.java.JavaRuntime;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;

 import javax.net.ssl.HttpsURLConnection;
@@ -43,10 +41,9 @@ import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateException;
 import java.util.Collections;
 import java.util.concurrent.CancellationException;
-import java.util.logging.Level;

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

 public final class Main {
@@ -55,26 +52,32 @@ public final class Main {
    }

    public static void main(String[] args) {
-        System.setProperty("java.net.useSystemProxies", "true");
-        System.setProperty("javafx.autoproxy.disable", "true");
+        System.getProperties().putIfAbsent("java.net.useSystemProxies", "true");
+        System.getProperties().putIfAbsent("javafx.autoproxy.disable", "true");
        System.getProperties().putIfAbsent("http.agent", "HMCL/" + Metadata.VERSION);

+        LOG.start(Metadata.HMCL_DIRECTORY.resolve("logs"));
+
        checkDirectoryPath();

-        if (JavaVersion.CURRENT_JAVA.getParsedVersion() < 9)
+        if (JavaRuntime.CURRENT_VERSION < 9)
            // This environment check will take ~300ms
            thread(Main::fixLetsEncrypt, "CA Certificate Check", true);

        if (OperatingSystem.CURRENT_OS == OperatingSystem.OSX)
            initIcon();

-        Logging.start(Metadata.HMCL_DIRECTORY.resolve("logs"));
-
        checkJavaFX();
+        verifyJavaFX();

        Launcher.main(args);
    }

+    public static void exit(int exitCode) {
+        LOG.shutdown();
+        System.exit(exitCode);
+    }
+
    private static void initIcon() {
        java.awt.Image image = java.awt.Toolkit.getDefaultToolkit().getImage(Main.class.getResource("/assets/img/icon@8x.png"));
        AwtUtils.setAppleIcon(image);
@@ -93,19 +96,27 @@ public final class Main {
        try {
            SelfDependencyPatcher.patch();
        } catch (SelfDependencyPatcher.PatchException e) {
-            LOG.log(Level.SEVERE, "unable to patch JVM", e);
+            LOG.error("unable to patch JVM", e);
            showErrorAndExit(i18n("fatal.javafx.missing"));
        } catch (SelfDependencyPatcher.IncompatibleVersionException e) {
-            LOG.log(Level.SEVERE, "unable to patch JVM", e);
-            if (Architecture.CURRENT_ARCH == Architecture.MIPS64EL
-                    || Architecture.CURRENT_ARCH == Architecture.LOONGARCH64
-                    || Architecture.CURRENT_ARCH == Architecture.LOONGARCH64_OW)
-                showErrorAndExit(i18n("fatal.javafx.incompatible.loongson"));
-            else
-                showErrorAndExit(i18n("fatal.javafx.incompatible"));
+            LOG.error("unable to patch JVM", e);
+            showErrorAndExit(i18n("fatal.javafx.incompatible"));
        } catch (CancellationException e) {
-            LOG.log(Level.SEVERE, "User cancels downloading JavaFX", e);
-            System.exit(0);
+            LOG.error("User cancels downloading JavaFX", e);
+            exit(0);
+        }
+    }
+
+    /**
+     * Check if JavaFX exists but is incomplete
+     */
+    private static void verifyJavaFX() {
+        try {
+            Class.forName("javafx.beans.binding.Binding"); // javafx.base
+            Class.forName("javafx.stage.Stage");           // javafx.graphics
+            Class.forName("javafx.scene.control.Skin");    // javafx.controls
+        } catch (Exception e) {
+            showErrorAndExit(i18n("fatal.javafx.incomplete"));
        }
    }

@@ -119,13 +130,13 @@ public final class Main {
        try {
            if (Platform.isFxApplicationThread()) {
                new Alert(Alert.AlertType.ERROR, message).showAndWait();
-                System.exit(1);
+                exit(1);
            }
        } catch (Throwable ignored) {
        }

        SwingUtils.showErrorDialog(message);
-        System.exit(1);
+        exit(1);
    }

    /**
@@ -146,7 +157,7 @@ public final class Main {
        SwingUtils.showWarningDialog(message);
    }

-    static void fixLetsEncrypt() {
+    private static void fixLetsEncrypt() {
        try {
            KeyStore defaultKeyStore = KeyStore.getInstance(KeyStore.getDefaultType());
            Path ksPath = Paths.get(System.getProperty("java.home"), "lib", "security", "cacerts");
@@ -175,7 +186,7 @@ public final class Main {
            LOG.info("Added Lets Encrypt root certificates as additional trust");
        } catch (KeyStoreException | IOException | NoSuchAlgorithmException | CertificateException |
                 KeyManagementException e) {
-            LOG.log(Level.SEVERE, "Failed to load lets encrypt certificate. Expect problems", e);
+            LOG.error("Failed to load lets encrypt certificate. Expect problems", e);
        }
    }
 }
@@ -37,11 +37,11 @@ public final class Metadata {
    public static final String TITLE = NAME + " " + VERSION;
    public static final String FULL_TITLE = FULL_NAME + " v" + VERSION;

-    public static final String UPDATE_URL = System.getProperty("hmcl.update_source.override", "https://hmcl.huangyuhui.net/api/update_link");
+    public static final String HMCL_UPDATE_URL = System.getProperty("hmcl.update_source.override", "https://hmcl.huangyuhui.net/api/update_link");
    public static final String CONTACT_URL = "https://docs.hmcl.net/help.html";
-    public static final String HELP_URL = "https://hmcl.huangyuhui.net/help";
+    public static final String HELP_URL = "https://docs.hmcl.net";
    public static final String CHANGELOG_URL = "https://docs.hmcl.net/changelog/";
-    public static final String PUBLISH_URL = "https://www.mcbbs.net/thread-142335-1-1.html";
+    public static final String PUBLISH_URL = "https://hmcl.huangyuhui.net";
    public static final String EULA_URL = "https://docs.hmcl.net/eula/hmcl.html";

    public static final String BUILD_CHANNEL = JarUtils.getManifestAttribute("Build-Channel", "nightly");
@@ -53,7 +53,7 @@ public final class Metadata {
    static {
        String hmclHome = System.getProperty("hmcl.home");
        if (hmclHome == null) {
-            if (OperatingSystem.CURRENT_OS == OperatingSystem.LINUX) {
+            if (OperatingSystem.CURRENT_OS.isLinuxOrBSD()) {
                String xdgData = System.getenv("XDG_DATA_HOME");
                if (StringUtils.isNotBlank(xdgData)) {
                    HMCL_DIRECTORY = Paths.get(xdgData, "hmcl").toAbsolutePath();
@@ -1,87 +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.countly;
-
-import org.jackhuang.hmcl.util.io.HttpRequest;
-
-import java.io.IOException;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
-import java.util.TimeZone;
-
-import static org.jackhuang.hmcl.util.Pair.pair;
-
-public class Countly {
-
-    private String deviceId;
-    private String endpoint;
-    private String serverURL;
-
-    public void sendMetric(String metrics) throws IOException {
-        HttpRequest.GET(serverURL + endpoint,
-                pair("begin_session", "1"),
-                pair("session_id", "1"),
-                pair("metrics", metrics),
-                pair("device_id", deviceId),
-                pair("timestamp", Long.toString(System.currentTimeMillis())),
-                pair("tz", Integer.toString(TimeZone.getDefault().getOffset(new Date().getTime()) / 60000)),
-                pair("hour", Integer.toString(currentHour())),
-                pair("dow", Integer.toString(currentDayOfWeek())),
-                pair("app_key", APP_KEY),
-                pair("sdk_name", "java-native"),
-                pair("sdk_version", "20.11.1"))
-                .getString();
-    }
-
-    private static int getTimezoneOffset() {
-        return TimeZone.getDefault().getOffset(new Date().getTime()) / 60000;
-    }
-
-    private static String getLocale() {
-        final Locale locale = Locale.getDefault();
-        return locale.getLanguage() + "_" + locale.getCountry();
-    }
-
-    private static int currentHour() {
-        return Calendar.getInstance().get(Calendar.HOUR_OF_DAY);
-    }
-
-    private int currentDayOfWeek() {
-        int day = Calendar.getInstance().get(Calendar.DAY_OF_WEEK);
-        switch (day) {
-            case Calendar.SUNDAY:
-                return 0;
-            case Calendar.MONDAY:
-                return 1;
-            case Calendar.TUESDAY:
-                return 2;
-            case Calendar.WEDNESDAY:
-                return 3;
-            case Calendar.THURSDAY:
-                return 4;
-            case Calendar.FRIDAY:
-                return 5;
-            case Calendar.SATURDAY:
-                return 6;
-        }
-        return 0;
-    }
-
-    private static final String APP_KEY = "";
-}
@@ -1,18 +1,12 @@
 package org.jackhuang.hmcl.countly;

 import org.jackhuang.hmcl.Metadata;
-import org.jackhuang.hmcl.util.Logging;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.platform.Architecture;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;

-import java.io.File;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Map;
-
-import static org.jackhuang.hmcl.util.Lang.mapOf;
-import static org.jackhuang.hmcl.util.Pair.pair;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;

 public class CrashReport {

@@ -20,48 +14,30 @@ public class CrashReport {
    private final Throwable throwable;
    private final String stackTrace;

-    private boolean nonFatal;
-
    public CrashReport(Thread thread, Throwable throwable) {
        this.thread = thread;
        this.throwable = throwable;
        stackTrace = StringUtils.getStackTrace(throwable);
-        nonFatal = false;
    }

-    public CrashReport setNonFatal() {
-        nonFatal = true;
-        return this;
+    public Throwable getThrowable() {
+        return this.throwable;
    }

    public boolean shouldBeReport() {
        if (!stackTrace.contains("org.jackhuang"))
            return false;

-        return true;
-    }
+        if (throwable instanceof VirtualMachineError)
+            return false;

-    public Map<String, Object> getMetrics(long runningTime) {
-        return mapOf(
-                pair("_run", runningTime),
-                pair("_app_version", Metadata.VERSION),
-                pair("_os", OperatingSystem.SYSTEM_NAME),
-                pair("_os_version", OperatingSystem.SYSTEM_VERSION),
-                pair("_disk_current", getDiskAvailable()),
-                pair("_disk_total", getDiskTotal()),
-                pair("_ram_current", getMemoryAvailable()),
-                pair("_ram_total", Runtime.getRuntime().maxMemory() / BYTES_IN_MB),
-                pair("_error", stackTrace),
-                pair("_logs", Logging.getLogs()),
-                pair("_name", throwable.getLocalizedMessage()),
-                pair("_nonfatal", nonFatal)
-        );
+        return true;
    }

    public String getDisplayText() {
        return "---- Hello Minecraft! Crash Report ----\n" +
                "  Version: " + Metadata.VERSION + "\n" +
-                "  Time: " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "\n" +
+                "  Time: " + DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(LocalDateTime.now()) + "\n" +
                "  Thread: " + thread + "\n" +
                "\n  Content: \n    " +
                stackTrace + "\n\n" +
@@ -75,29 +51,4 @@ public class CrashReport {
                "  JVM Total Memory: " + Runtime.getRuntime().totalMemory() + "\n" +
                "  JVM Free Memory: " + Runtime.getRuntime().freeMemory() + "\n";
    }
-
-    private static final Long BYTES_IN_MB = 1024L * 1024;
-
-    private static long getMemoryAvailable() {
-        Long total = Runtime.getRuntime().totalMemory();
-        Long availMem = Runtime.getRuntime().freeMemory();
-        return (total - availMem) / BYTES_IN_MB;
-    }
-
-    private static long getDiskAvailable() {
-        long total = 0, free = 0;
-        for (File f : File.listRoots()) {
-            total += f.getTotalSpace();
-            free += f.getUsableSpace();
-        }
-        return (total - free) / BYTES_IN_MB;
-    }
-
-    private static long getDiskTotal() {
-        long total = 0;
-        for (File f : File.listRoots()) {
-            total += f.getTotalSpace();
-        }
-        return total / BYTES_IN_MB;
-    }
 }
@@ -21,16 +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.Logging;
 import org.jackhuang.hmcl.util.i18n.I18n;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.platform.ManagedProcess;
+import org.jackhuang.hmcl.util.versioning.GameVersionNumber;

 import java.io.File;
 import java.io.IOException;
-import java.util.Locale;
 import java.util.Map;
-import java.util.logging.Level;
+
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;

 /**
 * @author huangyuhui
@@ -61,17 +61,43 @@ public final class HMCLGameLauncher extends DefaultLauncher {
        File optionsFile = new File(repository.getRunDirectory(version.getId()), "options.txt");
        File configFolder = new File(repository.getRunDirectory(version.getId()), "config");

-        if (optionsFile.exists())
+        if (optionsFile.exists()) {
            return;
-        if (configFolder.isDirectory())
-            if (findFiles(configFolder, "options.txt"))
+        }
+
+        if (configFolder.isDirectory()) {
+            if (findFiles(configFolder, "options.txt")) {
                return;
-        try {
-            // TODO: Dirty implementation here
-            if (I18n.getCurrentLocale().getLocale() == Locale.CHINA)
-                FileUtils.writeText(optionsFile, "lang:zh_CN\nforceUnicodeFont:true\n");
-        } catch (IOException e) {
-            Logging.LOG.log(Level.WARNING, "Unable to generate options.txt", e);
+            }
+        }
+
+        if (!I18n.isUseChinese()) {
+            return;
+        }
+
+        String lang;
+        /*
+            1.0-     ：没有语言选项，遇到这些版本时不设置
+            1.1 ~ 5  ：zh_CN 时正常，zh_cn 时崩溃（最后两位字母必须大写，否则将会 NPE 崩溃）
+            1.6 ~ 10 ：zh_CN 时正常，zh_cn 时自动切换为英文
+            1.11 ~ 12：zh_cn 时正常，zh_CN 时虽然显示了中文但语言设置会错误地显示选择英文
+            1.13+    ：zh_cn 时正常，zh_CN 时自动切换为英文
+         */
+        GameVersionNumber gameVersion = GameVersionNumber.asGameVersion(repository.getGameVersion(version));
+        if (gameVersion.compareTo("1.1") < 0) {
+            lang = null;
+        } else if (gameVersion.compareTo("1.11") < 0) {
+            lang = "zh_CN";
+        } else {
+            lang = "zh_cn";
+        }
+
+        if (lang != null) {
+            try {
+                FileUtils.writeText(optionsFile, String.format("lang:%s\n", lang));
+            } catch (IOException e) {
+                LOG.warning("Unable to generate options.txt", e);
+            }
        }
    }

@@ -33,11 +33,13 @@ import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.ProxyManager;
 import org.jackhuang.hmcl.setting.VersionIconType;
 import org.jackhuang.hmcl.setting.VersionSetting;
+import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
-import org.jackhuang.hmcl.util.platform.JavaVersion;
+import org.jackhuang.hmcl.util.javafx.PropertyUtils;
+import org.jackhuang.hmcl.java.JavaRuntime;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
 import org.jackhuang.hmcl.util.versioning.VersionNumber;
 import org.jetbrains.annotations.Nullable;
@@ -46,14 +48,13 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.time.Instant;
 import java.util.*;
-import java.util.logging.Level;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
-import static org.jackhuang.hmcl.ui.FXUtils.newImage;
-import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 import static org.jackhuang.hmcl.util.Pair.pair;

 public class HMCLGameRepository extends DefaultGameRepository {
@@ -102,7 +103,7 @@ public class HMCLGameRepository extends DefaultGameRepository {
    public Stream<Version> getDisplayVersions() {
        return getVersions().stream()
                .filter(v -> !v.isHidden())
-                .sorted(Comparator.comparing((Version v) -> v.getReleaseTime() == null ? new Date(0L) : v.getReleaseTime())
+                .sorted(Comparator.comparing((Version v) -> Lang.requireNonNullElse(v.getReleaseTime(), Instant.EPOCH))
                        .thenComparing(v -> VersionNumber.asVersion(v.getId())));
    }

@@ -122,10 +123,10 @@ public class HMCLGameRepository extends DefaultGameRepository {
            if (!file.exists() && !versions.isEmpty())
                FileUtils.writeText(file, PROFILE);
        } catch (IOException ex) {
-            LOG.log(Level.WARNING, "Unable to create launcher_profiles.json, Forge/LiteLoader installer will not work.", ex);
+            LOG.warning("Unable to create launcher_profiles.json, Forge/LiteLoader installer will not work.", ex);
        }

-        // https://github.com/huanghongxun/HMCL/issues/938
+        // https://github.com/HMCL-dev/HMCL/issues/938
        System.gc();
    }

@@ -164,7 +165,7 @@ public class HMCLGameRepository extends DefaultGameRepository {
        Files.move(fromJson, toJson);

        FileUtils.writeText(toJson.toFile(), JsonUtils.GSON.toJson(fromVersion.setId(dstId)));
-        
+
        VersionSetting oldVersionSetting = getVersionSetting(srcId).clone();
        GameDirectoryType originalGameDirType = oldVersionSetting.getGameDirType();
        oldVersionSetting.setUsesGlobal(false);
@@ -217,7 +218,7 @@ public class HMCLGameRepository extends DefaultGameRepository {

    private VersionSetting initLocalVersionSetting(String id, VersionSetting vs) {
        localVersionSettings.put(id, vs);
-        vs.addPropertyChangedListener(a -> saveVersionSetting(id));
+        vs.addListener(a -> saveVersionSetting(id));
        return vs;
    }

@@ -250,35 +251,82 @@ public class HMCLGameRepository extends DefaultGameRepository {
    public VersionSetting getVersionSetting(String id) {
        VersionSetting vs = getLocalVersionSetting(id);
        if (vs == null || vs.isUsesGlobal()) {
-            profile.getGlobal().setGlobal(true); // always keep global.isGlobal = true
            profile.getGlobal().setUsesGlobal(true);
            return profile.getGlobal();
        } else
            return vs;
    }

-    public File getVersionIconFile(String id) {
-        return new File(getVersionRoot(id), "icon.png");
+    public Optional<File> getVersionIconFile(String id) {
+        File root = getVersionRoot(id);
+
+        for (String extension : FXUtils.IMAGE_EXTENSIONS) {
+            File file = new File(root, "icon." + extension);
+            if (file.exists()) {
+                return Optional.of(file);
+            }
+        }
+
+        return Optional.empty();
+    }
+
+    public void setVersionIconFile(String id, File iconFile) throws IOException {
+        String ext = FileUtils.getExtension(iconFile).toLowerCase(Locale.ROOT);
+        if (!FXUtils.IMAGE_EXTENSIONS.contains(ext)) {
+            throw new IllegalArgumentException("Unsupported icon file: " + ext);
+        }
+
+        deleteIconFile(id);
+
+        FileUtils.copyFile(iconFile, new File(getVersionRoot(id), "icon." + ext));
+    }
+
+    public void deleteIconFile(String id) {
+        File root = getVersionRoot(id);
+        for (String extension : FXUtils.IMAGE_EXTENSIONS) {
+            new File(root, "icon." + extension).delete();
+        }
    }

    public Image getVersionIconImage(String id) {
        if (id == null || !isLoaded())
-            return newImage("/assets/img/grass.png");
+            return VersionIconType.DEFAULT.getIcon();

        VersionSetting vs = getLocalVersionSettingOrCreate(id);
-        VersionIconType iconType = Optional.ofNullable(vs).map(VersionSetting::getVersionIcon).orElse(VersionIconType.DEFAULT);
+        VersionIconType iconType = vs != null ? Lang.requireNonNullElse(vs.getVersionIcon(), VersionIconType.DEFAULT) : VersionIconType.DEFAULT;

        if (iconType == VersionIconType.DEFAULT) {
            Version version = getVersion(id).resolve(this);
-            File iconFile = getVersionIconFile(id);
-            if (iconFile.exists())
-                return new Image("file:" + iconFile.getAbsolutePath());
-            else if (LibraryAnalyzer.isModded(this, version))
-                return newImage("/assets/img/furnace.png");
-            else
-                return newImage("/assets/img/grass.png");
+            Optional<File> iconFile = getVersionIconFile(id);
+            if (iconFile.isPresent()) {
+                try {
+                    return FXUtils.loadImage(iconFile.get().toPath());
+                } catch (Exception e) {
+                    LOG.warning("Failed to load version icon of " + id, e);
+                }
+            }
+
+            if (LibraryAnalyzer.isModded(this, version)) {
+                LibraryAnalyzer libraryAnalyzer = LibraryAnalyzer.analyze(version, null);
+                if (libraryAnalyzer.has(LibraryAnalyzer.LibraryType.FABRIC))
+                    return VersionIconType.FABRIC.getIcon();
+                else if (libraryAnalyzer.has(LibraryAnalyzer.LibraryType.FORGE))
+                    return VersionIconType.FORGE.getIcon();
+                else if (libraryAnalyzer.has(LibraryAnalyzer.LibraryType.NEO_FORGE))
+                    return VersionIconType.NEO_FORGE.getIcon();
+                else if (libraryAnalyzer.has(LibraryAnalyzer.LibraryType.QUILT))
+                    return VersionIconType.QUILT.getIcon();
+                else if (libraryAnalyzer.has(LibraryAnalyzer.LibraryType.OPTIFINE))
+                    return VersionIconType.OPTIFINE.getIcon();
+                else if (libraryAnalyzer.has(LibraryAnalyzer.LibraryType.LITELOADER))
+                    return VersionIconType.CHICKEN.getIcon();
+                else
+                    return VersionIconType.FURNACE.getIcon();
+            }
+
+            return VersionIconType.DEFAULT.getIcon();
        } else {
-            return newImage(iconType.getResourceUrl());
+            return iconType.getIcon();
        }
    }

@@ -289,11 +337,13 @@ public class HMCLGameRepository extends DefaultGameRepository {
        if (!FileUtils.makeDirectory(file.getAbsoluteFile().getParentFile()))
            return false;

+        LOG.info("Saving version setting: " + id);
+
        try {
            FileUtils.writeText(file, GSON.toJson(localVersionSettings.get(id)));
            return true;
        } catch (IOException e) {
-            LOG.log(Level.SEVERE, "Unable to save version setting of " + id, e);
+            LOG.error("Unable to save version setting of " + id, e);
            return false;
        }
    }
@@ -309,7 +359,12 @@ public class HMCLGameRepository extends DefaultGameRepository {
            vs = createLocalVersionSetting(id);
        if (vs == null)
            return null;
-        vs.setUsesGlobal(false);
+        VersionIconType versionIcon = vs.getVersionIcon();
+        if (vs.isUsesGlobal()) {
+            PropertyUtils.copyProperties(profile.getGlobal(), vs);
+            vs.setUsesGlobal(false);
+        }
+        vs.setVersionIcon(versionIcon); // versionIcon is preserved
        return vs;
    }

@@ -319,7 +374,7 @@ public class HMCLGameRepository extends DefaultGameRepository {
            vs.setUsesGlobal(true);
    }

-    public LaunchOptions getLaunchOptions(String version, JavaVersion javaVersion, File gameDir, List<String> javaAgents, boolean makeLaunchScript) {
+    public LaunchOptions getLaunchOptions(String version, JavaRuntime javaVersion, File gameDir, List<String> javaAgents, boolean makeLaunchScript) {
        VersionSetting vs = getVersionSetting(version);

        LaunchOptions.Builder builder = new LaunchOptions.Builder()
@@ -332,7 +387,7 @@ public class HMCLGameRepository extends DefaultGameRepository {
                .setOverrideJavaArguments(StringUtils.tokenize(vs.getJavaArgs()))
                .setMaxMemory(vs.isNoJVMArgs() && vs.isAutoMemory() ? null : (int)(getAllocatedMemory(
                        vs.getMaxMemory() * 1024L * 1024L,
-                        OperatingSystem.getPhysicalMemoryStatus().orElse(OperatingSystem.PhysicalMemoryStatus.INVALID).getAvailable(),
+                        OperatingSystem.getPhysicalMemoryStatus().getAvailable(),
                        vs.isAutoMemory()
                ) / 1024 / 1024))
                .setMinMemory(vs.getMinMemory())
@@ -18,7 +18,6 @@
 package org.jackhuang.hmcl.game;

 import com.google.gson.JsonParseException;
-import com.google.gson.reflect.TypeToken;
 import org.jackhuang.hmcl.download.DefaultDependencyManager;
 import org.jackhuang.hmcl.download.LibraryAnalyzer;
 import org.jackhuang.hmcl.mod.MinecraftInstanceTask;
@@ -67,8 +66,7 @@ public final class HMCLModpackInstallTask extends Task<Void> {
        ModpackConfiguration<Modpack> config = null;
        try {
            if (json.exists()) {
-                config = JsonUtils.GSON.fromJson(FileUtils.readText(json), new TypeToken<ModpackConfiguration<Modpack>>() {
-                }.getType());
+                config = JsonUtils.GSON.fromJson(FileUtils.readText(json), ModpackConfiguration.typeOf(Modpack.class));

                if (!HMCLModpackProvider.INSTANCE.getName().equals(config.getType()))
                    throw new IllegalArgumentException("Version " + name + " is not a HMCL modpack. Cannot update this version.");
@@ -93,7 +91,7 @@ public final class HMCLModpackInstallTask extends Task<Void> {
    public void execute() throws Exception {
        String json = CompressingUtils.readTextZipEntry(zipFile, "minecraft/pack.json");
        Version originalVersion = JsonUtils.GSON.fromJson(json, Version.class).setId(name).setJar(null);
-        LibraryAnalyzer analyzer = LibraryAnalyzer.analyze(originalVersion);
+        LibraryAnalyzer analyzer = LibraryAnalyzer.analyze(originalVersion, null);
        Task<Version> libraryTask = Task.supplyAsync(() -> originalVersion);
        // reinstall libraries
        // libraries of Forge and OptiFine should be obtained by installation.
@@ -18,7 +18,6 @@
 package org.jackhuang.hmcl.game;

 import com.jfoenix.controls.JFXButton;
-import javafx.application.Platform;
 import javafx.stage.Stage;
 import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.auth.*;
@@ -28,7 +27,8 @@ import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.download.LibraryAnalyzer;
 import org.jackhuang.hmcl.download.MaintainTask;
 import org.jackhuang.hmcl.download.game.*;
-import org.jackhuang.hmcl.download.java.JavaRepository;
+import org.jackhuang.hmcl.java.JavaManager;
+import org.jackhuang.hmcl.java.JavaRuntime;
 import org.jackhuang.hmcl.launch.*;
 import org.jackhuang.hmcl.mod.ModpackCompletionException;
 import org.jackhuang.hmcl.mod.ModpackConfiguration;
@@ -36,12 +36,17 @@ import org.jackhuang.hmcl.mod.ModpackProvider;
 import org.jackhuang.hmcl.setting.*;
 import org.jackhuang.hmcl.task.*;
 import org.jackhuang.hmcl.ui.*;
-import org.jackhuang.hmcl.ui.construct.*;
+import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
+import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
 import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
+import org.jackhuang.hmcl.ui.construct.PromptDialogPane;
+import org.jackhuang.hmcl.ui.construct.TaskExecutorDialogPane;
 import org.jackhuang.hmcl.util.*;
 import org.jackhuang.hmcl.util.i18n.I18n;
+import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.io.ResponseCodeException;
 import org.jackhuang.hmcl.util.platform.*;
+import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
 import org.jackhuang.hmcl.util.versioning.VersionNumber;

 import java.io.File;
@@ -51,20 +56,18 @@ import java.net.SocketTimeoutException;
 import java.net.URL;
 import java.nio.file.AccessDeniedException;
 import java.util.*;
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.logging.Level;
 import java.util.stream.Collectors;

-import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static javafx.application.Platform.runLater;
+import static javafx.application.Platform.setImplicitExit;
 import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.Lang.resolveException;
-import static org.jackhuang.hmcl.util.Logging.LOG;
-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;
+import static org.jackhuang.hmcl.util.platform.Platform.SYSTEM_PLATFORM;
+import static org.jackhuang.hmcl.util.platform.Platform.isCompatibleWithX86Java;

 public final class LauncherHelper {

@@ -108,7 +111,7 @@ public final class LauncherHelper {
    public void launch() {
        FXUtils.checkFxUserThread();

-        Logging.LOG.info("Launching game version: " + selectedVersion);
+        LOG.info("Launching game version: " + selectedVersion);

        Controllers.dialog(launchingStepsPane);
        launch0();
@@ -129,12 +132,12 @@ public final class LauncherHelper {
        CountDownLatch launchingLatch = new CountDownLatch(1);
        List<String> javaAgents = new ArrayList<>(0);

-        AtomicReference<JavaVersion> javaVersionRef = new AtomicReference<>();
+        AtomicReference<JavaRuntime> javaVersionRef = new AtomicReference<>();

        TaskExecutor executor = checkGameState(profile, setting, version.get())
-                .thenComposeAsync(javaVersion -> {
-                    javaVersionRef.set(Objects.requireNonNull(javaVersion));
-                    version.set(NativePatcher.patchNative(version.get(), gameVersion.orElse(null), javaVersion, setting));
+                .thenComposeAsync(java -> {
+                    javaVersionRef.set(Objects.requireNonNull(java));
+                    version.set(NativePatcher.patchNative(version.get(), gameVersion.orElse(null), java, setting));
                    if (setting.isNotCheckGame())
                        return null;
                    return Task.allOf(
@@ -152,7 +155,7 @@ public final class LauncherHelper {
                            Task.composeAsync(() -> {
                                Renderer renderer = setting.getRenderer();
                                if (renderer != Renderer.DEFAULT && OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
-                                    Library lib = NativePatcher.getMesaLoader(javaVersion, renderer);
+                                    Library lib = NativePatcher.getMesaLoader(java, renderer);
                                    if (lib == null)
                                        return null;
                                    File file = dependencyManager.getGameRepository().getLibraryFile(version.get(), lib);
@@ -176,12 +179,13 @@ public final class LauncherHelper {
                            })
                    );
                }).withStage("launch.state.dependencies")
-                .thenComposeAsync(() -> {
-                    return gameVersion.map(s -> new GameVerificationFixTask(dependencyManager, s, version.get())).orElse(null);
-                })
+                .thenComposeAsync(() -> gameVersion.map(s -> new GameVerificationFixTask(dependencyManager, s, version.get())).orElse(null))
                .thenComposeAsync(() -> logIn(account).withStage("launch.state.logging_in"))
                .thenComposeAsync(authInfo -> Task.supplyAsync(() -> {
                    LaunchOptions launchOptions = repository.getLaunchOptions(selectedVersion, javaVersionRef.get(), profile.getGameDir(), javaAgents, scriptFile != null);
+
+                    LOG.info("Here's the structure of game mod directory:\n" + FileUtils.printFileStructure(repository.getModManager(selectedVersion).getModsDirectory(), 10));
+
                    return new HMCLGameLauncher(
                            repository,
                            version.get(),
@@ -211,14 +215,15 @@ public final class LauncherHelper {
                                it.fireEvent(new DialogCloseEvent());
                            }));
                    } else {
-                        Platform.runLater(() -> {
+                        runLater(() -> {
                            launchingStepsPane.fireEvent(new DialogCloseEvent());
                            Controllers.dialog(i18n("version.launch_script.success", scriptFile.getAbsolutePath()));
                        });
                    }
-                }).thenRunAsync(() -> {
-                    launchingLatch.await();
-                }).withStage("launch.state.waiting_launching"))
+                }).withFakeProgress(
+                        i18n("message.doing"),
+                        () -> launchingLatch.getCount() == 0, 6.95
+                ).withStage("launch.state.waiting_launching"))
                .withStagesHint(Lang.immutableListOf(
                        "launch.state.java",
                        "launch.state.dependencies",
@@ -230,14 +235,14 @@ public final class LauncherHelper {

            @Override
            public void onStop(boolean success, TaskExecutor executor) {
-                Platform.runLater(() -> {
+                runLater(() -> {
                    // Check if the application has stopped
                    // because onStop will be invoked if tasks fail when the executor service shut down.
                    if (!Controllers.isStopped()) {
                        launchingStepsPane.fireEvent(new DialogCloseEvent());
                        if (!success) {
                            Exception ex = executor.getException();
-                            if (!(ex instanceof CancellationException)) {
+                            if (ex != null && !(ex instanceof CancellationException)) {
                                String message;
                                if (ex instanceof ModpackCompletionException) {
                                    if (ex.getCause() instanceof FileNotFoundException)
@@ -247,9 +252,9 @@ public final class LauncherHelper {
                                } else if (ex instanceof PermissionException) {
                                    message = i18n("launch.failed.executable_permission");
                                } else if (ex instanceof ProcessCreationException) {
-                                    message = i18n("launch.failed.creating_process") + ex.getLocalizedMessage();
+                                    message = i18n("launch.failed.creating_process") + "\n" + ex.getLocalizedMessage();
                                } else if (ex instanceof NotDecompressingNativesException) {
-                                    message = i18n("launch.failed.decompressing_natives") + ex.getLocalizedMessage();
+                                    message = i18n("launch.failed.decompressing_natives") + "\n" + ex.getLocalizedMessage();
                                } else if (ex instanceof LibraryDownloadException) {
                                    message = i18n("launch.failed.download_library", ((LibraryDownloadException) ex).getLibrary().getName()) + "\n";
                                    if (ex.getCause() instanceof ResponseCodeException) {
@@ -327,171 +332,181 @@ public final class LauncherHelper {
        executor.start();
    }

-    private static Task<JavaVersion> checkGameState(Profile profile, VersionSetting setting, Version version) {
-        VersionNumber gameVersion = VersionNumber.asVersion(profile.getRepository().getGameVersion(version).orElse("Unknown"));
+    private static Task<JavaRuntime> checkGameState(Profile profile, VersionSetting setting, Version version) {
+        LibraryAnalyzer analyzer = LibraryAnalyzer.analyze(version, profile.getRepository().getGameVersion(version).orElse(null));
+        GameVersionNumber gameVersion = GameVersionNumber.asGameVersion(analyzer.getVersion(LibraryAnalyzer.LibraryType.MINECRAFT));

+        Task<JavaRuntime> getJavaTask = Task.supplyAsync(() -> {
+            try {
+                return setting.getJava(gameVersion, version);
+            } catch (InterruptedException e) {
+                throw new CancellationException();
+            }
+        });
+        Task<JavaRuntime> task;
        if (setting.isNotCheckJVM()) {
-            return Task.composeAsync(() -> setting.getJavaVersion(gameVersion, version))
-                    .thenApplyAsync(javaVersion -> Optional.ofNullable(javaVersion).orElseGet(JavaVersion::fromCurrentEnvironment))
-                    .withStage("launch.state.java");
-        }
+            task = getJavaTask.thenApplyAsync(java -> Lang.requireNonNullElse(java, JavaRuntime.getDefault()));
+        } else if (setting.getJavaVersionType() == JavaVersionType.AUTO || setting.getJavaVersionType() == JavaVersionType.VERSION) {
+            task = getJavaTask.thenComposeAsync(Schedulers.javafx(), java -> {
+                if (java != null) {
+                    return Task.completed(java);
+                }

-        return Task.composeAsync(() -> {
-            return setting.getJavaVersion(gameVersion, version);
-        }).thenComposeAsync(Schedulers.javafx(), javaVersion -> {
-            // Reset invalid java version
-            if (javaVersion == null) {
-                CompletableFuture<JavaVersion> future = new CompletableFuture<>();
-                Runnable continueAction = () -> future.complete(JavaVersion.fromCurrentEnvironment());
+                // Reset invalid java version
+                CompletableFuture<JavaRuntime> future = new CompletableFuture<>();
+                Task<JavaRuntime> result = Task.fromCompletableFuture(future);
+                Runnable breakAction = () -> future.completeExceptionally(new CancellationException("No accepted java"));
+                List<GameJavaVersion> supportedVersions = GameJavaVersion.getSupportedVersions(SYSTEM_PLATFORM);

-                if (setting.isJavaAutoSelected()) {
-                    GameJavaVersion targetJavaVersion = null;
+                GameJavaVersion targetJavaVersion = null;
+                if (setting.getJavaVersionType() == JavaVersionType.VERSION) {
+                    try {
+                        int targetJavaVersionMajor = Integer.parseInt(setting.getJavaVersion());
+                        GameJavaVersion minimumJavaVersion = GameJavaVersion.getMinimumJavaVersion(gameVersion);

-                    if (org.jackhuang.hmcl.util.platform.Platform.isCompatibleWithX86Java()) {
-                        JavaVersionConstraint.VersionRanges range = JavaVersionConstraint.findSuitableJavaVersionRange(gameVersion, version);
-                        if (range.getMandatory().contains(VersionNumber.asVersion("17.0.1"))) {
-                            targetJavaVersion = GameJavaVersion.JAVA_17;
-                        } else if (range.getMandatory().contains(VersionNumber.asVersion("16.0.1"))) {
-                            targetJavaVersion = GameJavaVersion.JAVA_16;
-                        } else {
-                            String java8Version;
+                        if (minimumJavaVersion != null && targetJavaVersionMajor < minimumJavaVersion.getMajorVersion()) {
+                            Controllers.dialog(
+                                    i18n("launch.failed.java_version_too_low"),
+                                    i18n("message.error"),
+                                    MessageType.ERROR,
+                                    breakAction
+                            );
+                            return result;
+                        }

-                            if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
-                                java8Version = "1.8.0_51";
-                            } else if (OperatingSystem.CURRENT_OS == OperatingSystem.LINUX) {
-                                java8Version = "1.8.0_202";
-                            } else if (OperatingSystem.CURRENT_OS == OperatingSystem.OSX) {
-                                java8Version = "1.8.0_74";
-                            } else {
-                                java8Version = null;
+                        targetJavaVersion = GameJavaVersion.get(targetJavaVersionMajor);
+                    } catch (NumberFormatException ignored) {
+                    }
+                } else
+                    targetJavaVersion = version.getJavaVersion();
+
+                if (targetJavaVersion != null && supportedVersions.contains(targetJavaVersion)) {
+                    downloadJava(targetJavaVersion, profile)
+                            .whenCompleteAsync((downloadedJava, exception) -> {
+                                if (exception == null) {
+                                    future.complete(downloadedJava);
+                                } else {
+                                    LOG.warning("Failed to download java", exception);
+                                    Controllers.confirm(i18n("launch.failed.no_accepted_java"), i18n("message.warning"), MessageType.WARNING,
+                                            () -> future.complete(JavaRuntime.getDefault()),
+                                            breakAction);
+                                }
+                            }, Schedulers.javafx());
+                } else {
+                    Controllers.confirm(i18n("launch.failed.no_accepted_java"), i18n("message.warning"), MessageType.WARNING,
+                            () -> future.complete(JavaRuntime.getDefault()),
+                            breakAction);
+                }
+
+                return result;
+            });
+        } else {
+            task = getJavaTask.thenComposeAsync(java -> {
+                Set<JavaVersionConstraint> violatedMandatoryConstraints = EnumSet.noneOf(JavaVersionConstraint.class);
+                Set<JavaVersionConstraint> violatedSuggestedConstraints = EnumSet.noneOf(JavaVersionConstraint.class);
+
+                if (java != null) {
+                    for (JavaVersionConstraint constraint : JavaVersionConstraint.ALL) {
+                        if (constraint.appliesToVersion(gameVersion, version, java, analyzer)) {
+                            if (!constraint.checkJava(gameVersion, version, java)) {
+                                if (constraint.isMandatory()) {
+                                    violatedMandatoryConstraints.add(constraint);
+                                } else {
+                                    violatedSuggestedConstraints.add(constraint);
+                                }
                            }
-
-                            if (java8Version != null && range.getMandatory().contains(VersionNumber.asVersion(java8Version)))
-                                targetJavaVersion = GameJavaVersion.JAVA_8;
-                            else
-                                targetJavaVersion = null;
                        }
                    }
+                }

-                    if (targetJavaVersion == null) {
-                        Controllers.confirm(i18n("launch.failed.no_accepted_java"), i18n("message.warning"), MessageType.WARNING, continueAction, () -> {
-                            future.completeExceptionally(new CancellationException("No accepted java"));
+                CompletableFuture<JavaRuntime> future = new CompletableFuture<>();
+                Task<JavaRuntime> result = Task.fromCompletableFuture(future);
+                Runnable breakAction = () -> future.completeExceptionally(new CancellationException("Launch operation was cancelled by user"));
+
+                if (java == null || !violatedMandatoryConstraints.isEmpty()) {
+                    JavaRuntime suggestedJava = JavaManager.findSuitableJava(gameVersion, version);
+                    if (suggestedJava != null) {
+                        FXUtils.runInFX(() -> {
+                            Controllers.confirm(i18n("launch.advice.java.auto"), i18n("message.warning"), () -> {
+                                setting.setJavaAutoSelected();
+                                future.complete(suggestedJava);
+                            }, breakAction);
                        });
+                        return result;
+                    } else if (java == null) {
+                        FXUtils.runInFX(() -> Controllers.dialog(
+                                i18n("launch.invalid_java"),
+                                i18n("message.error"),
+                                MessageType.ERROR,
+                                breakAction
+                        ));
+                        return result;
                    } else {
-                        downloadJava(gameVersion.toString(), targetJavaVersion, profile)
-                                .thenAcceptAsync(downloadedJavaVersion -> {
-                                    future.complete(downloadedJavaVersion);
-                                })
-                                .exceptionally(throwable -> {
-                                    LOG.log(Level.WARNING, "Failed to download java", throwable);
-                                    Controllers.confirm(i18n("launch.failed.no_accepted_java"), i18n("message.warning"), MessageType.WARNING, continueAction, () -> {
-                                        future.completeExceptionally(new CancellationException("No accepted java"));
-                                    });
-                                    return null;
-                                });
-                    }
-                } else {
-                    Controllers.dialog(i18n("launch.wrong_javadir"), i18n("message.warning"), MessageType.WARNING, continueAction);
+                        GameJavaVersion gameJavaVersion;
+                        if (violatedMandatoryConstraints.contains(JavaVersionConstraint.GAME_JSON))
+                            gameJavaVersion = version.getJavaVersion();
+                        else if (violatedMandatoryConstraints.contains(JavaVersionConstraint.VANILLA))
+                            gameJavaVersion = GameJavaVersion.getMinimumJavaVersion(gameVersion);
+                        else
+                            gameJavaVersion = null;

-                    setting.setJava(null);
-                    setting.setDefaultJavaPath(null);
-                    setting.setJavaVersion(JavaVersion.fromCurrentEnvironment());
-                }
+                        if (gameJavaVersion != null) {
+                            FXUtils.runInFX(() -> downloadJava(gameJavaVersion, profile).whenCompleteAsync((downloadedJava, throwable) -> {
+                                if (throwable == null) {
+                                    setting.setJavaAutoSelected();
+                                    future.complete(downloadedJava);
+                                } else {
+                                    LOG.warning("Failed to download java", throwable);
+                                    breakAction.run();
+                                }
+                            }, Schedulers.javafx()));
+                            return result;
+                        }

-                return Task.fromCompletableFuture(future);
-            } else {
-                return Task.completed(javaVersion);
-            }
-        }).thenComposeAsync(javaVersion -> {
-            return Task.allOf(Task.completed(javaVersion), Task.supplyAsync(() -> JavaVersionConstraint.findSuitableJavaVersion(gameVersion, version)));
-        }).thenComposeAsync(Schedulers.javafx(), javaVersions -> {
-            JavaVersion javaVersion = (JavaVersion) javaVersions.get(0);
-            JavaVersion suggestedJavaVersion = (JavaVersion) javaVersions.get(1);
-            if (setting.isJavaAutoSelected()) return Task.completed(javaVersion);
+                        if (violatedMandatoryConstraints.contains(JavaVersionConstraint.VANILLA_LINUX_JAVA_8)) {
+                            if (setting.getNativesDirType() == NativesDirectoryType.VERSION_FOLDER) {
+                                FXUtils.runInFX(() -> Controllers.dialog(i18n("launch.advice.vanilla_linux_java_8"), i18n("message.error"), MessageType.ERROR, breakAction));
+                                return result;
+                            } else {
+                                violatedMandatoryConstraints.remove(JavaVersionConstraint.VANILLA_LINUX_JAVA_8);
+                            }
+                        }

-            JavaVersionConstraint violatedMandatoryConstraint = null;
-            List<JavaVersionConstraint> violatedSuggestedConstraints = null;
+                        if (violatedMandatoryConstraints.contains(JavaVersionConstraint.LAUNCH_WRAPPER)) {
+                            FXUtils.runInFX(() -> Controllers.dialog(
+                                    i18n("launch.advice.java9") + "\n" + i18n("launch.advice.uncorrected"),
+                                    i18n("message.error"),
+                                    MessageType.ERROR,
+                                    breakAction
+                            ));
+                            return result;
+                        }

-            LibraryAnalyzer analyzer = LibraryAnalyzer.analyze(version);
-            for (JavaVersionConstraint constraint : JavaVersionConstraint.ALL) {
-                if (constraint.appliesToVersion(gameVersion, version, javaVersion, analyzer)) {
-                    if (!constraint.checkJava(gameVersion, version, javaVersion)) {
-                        if (constraint.getType() == JavaVersionConstraint.RULE_MANDATORY) {
-                            violatedMandatoryConstraint = constraint;
-                        } else if (constraint.getType() == JavaVersionConstraint.RULE_SUGGESTED) {
-                            if (violatedSuggestedConstraints == null)
-                                violatedSuggestedConstraints = new ArrayList<>(1);
-                            violatedSuggestedConstraints.add(constraint);
+                        if (!violatedMandatoryConstraints.isEmpty()) {
+                            FXUtils.runInFX(() -> Controllers.dialog(
+                                    i18n("launch.advice.unknown") + "\n" + violatedMandatoryConstraints,
+                                    i18n("message.error"),
+                                    MessageType.ERROR,
+                                    breakAction
+                            ));
+                            return result;
                        }
                    }
-
                }
-            }

-            CompletableFuture<JavaVersion> future = new CompletableFuture<>();
-            Runnable breakAction = () -> future.completeExceptionally(new CancellationException("Launch operation was cancelled by user"));
+                List<String> suggestions = new ArrayList<>();

-            if (violatedMandatoryConstraint != null) {
-                if (suggestedJavaVersion != null) {
-                    Controllers.confirm(i18n("launch.advice.java.auto"), i18n("message.warning"), () -> {
-                        setting.setJavaAutoSelected();
-                        future.complete(suggestedJavaVersion);
-                    }, breakAction);
-                    return Task.fromCompletableFuture(future);
-                } else {
-                    switch (violatedMandatoryConstraint) {
-                        case GAME_JSON:
-                            downloadJava(gameVersion.toString(), version.getJavaVersion(), profile)
-                                    .thenAcceptAsync(downloadedJavaVersion -> {
-                                        setting.setJavaVersion(downloadedJavaVersion);
-                                        future.complete(downloadedJavaVersion);
-                                    }, Schedulers.javafx())
-                                    .whenCompleteAsync((result, throwable) -> {
-                                        LOG.log(Level.WARNING, "Failed to download java", throwable);
-                                        breakAction.run();
-                                    }, Schedulers.javafx());
-                            return Task.fromCompletableFuture(future);
-                        case VANILLA_JAVA_16:
-                            Controllers.confirm(i18n("launch.advice.require_newer_java_version", gameVersion.toString(), 16), i18n("message.warning"),
-                                    () -> FXUtils.openLink(OPENJDK_DOWNLOAD_LINK), null);
-                            breakAction.run();
-                            return Task.fromCompletableFuture(future);
-                        case VANILLA_JAVA_17:
-                            Controllers.confirm(i18n("launch.advice.require_newer_java_version", gameVersion.toString(), 17), i18n("message.warning"),
-                                    () -> FXUtils.openLink(OPENJDK_DOWNLOAD_LINK), null);
-                            breakAction.run();
-                            return Task.fromCompletableFuture(future);
-                        case VANILLA_JAVA_8:
-                            Controllers.dialog(i18n("launch.advice.java8_1_13"), i18n("message.error"), MessageType.ERROR, breakAction);
-                            return Task.fromCompletableFuture(future);
-                        case VANILLA_LINUX_JAVA_8:
-                            if (setting.getNativesDirType() == NativesDirectoryType.VERSION_FOLDER) {
-                                Controllers.dialog(i18n("launch.advice.vanilla_linux_java_8"), i18n("message.error"), MessageType.ERROR, breakAction);
-                                return Task.fromCompletableFuture(future);
-                            } else {
-                                break;
-                            }
-                        case LAUNCH_WRAPPER:
-                            Controllers.dialog(i18n("launch.advice.java9") + "\n" + i18n("launch.advice.uncorrected"), i18n("message.error"), MessageType.ERROR, breakAction);
-                            return Task.fromCompletableFuture(future);
-                    }
+                if (Architecture.SYSTEM_ARCH == Architecture.X86_64 && java.getPlatform().getArchitecture() == Architecture.X86) {
+                    suggestions.add(i18n("launch.advice.different_platform"));
                }
-            }

-            List<String> suggestions = new ArrayList<>(0);
+                // 32-bit JVM cannot make use of too much memory.
+                if (java.getBits() == Bits.BIT_32 && setting.getMaxMemory() > 1.5 * 1024) {
+                    // 1.5 * 1024 is an inaccurate number.
+                    // Actual memory limit depends on operating system and memory.
+                    suggestions.add(i18n("launch.advice.too_large_memory_for_32bit"));
+                }

-            if (Architecture.SYSTEM_ARCH == Architecture.X86_64 && javaVersion.getPlatform().getArchitecture() == Architecture.X86) {
-                suggestions.add(i18n("launch.advice.different_platform"));
-            }
-
-            // 32-bit JVM cannot make use of too much memory.
-            if (javaVersion.getBits() == Bits.BIT_32 && setting.getMaxMemory() > 1.5 * 1024) {
-                // 1.5 * 1024 is an inaccurate number.
-                // Actual memory limit depends on operating system and memory.
-                suggestions.add(i18n("launch.advice.too_large_memory_for_32bit"));
-            }
-
-            if (violatedSuggestedConstraints != null) {
                for (JavaVersionConstraint violatedSuggestedConstraint : violatedSuggestedConstraints) {
                    switch (violatedSuggestedConstraint) {
                        case MODDED_JAVA_7:
@@ -499,17 +514,15 @@ public final class LauncherHelper {
                            break;
                        case MODDED_JAVA_8:
                            // Minecraft>=1.7.10+Forge accepts Java 8
-                            if (javaVersion.getParsedVersion() < 8)
+                            if (java.getParsedVersion() < 8)
                                suggestions.add(i18n("launch.advice.newer_java"));
                            else
                                suggestions.add(i18n("launch.advice.modded_java", 8, gameVersion));
                            break;
                        case MODDED_JAVA_16:
                            // Minecraft<=1.17.1+Forge[37.0.0,37.0.60) not compatible with Java 17
-                            String forgePatchVersion = analyzer.getVersion(LibraryAnalyzer.LibraryType.FORGE)
-                                    .map(LibraryAnalyzer.LibraryType.FORGE::patchVersion)
-                                    .orElse(null);
-                            if (forgePatchVersion != null && VersionNumber.VERSION_COMPARATOR.compare(forgePatchVersion, "37.0.60") < 0)
+                            String forgePatchVersion = analyzer.getVersion(LibraryAnalyzer.LibraryType.FORGE).orElse(null);
+                            if (forgePatchVersion != null && VersionNumber.compare(forgePatchVersion, "37.0.60") < 0)
                                suggestions.add(i18n("launch.advice.forge37_0_60"));
                            else
                                suggestions.add(i18n("launch.advice.modded_java", 16, gameVersion));
@@ -517,6 +530,9 @@ public final class LauncherHelper {
                        case MODDED_JAVA_17:
                            suggestions.add(i18n("launch.advice.modded_java", 17, gameVersion));
                            break;
+                        case MODDED_JAVA_21:
+                            suggestions.add(i18n("launch.advice.modded_java", 21, gameVersion));
+                            break;
                        case VANILLA_JAVA_8_51:
                            suggestions.add(i18n("launch.advice.java8_51_1_13"));
                            break;
@@ -525,127 +541,101 @@ public final class LauncherHelper {
                            break;
                        case VANILLA_X86:
                            if (setting.getNativesDirType() == NativesDirectoryType.VERSION_FOLDER
-                                    && org.jackhuang.hmcl.util.platform.Platform.isCompatibleWithX86Java()) {
+                                    && isCompatibleWithX86Java()) {
                                suggestions.add(i18n("launch.advice.vanilla_x86.translation"));
                            }
                            break;
+                        default:
+                            suggestions.add(violatedSuggestedConstraint.name());
                    }
                }
-            }

-            // Cannot allocate too much memory exceeding free space.
-            if (OperatingSystem.TOTAL_MEMORY > 0 && OperatingSystem.TOTAL_MEMORY < setting.getMaxMemory()) {
-                suggestions.add(i18n("launch.advice.not_enough_space", OperatingSystem.TOTAL_MEMORY));
-            }
-
-            VersionNumber forgeVersion = version.getLibraries().stream()
-                    .filter(it -> it.is("net.minecraftforge", "forge"))
-                    .findFirst()
-                    .map(library -> VersionNumber.asVersion(library.getVersion()))
-                    .orElse(null);
-
-            // Forge 2760~2773 will crash game with LiteLoader.
-            boolean hasForge2760 = forgeVersion != null && (forgeVersion.compareTo("1.12.2-14.23.5.2760") >= 0) && (forgeVersion.compareTo("1.12.2-14.23.5.2773") < 0);
-            boolean hasLiteLoader = version.getLibraries().stream().anyMatch(it -> it.is("com.mumfrey", "liteloader"));
-            if (hasForge2760 && hasLiteLoader && gameVersion.compareTo(VersionNumber.asVersion("1.12.2")) == 0) {
-                suggestions.add(i18n("launch.advice.forge2760_liteloader"));
-            }
-
-            // OptiFine 1.14.4 is not compatible with Forge 28.2.2 and later versions.
-            boolean hasForge28_2_2 = forgeVersion != null && (forgeVersion.compareTo("1.14.4-28.2.2") >= 0);
-            boolean hasOptiFine = version.getLibraries().stream().anyMatch(it -> it.is("optifine", "OptiFine"));
-            if (hasForge28_2_2 && hasOptiFine && gameVersion.compareTo(VersionNumber.asVersion("1.14.4")) == 0) {
-                suggestions.add(i18n("launch.advice.forge28_2_2_optifine"));
-            }
-
-            if (suggestions.isEmpty()) {
-                if (!future.isDone()) {
-                    future.complete(javaVersion);
+                // Cannot allocate too much memory exceeding free space.
+                if (OperatingSystem.TOTAL_MEMORY > 0 && OperatingSystem.TOTAL_MEMORY < setting.getMaxMemory()) {
+                    suggestions.add(i18n("launch.advice.not_enough_space", OperatingSystem.TOTAL_MEMORY));
                }
-            } else {
-                String message;
-                if (suggestions.size() == 1) {
-                    message = i18n("launch.advice", suggestions.get(0));
+
+                VersionNumber forgeVersion = analyzer.getVersion(LibraryAnalyzer.LibraryType.FORGE)
+                        .map(VersionNumber::asVersion)
+                        .orElse(null);
+
+                // Forge 2760~2773 will crash game with LiteLoader.
+                boolean hasForge2760 = forgeVersion != null && (forgeVersion.compareTo("1.12.2-14.23.5.2760") >= 0) && (forgeVersion.compareTo("1.12.2-14.23.5.2773") < 0);
+                boolean hasLiteLoader = version.getLibraries().stream().anyMatch(it -> it.is("com.mumfrey", "liteloader"));
+                if (hasForge2760 && hasLiteLoader && gameVersion.compareTo("1.12.2") == 0) {
+                    suggestions.add(i18n("launch.advice.forge2760_liteloader"));
+                }
+
+                // OptiFine 1.14.4 is not compatible with Forge 28.2.2 and later versions.
+                boolean hasForge28_2_2 = forgeVersion != null && (forgeVersion.compareTo("1.14.4-28.2.2") >= 0);
+                boolean hasOptiFine = version.getLibraries().stream().anyMatch(it -> it.is("optifine", "OptiFine"));
+                if (hasForge28_2_2 && hasOptiFine && gameVersion.compareTo("1.14.4") == 0) {
+                    suggestions.add(i18n("launch.advice.forge28_2_2_optifine"));
+                }
+
+                if (suggestions.isEmpty()) {
+                    if (!future.isDone()) {
+                        future.complete(java);
+                    }
                } else {
-                    message = i18n("launch.advice.multi", suggestions.stream().map(it -> "→ " + it).collect(Collectors.joining("\n")));
+                    String message;
+                    if (suggestions.size() == 1) {
+                        message = i18n("launch.advice", suggestions.get(0));
+                    } else {
+                        message = i18n("launch.advice.multi", suggestions.stream().map(it -> "→ " + it).collect(Collectors.joining("\n")));
+                    }
+
+                    FXUtils.runInFX(() -> Controllers.confirm(
+                            message,
+                            i18n("message.warning"),
+                            MessageType.WARNING,
+                            () -> future.complete(java),
+                            breakAction));
                }

-                Controllers.confirm(message, i18n("message.warning"), MessageType.WARNING, () -> future.complete(javaVersion), breakAction);
-            }
+                return result;
+            });
+        }

-            return Task.fromCompletableFuture(future);
-        }).withStage("launch.state.java");
+        return task.withStage("launch.state.java");
    }

-    private static CompletableFuture<JavaVersion> downloadJava(String gameVersion, GameJavaVersion javaVersion, Profile profile) {
-        CompletableFuture<JavaVersion> future = new CompletableFuture<>();
-
-        JFXHyperlink link = new JFXHyperlink(i18n("download.external_link"));
-        link.setOnAction(e -> {
-            if (javaVersion.getMajorVersion() == JavaVersion.JAVA_8) {
-                FXUtils.openLink(ORACLEJDK_DOWNLOAD_LINK);
-            } else {
-                FXUtils.openLink(OPENJDK_DOWNLOAD_LINK);
-            }
-            future.completeExceptionally(new CancellationException());
-        });
-
+    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",
-                        gameVersion,
-                        javaVersion.getMajorVersion()),
+                i18n("launch.advice.require_newer_java_version", javaVersion.getMajorVersion()),
                i18n("message.warning"),
                MessageType.QUESTION)
-                .addAction(link)
                .yesOrNo(() -> {
-                    downloadJavaImpl(javaVersion, profile.getDependency().getDownloadProvider())
-                            .thenAcceptAsync(future::complete)
-                            .exceptionally(throwable -> {
-                                Throwable resolvedException = resolveException(throwable);
-                                LOG.log(Level.WARNING, "Failed to download java", throwable);
-                                if (!(resolvedException instanceof CancellationException)) {
-                                    Controllers.dialog(DownloadProviders.localizeErrorMessage(resolvedException), i18n("install.failed"));
+                    DownloadProvider downloadProvider = profile.getDependency().getDownloadProvider();
+                    Controllers.taskDialog(JavaManager.getDownloadJavaTask(downloadProvider, SYSTEM_PLATFORM, javaVersion)
+                            .whenComplete(Schedulers.javafx(), (result, exception) -> {
+                                if (exception == null) {
+                                    future.complete(result);
+                                } else {
+                                    Throwable resolvedException = resolveException(exception);
+                                    LOG.warning("Failed to download java", exception);
+                                    if (!(resolvedException instanceof CancellationException)) {
+                                        Controllers.dialog(DownloadProviders.localizeErrorMessage(resolvedException), i18n("install.failed"));
+                                    }
+                                    future.completeExceptionally(new CancellationException());
                                }
-                                future.completeExceptionally(new CancellationException());
-                                return null;
-                            });
+                            }), i18n("download.java"), new TaskCancellationAction(() -> future.completeExceptionally(new CancellationException())));
                }, () -> future.completeExceptionally(new CancellationException())).build());

        return future;
    }

-    /**
-     * Directly start java downloading.
-     *
-     * @param javaVersion target Java version
-     * @param downloadProvider download provider
-     * @return JavaVersion, null if we failed to download java, failed if an error occurred when downloading.
-     */
-    private static CompletableFuture<JavaVersion> downloadJavaImpl(GameJavaVersion javaVersion, DownloadProvider downloadProvider) {
-        CompletableFuture<JavaVersion> future = new CompletableFuture<>();
-
-        Controllers.taskDialog(JavaRepository.downloadJava(javaVersion, downloadProvider)
-                .whenComplete(Schedulers.javafx(), (downloadedJava, exception) -> {
-                    if (exception != null) {
-                        future.completeExceptionally(exception);
-                    } else {
-                        future.complete(downloadedJava);
-                    }
-                }), i18n("download.java"), TaskCancellationAction.NORMAL);
-
-        return future;
-    }
-
    private static Task<AuthInfo> logIn(Account account) {
        return Task.composeAsync(() -> {
            try {
                return Task.completed(account.logIn());
            } catch (CredentialExpiredException e) {
-                LOG.log(Level.INFO, "Credential has expired", e);
+                LOG.info("Credential has expired", e);

                return Task.completed(DialogController.logIn(account));
            } catch (AuthenticationException e) {
-                LOG.log(Level.WARNING, "Authentication failed, try skipping refresh", e);
+                LOG.warning("Authentication failed, try skipping refresh", e);

                CompletableFuture<Task<AuthInfo>> future = new CompletableFuture<>();
                runInFX(() -> {
@@ -676,7 +666,7 @@ public final class LauncherHelper {
    private void checkExit() {
        switch (launcherVisibility) {
            case HIDE_AND_REOPEN:
-                Platform.runLater(() -> {
+                runLater(() -> {
                    Optional.ofNullable(Controllers.getStage())
                            .ifPresent(Stage::show);
                });
@@ -687,9 +677,9 @@ public final class LauncherHelper {
            case CLOSE:
                throw new Error("Never get to here");
            case HIDE:
-                Platform.runLater(() -> {
+                runLater(() -> {
                    // Shut down the platform when user closed log window.
-                    Platform.setImplicitExit(true);
+                    setImplicitExit(true);
                    // If we use Launcher.stop(), log window will be halt immediately.
                    Launcher.stopWithoutPlatform();
                });
@@ -708,14 +698,14 @@ public final class LauncherHelper {
        private final Version version;
        private final LaunchOptions launchOptions;
        private ManagedProcess process;
-        private boolean lwjgl;
+        private volatile boolean lwjgl;
        private LogWindow logWindow;
        private final boolean detectWindow;
-        private final ArrayDeque<String> logs;
-        private final ArrayDeque</*Log4jLevel*/Object> levels;
-        private final CountDownLatch logWindowLatch = new CountDownLatch(1);
+        private final CircularArrayList<Log> logs;
        private final CountDownLatch launchingLatch;
        private final String forbiddenAccessToken;
+        private Thread submitLogThread;
+        private LinkedBlockingQueue<Log> logBuffer;

        public HMCLProcessListener(HMCLGameRepository repository, Version version, AuthInfo authInfo, LaunchOptions launchOptions, CountDownLatch launchingLatch, boolean detectWindow) {
            this.repository = repository;
@@ -724,10 +714,7 @@ public final class LauncherHelper {
            this.launchingLatch = launchingLatch;
            this.detectWindow = detectWindow;
            this.forbiddenAccessToken = authInfo != null ? authInfo.getAccessToken() : null;
-
-            final int numLogs = config().getLogLines() + 1;
-            this.logs = new ArrayDeque<>(numLogs);
-            this.levels = new ArrayDeque<>(numLogs);
+            this.logs = new CircularArrayList<>(Log.getLogLines() + 1);
        }

        @Override
@@ -743,18 +730,66 @@ public final class LauncherHelper {
                LOG.info("Process ClassPath: " + classpath);
            }

-            if (showLogs)
-                Platform.runLater(() -> {
-                    logWindow = new LogWindow();
-                    logWindow.showNormal();
+            if (showLogs) {
+                CountDownLatch logWindowLatch = new CountDownLatch(1);
+                runLater(() -> {
+                    logWindow = new LogWindow(process, logs);
+                    logWindow.show();
                    logWindowLatch.countDown();
                });
+
+                logBuffer = new LinkedBlockingQueue<>();
+                submitLogThread = Lang.thread(new Runnable() {
+                    private final ArrayList<Log> currentLogs = new ArrayList<>();
+                    private final Semaphore semaphore = new Semaphore(0);
+
+                    private void submitLogs() {
+                        if (currentLogs.size() == 1) {
+                            Log log = currentLogs.get(0);
+                            runLater(() -> logWindow.logLine(log));
+                        } else {
+                            runLater(() -> {
+                                logWindow.logLines(currentLogs);
+                                semaphore.release();
+                            });
+                            semaphore.acquireUninterruptibly();
+                        }
+                        currentLogs.clear();
+                    }
+
+                    @Override
+                    public void run() {
+                        while (true) {
+                            try {
+                                currentLogs.add(logBuffer.take());
+                                //noinspection BusyWait
+                                Thread.sleep(200); // Wait for more logs
+                            } catch (InterruptedException e) {
+                                break;
+                            }
+
+                            logBuffer.drainTo(currentLogs);
+                            submitLogs();
+                        }
+
+                        do {
+                            submitLogs();
+                        } while (logBuffer.drainTo(currentLogs) > 0);
+                    }
+                }, "Game Log Submitter", true);
+
+                try {
+                    logWindowLatch.await();
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                }
+            }
        }

        private void finishLaunch() {
            switch (launcherVisibility) {
                case HIDE_AND_REOPEN:
-                    Platform.runLater(() -> {
+                    runLater(() -> {
                        // If application was stopped and execution services did not finish termination,
                        // these codes will be executed.
                        if (Controllers.getStage() != null) {
@@ -767,11 +802,11 @@ public final class LauncherHelper {
                    // Never come to here.
                    break;
                case KEEP:
-                    Platform.runLater(launchingLatch::countDown);
+                    runLater(launchingLatch::countDown);
                    break;
                case HIDE:
                    launchingLatch.countDown();
-                    Platform.runLater(() -> {
+                    runLater(() -> {
                        // If application was stopped and execution services did not finish termination,
                        // these codes will be executed.
                        if (Controllers.getStage() != null) {
@@ -787,64 +822,69 @@ public final class LauncherHelper {

        @Override
        public void onLog(String log, boolean isErrorStream) {
-            String filteredLog = forbiddenAccessToken == null ? log : log.replace(forbiddenAccessToken, "<access token>");
-
            if (isErrorStream)
-                System.err.println(filteredLog);
+                System.err.println(log);
            else
-                System.out.println(filteredLog);
+                System.out.println(log);

-            Log4jLevel level;
-            if (isErrorStream)
-                level = Log4jLevel.ERROR;
-            else
-                level = showLogs ? Optional.ofNullable(Log4jLevel.guessLevel(filteredLog)).orElse(Log4jLevel.INFO) : null;
-
-            synchronized (this) {
-                logs.add(filteredLog);
-                levels.add(level != null ? level : Optional.empty()); // Use 'Optional.empty()' as hole
-                if (logs.size() > config().getLogLines()) {
-                    logs.removeFirst();
-                    levels.removeFirst();
-                }
-            }
+            log = StringUtils.parseEscapeSequence(log);
+            if (forbiddenAccessToken != null)
+                log = log.replace(forbiddenAccessToken, "<access token>");

+            Log4jLevel level = isErrorStream && !log.startsWith("[authlib-injector]") ? Log4jLevel.ERROR : null;
            if (showLogs) {
-                try {
-                    logWindowLatch.await();
-                } catch (InterruptedException e) {
-                    Thread.currentThread().interrupt();
-                    return;
+                if (level == null)
+                    level = Lang.requireNonNullElse(Log4jLevel.guessLevel(log), Log4jLevel.INFO);
+                logBuffer.add(new Log(log, level));
+            } else {
+                synchronized (this) {
+                    logs.addLast(new Log(log, level));
+                    if (logs.size() > Log.getLogLines())
+                        logs.removeFirst();
                }
-
-                Platform.runLater(() -> logWindow.logLine(filteredLog, level));
            }

            if (!lwjgl) {
-                String lowerCaseLog = filteredLog.toLowerCase(Locale.ROOT);
+                String lowerCaseLog = log.toLowerCase(Locale.ROOT);
                if (!detectWindow || lowerCaseLog.contains("lwjgl version") || lowerCaseLog.contains("lwjgl openal")) {
-                    lwjgl = true;
-                    finishLaunch();
+                    synchronized (this) {
+                        if (!lwjgl) {
+                            lwjgl = true;
+                            finishLaunch();
+                        }
+                    }
                }
            }
        }

        @Override
        public void onExit(int exitCode, ExitType exitType) {
+            if (showLogs) {
+                logBuffer.add(new Log(String.format("[HMCL ProcessListener] Minecraft exit with code %d(0x%x), type is %s.", exitCode, exitCode, exitType), Log4jLevel.INFO));
+                submitLogThread.interrupt();
+                try {
+                    submitLogThread.join();
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                }
+            }
+
            launchingLatch.countDown();

            if (exitType == ExitType.INTERRUPTED)
                return;

            // Game crashed before opening the game window.
-            if (!lwjgl) finishLaunch();
+            if (!lwjgl) {
+                synchronized (this) {
+                    if (!lwjgl)
+                        finishLaunch();
+                }
+            }

            if (exitType != ExitType.NORMAL) {
-                ArrayList<Pair<String, Log4jLevel>> pairs = new ArrayList<>(logs.size());
-                Lang.forEachZipped(logs, levels,
-                        (log, l) -> pairs.add(pair(log, l instanceof Log4jLevel ? ((Log4jLevel) l) : Optional.ofNullable(Log4jLevel.guessLevel(log)).orElse(Log4jLevel.INFO))));
                repository.markVersionLaunchedAbnormally(version.getId());
-                Platform.runLater(() -> new GameCrashWindow(process, exitType, repository, version, launchOptions, pairs).show());
+                runLater(() -> new GameCrashWindow(process, exitType, repository, version, launchOptions, logs).show());
            }

            checkExit();
@@ -852,8 +892,8 @@ public final class LauncherHelper {

    }

-    private static final String ORACLEJDK_DOWNLOAD_LINK = "https://www.java.com/download";
-    private static final String OPENJDK_DOWNLOAD_LINK = "https://docs.microsoft.com/java/openjdk/download";
+    private static final String ORACLEJDK_DOWNLOAD_LINK = "https://www.java.com/download/";
+    private static final String OPENJDK_DOWNLOAD_LINK = "https://learn.microsoft.com/java/openjdk/download";

    public static final Queue<ManagedProcess> PROCESSES = new ConcurrentLinkedQueue<>();

@@ -1,38 +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.game;
-
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
-public enum LoadingState {
-    DEPENDENCIES("launch.state.dependencies"),
-    MODS("launch.state.modpack"),
-    LOGGING_IN("launch.state.logging_in"),
-    LAUNCHING("launch.state.waiting_launching"),
-    DONE("launch.state.done");
-
-    private final String key;
-
-    LoadingState(String key) {
-        this.key = key;
-    }
-
-    public String getLocalizedMessage() {
-        return i18n(key);
-    }
-}
@@ -21,44 +21,86 @@ 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;
+import org.jackhuang.hmcl.util.Pair;
 import org.jackhuang.hmcl.util.StringUtils;

 import java.io.IOException;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Stream;

+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
+
 public abstract class LocalizedRemoteModRepository implements RemoteModRepository {
+    private static final int CONTAIN_CHINESE_WEIGHT = 10;
+
+    private static final int INITIAL_CAPACITY = 16;

    protected abstract RemoteModRepository getBackedRemoteModRepository();

+    protected abstract SortType getBackedRemoteModRepositorySortOrder();
+
    @Override
-    public Stream<RemoteMod> search(String gameVersion, Category category, int pageOffset, int pageSize, String searchFilter, SortType sort, SortOrder sortOrder) throws IOException {
-        String newSearchFilter;
-        if (StringUtils.containsChinese(searchFilter)) {
-            ModTranslations modTranslations = ModTranslations.getTranslationsByRepositoryType(getType());
-            List<ModTranslations.Mod> mods = modTranslations.searchMod(searchFilter);
-            List<String> searchFilters = new ArrayList<>();
-            int count = 0;
-            for (ModTranslations.Mod mod : mods) {
-                String englishName = mod.getName();
-                if (StringUtils.isNotBlank(mod.getSubname())) {
-                    englishName = mod.getSubname();
-                }
-
-                searchFilters.add(englishName);
-
-                count++;
-                if (count >= 3) break;
-            }
-            newSearchFilter = String.join(" ", searchFilters);
-        } else {
-            newSearchFilter = searchFilter;
+    public SearchResult search(String gameVersion, Category category, int pageOffset, int pageSize, String searchFilter, SortType sort, SortOrder sortOrder) throws IOException {
+        if (!StringUtils.containsChinese(searchFilter)) {
+            return getBackedRemoteModRepository().search(gameVersion, category, pageOffset, pageSize, searchFilter, sort, sortOrder);
        }

-        return getBackedRemoteModRepository().search(gameVersion, category, pageOffset, pageSize, newSearchFilter, sort, sortOrder);
+        Set<String> englishSearchFiltersSet = new HashSet<>(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);
+            }
+
+            count++;
+            if (count >= 3) break;
+        }
+
+        RemoteMod[] searchResultArray = new RemoteMod[pageSize];
+        int totalPages, chineseIndex = 0, englishIndex = pageSize - 1;
+        {
+            SearchResult searchResult = getBackedRemoteModRepository().search(gameVersion, category, pageOffset, pageSize, String.join(" ", englishSearchFiltersSet), getBackedRemoteModRepositorySortOrder(), sortOrder);
+            for (Iterator<RemoteMod> iterator = searchResult.getUnsortedResults().iterator(); iterator.hasNext(); ) {
+                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;
+                } else {
+                    searchResultArray[englishIndex--] = remoteMod;
+                }
+            }
+            totalPages = searchResult.getTotalPages();
+        }
+
+        StringUtils.LevCalculator levCalculator = new StringUtils.LevCalculator();
+        return new SearchResult(Stream.concat(Arrays.stream(searchResultArray, 0, chineseIndex).map(remoteMod -> {
+            ModTranslations.Mod chineseRemoteMod = ModTranslations.getTranslationsByRepositoryType(getType()).getModByCurseForgeId(remoteMod.getSlug());
+            if (chineseRemoteMod == null || StringUtils.isBlank(chineseRemoteMod.getName()) || !StringUtils.containsChinese(chineseRemoteMod.getName())) {
+                return Pair.pair(remoteMod, Integer.MAX_VALUE);
+            }
+            String chineseRemoteModName = chineseRemoteMod.getName();
+            if (searchFilter.isEmpty() || chineseRemoteModName.isEmpty()) {
+                return Pair.pair(remoteMod, Math.max(searchFilter.length(), chineseRemoteModName.length()));
+            }
+            int l = levCalculator.calc(searchFilter, chineseRemoteModName);
+            for (int i = 0; i < searchFilter.length(); i++) {
+                if (chineseRemoteModName.indexOf(searchFilter.charAt(i)) >= 0) {
+                    l -= CONTAIN_CHINESE_WEIGHT;
+                }
+            }
+            return Pair.pair(remoteMod, l);
+        }).sorted(Comparator.comparingInt(Pair::getValue)).map(Pair::getKey), Arrays.stream(searchResultArray, englishIndex + 1, searchResultArray.length)), totalPages);
    }

    @Override
@@ -0,0 +1,72 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2024 huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.game;
+
+import org.jackhuang.hmcl.util.Log4jLevel;
+
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+
+public final class Log {
+    public static final int DEFAULT_LOG_LINES = 2000;
+
+    public static int getLogLines() {
+        Integer lines = config().getLogLines();
+        return lines != null && lines > 0 ? lines : DEFAULT_LOG_LINES;
+    }
+
+    private final String log;
+    private Log4jLevel level;
+    private boolean selected = false;
+
+    public Log(String log) {
+        this.log = log;
+    }
+
+    public Log(String log, Log4jLevel level) {
+        this.log = log;
+        this.level = level;
+    }
+
+    public String getLog() {
+        return log;
+    }
+
+    public Log4jLevel getLevel() {
+        Log4jLevel level = this.level;
+        if (level == null) {
+            level = Log4jLevel.guessLevel(log);
+            if (level == null)
+                level = Log4jLevel.INFO;
+            this.level = level;
+        }
+        return level;
+    }
+
+    public boolean isSelected() {
+        return selected;
+    }
+
+    public void setSelected(boolean selected) {
+        this.selected = selected;
+    }
+
+    @Override
+    public String toString() {
+        return log;
+    }
+}
@@ -17,7 +17,7 @@
 */
 package org.jackhuang.hmcl.game;

-import org.jackhuang.hmcl.util.Logging;
+import org.jackhuang.hmcl.util.logging.Logger;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.io.Zipper;
@@ -35,9 +35,8 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
-import java.util.logging.Level;

-import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;

 public final class LogExporter {
    private LogExporter() {
@@ -65,36 +64,14 @@ public final class LogExporter {

        return CompletableFuture.runAsync(() -> {
            try (Zipper zipper = new Zipper(zipFile)) {
-                Path logsDir = runDirectory.resolve("logs");
-                if (Files.exists(logsDir.resolve("debug.log"))) {
-                    zipper.putFile(logsDir.resolve("debug.log"), "debug.log");
-                }
-                if (Files.exists(logsDir.resolve("latest.log"))) {
-                    zipper.putFile(logsDir.resolve("latest.log"), "latest.log");
-                }
-                if (Files.exists(logsDir.resolve("fml-client-latest.log"))) {
-                    zipper.putFile(logsDir.resolve("fml-client-latest.log"), "fml-client-latest.log");
-                }
+                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);

-                zipper.putTextFile(Logging.getLogs(), "hmcl.log");
+                zipper.putTextFile(LOG.getLogs(), "hmcl.log");
                zipper.putTextFile(logs, "minecraft.log");
-                zipper.putTextFile(Logging.filterForbiddenToken(launchScript), OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS ? "launch.bat" : "launch.sh");
-
-                try (DirectoryStream<Path> stream = Files.newDirectoryStream(runDirectory, "hs_err_*.log")) {
-                    long processStartTime = ManagementFactory.getRuntimeMXBean().getStartTime();
-
-                    for (Path file : stream) {
-                        if (Files.isRegularFile(file)) {
-                            FileTime time = Files.readAttributes(file, BasicFileAttributes.class).creationTime();
-                            if (time.toMillis() >= processStartTime) {
-                                String crashLog = Logging.filterForbiddenToken(FileUtils.readText(file));
-                                zipper.putTextFile(crashLog, file.getFileName().toString());
-                            }
-                        }
-                    }
-                } catch (Throwable e) {
-                    LOG.log(Level.WARNING, "Failed to find vm crash log", e);
-                }
+                zipper.putTextFile(Logger.filterForbiddenToken(launchScript), OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS ? "launch.bat" : "launch.sh");

                for (String id : versions) {
                    Path versionJson = baseDirectory.resolve("versions").resolve(id).resolve(id + ".json");
@@ -107,4 +84,26 @@ public final class LogExporter {
            }
        });
    }
+
+    private static void processLogs(Path directory, String fileExtension, String logDirectory, Zipper zipper) {
+        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) {
+                        try {
+                            String crashLog = Logger.filterForbiddenToken(FileUtils.readText(file, OperatingSystem.NATIVE_CHARSET));
+                            zipper.putTextFile(crashLog, file.getFileName().toString());
+                        } catch (IOException e) {
+                            LOG.warning("Failed to read log file: " + file, e);
+                        }
+                    }
+                }
+            }
+        } catch (Throwable e) {
+            LOG.warning("Failed to find any log on " + logDirectory, e);
+        }
+    }
 }
@@ -18,7 +18,6 @@
 package org.jackhuang.hmcl.game;

 import com.google.gson.JsonParseException;
-import com.google.gson.reflect.TypeToken;
 import org.apache.commons.compress.archivers.zip.ZipFile;
 import org.jackhuang.hmcl.mod.*;
 import org.jackhuang.hmcl.mod.curse.CurseModpackProvider;
@@ -141,8 +140,7 @@ public final class ModpackHelper {
            throw new FileNotFoundException(file.getPath());
        else
            try {
-                return JsonUtils.GSON.fromJson(FileUtils.readText(file), new TypeToken<ModpackConfiguration<?>>() {
-                }.getType());
+                return JsonUtils.GSON.fromJson(FileUtils.readText(file), ModpackConfiguration.class);
            } catch (JsonParseException e) {
                throw new IOException("Malformed modpack configuration");
            }
@@ -23,7 +23,6 @@ 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.util.Logging;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.io.IOUtils;
 import org.jackhuang.hmcl.util.io.JarUtils;
@@ -34,10 +33,10 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
-import java.util.logging.Level;

 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;

 public final class OAuthServer extends NanoHTTPD implements OAuth.Session {
@@ -80,7 +79,7 @@ public final class OAuthServer extends NanoHTTPD implements OAuth.Session {
            try {
                session.parseBody(files);
            } catch (IOException e) {
-                Logging.LOG.log(Level.WARNING, "Failed to read post data", e);
+                LOG.warning("Failed to read post data", e);
                return newFixedLengthResponse(Response.Status.INTERNAL_ERROR, MIME_HTML, "");
            } catch (ResponseException re) {
                return newFixedLengthResponse(re.getStatus(), MIME_PLAINTEXT, re.getMessage());
@@ -97,7 +96,7 @@ public final class OAuthServer extends NanoHTTPD implements OAuth.Session {
            idToken = query.get("id_token");
            future.complete(query.get("code"));
        } else {
-            Logging.LOG.warning("Error: " + parameters);
+            LOG.warning("Error: " + parameters);
            future.completeExceptionally(new AuthenticationException("failed to authenticate"));
        }

@@ -106,7 +105,7 @@ public final class OAuthServer extends NanoHTTPD implements OAuth.Session {
            html = IOUtils.readFullyAsString(OAuthServer.class.getResourceAsStream("/assets/microsoft_auth.html"))
                    .replace("%close-page%", i18n("account.methods.microsoft.close_page"));
        } catch (IOException e) {
-            Logging.LOG.log(Level.SEVERE, "Failed to load html");
+            LOG.error("Failed to load html", e);
            return newFixedLengthResponse(Response.Status.INTERNAL_ERROR, MIME_HTML, "");
        }
        thread(() -> {
@@ -114,7 +113,7 @@ public final class OAuthServer extends NanoHTTPD implements OAuth.Session {
                Thread.sleep(1000);
                stop();
            } catch (InterruptedException e) {
-                Logging.LOG.log(Level.SEVERE, "Failed to sleep for 1 second");
+                LOG.error("Failed to sleep for 1 second");
            }
        });
        return newFixedLengthResponse(Response.Status.OK, "text/html; charset=UTF-8", html);
@@ -17,7 +17,10 @@
 */
 package org.jackhuang.hmcl.game;

+import javafx.beans.InvalidationListener;
+import javafx.beans.WeakInvalidationListener;
 import javafx.beans.binding.ObjectBinding;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.scene.canvas.Canvas;
@@ -29,9 +32,13 @@ import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.auth.ServerResponseMalformedException;
 import org.jackhuang.hmcl.auth.microsoft.MicrosoftAccount;
+import org.jackhuang.hmcl.auth.offline.OfflineAccount;
+import org.jackhuang.hmcl.auth.offline.Skin;
 import org.jackhuang.hmcl.auth.yggdrasil.*;
 import org.jackhuang.hmcl.task.FileDownloadTask;
-import org.jackhuang.hmcl.util.ResourceNotFoundError;
+import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.util.Holder;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.javafx.BindingMapping;

@@ -45,13 +52,12 @@ import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;

 import static java.util.Collections.emptyMap;
 import static java.util.Collections.singletonMap;
 import static java.util.Objects.requireNonNull;
 import static org.jackhuang.hmcl.util.Lang.threadPool;
-import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;

 /**
 * @author yushijinhun
@@ -81,7 +87,7 @@ public final class TexturesLoader {
    }

    private static final ThreadPoolExecutor POOL = threadPool("TexturesDownload", true, 2, 10, TimeUnit.SECONDS);
-    private static final Path TEXTURES_DIR = Metadata.MINECRAFT_DIRECTORY.resolve("assets").resolve("skins");
+    private static final Path TEXTURES_DIR = Metadata.HMCL_DIRECTORY.resolve("skins");

    private static Path getTexturePath(Texture texture) {
        String url = texture.getUrl();
@@ -109,7 +115,7 @@ public final class TexturesLoader {
            } catch (Exception e) {
                if (Files.isRegularFile(file)) {
                    // concurrency conflict?
-                    LOG.log(Level.WARNING, "Failed to download texture " + texture.getUrl() + ", but the file is available", e);
+                    LOG.warning("Failed to download texture " + texture.getUrl() + ", but the file is available", e);
                } else {
                    throw new IOException("Failed to download texture " + texture.getUrl());
                }
@@ -133,39 +139,42 @@ public final class TexturesLoader {
    // ====

    // ==== Skins ====
-    private final static Map<TextureModel, LoadedTexture> DEFAULT_SKINS = new EnumMap<>(TextureModel.class);
+    private static final String[] DEFAULT_SKINS = {"alex", "ari", "efe", "kai", "makena", "noor", "steve", "sunny", "zuri"};

-    static {
-        loadDefaultSkin("/assets/img/skin/steve.png", TextureModel.STEVE);
-        loadDefaultSkin("/assets/img/skin/alex.png", TextureModel.ALEX);
+    public static Image getDefaultSkinImage() {
+        return FXUtils.newBuiltinImage("/assets/img/skin/wide/steve.png");
    }

-    private static void loadDefaultSkin(String path, TextureModel model) {
+    public static LoadedTexture getDefaultSkin(UUID uuid) {
+        int idx = Math.floorMod(uuid.hashCode(), DEFAULT_SKINS.length * 2);
+        TextureModel model;
        Image skin;
-        try {
-            skin = new Image(path);
-            if (skin.isError())
-                throw skin.getException();
-        } catch (Throwable e) {
-            throw new ResourceNotFoundError("Cannot load default skin from " + path, e);
+        if (idx < DEFAULT_SKINS.length) {
+            model = TextureModel.SLIM;
+            skin = FXUtils.newBuiltinImage("/assets/img/skin/slim/" + DEFAULT_SKINS[idx] + ".png");
+        } else {
+            model = TextureModel.WIDE;
+            skin = FXUtils.newBuiltinImage("/assets/img/skin/wide/" + DEFAULT_SKINS[idx - DEFAULT_SKINS.length] + ".png");
        }

-        DEFAULT_SKINS.put(model, new LoadedTexture(skin, singletonMap("model", model.modelName)));
+        return new LoadedTexture(skin, singletonMap("model", model.modelName));
    }

-    public static LoadedTexture getDefaultSkin(TextureModel model) {
-        return DEFAULT_SKINS.get(model);
+    public static TextureModel getDefaultModel(UUID uuid) {
+        return TextureModel.WIDE.modelName.equals(getDefaultSkin(uuid).getMetadata().get("model"))
+                ? TextureModel.WIDE
+                : TextureModel.SLIM;
    }

    public static ObjectBinding<LoadedTexture> skinBinding(YggdrasilService service, UUID uuid) {
-        LoadedTexture uuidFallback = getDefaultSkin(TextureModel.detectUUID(uuid));
+        LoadedTexture uuidFallback = getDefaultSkin(uuid);
        return BindingMapping.of(service.getProfileRepository().binding(uuid))
                .map(profile -> profile
                        .flatMap(it -> {
                            try {
                                return YggdrasilService.getTextures(it);
                            } catch (ServerResponseMalformedException e) {
-                                LOG.log(Level.WARNING, "Failed to parse texture payload", e);
+                                LOG.warning("Failed to parse texture payload", e);
                                return Optional.empty();
                            }
                        })
@@ -178,7 +187,7 @@ public final class TexturesLoader {
                            try {
                                return loadTexture(texture);
                            } catch (Throwable e) {
-                                LOG.log(Level.WARNING, "Failed to load texture " + texture.getUrl() + ", using fallback texture", e);
+                                LOG.warning("Failed to load texture " + texture.getUrl() + ", using fallback texture", e);
                                return uuidFallback;
                            }
                        }, POOL);
@@ -188,27 +197,61 @@ public final class TexturesLoader {
                }, uuidFallback);
    }

-    public static ObjectBinding<LoadedTexture> skinBinding(Account account) {
-        LoadedTexture uuidFallback = getDefaultSkin(TextureModel.detectUUID(account.getUUID()));
-        return BindingMapping.of(account.getTextures())
-                .map(textures -> textures
-                        .flatMap(it -> Optional.ofNullable(it.get(TextureType.SKIN)))
-                        .filter(it -> StringUtils.isNotBlank(it.getUrl())))
-                .asyncMap(it -> {
-                    if (it.isPresent()) {
-                        Texture texture = it.get();
-                        return CompletableFuture.supplyAsync(() -> {
-                            try {
-                                return loadTexture(texture);
-                            } catch (Throwable e) {
-                                LOG.log(Level.WARNING, "Failed to load texture " + texture.getUrl() + ", using fallback texture", e);
-                                return uuidFallback;
+    public static ObservableValue<LoadedTexture> skinBinding(Account account) {
+        LoadedTexture uuidFallback = getDefaultSkin(account.getUUID());
+        if (account instanceof OfflineAccount) {
+            OfflineAccount offlineAccount = (OfflineAccount) account;
+
+            SimpleObjectProperty<LoadedTexture> binding = new SimpleObjectProperty<>();
+            InvalidationListener listener = o -> {
+                Skin skin = offlineAccount.getSkin();
+                String username = offlineAccount.getUsername();
+
+                binding.set(uuidFallback);
+                if (skin != null) {
+                    skin.load(username).setExecutor(POOL).whenComplete(Schedulers.javafx(), (result, exception) -> {
+                        if (exception != null) {
+                            LOG.warning("Failed to load texture", exception);
+                        } else if (result != null && result.getSkin() != null && result.getSkin().getImage() != null) {
+                            Map<String, String> metadata;
+                            if (result.getModel() != null) {
+                                metadata = singletonMap("model", result.getModel().modelName);
+                            } else {
+                                metadata = emptyMap();
                            }
-                        }, POOL);
-                    } else {
+
+                            binding.set(new LoadedTexture(result.getSkin().getImage(), metadata));
+                        }
+                    }).start();
+                }
+            };
+
+            listener.invalidated(offlineAccount);
+
+            binding.addListener(new Holder<>(listener));
+            offlineAccount.addListener(new WeakInvalidationListener(listener));
+
+            return binding;
+        } else {
+            return BindingMapping.of(account.getTextures())
+                    .asyncMap(textures -> {
+                        if (textures.isPresent()) {
+                            Texture texture = textures.get().get(TextureType.SKIN);
+                            if (texture != null && StringUtils.isNotBlank(texture.getUrl())) {
+                                return CompletableFuture.supplyAsync(() -> {
+                                    try {
+                                        return loadTexture(texture);
+                                    } catch (Throwable e) {
+                                        LOG.warning("Failed to load texture " + texture.getUrl() + ", using fallback texture", e);
+                                        return uuidFallback;
+                                    }
+                                }, POOL);
+                            }
+                        }
+
                        return CompletableFuture.completedFuture(uuidFallback);
-                    }
-                }, uuidFallback);
+                    }, uuidFallback);
+        }
    }

    // ====
@@ -277,9 +320,9 @@ public final class TexturesLoader {
        static final WeakHashMap<Canvas, SkinBindingChangeListener> hole = new WeakHashMap<>();

        final WeakReference<Canvas> canvasRef;
-        final ObjectBinding<LoadedTexture> binding;
+        final ObservableValue<LoadedTexture> binding;

-        SkinBindingChangeListener(Canvas canvas, ObjectBinding<LoadedTexture> binding) {
+        SkinBindingChangeListener(Canvas canvas, ObservableValue<LoadedTexture> binding) {
            this.canvasRef = new WeakReference<>(canvas);
            this.binding = binding;
        }
@@ -293,14 +336,14 @@ public final class TexturesLoader {
        }
    }

-    public static void fxAvatarBinding(Canvas canvas, ObjectBinding<LoadedTexture> skinBinding) {
+    public static void fxAvatarBinding(Canvas canvas, ObservableValue<LoadedTexture> skinBinding) {
        synchronized (SkinBindingChangeListener.hole) {
            SkinBindingChangeListener oldListener = SkinBindingChangeListener.hole.remove(canvas);
            if (oldListener != null)
                oldListener.binding.removeListener(oldListener);

            SkinBindingChangeListener listener = new SkinBindingChangeListener(canvas, skinBinding);
-            listener.changed(skinBinding, null, skinBinding.get());
+            listener.changed(skinBinding, null, skinBinding.getValue());
            skinBinding.addListener(listener);

            SkinBindingChangeListener.hole.put(canvas, listener);
@@ -312,11 +355,11 @@ public final class TexturesLoader {
    }

    public static void bindAvatar(Canvas canvas, Account account) {
-        if (account instanceof YggdrasilAccount || account instanceof MicrosoftAccount)
+        if (account instanceof YggdrasilAccount || account instanceof MicrosoftAccount || account instanceof OfflineAccount)
            fxAvatarBinding(canvas, skinBinding(account));
        else {
            unbindAvatar(canvas);
-            drawAvatar(canvas, getDefaultSkin(TextureModel.detectUUID(account.getUUID())).image);
+            drawAvatar(canvas, getDefaultSkin(account.getUUID()).image);
        }
    }

@@ -0,0 +1,221 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2024 huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.java;
+
+import org.jackhuang.hmcl.download.DownloadProvider;
+import org.jackhuang.hmcl.download.java.mojang.MojangJavaDownloadTask;
+import org.jackhuang.hmcl.download.java.mojang.MojangJavaRemoteFiles;
+import org.jackhuang.hmcl.game.DownloadInfo;
+import org.jackhuang.hmcl.game.GameJavaVersion;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.util.gson.JsonUtils;
+import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;
+import org.jackhuang.hmcl.util.platform.Platform;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.*;
+import java.util.*;
+
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
+
+/**
+ * @author Glavo
+ */
+public final class HMCLJavaRepository implements JavaRepository {
+    public static final String MOJANG_JAVA_PREFIX = "mojang-";
+
+    private final Path root;
+
+    public HMCLJavaRepository(Path root) {
+        this.root = root;
+    }
+
+    public Path getPlatformRoot(Platform platform) {
+        return root.resolve(platform.toString());
+    }
+
+    @Override
+    public Path getJavaDir(Platform platform, String name) {
+        return getPlatformRoot(platform).resolve(name);
+    }
+
+    public Path getJavaDir(Platform platform, GameJavaVersion gameJavaVersion) {
+        return getJavaDir(platform, MOJANG_JAVA_PREFIX + gameJavaVersion.getComponent());
+    }
+
+    @Override
+    public Path getManifestFile(Platform platform, String name) {
+        return getPlatformRoot(platform).resolve(name + ".json");
+    }
+
+    public Path getManifestFile(Platform platform, GameJavaVersion gameJavaVersion) {
+        return getManifestFile(platform, MOJANG_JAVA_PREFIX + gameJavaVersion.getComponent());
+    }
+
+    public boolean isInstalled(Platform platform, String name) {
+        return Files.exists(getManifestFile(platform, name));
+    }
+
+    public boolean isInstalled(Platform platform, GameJavaVersion gameJavaVersion) {
+        return isInstalled(platform, MOJANG_JAVA_PREFIX + gameJavaVersion.getComponent());
+    }
+
+    public @Nullable Path getJavaExecutable(Platform platform, String name) {
+        Path javaDir = getJavaDir(platform, name);
+        try {
+            return JavaManager.getExecutable(javaDir).toRealPath();
+        } catch (IOException ignored) {
+            if (platform.getOperatingSystem() == OperatingSystem.OSX) {
+                try {
+                    return JavaManager.getMacExecutable(javaDir).toRealPath();
+                } catch (IOException ignored1) {
+                }
+            }
+        }
+
+        return null;
+    }
+
+    public @Nullable Path getJavaExecutable(Platform platform, GameJavaVersion gameJavaVersion) {
+        return getJavaExecutable(platform, MOJANG_JAVA_PREFIX + gameJavaVersion.getComponent());
+    }
+
+    @Override
+    public Collection<JavaRuntime> getAllJava(Platform platform) {
+        Path root = getPlatformRoot(platform);
+        if (!Files.isDirectory(root))
+            return Collections.emptyList();
+
+        ArrayList<JavaRuntime> list = new ArrayList<>();
+        try (DirectoryStream<Path> stream = Files.newDirectoryStream(root)) {
+            for (Path file : stream) {
+                try {
+                    String name = file.getFileName().toString();
+                    if (name.endsWith(".json") && Files.isRegularFile(file)) {
+                        Path javaDir = file.resolveSibling(name.substring(0, name.length() - ".json".length()));
+                        Path executable;
+                        try {
+                            executable = JavaManager.getExecutable(javaDir).toRealPath();
+                        } catch (IOException e) {
+                            if (platform.getOperatingSystem() == OperatingSystem.OSX)
+                                executable = JavaManager.getMacExecutable(javaDir).toRealPath();
+                            else
+                                throw e;
+                        }
+
+                        if (Files.isDirectory(javaDir)) {
+                            JavaManifest manifest;
+                            try (InputStream input = Files.newInputStream(file)) {
+                                manifest = JsonUtils.fromJsonFully(input, JavaManifest.class);
+                            }
+
+                            list.add(JavaRuntime.of(executable, manifest.getInfo(), true));
+                        }
+                    }
+                } catch (Throwable e) {
+                    LOG.warning("Failed to parse " + file, e);
+                }
+            }
+
+        } catch (IOException ignored) {
+        }
+        return list;
+    }
+
+    @Override
+    public Task<JavaRuntime> getDownloadJavaTask(DownloadProvider downloadProvider, Platform platform, GameJavaVersion gameJavaVersion) {
+        Path javaDir = getJavaDir(platform, gameJavaVersion);
+
+        return new MojangJavaDownloadTask(downloadProvider, javaDir, gameJavaVersion, JavaManager.getMojangJavaPlatform(platform)).thenApplyAsync(result -> {
+            Path executable;
+            try {
+                executable = JavaManager.getExecutable(javaDir).toRealPath();
+            } catch (IOException e) {
+                if (platform.getOperatingSystem() == OperatingSystem.OSX)
+                    executable = JavaManager.getMacExecutable(javaDir).toRealPath();
+                else
+                    throw e;
+            }
+
+            JavaInfo info;
+            if (JavaManager.isCompatible(platform))
+                info = JavaInfo.fromExecutable(executable, false);
+            else
+                info = new JavaInfo(platform, result.download.getVersion().getName(), null);
+
+            Map<String, Object> update = new LinkedHashMap<>();
+            update.put("provider", "mojang");
+            update.put("component", gameJavaVersion.getComponent());
+
+            Map<String, JavaLocalFiles.Local> files = new LinkedHashMap<>();
+            result.remoteFiles.getFiles().forEach((path, file) -> {
+                if (file instanceof MojangJavaRemoteFiles.RemoteFile) {
+                    DownloadInfo downloadInfo = ((MojangJavaRemoteFiles.RemoteFile) file).getDownloads().get("raw");
+                    if (downloadInfo != null) {
+                        files.put(path, new JavaLocalFiles.LocalFile(downloadInfo.getSha1(), downloadInfo.getSize()));
+                    }
+                } else if (file instanceof MojangJavaRemoteFiles.RemoteDirectory) {
+                    files.put(path, new JavaLocalFiles.LocalDirectory());
+                } else if (file instanceof MojangJavaRemoteFiles.RemoteLink) {
+                    files.put(path, new JavaLocalFiles.LocalLink(((MojangJavaRemoteFiles.RemoteLink) file).getTarget()));
+                }
+            });
+
+            JavaManifest manifest = new JavaManifest(info, update, files);
+            FileUtils.writeText(getManifestFile(platform, gameJavaVersion), JsonUtils.GSON.toJson(manifest));
+            return JavaRuntime.of(executable, info, true);
+        });
+    }
+
+    public Task<JavaRuntime> getInstallJavaTask(Platform platform, String name, Map<String, Object> update, Path archiveFile) {
+        Path javaDir = getJavaDir(platform, name);
+        return new JavaInstallTask(javaDir, update, archiveFile).thenApplyAsync(result -> {
+            if (!result.getInfo().getPlatform().equals(platform))
+                throw new IOException("Platform is mismatch: expected " + platform + " but got " + result.getInfo().getPlatform());
+
+            Path executable = javaDir.resolve("bin").resolve(platform.getOperatingSystem().getJavaExecutable()).toRealPath();
+            FileUtils.writeText(getManifestFile(platform, name), JsonUtils.GSON.toJson(result));
+            return JavaRuntime.of(executable, result.getInfo(), true);
+        });
+    }
+
+    @Override
+    public Task<Void> getUninstallJavaTask(Platform platform, String name) {
+        return Task.runAsync(() -> {
+            Files.deleteIfExists(getManifestFile(platform, name));
+            FileUtils.deleteDirectory(getJavaDir(platform, name).toFile());
+        });
+    }
+
+    @Override
+    public Task<Void> getUninstallJavaTask(JavaRuntime java) {
+        return Task.runAsync(() -> {
+            Path root = getPlatformRoot(java.getPlatform());
+            Path relativized = root.relativize(java.getBinary());
+
+            if (relativized.getNameCount() > 1) {
+                String name = relativized.getName(0).toString();
+                Files.deleteIfExists(getManifestFile(java.getPlatform(), name));
+                FileUtils.deleteDirectory(getJavaDir(java.getPlatform(), name).toFile());
+            }
+        });
+    }
+}
@@ -0,0 +1,116 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2024 huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.java;
+
+import org.apache.commons.compress.archivers.ArchiveEntry;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.util.DigestUtils;
+import org.jackhuang.hmcl.util.Hex;
+import org.jackhuang.hmcl.util.io.IOUtils;
+import org.jackhuang.hmcl.util.tree.ArchiveFileTree;
+
+import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.security.MessageDigest;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * @author Glavo
+ */
+public final class JavaInstallTask extends Task<JavaManifest> {
+
+    private final Path targetDir;
+    private final Map<String, Object> update;
+    private final Path archiveFile;
+
+    private final Map<String, JavaLocalFiles.Local> files = new LinkedHashMap<>();
+    private final ArrayList<String> nameStack = new ArrayList<>();
+    private final byte[] buffer = new byte[IOUtils.DEFAULT_BUFFER_SIZE];
+    private final MessageDigest messageDigest = DigestUtils.getDigest("SHA-1");
+
+    public JavaInstallTask(Path targetDir, Map<String, Object> update, Path archiveFile) {
+        this.targetDir = targetDir;
+        this.update = update;
+        this.archiveFile = archiveFile;
+    }
+
+    @Override
+    public void execute() throws Exception {
+        JavaInfo info;
+
+        try (ArchiveFileTree<?, ?> tree = ArchiveFileTree.open(archiveFile)) {
+            info = JavaInfo.fromArchive(tree);
+            copyDirContent(tree, targetDir);
+        }
+
+        setResult(new JavaManifest(info, update, files));
+    }
+
+    private <F, E extends ArchiveEntry> void copyDirContent(ArchiveFileTree<F, E> tree, Path targetDir) throws IOException {
+        copyDirContent(tree, tree.getRoot().getSubDirs().values().iterator().next(), targetDir);
+    }
+
+    private <F, E extends ArchiveEntry> void copyDirContent(ArchiveFileTree<F, E> tree, ArchiveFileTree.Dir<E> dir, Path targetDir) throws IOException {
+        Files.createDirectories(targetDir);
+
+        for (Map.Entry<String, E> pair : dir.getFiles().entrySet()) {
+            Path path = targetDir.resolve(pair.getKey());
+            E entry = pair.getValue();
+
+            nameStack.add(pair.getKey());
+            if (tree.isLink(entry)) {
+                String linkTarget = tree.getLink(entry);
+                files.put(String.join("/", nameStack), new JavaLocalFiles.LocalLink(linkTarget));
+                Files.createSymbolicLink(path, Paths.get(linkTarget));
+            } else {
+                long size = 0L;
+
+                try (InputStream input = tree.getInputStream(entry);
+                     OutputStream output = Files.newOutputStream(path, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING)) {
+                    messageDigest.reset();
+
+                    int c;
+                    while ((c = input.read(buffer)) > 0) {
+                        size += c;
+                        output.write(buffer, 0, c);
+                        messageDigest.update(buffer, 0, c);
+                    }
+                }
+
+                if (tree.isExecutable(entry))
+                    //noinspection ResultOfMethodCallIgnored
+                    path.toFile().setExecutable(true);
+
+                files.put(String.join("/", nameStack), new JavaLocalFiles.LocalFile(Hex.encodeHex(messageDigest.digest()), size));
+            }
+            nameStack.remove(nameStack.size() - 1);
+        }
+
+        for (Map.Entry<String, ArchiveFileTree.Dir<E>> pair : dir.getSubDirs().entrySet()) {
+            nameStack.add(pair.getKey());
+            files.put(String.join("/", nameStack), new JavaLocalFiles.LocalDirectory());
+            copyDirContent(tree, pair.getValue(), targetDir.resolve(pair.getKey()));
+            nameStack.remove(nameStack.size() - 1);
+        }
+    }
+}
@@ -0,0 +1,128 @@
+/*
+ * 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.java;
+
+import com.google.gson.*;
+import com.google.gson.annotations.JsonAdapter;
+
+import java.lang.reflect.Type;
+
+/**
+ * @author Glavo
+ */
+public final class JavaLocalFiles {
+    @JsonAdapter(Serializer.class)
+    public abstract static class Local {
+        private final String type;
+
+        Local(String type) {
+            this.type = type;
+        }
+
+        public String getType() {
+            return type;
+        }
+    }
+
+    public static final class LocalFile extends Local {
+        private final String sha1;
+        private final long size;
+
+        public LocalFile(String sha1, long size) {
+            super("file");
+            this.sha1 = sha1;
+            this.size = size;
+        }
+
+        public String getSha1() {
+            return sha1;
+        }
+
+        public long getSize() {
+            return size;
+        }
+    }
+
+    public static final class LocalDirectory extends Local {
+        public LocalDirectory() {
+            super("directory");
+        }
+    }
+
+    public static final class LocalLink extends Local {
+        private final String target;
+
+        public LocalLink(String target) {
+            super("link");
+            this.target = target;
+        }
+
+        public String getTarget() {
+            return target;
+        }
+    }
+
+    public static class Serializer implements JsonSerializer<Local>, JsonDeserializer<Local> {
+
+        @Override
+        public JsonElement serialize(Local src, Type typeOfSrc, JsonSerializationContext context) {
+            JsonObject obj = new JsonObject();
+            obj.addProperty("type", src.getType());
+            if (src instanceof LocalFile) {
+                obj.addProperty("sha1", ((LocalFile) src).getSha1());
+                obj.addProperty("size", ((LocalFile) src).getSize());
+            } else if (src instanceof LocalLink) {
+                obj.addProperty("target", ((LocalLink) src).getTarget());
+            }
+            return obj;
+        }
+
+        @Override
+        public Local deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+            if (!json.isJsonObject())
+                throw new JsonParseException(json.toString());
+
+            JsonObject obj = json.getAsJsonObject();
+            if (!obj.has("type"))
+                throw new JsonParseException(json.toString());
+
+            String type = obj.getAsJsonPrimitive("type").getAsString();
+
+            try {
+                switch (type) {
+                    case "file": {
+                        String sha1 = obj.getAsJsonPrimitive("sha1").getAsString();
+                        long size = obj.getAsJsonPrimitive("size").getAsLong();
+                        return new LocalFile(sha1, size);
+                    }
+                    case "directory": {
+                        return new LocalDirectory();
+                    }
+                    case "link": {
+                        String target = obj.getAsJsonPrimitive("target").getAsString();
+                        return new LocalLink(target);
+                    }
+                    default:
+                        throw new AssertionError("unknown type: " + type);
+                }
+            } catch (Throwable e) {
+                throw new JsonParseException(json.toString());
+            }
+        }
+    }
+}
@@ -0,0 +1,698 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2024 huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.java;
+
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import org.jackhuang.hmcl.Metadata;
+import org.jackhuang.hmcl.download.DownloadProvider;
+import org.jackhuang.hmcl.download.LibraryAnalyzer;
+import org.jackhuang.hmcl.game.GameJavaVersion;
+import org.jackhuang.hmcl.game.JavaVersionConstraint;
+import org.jackhuang.hmcl.game.Version;
+import org.jackhuang.hmcl.setting.ConfigHolder;
+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.Lang;
+import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.util.platform.Architecture;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;
+import org.jackhuang.hmcl.util.platform.Platform;
+import org.jackhuang.hmcl.util.platform.UnsupportedPlatformException;
+import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.file.*;
+import java.util.*;
+import java.util.concurrent.CountDownLatch;
+import java.util.stream.Collectors;
+
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
+
+/**
+ * @author Glavo
+ */
+public final class JavaManager {
+
+    private JavaManager() {
+    }
+
+    public static final HMCLJavaRepository REPOSITORY = new HMCLJavaRepository(Metadata.HMCL_DIRECTORY.resolve("java"));
+
+    public static String getMojangJavaPlatform(Platform platform) {
+        if (platform.getOperatingSystem() == OperatingSystem.WINDOWS) {
+            if (Architecture.SYSTEM_ARCH == Architecture.X86) {
+                return "windows-x86";
+            } else if (Architecture.SYSTEM_ARCH == Architecture.X86_64) {
+                return "windows-x64";
+            } else if (Architecture.SYSTEM_ARCH == Architecture.ARM64) {
+                return "windows-arm64";
+            }
+        } else if (platform.getOperatingSystem() == OperatingSystem.LINUX) {
+            if (Architecture.SYSTEM_ARCH == Architecture.X86) {
+                return "linux-i386";
+            } else if (Architecture.SYSTEM_ARCH == Architecture.X86_64) {
+                return "linux";
+            }
+        } else if (platform.getOperatingSystem() == OperatingSystem.OSX) {
+            if (Architecture.SYSTEM_ARCH == Architecture.X86_64) {
+                return "mac-os";
+            } else if (Architecture.SYSTEM_ARCH == Architecture.ARM64) {
+                return "mac-os-arm64";
+            }
+        }
+
+        return null;
+    }
+
+    public static Path getExecutable(Path javaHome) {
+        return javaHome.resolve("bin").resolve(OperatingSystem.CURRENT_OS.getJavaExecutable());
+    }
+
+    public static Path getMacExecutable(Path javaHome) {
+        return javaHome.resolve("jre.bundle/Contents/Home/bin/java");
+    }
+
+    public static boolean isCompatible(Platform platform) {
+        if (platform.getOperatingSystem() != OperatingSystem.CURRENT_OS)
+            return false;
+
+        Architecture architecture = platform.getArchitecture();
+        if (architecture == Architecture.SYSTEM_ARCH || architecture == Architecture.CURRENT_ARCH)
+            return true;
+
+        switch (OperatingSystem.CURRENT_OS) {
+            case WINDOWS:
+                if (Architecture.SYSTEM_ARCH == Architecture.X86_64)
+                    return architecture == Architecture.X86;
+                if (Architecture.SYSTEM_ARCH == Architecture.ARM64)
+                    return OperatingSystem.SYSTEM_BUILD_NUMBER >= 21277 && architecture == Architecture.X86_64 || architecture == Architecture.X86;
+                break;
+            case LINUX:
+                if (Architecture.SYSTEM_ARCH == Architecture.X86_64)
+                    return architecture == Architecture.X86;
+                break;
+            case OSX:
+                if (Architecture.SYSTEM_ARCH == Architecture.ARM64)
+                    return architecture == Architecture.X86_64;
+                break;
+        }
+
+        return false;
+    }
+
+    private static volatile Map<Path, JavaRuntime> allJava;
+    private static final CountDownLatch LATCH = new CountDownLatch(1);
+
+    private static final ObjectProperty<Collection<JavaRuntime>> allJavaProperty = new SimpleObjectProperty<>();
+
+    private static Map<Path, JavaRuntime> getAllJavaMap() throws InterruptedException {
+        Map<Path, JavaRuntime> map = allJava;
+        if (map == null) {
+            LATCH.await();
+            map = allJava;
+        }
+        return map;
+    }
+
+    private static void updateAllJavaProperty(Map<Path, JavaRuntime> javaRuntimes) {
+        JavaRuntime[] array = javaRuntimes.values().toArray(new JavaRuntime[0]);
+        Arrays.sort(array);
+        allJavaProperty.set(Arrays.asList(array));
+    }
+
+    public static boolean isInitialized() {
+        return allJava != null;
+    }
+
+    public static Collection<JavaRuntime> getAllJava() throws InterruptedException {
+        return getAllJavaMap().values();
+    }
+
+    public static ObjectProperty<Collection<JavaRuntime>> getAllJavaProperty() {
+        return allJavaProperty;
+    }
+
+    public static JavaRuntime getJava(Path executable) throws IOException, InterruptedException {
+        executable = executable.toRealPath();
+
+        JavaRuntime javaRuntime = getAllJavaMap().get(executable);
+        if (javaRuntime != null) {
+            return javaRuntime;
+        }
+
+        JavaInfo info = JavaInfo.fromExecutable(executable);
+        return JavaRuntime.of(executable, info, false);
+    }
+
+    public static void refresh() {
+        Task.supplyAsync(JavaManager::searchPotentialJavaExecutables).whenComplete(Schedulers.javafx(), (result, exception) -> {
+            if (result != null) {
+                LATCH.await();
+                allJava = result;
+                updateAllJavaProperty(result);
+            }
+        }).start();
+    }
+
+    public static Task<JavaRuntime> getAddJavaTask(Path binary) {
+        return Task.supplyAsync("Get Java", () -> JavaManager.getJava(binary))
+                .thenApplyAsync(Schedulers.javafx(), javaRuntime -> {
+                    if (!JavaManager.isCompatible(javaRuntime.getPlatform())) {
+                        throw new UnsupportedPlatformException("Incompatible platform: " + javaRuntime.getPlatform());
+                    }
+
+                    String pathString = javaRuntime.getBinary().toString();
+
+                    ConfigHolder.globalConfig().getDisabledJava().remove(pathString);
+                    if (ConfigHolder.globalConfig().getUserJava().add(pathString)) {
+                        addJava(javaRuntime);
+                    }
+                    return javaRuntime;
+                });
+    }
+
+    public static Task<JavaRuntime> getDownloadJavaTask(DownloadProvider downloadProvider, Platform platform, GameJavaVersion gameJavaVersion) {
+        return REPOSITORY.getDownloadJavaTask(downloadProvider, platform, gameJavaVersion)
+                .thenApplyAsync(Schedulers.javafx(), java -> {
+                    addJava(java);
+                    return java;
+                });
+    }
+
+    public static Task<JavaRuntime> getInstallJavaTask(Platform platform, String name, Map<String, Object> update, Path archiveFile) {
+        return REPOSITORY.getInstallJavaTask(platform, name, update, archiveFile)
+                .thenApplyAsync(Schedulers.javafx(), java -> {
+                    addJava(java);
+                    return java;
+                });
+    }
+
+    public static Task<Void> getUninstallJavaTask(JavaRuntime java) {
+        assert java.isManaged();
+        Path root = REPOSITORY.getPlatformRoot(java.getPlatform());
+        Path relativized = root.relativize(java.getBinary());
+
+        if (relativized.getNameCount() > 1) {
+            FXUtils.runInFX(() -> {
+                try {
+                    removeJava(java);
+                } catch (InterruptedException e) {
+                    throw new AssertionError("Unreachable code", e);
+                }
+            });
+
+            String name = relativized.getName(0).toString();
+            return REPOSITORY.getUninstallJavaTask(java.getPlatform(), name);
+        } else {
+            return Task.completed(null);
+        }
+    }
+
+    // FXThread
+    public static void addJava(JavaRuntime java) throws InterruptedException {
+        Map<Path, JavaRuntime> oldMap = getAllJavaMap();
+        if (!oldMap.containsKey(java.getBinary())) {
+            HashMap<Path, JavaRuntime> newMap = new HashMap<>(oldMap);
+            newMap.put(java.getBinary(), java);
+            allJava = newMap;
+            updateAllJavaProperty(newMap);
+        }
+    }
+
+    // FXThread
+    public static void removeJava(JavaRuntime java) throws InterruptedException {
+        removeJava(java.getBinary());
+    }
+
+    // FXThread
+    public static void removeJava(Path realPath) throws InterruptedException {
+        Map<Path, JavaRuntime> oldMap = getAllJavaMap();
+        if (oldMap.containsKey(realPath)) {
+            HashMap<Path, JavaRuntime> newMap = new HashMap<>(oldMap);
+            newMap.remove(realPath);
+            allJava = newMap;
+            updateAllJavaProperty(newMap);
+        }
+    }
+
+    private static int compareJavaVersion(JavaRuntime java1, JavaRuntime java2, GameJavaVersion suggestedJavaVersion) {
+        if (suggestedJavaVersion != null) {
+            boolean b1 = java1.getParsedVersion() == suggestedJavaVersion.getMajorVersion();
+            boolean b2 = java2.getParsedVersion() == suggestedJavaVersion.getMajorVersion();
+
+            if (b1 != b2)
+                return b1 ? 1 : -1;
+        }
+
+        return java1.getVersionNumber().compareTo(java2.getVersionNumber());
+    }
+
+    @Nullable
+    public static JavaRuntime findSuitableJava(GameVersionNumber gameVersion, Version version) throws InterruptedException {
+        return findSuitableJava(getAllJava(), gameVersion, version);
+    }
+
+    @Nullable
+    public static JavaRuntime findSuitableJava(Collection<JavaRuntime> javaRuntimes, GameVersionNumber gameVersion, Version version) {
+        LibraryAnalyzer analyzer = version != null ? LibraryAnalyzer.analyze(version, gameVersion != null ? gameVersion.toString() : null) : null;
+
+        boolean forceX86 = Architecture.SYSTEM_ARCH == Architecture.ARM64
+                && (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS || OperatingSystem.CURRENT_OS == OperatingSystem.OSX)
+                && (gameVersion == null || gameVersion.compareTo("1.6") < 0);
+
+        GameJavaVersion suggestedJavaVersion =
+                (version != null && gameVersion != null && gameVersion.compareTo("1.7.10") >= 0) ? version.getJavaVersion() : null;
+
+        JavaRuntime mandatory = null;
+        JavaRuntime suggested = null;
+        for (JavaRuntime java : javaRuntimes) {
+            if (forceX86) {
+                if (!java.getArchitecture().isX86())
+                    continue;
+            } else {
+                if (java.getArchitecture() != Architecture.SYSTEM_ARCH)
+                    continue;
+            }
+
+            boolean violationMandatory = false;
+            boolean violationSuggested = false;
+
+            for (JavaVersionConstraint constraint : JavaVersionConstraint.ALL) {
+                if (constraint.appliesToVersion(gameVersion, version, java, analyzer)) {
+                    if (!constraint.checkJava(gameVersion, version, java)) {
+                        if (constraint.isMandatory()) {
+                            violationMandatory = true;
+                        } else {
+                            violationSuggested = true;
+                        }
+                    }
+                }
+            }
+
+            if (!violationMandatory) {
+                if (mandatory == null) mandatory = java;
+                else if (compareJavaVersion(java, mandatory, suggestedJavaVersion) > 0)
+                    mandatory = java;
+
+                if (!violationSuggested) {
+                    if (suggested == null) suggested = java;
+                    else if (compareJavaVersion(java, suggested, suggestedJavaVersion) > 0)
+                        suggested = java;
+                }
+            }
+        }
+
+        return suggested != null ? suggested : mandatory;
+    }
+
+    public static void initialize() {
+        Map<Path, JavaRuntime> allJava = searchPotentialJavaExecutables();
+        JavaManager.allJava = allJava;
+        LATCH.countDown();
+        FXUtils.runInFX(() -> updateAllJavaProperty(allJava));
+    }
+
+    // search java
+
+    private static Map<Path, JavaRuntime> searchPotentialJavaExecutables() {
+        Map<Path, JavaRuntime> javaRuntimes = new HashMap<>();
+        searchAllJavaInRepository(javaRuntimes, Platform.SYSTEM_PLATFORM);
+        switch (OperatingSystem.CURRENT_OS) {
+            case WINDOWS:
+                if (Architecture.SYSTEM_ARCH == Architecture.X86_64)
+                    searchAllJavaInRepository(javaRuntimes, 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);
+                }
+                break;
+            case OSX:
+                if (Architecture.SYSTEM_ARCH == Architecture.ARM64)
+                    searchAllJavaInRepository(javaRuntimes, Platform.OSX_X86_64);
+                break;
+        }
+
+        switch (OperatingSystem.CURRENT_OS) {
+            case WINDOWS:
+                queryJavaInRegistryKey(javaRuntimes, "HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\");
+                queryJavaInRegistryKey(javaRuntimes, "HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\");
+                queryJavaInRegistryKey(javaRuntimes, "HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\JRE\\");
+                queryJavaInRegistryKey(javaRuntimes, "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)");
+                }
+                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!
+                break;
+            case OSX:
+                tryAddJavaHome(javaRuntimes, Paths.get("/Library/Java/JavaVirtualMachines/Contents/Home"));
+                tryAddJavaHome(javaRuntimes, Paths.get(System.getProperty("user.home"), "/Library/Java/JavaVirtualMachines/Contents/Home"));
+                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"));
+                // 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@*")) {
+                    for (Path dir : dirs) {
+                        searchAllJavaInDirectory(javaRuntimes, dir);
+                    }
+                } catch (IOException e) {
+                    LOG.warning("Failed to get subdirectories of /opt/homebrew/Cellar");
+                }
+                break;
+
+            default:
+                break;
+        }
+
+        // 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));
+
+            FileUtils.tryGetPath(Lang.requireNonNullElse(System.getenv("ProgramFiles(x86)"), "C:\\Program Files (x86)"), "Minecraft Launcher\\runtime")
+                    .ifPresent(it -> searchAllOfficialJava(javaRuntimes, 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);
+        } else if (OperatingSystem.CURRENT_OS == OperatingSystem.OSX) {
+            searchAllOfficialJava(javaRuntimes, Paths.get(System.getProperty("user.home"), "Library/Application Support/minecraft/runtime"), false);
+        }
+        searchAllOfficialJava(javaRuntimes, CacheRepository.getInstance().getCacheDirectory().resolve("java"), true);
+
+        // Search in PATH.
+        if (System.getenv("PATH") != null) {
+            String[] paths = System.getenv("PATH").split(OperatingSystem.PATH_SEPARATOR);
+            for (String path : paths) {
+                try {
+                    tryAddJavaExecutable(javaRuntimes, Paths.get(path, OperatingSystem.CURRENT_OS.getJavaExecutable()));
+                } catch (InvalidPathException ignored) {
+                }
+            }
+        }
+
+        if (System.getenv("HMCL_JRES") != null) {
+            String[] paths = System.getenv("HMCL_JRES").split(OperatingSystem.PATH_SEPARATOR);
+            for (String path : paths) {
+                try {
+                    tryAddJavaHome(javaRuntimes, Paths.get(path));
+                } catch (InvalidPathException ignored) {
+                }
+            }
+        }
+        searchAllJavaInDirectory(javaRuntimes, Paths.get(System.getProperty("user.home"), ".jdks"));
+
+        for (String javaPath : ConfigHolder.globalConfig().getUserJava()) {
+            try {
+                tryAddJavaExecutable(javaRuntimes, Paths.get(javaPath));
+            } catch (InvalidPathException e) {
+                LOG.warning("Invalid Java path: " + javaPath);
+            }
+        }
+
+        JavaRuntime currentJava = JavaRuntime.CURRENT_JAVA;
+        if (currentJava != null
+                && !javaRuntimes.containsKey(currentJava.getBinary())
+                && !ConfigHolder.globalConfig().getDisabledJava().contains(currentJava.getBinary().toString())) {
+            javaRuntimes.put(currentJava.getBinary(), currentJava);
+        }
+
+        LOG.trace(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;
+    }
+
+    private static void tryAddJavaHome(Map<Path, JavaRuntime> javaRuntimes, Path javaHome) {
+        Path executable = getExecutable(javaHome);
+        if (!Files.isRegularFile(executable)) {
+            return;
+        }
+
+        try {
+            executable = executable.toRealPath();
+        } catch (IOException e) {
+            LOG.warning("Failed to resolve path " + executable, e);
+            return;
+        }
+
+        if (javaRuntimes.containsKey(executable) || ConfigHolder.globalConfig().getDisabledJava().contains(executable.toString())) {
+            return;
+        }
+
+        JavaInfo info = null;
+
+        Path releaseFile = javaHome.resolve("release");
+        if (Files.exists(releaseFile)) {
+            try {
+                info = JavaInfo.fromReleaseFile(releaseFile);
+            } catch (IOException e) {
+                try {
+                    info = JavaInfo.fromExecutable(executable, false);
+                } catch (IOException e2) {
+                    e2.addSuppressed(e);
+                    LOG.warning("Failed to lookup Java executable at " + executable, e2);
+                }
+            }
+        }
+
+        if (info != null && isCompatible(info.getPlatform()))
+            javaRuntimes.put(executable, JavaRuntime.of(executable, info, false));
+    }
+
+    private static void tryAddJavaExecutable(Map<Path, JavaRuntime> javaRuntimes, Path executable) {
+        try {
+            executable = executable.toRealPath();
+        } catch (IOException e) {
+            return;
+        }
+
+        if (javaRuntimes.containsKey(executable) || ConfigHolder.globalConfig().getDisabledJava().contains(executable.toString())) {
+            return;
+        }
+
+        JavaInfo info = null;
+        try {
+            info = JavaInfo.fromExecutable(executable);
+        } 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());
+                }
+            } catch (IOException e) {
+                LOG.warning("Failed to verify Java in " + component, e);
+                return;
+            }
+        }
+
+        if (OperatingSystem.CURRENT_OS == OperatingSystem.OSX) {
+            Path macPath = dir.resolve("jre.bundle/Contents/Home");
+            if (Files.exists(macPath)) {
+                tryAddJavaHome(javaRuntimes, macPath);
+                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);
+        }
+    }
+
+    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);
+                }
+                searchAllOfficialJava(javaRuntimes, directory, getMojangJavaPlatform(Platform.WINDOWS_X86), verify);
+            }
+        } else if (OperatingSystem.CURRENT_OS == OperatingSystem.OSX && Architecture.CURRENT_ARCH == Architecture.ARM64) {
+            searchAllOfficialJava(javaRuntimes, directory, getMojangJavaPlatform(Platform.OSX_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);
+            }
+        } 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);
+            }
+        } 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));
+        }
+    }
+
+    // ==== Windows Registry Support ====
+    private static void queryJavaInRegistryKey(Map<Path, JavaRuntime> javaRuntimes, String location) {
+        for (String java : querySubFolders(location)) {
+            if (!querySubFolders(java).contains(java + "\\MSI"))
+                continue;
+            String home = queryRegisterValue(java, "JavaHome");
+            if (home != null) {
+                try {
+                    tryAddJavaHome(javaRuntimes, Paths.get(home));
+                } catch (InvalidPathException e) {
+                    LOG.warning("Invalid Java path in system registry: " + home);
+                }
+            }
+        }
+    }
+
+    private static List<String> querySubFolders(String location) {
+        List<String> res = new ArrayList<>();
+
+        try {
+            Process process = Runtime.getRuntime().exec(new String[]{"cmd", "/c", "reg", "query", location});
+            try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream(), OperatingSystem.NATIVE_CHARSET))) {
+                for (String line; (line = reader.readLine()) != null; ) {
+                    if (line.startsWith(location) && !line.equals(location)) {
+                        res.add(line);
+                    }
+                }
+            }
+        } catch (IOException e) {
+            LOG.warning("Failed to query sub folders of " + location, e);
+        }
+        return res;
+    }
+
+    private static String queryRegisterValue(String location, String name) {
+        boolean last = false;
+
+        try {
+            Process process = Runtime.getRuntime().exec(new String[]{"cmd", "/c", "reg", "query", location, "/v", name});
+            try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream(), OperatingSystem.NATIVE_CHARSET))) {
+                for (String line; (line = reader.readLine()) != null; ) {
+                    if (StringUtils.isNotBlank(line)) {
+                        if (last && line.trim().startsWith(name)) {
+                            int begins = line.indexOf(name);
+                            if (begins > 0) {
+                                String s2 = line.substring(begins + name.length());
+                                begins = s2.indexOf("REG_SZ");
+                                if (begins > 0) {
+                                    return s2.substring(begins + "REG_SZ".length()).trim();
+                                }
+                            }
+                        }
+                        if (location.equals(line.trim())) {
+                            last = true;
+                        }
+                    }
+                }
+            }
+        } catch (IOException e) {
+            LOG.warning("Failed to query register value of " + location, e);
+        }
+
+        return null;
+    }
+}
@@ -0,0 +1,112 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2024 huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.java;
+
+import com.google.gson.*;
+import com.google.gson.annotations.JsonAdapter;
+import org.jackhuang.hmcl.util.platform.Architecture;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;
+import org.jackhuang.hmcl.util.platform.Platform;
+import org.jetbrains.annotations.Nullable;
+
+import java.lang.reflect.Type;
+import java.util.Map;
+import java.util.Optional;
+
+import static org.jackhuang.hmcl.util.gson.JsonUtils.mapTypeOf;
+
+/**
+ * @author Glavo
+ */
+@JsonAdapter(JavaManifest.Serializer.class)
+public final class JavaManifest {
+
+    private final JavaInfo info;
+
+    @Nullable
+    private final Map<String, Object> update;
+
+    @Nullable
+    private final Map<String, JavaLocalFiles.Local> files;
+
+    public JavaManifest(JavaInfo info, @Nullable Map<String, Object> update, @Nullable Map<String, JavaLocalFiles.Local> files) {
+        this.info = info;
+        this.update = update;
+        this.files = files;
+    }
+
+    public JavaInfo getInfo() {
+        return info;
+    }
+
+    public Map<String, Object> getUpdate() {
+        return update;
+    }
+
+    public Map<String, JavaLocalFiles.Local> getFiles() {
+        return files;
+    }
+
+    public static final class Serializer implements JsonSerializer<JavaManifest>, JsonDeserializer<JavaManifest> {
+
+        private static final Type LOCAL_FILES_TYPE = mapTypeOf(String.class, JavaLocalFiles.Local.class).getType();
+
+        @Override
+        public JsonElement serialize(JavaManifest src, Type typeOfSrc, JsonSerializationContext context) {
+            JsonObject res = new JsonObject();
+            res.addProperty("os.name", src.getInfo().getPlatform().getOperatingSystem().getCheckedName());
+            res.addProperty("os.arch", src.getInfo().getPlatform().getArchitecture().getCheckedName());
+            res.addProperty("java.version", src.getInfo().getVersion());
+            res.addProperty("java.vendor", src.getInfo().getVendor());
+
+            if (src.getUpdate() != null)
+                res.add("update", context.serialize(src.getUpdate()));
+
+            if (src.getFiles() != null)
+                res.add("files", context.serialize(src.getFiles(), LOCAL_FILES_TYPE));
+
+            return res;
+        }
+
+        @Override
+        public JavaManifest deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+            if (!json.isJsonObject())
+                throw new JsonParseException(json.toString());
+
+            try {
+                JsonObject jsonObject = json.getAsJsonObject();
+                OperatingSystem osName = OperatingSystem.parseOSName(jsonObject.getAsJsonPrimitive("os.name").getAsString());
+                Architecture osArch = Architecture.parseArchName(jsonObject.getAsJsonPrimitive("os.arch").getAsString());
+                String javaVersion = jsonObject.getAsJsonPrimitive("java.version").getAsString();
+                String javaVendor = Optional.ofNullable(jsonObject.get("java.vendor")).map(JsonElement::getAsString).orElse(null);
+
+                Map<String, Object> update = jsonObject.has("update") ? context.deserialize(jsonObject.get("update"), Map.class) : null;
+                Map<String, JavaLocalFiles.Local> files = jsonObject.has("files") ? context.deserialize(jsonObject.get("files"), LOCAL_FILES_TYPE) : null;
+
+                if (osName == null || osArch == null || javaVersion == null)
+                    throw new JsonParseException(json.toString());
+
+                return new JavaManifest(new JavaInfo(Platform.getPlatform(osName, osArch), javaVersion, javaVendor), update, files);
+            } catch (JsonParseException e) {
+                throw e;
+            } catch (Throwable e) {
+                throw new JsonParseException(e);
+            }
+        }
+    }
+}
@@ -17,7 +17,6 @@
 */
 package org.jackhuang.hmcl.setting;

-import com.google.gson.reflect.TypeToken;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
 import javafx.beans.property.ObjectProperty;
@@ -33,8 +32,6 @@ import org.jackhuang.hmcl.auth.microsoft.MicrosoftService;
 import org.jackhuang.hmcl.auth.offline.OfflineAccount;
 import org.jackhuang.hmcl.auth.offline.OfflineAccountFactory;
 import org.jackhuang.hmcl.auth.yggdrasil.RemoteAuthenticationException;
-import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
-import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccountFactory;
 import org.jackhuang.hmcl.game.OAuthServer;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.util.InvocationDispatcher;
@@ -42,13 +39,13 @@ import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.skin.InvalidSkinException;

+import javax.net.ssl.SSLException;
 import java.io.IOException;
 import java.io.Reader;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.*;
-import java.util.logging.Level;

 import static java.util.stream.Collectors.toList;
 import static javafx.collections.FXCollections.observableArrayList;
@@ -56,24 +53,28 @@ import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
 import static org.jackhuang.hmcl.util.Lang.immutableListOf;
 import static org.jackhuang.hmcl.util.Lang.mapOf;
-import static org.jackhuang.hmcl.util.Logging.LOG;
 import static org.jackhuang.hmcl.util.Pair.pair;
+import static org.jackhuang.hmcl.util.gson.JsonUtils.listTypeOf;
+import static org.jackhuang.hmcl.util.gson.JsonUtils.mapTypeOf;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;

 /**
 * @author huangyuhui
 */
 public final class Accounts {
-    private Accounts() {}
+    private Accounts() {
+    }

    private static final AuthlibInjectorArtifactProvider AUTHLIB_INJECTOR_DOWNLOADER = createAuthlibInjectorArtifactProvider();
+
    private static void triggerAuthlibInjectorUpdateCheck() {
        if (AUTHLIB_INJECTOR_DOWNLOADER instanceof AuthlibInjectorDownloader) {
            Schedulers.io().execute(() -> {
                try {
                    ((AuthlibInjectorDownloader) AUTHLIB_INJECTOR_DOWNLOADER).checkUpdate();
                } catch (IOException e) {
-                    LOG.log(Level.WARNING, "Failed to check update for authlib-injector", e);
+                    LOG.warning("Failed to check update for authlib-injector", e);
                }
            });
        }
@@ -82,17 +83,16 @@ public final class Accounts {
    public static final OAuthServer.Factory OAUTH_CALLBACK = new OAuthServer.Factory();

    public static final OfflineAccountFactory FACTORY_OFFLINE = new OfflineAccountFactory(AUTHLIB_INJECTOR_DOWNLOADER);
-    public static final YggdrasilAccountFactory FACTORY_MOJANG = YggdrasilAccountFactory.MOJANG;
    public static final AuthlibInjectorAccountFactory FACTORY_AUTHLIB_INJECTOR = new AuthlibInjectorAccountFactory(AUTHLIB_INJECTOR_DOWNLOADER, Accounts::getOrCreateAuthlibInjectorServer);
    public static final MicrosoftAccountFactory FACTORY_MICROSOFT = new MicrosoftAccountFactory(new MicrosoftService(OAUTH_CALLBACK));
-    public static final List<AccountFactory<?>> FACTORIES = immutableListOf(FACTORY_OFFLINE, FACTORY_MOJANG, FACTORY_MICROSOFT, FACTORY_AUTHLIB_INJECTOR);
+    public static final List<AccountFactory<?>> FACTORIES = immutableListOf(FACTORY_OFFLINE, FACTORY_MICROSOFT, FACTORY_AUTHLIB_INJECTOR);

    // ==== login type / account factory mapping ====
    private static final Map<String, AccountFactory<?>> type2factory = new HashMap<>();
    private static final Map<AccountFactory<?>, String> factory2type = new HashMap<>();
+
    static {
        type2factory.put("offline", FACTORY_OFFLINE);
-        type2factory.put("yggdrasil", FACTORY_MOJANG);
        type2factory.put("authlibInjector", FACTORY_AUTHLIB_INJECTOR);
        type2factory.put("microsoft", FACTORY_MICROSOFT);

@@ -125,8 +125,6 @@ public final class Accounts {
            return FACTORY_OFFLINE;
        else if (account instanceof AuthlibInjectorAccount)
            return FACTORY_AUTHLIB_INJECTOR;
-        else if (account instanceof YggdrasilAccount)
-            return FACTORY_MOJANG;
        else if (account instanceof MicrosoftAccount)
            return FACTORY_MICROSOFT;
        else
@@ -136,7 +134,7 @@ public final class Accounts {
    private static final String GLOBAL_PREFIX = "$GLOBAL:";
    private static final ObservableList<Map<Object, Object>> globalAccountStorages = FXCollections.observableArrayList();

-    private static final ObservableList<Account> accounts = observableArrayList(account -> new Observable[] { account });
+    private static final ObservableList<Account> accounts = observableArrayList(account -> new Observable[]{account});
    private static final ObjectProperty<Account> selectedAccount = new SimpleObjectProperty<>(Accounts.class, "selectedAccount");

    /**
@@ -174,16 +172,13 @@ public final class Accounts {
            config().getAccountStorages().setAll(portable);
    }

-    @SuppressWarnings("unchecked")
    private static void loadGlobalAccountStorages() {
        Path globalAccountsFile = Metadata.HMCL_DIRECTORY.resolve("accounts.json");
        if (Files.exists(globalAccountsFile)) {
            try (Reader reader = Files.newBufferedReader(globalAccountsFile)) {
-                globalAccountStorages.setAll((List<Map<Object, Object>>)
-                        Config.CONFIG_GSON.fromJson(reader, new TypeToken<List<Map<Object, Object>>>() {
-                        }.getType()));
+                globalAccountStorages.setAll(Config.CONFIG_GSON.fromJson(reader, listTypeOf(mapTypeOf(Object.class, Object.class))));
            } catch (Throwable e) {
-                LOG.log(Level.WARNING, "Failed to load global accounts", e);
+                LOG.warning("Failed to load global accounts", e);
            }
        }

@@ -195,7 +190,7 @@ public final class Accounts {
                        FileUtils.saveSafely(globalAccountsFile, json);
                    }
                } catch (IOException e) {
-                    LOG.log(Level.SEVERE, "Failed to save global accounts", e);
+                    LOG.error("Failed to save global accounts", e);
                }
            }
        });
@@ -214,7 +209,7 @@ public final class Accounts {
        try {
            return factory.fromStorage(storage);
        } catch (Exception e) {
-            LOG.log(Level.WARNING, "Failed to load account: " + storage, e);
+            LOG.warning("Failed to load account: " + storage, e);
            return null;
        }
    }
@@ -326,7 +321,7 @@ public final class Accounts {
                try {
                    finalSelected.logIn();
                } catch (Throwable e) {
-                    LOG.log(Level.WARNING, "Failed to log " + finalSelected + " in", e);
+                    LOG.warning("Failed to log " + finalSelected + " in", e);
                }
            });
        }
@@ -340,7 +335,7 @@ public final class Accounts {
                try {
                    server.fetchMetadataResponse();
                } catch (IOException e) {
-                    LOG.log(Level.WARNING, "Failed to fetch authlib-injector server metdata: " + server, e);
+                    LOG.warning("Failed to fetch authlib-injector server metdata: " + server, e);
                }
            });
        }
@@ -413,7 +408,6 @@ public final class Accounts {
    // ==== Login type name i18n ===
    private static final Map<AccountFactory<?>, String> unlocalizedLoginTypeNames = mapOf(
            pair(Accounts.FACTORY_OFFLINE, "account.methods.offline"),
-            pair(Accounts.FACTORY_MOJANG, "account.methods.yggdrasil"),
            pair(Accounts.FACTORY_AUTHLIB_INJECTOR, "account.methods.authlib_injector"),
            pair(Accounts.FACTORY_MICROSOFT, "account.methods.microsoft"));

@@ -427,7 +421,11 @@ public final class Accounts {
        if (exception instanceof NoCharacterException) {
            return i18n("account.failed.no_character");
        } else if (exception instanceof ServerDisconnectException) {
-            return i18n("account.failed.connect_authentication_server");
+            if (exception.getCause() instanceof SSLException) {
+                return i18n("account.failed.ssl");
+            } else {
+                return i18n("account.failed.connect_authentication_server");
+            }
        } else if (exception instanceof ServerResponseMalformedException) {
            return i18n("account.failed.server_response_malformed");
        } else if (exception instanceof RemoteAuthenticationException) {
@@ -468,6 +466,8 @@ public final class Accounts {
            } else {
                return i18n("account.methods.microsoft.error.unknown", errorCode);
            }
+        } else if (exception instanceof MicrosoftService.XBox400Exception) {
+            return i18n("account.methods.microsoft.error.wrong_verify_method");
        } else if (exception instanceof MicrosoftService.NoMinecraftJavaEditionProfileException) {
            return i18n("account.methods.microsoft.error.no_character");
        } else if (exception instanceof MicrosoftService.NoXuiException) {
@@ -22,70 +22,75 @@ import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 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.io.FileUtils;
+import org.jackhuang.hmcl.util.io.JarUtils;

 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Collections;
 import java.util.List;
-import java.util.logging.Level;
+import java.util.Set;
+import java.util.concurrent.CopyOnWriteArraySet;

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

-public class AuthlibInjectorServers implements Validation {
+public final class AuthlibInjectorServers implements Validation {

    public static final String CONFIG_FILENAME = "authlib-injectors.json";

+    private static final Set<AuthlibInjectorServer> servers = new CopyOnWriteArraySet<>();
+
+    public static Set<AuthlibInjectorServer> getServers() {
+        return servers;
+    }
+
    private final List<String> urls;

-    public AuthlibInjectorServers(List<String> urls) {
+    private AuthlibInjectorServers(List<String> urls) {
        this.urls = urls;
    }

-    public List<String> getUrls() {
-        return urls;
-    }
-
    @Override
-    public void validate() throws JsonParseException {
-        if (urls == null)
-            throw new JsonParseException("authlib-injectors.json -> urls cannot be null");
+    public void validate() throws JsonParseException, TolerableValidationException {
+        if (this.urls == null) {
+            throw new JsonParseException("authlib-injectors.json -> urls cannot be null.");
+        }
    }

-    private static final Path configLocation = Paths.get(CONFIG_FILENAME);
-    private static AuthlibInjectorServers configInstance;
-
-    public synchronized static void init() {
-        if (configInstance != null) {
-            throw new IllegalStateException("AuthlibInjectorServers is already loaded");
+    public static void init() {
+        Path configLocation;
+        Path jarPath = JarUtils.thisJarPath();
+        if (jarPath != null && Files.isRegularFile(jarPath) && Files.isWritable(jarPath)) {
+            configLocation = jarPath.getParent().resolve(CONFIG_FILENAME);
+        } else {
+            configLocation = Paths.get(CONFIG_FILENAME);
        }

-        configInstance = new AuthlibInjectorServers(Collections.emptyList());
-
-        if (Files.exists(configLocation)) {
+        if (ConfigHolder.isNewlyCreated() && Files.exists(configLocation)) {
+            AuthlibInjectorServers configInstance;
            try {
                String content = FileUtils.readText(configLocation);
                configInstance = JsonUtils.GSON.fromJson(content, AuthlibInjectorServers.class);
            } catch (IOException | JsonParseException e) {
-                LOG.log(Level.WARNING, "Malformed authlib-injectors.json", e);
+                LOG.warning("Malformed authlib-injectors.json", e);
+                return;
+            }
+
+            if (!configInstance.urls.isEmpty()) {
+                config().setPreferredLoginType(Accounts.getLoginType(Accounts.FACTORY_AUTHLIB_INJECTOR));
+                for (String url : configInstance.urls) {
+                    Task.supplyAsync(Schedulers.io(), () -> AuthlibInjectorServer.locateServer(url))
+                            .thenAcceptAsync(Schedulers.javafx(), server -> {
+                                config().getAuthlibInjectorServers().add(server);
+                                servers.add(server);
+                            })
+                            .start();
+                }
            }
        }
-
-        if (ConfigHolder.isNewlyCreated() && !AuthlibInjectorServers.getConfigInstance().getUrls().isEmpty()) {
-            config().setPreferredLoginType(Accounts.getLoginType(Accounts.FACTORY_AUTHLIB_INJECTOR));
-            for (String url : AuthlibInjectorServers.getConfigInstance().getUrls()) {
-                Task.supplyAsync(Schedulers.io(), () -> AuthlibInjectorServer.locateServer(url))
-                        .thenAcceptAsync(Schedulers.javafx(), server -> config().getAuthlibInjectorServers().add(server))
-                        .start();
-            }
-        }
-    }
-
-    public static AuthlibInjectorServers getConfigInstance() {
-        return configInstance;
    }
 }
@@ -47,7 +47,7 @@ import java.net.Proxy;
 import java.util.Map;
 import java.util.TreeMap;

-public final class Config implements Cloneable, Observable {
+public final class Config implements Observable {

    public static final int CURRENT_UI_VERSION = 0;

@@ -112,6 +112,12 @@ public final class Config implements Cloneable, Observable {
    @SerializedName("proxyPassword")
    private StringProperty proxyPass = new SimpleStringProperty();

+    @SerializedName("x")
+    private DoubleProperty x = new SimpleDoubleProperty();
+
+    @SerializedName("y")
+    private DoubleProperty y = new SimpleDoubleProperty();
+
    @SerializedName("width")
    private DoubleProperty width = new SimpleDoubleProperty();

@@ -125,13 +131,13 @@ public final class Config implements Cloneable, Observable {
    private ObjectProperty<SupportedLocale> localization = new SimpleObjectProperty<>(Locales.DEFAULT);

    @SerializedName("autoDownloadThreads")
-    private BooleanProperty autoDownloadThreads = new SimpleBooleanProperty(false);
+    private BooleanProperty autoDownloadThreads = new SimpleBooleanProperty(true);

    @SerializedName("downloadThreads")
    private IntegerProperty downloadThreads = new SimpleIntegerProperty(64);

    @SerializedName("downloadType")
-    private StringProperty downloadType = new SimpleStringProperty("mcbbs");
+    private StringProperty downloadType = new SimpleStringProperty(DownloadProviders.DEFAULT_RAW_PROVIDER_ID);

    @SerializedName("autoChooseDownloadType")
    private BooleanProperty autoChooseDownloadType = new SimpleBooleanProperty(true);
@@ -158,7 +164,7 @@ public final class Config implements Cloneable, Observable {
    private StringProperty launcherFontFamily = new SimpleStringProperty();

    @SerializedName("logLines")
-    private IntegerProperty logLines = new SimpleIntegerProperty(100);
+    private ObjectProperty<Integer> logLines = new SimpleObjectProperty<>();

    @SerializedName("titleTransparent")
    private BooleanProperty titleTransparent = new SimpleBooleanProperty(false);
@@ -194,6 +200,9 @@ public final class Config implements Cloneable, Observable {
    @SerializedName("animationDisabled")
    private BooleanProperty animationDisabled = new SimpleBooleanProperty();

+    @SerializedName("shownTips")
+    private ObservableMap<String, Object> shownTips = FXCollections.observableHashMap();
+
    private transient ObservableHelper helper = new ObservableHelper(this);

    public Config() {
@@ -214,11 +223,6 @@ public final class Config implements Cloneable, Observable {
        return CONFIG_GSON.toJson(this);
    }

-    @Override
-    public Config clone() {
-        return fromJson(this.toJson());
-    }
-
    // Getters & Setters & Properties
    public String getSelectedProfile() {
        return selectedProfile.get();
@@ -376,6 +380,30 @@ public final class Config implements Cloneable, Observable {
        return proxyPass;
    }

+    public double getX() {
+        return x.get();
+    }
+
+    public DoubleProperty xProperty() {
+        return x;
+    }
+
+    public void setX(double x) {
+        this.x.set(x);
+    }
+
+    public double getY() {
+        return y.get();
+    }
+
+    public DoubleProperty yProperty() {
+        return y;
+    }
+
+    public void setY(double y) {
+        this.y.set(y);
+    }
+
    public double getWidth() {
        return width.get();
    }
@@ -540,15 +568,15 @@ public final class Config implements Cloneable, Observable {
        this.launcherFontFamily.set(launcherFontFamily);
    }

-    public int getLogLines() {
+    public Integer getLogLines() {
        return logLines.get();
    }

-    public void setLogLines(int logLines) {
+    public void setLogLines(Integer logLines) {
        this.logLines.set(logLines);
    }

-    public IntegerProperty logLinesProperty() {
+    public ObjectProperty<Integer> logLinesProperty() {
        return logLines;
    }

@@ -639,4 +667,8 @@ public final class Config implements Cloneable, Observable {
    public void setPromptedVersion(String promptedVersion) {
        this.promptedVersion.set(promptedVersion);
    }
+
+    public ObservableMap<String, Object> getShownTips() {
+        return shownTips;
+    }
 }
@@ -17,21 +17,20 @@
 */
 package org.jackhuang.hmcl.setting;

-import com.google.gson.Gson;
 import com.google.gson.JsonParseException;
 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.util.InvocationDispatcher;
 import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.i18n.I18n;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.io.JarUtils;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;

 import java.io.IOException;
 import java.nio.file.*;
-import java.util.Map;
-import java.util.logging.Level;
+import java.util.Locale;

-import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;

 public final class ConfigHolder {

@@ -74,14 +73,14 @@ public final class ConfigHolder {
        return ownerChanged;
    }

-    public synchronized static void init() throws IOException {
+    public static void init() throws IOException {
        if (configInstance != null) {
            throw new IllegalStateException("Configuration is already loaded");
        }

        configLocation = locateConfig();

-        LOG.log(Level.INFO, "Config location: " + configLocation);
+        LOG.info("Config location: " + configLocation);

        configInstance = loadConfig();
        configInstance.addListener(source -> markConfigDirty());
@@ -89,6 +88,9 @@ public final class ConfigHolder {
        globalConfigInstance = loadGlobalConfig();
        globalConfigInstance.addListener(source -> markGlobalConfigDirty());

+        Locale.setDefault(config().getLocalization().getLocale());
+        I18n.setLocale(configInstance.getLocalization());
+        LOG.setLogRetention(globalConfig().getLogRetention());
        Settings.init();

        if (newlyCreated) {
@@ -99,7 +101,7 @@ public final class ConfigHolder {
                try {
                    Files.setAttribute(configLocation, "dos:hidden", true);
                } catch (IOException e) {
-                    LOG.log(Level.WARNING, "Failed to set hidden attribute of " + configLocation, e);
+                    LOG.warning("Failed to set hidden attribute of " + configLocation, e);
                }
            }
        }
@@ -121,7 +123,7 @@ public final class ConfigHolder {
    private static Path locateConfig() {
        Path exePath = Paths.get("").toAbsolutePath();
        try {
-            Path jarPath = JarUtils.thisJar().orElse(null);
+            Path jarPath = JarUtils.thisJarPath();
            if (jarPath != null && Files.isRegularFile(jarPath) && Files.isWritable(jarPath)) {
                jarPath = jarPath.getParent();
                exePath = jarPath;
@@ -159,7 +161,7 @@ public final class ConfigHolder {
                    ownerChanged = true;
                }
            } catch (IOException e1) {
-                LOG.log(Level.WARNING, "Failed to get owner");
+                LOG.warning("Failed to get owner");
            }
            try {
                String content = FileUtils.readText(configLocation);
@@ -167,12 +169,11 @@ public final class ConfigHolder {
                if (deserialized == null) {
                    LOG.info("Config is empty");
                } else {
-                    Map<?, ?> raw = new Gson().fromJson(content, Map.class);
-                    ConfigUpgrader.upgradeConfig(deserialized, raw);
+                    ConfigUpgrader.upgradeConfig(deserialized, content);
                    return deserialized;
                }
            } catch (JsonParseException e) {
-                LOG.log(Level.WARNING, "Malformed config.", e);
+                LOG.warning("Malformed config.", e);
            }
        }

@@ -185,7 +186,7 @@ public final class ConfigHolder {
        try {
            writeToConfig(content);
        } catch (IOException e) {
-            LOG.log(Level.SEVERE, "Failed to save config", e);
+            LOG.error("Failed to save config", e);
        }
    });

@@ -196,7 +197,7 @@ public final class ConfigHolder {
        }
    }

-    static void markConfigDirty() {
+    private static void markConfigDirty() {
        configWriter.accept(configInstance.toJson());
    }

@@ -217,7 +218,7 @@ public final class ConfigHolder {
                    return deserialized;
                }
            } catch (JsonParseException e) {
-                LOG.log(Level.WARNING, "Malformed config.", e);
+                LOG.warning("Malformed config.", e);
            }
        }

@@ -229,7 +230,7 @@ public final class ConfigHolder {
        try {
            writeToGlobalConfig(content);
        } catch (IOException e) {
-            LOG.log(Level.SEVERE, "Failed to save config", e);
+            LOG.error("Failed to save config", e);
        }
    });

@@ -240,11 +241,7 @@ public final class ConfigHolder {
        }
    }

-    static void markGlobalConfigDirty() {
+    private static void markGlobalConfigDirty() {
        globalConfigWriter.accept(globalConfigInstance.toJson());
    }
-
-    private static void saveGlobalConfigSync() throws IOException {
-        writeToConfig(globalConfigInstance.toJson());
-    }
 }
@@ -17,96 +17,89 @@
 */
 package org.jackhuang.hmcl.setting;

+import com.google.gson.Gson;
 import org.jackhuang.hmcl.util.StringUtils;
+
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;

 import static org.jackhuang.hmcl.util.Lang.tryCast;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;

 final class ConfigUpgrader {
-    private static final int VERSION = 0;
-
    private ConfigUpgrader() {
    }

+    private static final int CURRENT_VERSION = 2;
+
    /**
-     * This method is for the compatibility with old HMCL 3.x as well as HMCL 2.x.
+     * This method is for the compatibility with old HMCL versions.
     *
     * @param deserialized deserialized config settings
-     * @param rawJson      raw json structure of the config settings without modification
-     * @return true if config version is upgraded
+     * @param rawContent   raw json content of the config settings without modification
     */
-    static boolean upgradeConfig(Config deserialized, Map<?, ?> rawJson) {
-        boolean upgraded;
-        if (deserialized.getConfigVersion() < VERSION) {
-            deserialized.setConfigVersion(VERSION);
-            // TODO: Add upgrade code here.
-            upgraded = true;
-        } else {
-            upgraded = false;
+    static void upgradeConfig(Config deserialized, String rawContent) {
+        int configVersion = deserialized.getConfigVersion();
+
+        if (configVersion == CURRENT_VERSION) {
+            return;
        }

-        upgradeV2(deserialized, rawJson);
-        upgradeV3(deserialized, rawJson);
+        if (configVersion > CURRENT_VERSION) {
+            LOG.warning(String.format("Current HMCL only support the configuration version up to %d. However, the version now is %d.", CURRENT_VERSION, configVersion));
+            deserialized.setConfigVersion(CURRENT_VERSION);
+            return;
+        }

-        return upgraded;
-    }
+        LOG.info(String.format("Updating configuration from %d to %d.", configVersion, CURRENT_VERSION));
+        Map<?, ?> rawJson = Collections.unmodifiableMap(new Gson().<Map<?, ?>>fromJson(rawContent, Map.class));

-    /**
-     * Upgrade configuration of HMCL 2.x
-     *
-     * @param deserialized deserialized config settings
-     * @param rawJson      raw json structure of the config settings without modification
-     */
-    private static void upgradeV2(Config deserialized, Map<?, ?> rawJson) {
-        // Convert OfflineAccounts whose stored uuid is important.
-        tryCast(rawJson.get("auth"), Map.class).ifPresent(auth -> {
-            tryCast(auth.get("offline"), Map.class).ifPresent(offline -> {
-                String selected = rawJson.containsKey("selectedAccount") ? null
-                        : tryCast(offline.get("IAuthenticator_UserName"), String.class).orElse(null);
+        if (configVersion < 1) {
+            // Upgrade configuration of HMCL 2.x: Convert OfflineAccounts whose stored uuid is important.
+            tryCast(rawJson.get("auth"), Map.class).ifPresent(auth -> {
+                tryCast(auth.get("offline"), Map.class).ifPresent(offline -> {
+                    String selected = rawJson.containsKey("selectedAccount") ? null
+                            : tryCast(offline.get("IAuthenticator_UserName"), String.class).orElse(null);

-                tryCast(offline.get("uuidMap"), Map.class).ifPresent(uuidMap -> {
-                    ((Map<?, ?>) uuidMap).forEach((key, value) -> {
-                        Map<Object, Object> storage = new HashMap<>();
-                        storage.put("type", "offline");
-                        storage.put("username", key);
-                        storage.put("uuid", value);
-                        if (key.equals(selected)) {
-                            storage.put("selected", true);
-                        }
-                        deserialized.getAccountStorages().add(storage);
+                    tryCast(offline.get("uuidMap"), Map.class).ifPresent(uuidMap -> {
+                        ((Map<?, ?>) uuidMap).forEach((key, value) -> {
+                            Map<Object, Object> storage = new HashMap<>();
+                            storage.put("type", "offline");
+                            storage.put("username", key);
+                            storage.put("uuid", value);
+                            if (key.equals(selected)) {
+                                storage.put("selected", true);
+                            }
+                            deserialized.getAccountStorages().add(storage);
+                        });
                    });
                });
            });
-        });
-    }

-    /**
-     * Upgrade configuration of HMCL earlier than 3.1.70
-     *
-     * @param deserialized deserialized config settings
-     * @param rawJson      raw json structure of the config settings without modification
-     */
-    private static void upgradeV3(Config deserialized, Map<?, ?> rawJson) {
-        if (!rawJson.containsKey("commonDirType"))
-            deserialized.setCommonDirType(deserialized.getCommonDirectory().equals(Settings.getDefaultCommonDirectory()) ? EnumCommonDirectory.DEFAULT : EnumCommonDirectory.CUSTOM);
-        if (!rawJson.containsKey("backgroundType"))
-            deserialized.setBackgroundImageType(StringUtils.isNotBlank(deserialized.getBackgroundImage()) ? EnumBackgroundImage.CUSTOM : EnumBackgroundImage.DEFAULT);
-        if (!rawJson.containsKey("hasProxy"))
-            deserialized.setHasProxy(StringUtils.isNotBlank(deserialized.getProxyHost()));
-        if (!rawJson.containsKey("hasProxyAuth"))
-            deserialized.setHasProxyAuth(StringUtils.isNotBlank(deserialized.getProxyUser()));
+            // Upgrade configuration of HMCL earlier than 3.1.70
+            if (!rawJson.containsKey("commonDirType"))
+                deserialized.setCommonDirType(deserialized.getCommonDirectory().equals(Settings.getDefaultCommonDirectory()) ? EnumCommonDirectory.DEFAULT : EnumCommonDirectory.CUSTOM);
+            if (!rawJson.containsKey("backgroundType"))
+                deserialized.setBackgroundImageType(StringUtils.isNotBlank(deserialized.getBackgroundImage()) ? EnumBackgroundImage.CUSTOM : EnumBackgroundImage.DEFAULT);
+            if (!rawJson.containsKey("hasProxy"))
+                deserialized.setHasProxy(StringUtils.isNotBlank(deserialized.getProxyHost()));
+            if (!rawJson.containsKey("hasProxyAuth"))
+                deserialized.setHasProxyAuth(StringUtils.isNotBlank(deserialized.getProxyUser()));

-        if (!rawJson.containsKey("downloadType")) {
-            tryCast(rawJson.get("downloadtype"), Number.class)
-                    .map(Number::intValue)
-                    .ifPresent(id -> {
-                        if (id == 0) {
-                            deserialized.setDownloadType("mojang");
-                        } else if (id == 1) {
-                            deserialized.setDownloadType("bmclapi");
-                        }
-                    });
+            if (!rawJson.containsKey("downloadType")) {
+                tryCast(rawJson.get("downloadtype"), Number.class)
+                        .map(Number::intValue)
+                        .ifPresent(id -> {
+                            if (id == 0) {
+                                deserialized.setDownloadType("mojang");
+                            } else if (id == 1) {
+                                deserialized.setDownloadType("bmclapi");
+                            }
+                        });
+            }
        }
+
+        deserialized.setConfigVersion(CURRENT_VERSION);
    }
 }
@@ -55,10 +55,9 @@ public final class DownloadProviders {

    private static final MojangDownloadProvider MOJANG;
    private static final BMCLAPIDownloadProvider BMCLAPI;
-    private static final BMCLAPIDownloadProvider MCBBS;

    public static final String DEFAULT_PROVIDER_ID = "balanced";
-    public static final String DEFAULT_RAW_PROVIDER_ID = "mcbbs";
+    public static final String DEFAULT_RAW_PROVIDER_ID = "bmclapi";

    private static final InvalidationListener observer;

@@ -69,21 +68,19 @@ public final class DownloadProviders {

        MOJANG = new MojangDownloadProvider();
        BMCLAPI = new BMCLAPIDownloadProvider(bmclapiRoot);
-        MCBBS = new BMCLAPIDownloadProvider("https://download.mcbbs.net");
        rawProviders = mapOf(
                pair("mojang", MOJANG),
-                pair("bmclapi", BMCLAPI),
-                pair("mcbbs", MCBBS)
+                pair("bmclapi", BMCLAPI)
        );

        AdaptedDownloadProvider fileProvider = new AdaptedDownloadProvider();
-        fileProvider.setDownloadProviderCandidates(Arrays.asList(MCBBS, BMCLAPI, MOJANG));
-        BalancedDownloadProvider balanced = new BalancedDownloadProvider(Arrays.asList(MCBBS, BMCLAPI, MOJANG));
+        fileProvider.setDownloadProviderCandidates(Arrays.asList(BMCLAPI, MOJANG));
+        BalancedDownloadProvider balanced = new BalancedDownloadProvider(MOJANG, BMCLAPI);

        providersById = mapOf(
                pair("official", new AutoDownloadProvider(MOJANG, fileProvider)),
                pair("balanced", new AutoDownloadProvider(balanced, fileProvider)),
-                pair("mirror", new AutoDownloadProvider(MCBBS, fileProvider)));
+                pair("mirror", new AutoDownloadProvider(BMCLAPI, fileProvider)));

        observer = FXUtils.observeWeak(() -> {
            FetchTask.setDownloadExecutorConcurrency(
@@ -102,12 +99,11 @@ public final class DownloadProviders {
                    .orElse(providersById.get(DEFAULT_PROVIDER_ID));
        });

-        FXUtils.onChangeAndOperate(config().downloadTypeProperty(), downloadType -> {
-            if (!rawProviders.containsKey(downloadType)) {
-                config().setDownloadType(DEFAULT_RAW_PROVIDER_ID);
-                return;
-            }
+        if (!rawProviders.containsKey(config().getDownloadType())) {
+            config().setDownloadType(DEFAULT_RAW_PROVIDER_ID);
+        }

+        FXUtils.onChangeAndOperate(config().downloadTypeProperty(), downloadType -> {
            DownloadProvider primary = Optional.ofNullable(rawProviders.get(downloadType))
                    .orElse(rawProviders.get(DEFAULT_RAW_PROVIDER_ID));
            fileDownloadProvider.setDownloadProviderCandidates(
@@ -21,10 +21,10 @@ import com.google.gson.*;
 import com.google.gson.annotations.JsonAdapter;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
-import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.IntegerProperty;
-import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleIntegerProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableSet;
 import org.jackhuang.hmcl.util.javafx.ObservableHelper;
 import org.jackhuang.hmcl.util.javafx.PropertyUtils;
 import org.jetbrains.annotations.Nullable;
@@ -33,7 +33,7 @@ import java.lang.reflect.Type;
 import java.util.*;

@JsonAdapter(GlobalConfig.Serializer.class)
-public class GlobalConfig implements Cloneable, Observable {
+public final class GlobalConfig implements Observable {

    @Nullable
    public static GlobalConfig fromJson(String json) throws JsonParseException {
@@ -47,17 +47,19 @@ public class GlobalConfig implements Cloneable, Observable {
        return instance;
    }

-    private IntegerProperty agreementVersion = new SimpleIntegerProperty();
+    private final IntegerProperty agreementVersion = new SimpleIntegerProperty();

-    private IntegerProperty platformPromptVersion = new SimpleIntegerProperty();
+    private final IntegerProperty platformPromptVersion = new SimpleIntegerProperty();

-    private BooleanProperty multiplayerRelay = new SimpleBooleanProperty();
+    private final IntegerProperty logRetention = new SimpleIntegerProperty();

-    private IntegerProperty multiplayerAgreementVersion = new SimpleIntegerProperty(0);
+    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 transient ObservableHelper helper = new ObservableHelper(this);
+    private final transient ObservableHelper helper = new ObservableHelper(this);

    public GlobalConfig() {
        PropertyUtils.attachListener(this, helper);
@@ -77,11 +79,6 @@ public class GlobalConfig implements Cloneable, Observable {
        return Config.CONFIG_GSON.toJson(this);
    }

-    @Override
-    public GlobalConfig clone() {
-        return fromJson(this.toJson());
-    }
-
    public int getAgreementVersion() {
        return agreementVersion.get();
    }
@@ -106,37 +103,33 @@ public class GlobalConfig implements Cloneable, Observable {
        this.platformPromptVersion.set(platformPromptVersion);
    }

-    public boolean isMultiplayerRelay() {
-        return multiplayerRelay.get();
+    public int getLogRetention() {
+        return logRetention.get();
    }

-    public BooleanProperty multiplayerRelayProperty() {
-        return multiplayerRelay;
+    public IntegerProperty logRetentionProperty() {
+        return logRetention;
    }

-    public void setMultiplayerRelay(boolean multiplayerRelay) {
-        this.multiplayerRelay.set(multiplayerRelay);
+    public void setLogRetention(int logRetention) {
+        this.logRetention.set(logRetention);
    }

-    public int getMultiplayerAgreementVersion() {
-        return multiplayerAgreementVersion.get();
+    public ObservableSet<String> getUserJava() {
+        return userJava;
    }

-    public IntegerProperty multiplayerAgreementVersionProperty() {
-        return multiplayerAgreementVersion;
+    public ObservableSet<String> getDisabledJava() {
+        return disabledJava;
    }

-    public void setMultiplayerAgreementVersion(int multiplayerAgreementVersion) {
-        this.multiplayerAgreementVersion.set(multiplayerAgreementVersion);
-    }
-
-    public static class Serializer implements JsonSerializer<GlobalConfig>, JsonDeserializer<GlobalConfig> {
+    public static final class Serializer implements JsonSerializer<GlobalConfig>, JsonDeserializer<GlobalConfig> {
        private static final Set<String> knownFields = new HashSet<>(Arrays.asList(
                "agreementVersion",
                "platformPromptVersion",
-                "multiplayerToken",
-                "multiplayerRelay",
-                "multiplayerAgreementVersion"
+                "logRetention",
+                "userJava",
+                "disabledJava"
        ));

        @Override
@@ -148,8 +141,13 @@ public class GlobalConfig implements Cloneable, Observable {
            JsonObject jsonObject = new JsonObject();
            jsonObject.add("agreementVersion", context.serialize(src.getAgreementVersion()));
            jsonObject.add("platformPromptVersion", context.serialize(src.getPlatformPromptVersion()));
-            jsonObject.add("multiplayerRelay", context.serialize(src.isMultiplayerRelay()));
-            jsonObject.add("multiplayerAgreementVersion", context.serialize(src.getMultiplayerAgreementVersion()));
+            jsonObject.add("logRetention", context.serialize(src.getLogRetention()));
+            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()));
            }
@@ -166,8 +164,21 @@ public class GlobalConfig implements Cloneable, Observable {
            GlobalConfig config = new GlobalConfig();
            config.setAgreementVersion(Optional.ofNullable(obj.get("agreementVersion")).map(JsonElement::getAsInt).orElse(0));
            config.setPlatformPromptVersion(Optional.ofNullable(obj.get("platformPromptVersion")).map(JsonElement::getAsInt).orElse(0));
-            config.setMultiplayerRelay(Optional.ofNullable(obj.get("multiplayerRelay")).map(JsonElement::getAsBoolean).orElse(false));
-            config.setMultiplayerAgreementVersion(Optional.ofNullable(obj.get("multiplayerAgreementVersion")).map(JsonElement::getAsInt).orElse(0));
+            config.setLogRetention(Optional.ofNullable(obj.get("logRetention")).map(JsonElement::getAsInt).orElse(20));
+
+            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())) {
@@ -1,164 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2021  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;
-
-import com.google.gson.annotations.SerializedName;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import org.jackhuang.hmcl.auth.OAuth;
-import org.jackhuang.hmcl.task.Schedulers;
-import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.util.gson.JsonUtils;
-import org.jackhuang.hmcl.util.gson.UUIDTypeAdapter;
-import org.jackhuang.hmcl.util.io.HttpRequest;
-import org.jackhuang.hmcl.util.io.NetworkUtils;
-
-import java.util.UUID;
-
-import static org.jackhuang.hmcl.util.Lang.mapOf;
-import static org.jackhuang.hmcl.util.Pair.pair;
-
-public final class HMCLAccounts {
-
-    private static final ObjectProperty<HMCLAccount> account = new SimpleObjectProperty<>();
-
-    private HMCLAccounts() {
-    }
-
-    public static HMCLAccount getAccount() {
-        return account.get();
-    }
-
-    public static ObjectProperty<HMCLAccount> accountProperty() {
-        return account;
-    }
-
-    public static void setAccount(HMCLAccount account) {
-        HMCLAccounts.account.set(account);
-    }
-
-    public static Task<Void> login() {
-        String nonce = UUIDTypeAdapter.fromUUID(UUID.randomUUID());
-        String scope = "openid offline_access";
-
-        return Task.supplyAsync(() -> {
-            OAuth.Session session = Accounts.OAUTH_CALLBACK.startServer();
-            Accounts.OAUTH_CALLBACK.openBrowser(NetworkUtils.withQuery(
-                    "https://login.microsoftonline.com/common/oauth2/v2.0/authorize",
-                    mapOf(
-                            pair("client_id", Accounts.OAUTH_CALLBACK.getClientId()),
-                            pair("response_type", "id_token code"),
-                            pair("response_mode", "form_post"),
-                            pair("scope", scope),
-                            pair("redirect_uri", session.getRedirectURI()),
-                            pair("nonce", nonce)
-                    )));
-            String code = session.waitFor();
-
-            // Authorization Code -> Token
-            String responseText = HttpRequest.POST("https://login.microsoftonline.com/common/oauth2/v2.0/token")
-                    .form(mapOf(pair("client_id", Accounts.OAUTH_CALLBACK.getClientId()), pair("code", code),
-                            pair("grant_type", "authorization_code"), pair("client_secret", Accounts.OAUTH_CALLBACK.getClientSecret()),
-                            pair("redirect_uri", session.getRedirectURI()), pair("scope", scope)))
-                    .getString();
-            OAuth.AuthorizationResponse response = JsonUtils.fromNonNullJson(responseText,
-                    OAuth.AuthorizationResponse.class);
-
-            HMCLAccountProfile profile = HttpRequest.GET("https://hmcl.huangyuhui.net/api/user")
-                    .header("Token-Type", response.tokenType)
-                    .header("Access-Token", response.accessToken)
-                    .header("Authorization-Provider", "microsoft")
-                    .authorization("Bearer", session.getIdToken())
-                    .getJson(HMCLAccountProfile.class);
-
-            return new HMCLAccount("microsoft", profile.nickname, profile.email, profile.role, session.getIdToken(), response.tokenType, response.accessToken, response.refreshToken);
-        }).thenAcceptAsync(Schedulers.javafx(), account -> {
-            setAccount(account);
-        });
-    }
-
-    public static class HMCLAccount implements HttpRequest.Authorization {
-        private final String provider;
-        private final String nickname;
-        private final String email;
-        private final String role;
-        private final String idToken;
-        private final String tokenType;
-        private final String accessToken;
-        private final String refreshToken;
-
-        public HMCLAccount(String provider, String nickname, String email, String role, String idToken, String tokenType, String accessToken, String refreshToken) {
-            this.provider = provider;
-            this.nickname = nickname;
-            this.email = email;
-            this.role = role;
-            this.idToken = idToken;
-            this.tokenType = tokenType;
-            this.accessToken = accessToken;
-            this.refreshToken = refreshToken;
-        }
-
-        public String getProvider() {
-            return provider;
-        }
-
-        public String getNickname() {
-            return nickname;
-        }
-
-        public String getEmail() {
-            return email;
-        }
-
-        public String getRole() {
-            return role;
-        }
-
-        public String getIdToken() {
-            return idToken;
-        }
-
-        @Override
-        public String getTokenType() {
-            return tokenType;
-        }
-
-        @Override
-        public String getAccessToken() {
-            return accessToken;
-        }
-
-        public String getRefreshToken() {
-            return refreshToken;
-        }
-    }
-
-    private static class HMCLAccountProfile {
-        @SerializedName("ID")
-        String id;
-        @SerializedName("Provider")
-        String provider;
-        @SerializedName("Email")
-        String email;
-        @SerializedName("NickName")
-        String nickname;
-        @SerializedName("Role")
-        String role;
-    }
-
-}
@@ -1,6 +1,6 @@
 /*
 * Hello Minecraft! Launcher
- * Copyright (C) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2024 huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,12 +15,11 @@
 * 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.game;
+package org.jackhuang.hmcl.setting;

 /**
- *
- * @author huang
+ * @author Glavo
 */
-public class ClassicLibrary {
-
+public enum JavaVersionType {
+    DEFAULT, AUTO, VERSION, DETECTED, CUSTOM
 }
@@ -188,7 +188,7 @@ public final class Profile implements Observable {
        global.addListener(listener);
        gameDir.addListener(listener);
        useRelativePath.addListener(listener);
-        global.get().addPropertyChangedListener(listener);
+        global.get().addListener(listener);
        selectedVersion.addListener(listener);
    }

@@ -29,7 +29,7 @@ import java.net.Proxy;
 import java.net.Proxy.Type;

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

 public final class ProxyManager {
    private ProxyManager() {
@@ -24,8 +24,6 @@ import org.jackhuang.hmcl.ui.animation.AnimationUtils;
 import org.jackhuang.hmcl.util.CacheRepository;
 import org.jackhuang.hmcl.util.io.FileUtils;

-import java.util.Locale;
-
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;

 public final class Settings {
@@ -47,9 +45,6 @@ public final class Settings {
    }

    private Settings() {
-        config().localizationProperty().addListener(unused -> updateSystemLocale());
-        updateSystemLocale();
-
        DownloadProviders.init();
        ProxyManager.init();
        Accounts.init();
@@ -81,8 +76,4 @@ public final class Settings {
                return null;
        }
    }
-
-    private static void updateSystemLocale() {
-        Locale.setDefault(config().getLocalization().getLocale());
-    }
 }
@@ -23,23 +23,25 @@ import com.google.gson.stream.JsonWriter;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.ObjectBinding;
 import javafx.scene.paint.Color;
-import org.jackhuang.hmcl.util.Lang;
-import org.jackhuang.hmcl.util.Logging;
+import javafx.scene.text.Font;
+import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
-import org.jackhuang.hmcl.util.io.IOUtils;

 import java.io.File;
 import java.io.IOException;
+import java.net.MalformedURLException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Base64;
 import java.util.Locale;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.logging.Level;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;

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

@JsonAdapter(Theme.TypeAdapter.class)
 public class Theme {
@@ -54,32 +56,28 @@ public class Theme {
            Color.web("#B71C1C")  // red
    };

-    private static Charset cssCharset;
+    @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
+    private static Optional<Font> font;

-    private static Charset getCssCharset() {
-        if (cssCharset != null)
-            return cssCharset;
+    private static Optional<Font> tryLoadFont() {
+        //noinspection OptionalAssignedToNull
+        if (font != null) {
+            return font;
+        }

-        Charset defaultCharset = Charset.defaultCharset();
-        if (defaultCharset != StandardCharsets.UTF_8) {
-            // https://bugs.openjdk.org/browse/JDK-8279328
-            // For JavaFX 17 or earlier, native encoding should be used
-            String jfxVersion = System.getProperty("javafx.version");
-            if (jfxVersion != null) {
-                Matcher matcher = Pattern.compile("^(?<version>[0-9]+)").matcher(jfxVersion);
-                if (matcher.find()) {
-                    int v = Lang.parseInt(matcher.group(), -1);
-                    if (v >= 18) {
-                        cssCharset = StandardCharsets.UTF_8;
-                    }
-                }
+        Path path = Paths.get("font.ttf");
+        if (!Files.isRegularFile(path)) {
+            path = Paths.get("font.otf");
+        }
+
+        if (Files.isRegularFile(path)) {
+            try {
+                return font = Optional.ofNullable(Font.loadFont(path.toAbsolutePath().toUri().toURL().toExternalForm(), 0));
+            } catch (MalformedURLException ignored) {
            }
        }

-        if (cssCharset == null)
-            cssCharset = defaultCharset;
-
-        return cssCharset;
+        return font = Optional.empty();
    }

    public static Theme getTheme() {
@@ -117,30 +115,70 @@ public class Theme {
        return isLight() ? Color.BLACK : Color.WHITE;
    }

+    private static String rgba(Color color, double opacity) {
+        return String.format("rgba(%d, %d, %d, %.1f)",
+                (int) Math.ceil(color.getRed() * 256),
+                (int) Math.ceil(color.getGreen() * 256),
+                (int) Math.ceil(color.getBlue() * 256),
+                opacity);
+    }
+
    public String[] getStylesheets(String overrideFontFamily) {
        String css = "/assets/css/blue.css";

-        String fontFamily = System.getProperty("hmcl.font.override", overrideFontFamily);
+        String fontFamily = overrideFontFamily == null
+                ? System.getProperty("hmcl.font.override", System.getenv("HMCL_FONT"))
+                : overrideFontFamily;
+
+        String fontStyle = null;
+        if (fontFamily == null) {
+            Optional<Font> font = tryLoadFont();
+            if (font.isPresent()) {
+                fontFamily = font.get().getFamily();
+                fontStyle = font.get().getStyle();
+            }
+        }

        if (fontFamily != null || !this.color.equalsIgnoreCase(BLUE.color)) {
            Color textFill = getForegroundColor();
-            try {
-                File temp = File.createTempFile("hmcl", ".css");
-                String themeText = IOUtils.readFullyAsString(Theme.class.getResourceAsStream("/assets/css/custom.css"))
-                        .replace("%base-color%", color)
-                        .replace("%base-red%", Integer.toString((int) Math.ceil(paint.getRed() * 256)))
-                        .replace("%base-green%", Integer.toString((int) Math.ceil(paint.getGreen() * 256)))
-                        .replace("%base-blue%", Integer.toString((int) Math.ceil(paint.getBlue() * 256)))
-                        .replace("%base-rippler-color%", String.format("rgba(%d, %d, %d, 0.3)", (int) Math.ceil(paint.getRed() * 256), (int) Math.ceil(paint.getGreen() * 256), (int) Math.ceil(paint.getBlue() * 256)))
-                        .replace("%disabled-font-color%", String.format("rgba(%d, %d, %d, 0.7)", (int) Math.ceil(textFill.getRed() * 256), (int) Math.ceil(textFill.getGreen() * 256), (int) Math.ceil(textFill.getBlue() * 256)))
-                        .replace("%font-color%", getColorDisplayName(getForegroundColor()))
-                        .replace("%font%", Optional.ofNullable(fontFamily).map(f -> "-fx-font-family: \"" + f + "\";").orElse(""));
-                FileUtils.writeText(temp, themeText, getCssCharset());
-                temp.deleteOnExit();
-                css = temp.toURI().toString();
-            } catch (IOException | NullPointerException e) {
-                Logging.LOG.log(Level.SEVERE, "Unable to create theme stylesheet. Fallback to blue theme.", e);
-            }
+
+            StringBuilder themeBuilder = new StringBuilder(512);
+            themeBuilder.append(".root {")
+                    .append("-fx-base-color:").append(color).append(';')
+                    .append("-fx-base-darker-color: derive(-fx-base-color, -10%);")
+                    .append("-fx-base-check-color: derive(-fx-base-color, 30%);")
+                    .append("-fx-rippler-color:").append(rgba(paint, 0.3)).append(';')
+                    .append("-fx-base-rippler-color: derive(").append(rgba(paint, 0.3)).append(", 100%);")
+                    .append("-fx-base-disabled-text-fill:").append(rgba(textFill, 0.7)).append(";")
+                    .append("-fx-base-text-fill:").append(getColorDisplayName(getForegroundColor())).append(";")
+                    .append("-theme-thumb:").append(rgba(paint, 0.7)).append(";");
+
+            if (fontFamily == null)
+                // https://github.com/HMCL-dev/HMCL/pull/3423
+                themeBuilder.append("-fx-font-family: -fx-base-font-family;");
+            else
+                themeBuilder.append("-fx-font-family:\"").append(fontFamily).append("\";");
+
+            if (fontStyle != null && !fontStyle.isEmpty())
+                themeBuilder.append("-fx-font-style:\"").append(fontStyle).append("\";");
+
+            themeBuilder.append('}');
+
+            if (FXUtils.JAVAFX_MAJOR_VERSION >= 17)
+                // JavaFX 17+ support loading stylesheets from data URIs
+                // https://bugs.openjdk.org/browse/JDK-8267554
+                css = "data:text/css;charset=UTF-8;base64," + Base64.getEncoder().encodeToString(themeBuilder.toString().getBytes(StandardCharsets.UTF_8));
+            else
+                try {
+                    File temp = File.createTempFile("hmcl", ".css");
+                    // For JavaFX 17 or earlier, CssParser uses the default charset
+                    // https://bugs.openjdk.org/browse/JDK-8279328
+                    FileUtils.writeText(temp, themeBuilder.toString(), Charset.defaultCharset());
+                    temp.deleteOnExit();
+                    css = temp.toURI().toString();
+                } catch (IOException | NullPointerException e) {
+                    LOG.error("Unable to create theme stylesheet. Fallback to blue theme.", e);
+                }
        }

        return new String[]{css, "/assets/css/root.css"};
@@ -189,11 +227,9 @@ public class Theme {
    }

    public static String getColorDisplayName(Color c) {
-        return c != null ? String.format("#%02x%02x%02x", Math.round(c.getRed() * 255.0D), Math.round(c.getGreen() * 255.0D), Math.round(c.getBlue() * 255.0D)).toUpperCase(Locale.ROOT) : null;
+        return c != null ? String.format("#%02X%02X%02X", Math.round(c.getRed() * 255.0D), Math.round(c.getGreen() * 255.0D), Math.round(c.getBlue() * 255.0D)) : null;
    }

-    private static final ObjectBinding<Color> BLACK_FILL = Bindings.createObjectBinding(() -> BLACK);
-    private static final ObjectBinding<Color> WHITE_FILL = Bindings.createObjectBinding(() -> Color.WHITE);
    private static ObjectBinding<Color> FOREGROUND_FILL;

    public static ObjectBinding<Color> foregroundFillBinding() {
@@ -206,12 +242,12 @@ public class Theme {
        return FOREGROUND_FILL;
    }

-    public static ObjectBinding<Color> blackFillBinding() {
-        return BLACK_FILL;
+    public static Color blackFill() {
+        return BLACK;
    }

-    public static ObjectBinding<Color> whiteFillBinding() {
-        return WHITE_FILL;
+    public static Color whiteFill() {
+        return Color.WHITE;
    }

    public static class TypeAdapter extends com.google.gson.TypeAdapter<Theme> {
@@ -17,6 +17,9 @@
 */
 package org.jackhuang.hmcl.setting;

+import javafx.scene.image.Image;
+import org.jackhuang.hmcl.ui.FXUtils;
+
 public enum VersionIconType {
    DEFAULT("/assets/img/grass.png"),

@@ -24,9 +27,11 @@ public enum VersionIconType {
    CHEST("/assets/img/chest.png"),
    CHICKEN("/assets/img/chicken.png"),
    COMMAND("/assets/img/command.png"),
+    OPTIFINE("/assets/img/optifine.png"),
    CRAFT_TABLE("/assets/img/craft_table.png"),
    FABRIC("/assets/img/fabric.png"),
    FORGE("/assets/img/forge.png"),
+    NEO_FORGE("/assets/img/neoforge.png"),
    FURNACE("/assets/img/furnace.png"),
    QUILT("/assets/img/quilt.png");

@@ -38,7 +43,7 @@ public enum VersionIconType {
        this.resourceUrl = resourceUrl;
    }

-    public String getResourceUrl() {
-        return resourceUrl;
+    public Image getIcon() {
+        return FXUtils.newBuiltinImage(resourceUrl);
    }
 }
@@ -20,44 +20,37 @@ package org.jackhuang.hmcl.setting;
 import com.google.gson.*;
 import com.google.gson.annotations.JsonAdapter;
 import javafx.beans.InvalidationListener;
+import javafx.beans.Observable;
 import javafx.beans.property.*;
 import org.jackhuang.hmcl.game.*;
-import org.jackhuang.hmcl.task.Schedulers;
-import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.java.JavaManager;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.StringUtils;
-import org.jackhuang.hmcl.util.platform.Architecture;
-import org.jackhuang.hmcl.util.platform.JavaVersion;
+import org.jackhuang.hmcl.util.javafx.ObservableHelper;
+import org.jackhuang.hmcl.util.javafx.PropertyUtils;
+import org.jackhuang.hmcl.java.JavaRuntime;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
-import org.jackhuang.hmcl.util.platform.Platform;
-import org.jackhuang.hmcl.util.versioning.VersionNumber;
+import org.jackhuang.hmcl.util.versioning.GameVersionNumber;

 import java.io.IOException;
 import java.lang.reflect.Type;
 import java.nio.file.InvalidPathException;
 import java.nio.file.Paths;
-import java.util.List;
-import java.util.Locale;
-import java.util.Optional;
-import java.util.concurrent.CancellationException;
+import java.util.*;
 import java.util.stream.Collectors;

+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
+
 /**
- *
 * @author huangyuhui
 */
@JsonAdapter(VersionSetting.Serializer.class)
-public final class VersionSetting implements Cloneable {
+public final class VersionSetting implements Cloneable, Observable {

-    private boolean global = false;
+    private transient ObservableHelper helper = new ObservableHelper(this);

-    public boolean isGlobal() {
-        return global;
-    }
-
-    public void setGlobal(boolean global) {
-        this.global = global;
+    public VersionSetting() {
+        PropertyUtils.attachListener(this, helper);
    }

    private final BooleanProperty usesGlobalProperty = new SimpleBooleanProperty(this, "usesGlobal", true);
@@ -84,38 +77,43 @@ public final class VersionSetting implements Cloneable {

    // java

-    private final StringProperty javaProperty = new SimpleStringProperty(this, "java", "");
+    private final ObjectProperty<JavaVersionType> javaVersionTypeProperty = new SimpleObjectProperty<>(this, "javaVersionType", JavaVersionType.AUTO);

-    public StringProperty javaProperty() {
-        return javaProperty;
+    public ObjectProperty<JavaVersionType> javaVersionTypeProperty() {
+        return javaVersionTypeProperty;
    }

-    /**
-     * Java version or "Custom" if user customizes java directory, "Default" if the jvm that this app relies on.
-     */
-    public String getJava() {
-        return javaProperty.get();
+    public JavaVersionType getJavaVersionType() {
+        return javaVersionTypeProperty.get();
    }

-    public void setJava(String java) {
-        javaProperty.set(java);
+    public void setJavaVersionType(JavaVersionType javaVersionType) {
+        javaVersionTypeProperty.set(javaVersionType);
    }

-    public boolean isUsesCustomJavaDir() {
-        return "Custom".equals(getJava());
+    private final StringProperty javaVersionProperty = new SimpleStringProperty(this, "javaVersion", "");
+
+    public StringProperty javaVersionProperty() {
+        return javaVersionProperty;
+    }
+
+    public String getJavaVersion() {
+        return javaVersionProperty.get();
+    }
+
+    public void setJavaVersion(String java) {
+        javaVersionProperty.set(java);
    }

    public void setUsesCustomJavaDir() {
-        setJava("Custom");
+        setJavaVersionType(JavaVersionType.CUSTOM);
+        setJavaVersion("");
        setDefaultJavaPath(null);
    }

-    public boolean isJavaAutoSelected() {
-        return "Auto".equals(getJava());
-    }
-
    public void setJavaAutoSelected() {
-        setJava("Auto");
+        setJavaVersionType(JavaVersionType.AUTO);
+        setJavaVersion("");
        setDefaultJavaPath(null);
    }

@@ -644,127 +642,86 @@ public final class VersionSetting implements Cloneable {
        launcherVisibilityProperty.set(launcherVisibility);
    }

-    public Task<JavaVersion> getJavaVersion(VersionNumber gameVersion, Version version) {
-        return getJavaVersion(gameVersion, version, true);
-    }
+    public JavaRuntime getJava(GameVersionNumber gameVersion, Version version) throws InterruptedException {
+        switch (getJavaVersionType()) {
+            case DEFAULT:
+                return JavaRuntime.getDefault();
+            case AUTO:
+                return JavaManager.findSuitableJava(gameVersion, version);
+            case CUSTOM:
+                try {
+                    return JavaManager.getJava(Paths.get(getJavaDir()));
+                } catch (IOException | InvalidPathException e) {
+                    return null; // Custom Java not found
+                }
+            case VERSION: {
+                String javaVersion = getJavaVersion();
+                if (StringUtils.isBlank(javaVersion)) {
+                    return JavaManager.findSuitableJava(gameVersion, version);
+                }

-    public Task<JavaVersion> getJavaVersion(VersionNumber gameVersion, Version version, boolean checkJava) {
-        return Task.runAsync(Schedulers.javafx(), () -> {
-            if (StringUtils.isBlank(getJava())) {
-                setJava(StringUtils.isBlank(getJavaDir()) ? "Auto" : "Custom");
+                int majorVersion = -1;
+                try {
+                    majorVersion = Integer.parseInt(javaVersion);
+                } catch (NumberFormatException ignored) {
+                }
+
+                if (majorVersion < 0) {
+                    LOG.warning("Invalid Java version: " + javaVersion);
+                    return null;
+                }
+
+                final int finalMajorVersion = majorVersion;
+                Collection<JavaRuntime> allJava = JavaManager.getAllJava().stream()
+                        .filter(it -> it.getParsedVersion() == finalMajorVersion)
+                        .collect(Collectors.toList());
+                return JavaManager.findSuitableJava(allJava, gameVersion, version);
            }
-        }).thenSupplyAsync(() -> {
-            try {
-                if ("Default".equals(getJava())) {
-                    return JavaVersion.fromCurrentEnvironment();
-                } else if (isJavaAutoSelected()) {
-                    return JavaVersionConstraint.findSuitableJavaVersion(gameVersion, version);
-                } else if (isUsesCustomJavaDir()) {
-                    try {
-                        if (checkJava)
-                            return JavaVersion.fromExecutable(Paths.get(getJavaDir()));
-                        else
-                            return new JavaVersion(Paths.get(getJavaDir()), "", Platform.getPlatform(OperatingSystem.CURRENT_OS, Architecture.UNKNOWN));
-                    } catch (IOException | InvalidPathException e) {
-                        return null; // Custom Java Directory not found,
+            case DETECTED: {
+                String javaVersion = getJavaVersion();
+                if (StringUtils.isBlank(javaVersion)) {
+                    return JavaManager.findSuitableJava(gameVersion, version);
+                }
+
+                try {
+                    String defaultJavaPath = getDefaultJavaPath();
+                    if (StringUtils.isNotBlank(defaultJavaPath)) {
+                        JavaRuntime java = JavaManager.getJava(Paths.get(defaultJavaPath).toRealPath());
+                        if (java != null && java.getVersion().equals(javaVersion)) {
+                            return java;
+                        }
                    }
-                } else if (StringUtils.isNotBlank(getJava())) {
-                    List<JavaVersion> matchedJava = JavaVersion.getJavas().stream()
-                            .filter(java -> java.getVersion().equals(getJava()))
-                            .collect(Collectors.toList());
-                    if (matchedJava.isEmpty()) {
-                        FXUtils.runInFX(() -> setJava("Auto"));
-                        return JavaVersion.fromCurrentEnvironment();
-                    } else {
-                        return matchedJava.stream()
-                                .filter(java -> java.getBinary().toString().equals(getDefaultJavaPath()))
-                                .findFirst()
-                                .orElse(matchedJava.get(0));
+                } catch (IOException | InvalidPathException ignored) {
+                }
+
+                for (JavaRuntime java : JavaManager.getAllJava()) {
+                    if (java.getVersion().equals(javaVersion)) {
+                        return java;
                    }
-                } else throw new Error();
-            } catch (InterruptedException e) {
-                throw new CancellationException();
+                }
+
+                return null;
            }
-        });
+            default:
+                throw new AssertionError("JavaVersionType: " + getJavaVersionType());
+        }
    }

-    public void setJavaVersion(JavaVersion java) {
-        setJava(java.getVersion());
-        setDefaultJavaPath(java.getBinary().toString());
+    @Override
+    public void addListener(InvalidationListener listener) {
+        helper.addListener(listener);
    }

-    public void addPropertyChangedListener(InvalidationListener listener) {
-        usesGlobalProperty.addListener(listener);
-        javaProperty.addListener(listener);
-        javaDirProperty.addListener(listener);
-        wrapperProperty.addListener(listener);
-        permSizeProperty.addListener(listener);
-        maxMemoryProperty.addListener(listener);
-        minMemoryProperty.addListener(listener);
-        autoMemory.addListener(listener);
-        preLaunchCommandProperty.addListener(listener);
-        postExitCommand.addListener(listener);
-        javaArgsProperty.addListener(listener);
-        minecraftArgsProperty.addListener(listener);
-        environmentVariablesProperty.addListener(listener);
-        noJVMArgsProperty.addListener(listener);
-        notCheckGameProperty.addListener(listener);
-        notCheckJVMProperty.addListener(listener);
-        notPatchNativesProperty.addListener(listener);
-        showLogsProperty.addListener(listener);
-        serverIpProperty.addListener(listener);
-        fullscreenProperty.addListener(listener);
-        widthProperty.addListener(listener);
-        heightProperty.addListener(listener);
-        gameDirTypeProperty.addListener(listener);
-        gameDirProperty.addListener(listener);
-        processPriorityProperty.addListener(listener);
-        rendererProperty.addListener(listener);
-        useNativeGLFW.addListener(listener);
-        useNativeOpenAL.addListener(listener);
-        launcherVisibilityProperty.addListener(listener);
-        defaultJavaPathProperty.addListener(listener);
-        nativesDirProperty.addListener(listener);
-        nativesDirTypeProperty.addListener(listener);
-        versionIcon.addListener(listener);
+    @Override
+    public void removeListener(InvalidationListener listener) {
+        helper.removeListener(listener);
    }

    @Override
    public VersionSetting clone() {
-        VersionSetting versionSetting = new VersionSetting();
-        versionSetting.setUsesGlobal(isUsesGlobal());
-        versionSetting.setJava(getJava());
-        versionSetting.setDefaultJavaPath(getDefaultJavaPath());
-        versionSetting.setJavaDir(getJavaDir());
-        versionSetting.setWrapper(getWrapper());
-        versionSetting.setPermSize(getPermSize());
-        versionSetting.setMaxMemory(getMaxMemory());
-        versionSetting.setMinMemory(getMinMemory());
-        versionSetting.setAutoMemory(isAutoMemory());
-        versionSetting.setPreLaunchCommand(getPreLaunchCommand());
-        versionSetting.setPostExitCommand(getPostExitCommand());
-        versionSetting.setJavaArgs(getJavaArgs());
-        versionSetting.setMinecraftArgs(getMinecraftArgs());
-        versionSetting.setEnvironmentVariables(getEnvironmentVariables());
-        versionSetting.setNoJVMArgs(isNoJVMArgs());
-        versionSetting.setNotCheckGame(isNotCheckGame());
-        versionSetting.setNotCheckJVM(isNotCheckJVM());
-        versionSetting.setNotPatchNatives(isNotPatchNatives());
-        versionSetting.setShowLogs(isShowLogs());
-        versionSetting.setServerIp(getServerIp());
-        versionSetting.setFullscreen(isFullscreen());
-        versionSetting.setWidth(getWidth());
-        versionSetting.setHeight(getHeight());
-        versionSetting.setGameDirType(getGameDirType());
-        versionSetting.setGameDir(getGameDir());
-        versionSetting.setProcessPriority(getProcessPriority());
-        versionSetting.setRenderer(getRenderer());
-        versionSetting.setUseNativeGLFW(isUseNativeGLFW());
-        versionSetting.setUseNativeOpenAL(isUseNativeOpenAL());
-        versionSetting.setLauncherVisibility(getLauncherVisibility());
-        versionSetting.setNativesDir(getNativesDir());
-        versionSetting.setVersionIcon(getVersionIcon());
-        return versionSetting;
+        VersionSetting cloned = new VersionSetting();
+        PropertyUtils.copyProperties(this, cloned);
+        return cloned;
    }

    public static class Serializer implements JsonSerializer<VersionSetting>, JsonDeserializer<VersionSetting> {
@@ -787,7 +744,6 @@ public final class VersionSetting implements Cloneable {
            obj.addProperty("precalledCommand", src.getPreLaunchCommand());
            obj.addProperty("postExitCommand", src.getPostExitCommand());
            obj.addProperty("serverIp", src.getServerIp());
-            obj.addProperty("java", src.getJava());
            obj.addProperty("wrapper", src.getWrapper());
            obj.addProperty("fullscreen", src.isFullscreen());
            obj.addProperty("noJVMArgs", src.isNoJVMArgs());
@@ -806,6 +762,24 @@ public final class VersionSetting implements Cloneable {
            obj.addProperty("nativesDirType", src.getNativesDirType().ordinal());
            obj.addProperty("versionIcon", src.getVersionIcon().ordinal());

+            obj.addProperty("javaVersionType", src.getJavaVersionType().name());
+            String java;
+            switch (src.getJavaVersionType()) {
+                case DEFAULT:
+                    java = "Default";
+                    break;
+                case AUTO:
+                    java = "Auto";
+                    break;
+                case CUSTOM:
+                    java = "Custom";
+                    break;
+                default:
+                    java = src.getJavaVersion();
+                    break;
+            }
+            obj.addProperty("java", java);
+
            obj.addProperty("renderer", src.getRenderer().name());
            if (src.getRenderer() == Renderer.LLVMPIPE)
                obj.addProperty("useSoftwareRenderer", true);
@@ -844,8 +818,8 @@ public final class VersionSetting implements Cloneable {
            vs.setHeight(Optional.ofNullable(obj.get("height")).map(JsonElement::getAsJsonPrimitive).map(this::parseJsonPrimitive).orElse(0));
            vs.setJavaDir(Optional.ofNullable(obj.get("javaDir")).map(JsonElement::getAsString).orElse(""));
            vs.setPreLaunchCommand(Optional.ofNullable(obj.get("precalledCommand")).map(JsonElement::getAsString).orElse(""));
+            vs.setPostExitCommand(Optional.ofNullable(obj.get("postExitCommand")).map(JsonElement::getAsString).orElse(""));
            vs.setServerIp(Optional.ofNullable(obj.get("serverIp")).map(JsonElement::getAsString).orElse(""));
-            vs.setJava(Optional.ofNullable(obj.get("java")).map(JsonElement::getAsString).orElse(""));
            vs.setWrapper(Optional.ofNullable(obj.get("wrapper")).map(JsonElement::getAsString).orElse(""));
            vs.setGameDir(Optional.ofNullable(obj.get("gameDir")).map(JsonElement::getAsString).orElse(""));
            vs.setNativesDir(Optional.ofNullable(obj.get("nativesDir")).map(JsonElement::getAsString).orElse(""));
@@ -864,6 +838,27 @@ public final class VersionSetting implements Cloneable {
            vs.setNativesDirType(getOrDefault(NativesDirectoryType.values(), obj.get("nativesDirType"), NativesDirectoryType.VERSION_FOLDER));
            vs.setVersionIcon(getOrDefault(VersionIconType.values(), obj.get("versionIcon"), VersionIconType.DEFAULT));

+            if (obj.get("javaVersionType") != null) {
+                JavaVersionType javaVersionType = parseJsonPrimitive(obj.getAsJsonPrimitive("javaVersionType"), JavaVersionType.class, JavaVersionType.AUTO);
+                vs.setJavaVersionType(javaVersionType);
+                vs.setJavaVersion(Optional.ofNullable(obj.get("java")).map(JsonElement::getAsString).orElse(null));
+            } else {
+                String java = Optional.ofNullable(obj.get("java")).map(JsonElement::getAsString).orElse("");
+                switch (java) {
+                    case "Default":
+                        vs.setJavaVersionType(JavaVersionType.DEFAULT);
+                        break;
+                    case "Auto":
+                        vs.setJavaVersionType(JavaVersionType.AUTO);
+                        break;
+                    case "Custom":
+                        vs.setJavaVersionType(JavaVersionType.CUSTOM);
+                        break;
+                    default:
+                        vs.setJavaVersion(java);
+                }
+            }
+
            vs.setRenderer(Optional.ofNullable(obj.get("renderer")).map(JsonElement::getAsString)
                    .flatMap(name -> {
                        try {
@@ -891,5 +886,25 @@ public final class VersionSetting implements Cloneable {
            else
                return Lang.parseInt(primitive.getAsString(), defaultValue);
        }
+
+        private <E extends Enum<E>> E parseJsonPrimitive(JsonPrimitive primitive, Class<E> clazz, E defaultValue) {
+            if (primitive == null)
+                return defaultValue;
+            else {
+                E[] enumConstants = clazz.getEnumConstants();
+                if (primitive.isNumber()) {
+                    int index = primitive.getAsInt();
+                    return index >= 0 && index < enumConstants.length ? enumConstants[index] : defaultValue;
+                } else {
+                    String name = primitive.getAsString();
+                    for (E enumConstant : enumConstants) {
+                        if (enumConstant.name().equalsIgnoreCase(name)) {
+                            return enumConstant;
+                        }
+                    }
+                    return defaultValue;
+                }
+            }
+        }
    }
 }
@@ -24,21 +24,21 @@ import javafx.beans.WeakInvalidationListener;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.ReadOnlyDoubleProperty;
 import javafx.beans.property.SimpleDoubleProperty;
+import javafx.geometry.Rectangle2D;
 import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.control.ButtonBase;
 import javafx.scene.control.Label;
 import javafx.scene.layout.Region;
 import javafx.scene.paint.Color;
+import javafx.stage.Screen;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.game.ModpackHelper;
-import org.jackhuang.hmcl.setting.Accounts;
-import org.jackhuang.hmcl.setting.EnumCommonDirectory;
-import org.jackhuang.hmcl.setting.Profiles;
-import org.jackhuang.hmcl.setting.Theme;
+import org.jackhuang.hmcl.java.JavaManager;
+import org.jackhuang.hmcl.setting.*;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskExecutor;
 import org.jackhuang.hmcl.ui.account.AccountListPage;
@@ -51,13 +51,9 @@ import org.jackhuang.hmcl.ui.main.LauncherSettingsPage;
 import org.jackhuang.hmcl.ui.main.RootPage;
 import org.jackhuang.hmcl.ui.versions.GameListPage;
 import org.jackhuang.hmcl.ui.versions.VersionPage;
-import org.jackhuang.hmcl.util.FutureCallback;
-import org.jackhuang.hmcl.util.Lazy;
-import org.jackhuang.hmcl.util.Logging;
-import org.jackhuang.hmcl.util.TaskCancellationAction;
+import org.jackhuang.hmcl.util.*;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.platform.Architecture;
-import org.jackhuang.hmcl.util.platform.JavaVersion;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;

 import java.io.File;
@@ -65,11 +61,16 @@ import java.util.List;
 import java.util.concurrent.CompletableFuture;

 import static org.jackhuang.hmcl.setting.ConfigHolder.*;
-import static org.jackhuang.hmcl.ui.FXUtils.newImage;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 public final class Controllers {
+    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
+    public static final Screen SCREEN = Screen.getPrimary();
    private static InvalidationListener stageSizeChangeListener;
+    private static DoubleProperty stageX = new SimpleDoubleProperty();
+    private static DoubleProperty stageY = new SimpleDoubleProperty();
    private static DoubleProperty stageWidth = new SimpleDoubleProperty();
    private static DoubleProperty stageHeight = new SimpleDoubleProperty();

@@ -146,6 +147,14 @@ public final class Controllers {

    public static void onApplicationStop() {
        stageSizeChangeListener = null;
+        if (stageX != null) {
+            config().setX(stageX.get() / SCREEN.getBounds().getWidth());
+            stageX = null;
+        }
+        if (stageY != null) {
+            config().setY(stageY.get() / SCREEN.getBounds().getHeight());
+            stageY = null;
+        }
        if (stageHeight != null) {
            config().setHeight(stageHeight.get());
            stageHeight = null;
@@ -157,13 +166,34 @@ public final class Controllers {
    }

    public static void initialize(Stage stage) {
-        Logging.LOG.info("Start initializing application");
+        LOG.info("Start initializing application");

        Controllers.stage = stage;

        stageSizeChangeListener = o -> {
            ReadOnlyDoubleProperty sourceProperty = (ReadOnlyDoubleProperty) o;
-            DoubleProperty targetProperty = "width".equals(sourceProperty.getName()) ? stageWidth : stageHeight;
+            DoubleProperty targetProperty;
+            switch (sourceProperty.getName()) {
+                case "x": {
+                    targetProperty = stageX;
+                    break;
+                }
+                case "y": {
+                    targetProperty = stageY;
+                    break;
+                }
+                case "width": {
+                    targetProperty = stageWidth;
+                    break;
+                }
+                case "height": {
+                    targetProperty = stageHeight;
+                    break;
+                }
+                default: {
+                    targetProperty = null;
+                }
+            }

            if (targetProperty != null
                    && Controllers.stage != null
@@ -174,13 +204,41 @@ public final class Controllers {

        WeakInvalidationListener weakListener = new WeakInvalidationListener(stageSizeChangeListener);

-        double initHeight = config().getHeight();
-        double initWidth = config().getWidth();
+        double initWidth = Math.max(MIN_WIDTH, config().getWidth());
+        double initHeight = Math.max(MIN_HEIGHT, config().getHeight());
+
+        {
+            double initX = config().getX() * SCREEN.getBounds().getWidth();
+            double initY = config().getY() * SCREEN.getBounds().getHeight();
+
+            boolean invalid = true;
+            double border = 20D;
+            for (Screen screen : Screen.getScreens()) {
+                Rectangle2D bound = screen.getBounds();
+
+                if (bound.getMinX() + border <= initX + initWidth && initX <= bound.getMaxX() - border && bound.getMinY() + border <= initY && initY <= bound.getMaxY() - border) {
+                    invalid = false;
+                    break;
+                }
+            }
+
+            if (invalid) {
+                initX = (0.5D - initWidth / SCREEN.getBounds().getWidth() / 2) * SCREEN.getBounds().getWidth();
+                initY = (0.5D - initHeight / SCREEN.getBounds().getHeight() / 2) * SCREEN.getBounds().getHeight();
+            }
+
+            stage.setX(initX);
+            stage.setY(initY);
+            stageX.set(initX);
+            stageY.set(initY);
+        }

        stage.setHeight(initHeight);
        stage.setWidth(initWidth);
        stageHeight.set(initHeight);
        stageWidth.set(initWidth);
+        stage.xProperty().addListener(weakListener);
+        stage.yProperty().addListener(weakListener);
        stage.heightProperty().addListener(weakListener);
        stage.widthProperty().addListener(weakListener);

@@ -194,17 +252,17 @@ public final class Controllers {
            dialog(i18n("launcher.cache_directory.invalid"));
        }

-        Task.runAsync(JavaVersion::initialize).start();
+        Lang.thread(JavaManager::initialize, "Search Java", true);

        scene = new Scene(decorator.getDecorator());
        scene.setFill(Color.TRANSPARENT);
-        stage.setMinHeight(450 + 2 + 40 + 16); // bg height + border width*2 + toolbar height + shadow width*2
-        stage.setMinWidth(800 + 2 + 16); // bg width + border width*2 + shadow width*2
+        stage.setMinWidth(MIN_WIDTH);
+        stage.setMinHeight(MIN_HEIGHT);
        decorator.getDecorator().prefWidthProperty().bind(scene.widthProperty());
        decorator.getDecorator().prefHeightProperty().bind(scene.heightProperty());
        scene.getStylesheets().setAll(Theme.getTheme().getStylesheets(config().getLauncherFontFamily()));

-        stage.getIcons().add(newImage("/assets/img/icon.png"));
+        FXUtils.setIcon(stage);
        stage.setTitle(Metadata.FULL_TITLE);
        stage.initStyle(StageStyle.TRANSPARENT);
        stage.setScene(scene);
@@ -216,6 +274,11 @@ public final class Controllers {
                Controllers.dialog(i18n("fatal.unsupported_platform.osx_arm64"), null, MessageType.INFO, continueAction);
            } 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 &&
+                    (Architecture.SYSTEM_ARCH == Architecture.LOONGARCH64
+                            || Architecture.SYSTEM_ARCH == Architecture.LOONGARCH64_OW
+                            || Architecture.SYSTEM_ARCH == Architecture.MIPS64EL)) {
+                Controllers.dialog(i18n("fatal.unsupported_platform.loongarch"), null, MessageType.INFO, continueAction);
            } else {
                Controllers.dialog(i18n("fatal.unsupported_platform"), null, MessageType.WARNING, continueAction);
            }
@@ -236,7 +299,7 @@ public final class Controllers {
            });
            JFXButton noButton = new JFXButton(i18n("launcher.agreement.decline"));
            noButton.getStyleClass().add("dialog-cancel");
-            noButton.setOnAction(e -> System.exit(1));
+            noButton.setOnAction(e -> javafx.application.Platform.exit());
            agreementPane.setActions(agreementLink, yesButton, noButton);
            Controllers.dialog(agreementPane);
        }
@@ -323,9 +386,11 @@ public final class Controllers {

    public static void onHyperlinkAction(String href) {
        if (href.startsWith("hmcl://")) {
-            if ("hmcl://settings/feedback".equals(href)) {
-                Controllers.getSettingsPage().showFeedback();
-                Controllers.navigate(Controllers.getSettingsPage());
+            switch (href) {
+                case "hmcl://settings/feedback":
+                    Controllers.getSettingsPage().showFeedback();
+                    Controllers.navigate(Controllers.getSettingsPage());
+                    break;
            }
        } else {
            FXUtils.openLink(href);
@@ -347,5 +412,7 @@ public final class Controllers {
        stage = null;
        scene = null;
        onApplicationStop();
+
+        FXUtils.shutdown();
    }
 }
@@ -27,9 +27,9 @@ import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
 import javafx.stage.Stage;
 import org.jackhuang.hmcl.Metadata;
+import org.jackhuang.hmcl.countly.CrashReport;
 import org.jackhuang.hmcl.upgrade.UpdateChecker;

-import static org.jackhuang.hmcl.ui.FXUtils.newImage;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 /**
@@ -37,21 +37,23 @@ import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 */
 public class CrashWindow extends Stage {

-    public CrashWindow(String text) {
+    public CrashWindow(CrashReport report) {
        Label lblCrash = new Label();
-        if (UpdateChecker.isOutdated())
-            lblCrash.setText(i18n("launcher.crash_out_dated"));
+        if (report.getThrowable() instanceof InternalError)
+            lblCrash.setText(i18n("launcher.crash.java_internal_error"));
+        else if (UpdateChecker.isOutdated())
+            lblCrash.setText(i18n("launcher.crash.hmcl_out_dated"));
        else
            lblCrash.setText(i18n("launcher.crash"));
        lblCrash.setWrapText(true);

        TextArea textArea = new TextArea();
-        textArea.setText(text);
+        textArea.setText(report.getDisplayText());
        textArea.setEditable(false);

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

        Scene scene = new Scene(pane, 800, 480);
        setScene(scene);
-        getIcons().add(newImage("/assets/img/icon.png"));
+        FXUtils.setIcon(this);
        setTitle(i18n("message.error"));

-        setOnCloseRequest(e -> System.exit(1));
+        setOnCloseRequest(e -> javafx.application.Platform.exit());
    }

 }
@@ -18,41 +18,47 @@
 package org.jackhuang.hmcl.ui;

 import com.jfoenix.controls.*;
+import com.twelvemonkeys.imageio.plugins.webp.WebPImageReaderSpi;
 import javafx.animation.*;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
 import javafx.beans.WeakInvalidationListener;
+import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.Property;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
-import javafx.beans.value.WeakChangeListener;
-import javafx.beans.value.WritableValue;
+import javafx.beans.value.*;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
+import javafx.scene.Cursor;
 import javafx.scene.Node;
-import javafx.scene.control.*;
+import javafx.scene.Scene;
+import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
-import javafx.scene.image.*;
+import javafx.scene.control.*;
 import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
 import javafx.scene.input.*;
 import javafx.scene.layout.ColumnConstraints;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
+import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
 import javafx.scene.text.Text;
 import javafx.scene.text.TextFlow;
+import javafx.stage.FileChooser;
+import javafx.stage.Stage;
 import javafx.util.Callback;
 import javafx.util.Duration;
 import javafx.util.StringConverter;
-import org.jackhuang.hmcl.task.Schedulers;
+import org.glavo.png.PNGType;
+import org.glavo.png.PNGWriter;
+import org.glavo.png.javafx.PNGJavaFXUtils;
+import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.animation.AnimationUtils;
-import org.jackhuang.hmcl.ui.construct.JFXHyperlink;
-import org.jackhuang.hmcl.util.Holder;
-import org.jackhuang.hmcl.util.Logging;
-import org.jackhuang.hmcl.util.ResourceNotFoundError;
+import org.jackhuang.hmcl.util.*;
 import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.util.io.NetworkUtils;
 import org.jackhuang.hmcl.util.javafx.ExtendedProperties;
 import org.jackhuang.hmcl.util.javafx.SafeStringConverter;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
@@ -63,38 +69,71 @@ import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;

-import javax.swing.*;
-import javax.swing.event.HyperlinkEvent;
+import javax.imageio.ImageIO;
+import javax.imageio.ImageReader;
+import javax.imageio.stream.ImageInputStream;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
-import java.awt.*;
 import java.io.*;
-import java.lang.ref.WeakReference;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.net.URI;
+import java.net.*;
+import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collections;
+import java.nio.file.Paths;
 import java.util.List;
-import java.util.Objects;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BooleanSupplier;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import java.util.logging.Level;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;

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

 public final class FXUtils {
    private FXUtils() {
    }

-    public static String DEFAULT_MONOSPACE_FONT = OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS ? "Consolas" : "Monospace";
+    public static final int JAVAFX_MAJOR_VERSION;
+
+    static {
+        String jfxVersion = System.getProperty("javafx.version");
+        int majorVersion = -1;
+        if (jfxVersion != null) {
+            Matcher matcher = Pattern.compile("^(?<version>[0-9]+)").matcher(jfxVersion);
+            if (matcher.find()) {
+                majorVersion = Lang.parseInt(matcher.group(), -1);
+            }
+        }
+        JAVAFX_MAJOR_VERSION = majorVersion;
+    }
+
+    public static final String DEFAULT_MONOSPACE_FONT = OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS ? "Consolas" : "Monospace";
+
+    public static final List<String> IMAGE_EXTENSIONS = Lang.immutableListOf(
+            "png", "jpg", "jpeg", "bmp", "gif", "webp"
+    );
+
+    private static final Map<String, Image> builtinImageCache = new ConcurrentHashMap<>();
+    private static final Map<String, Path> remoteImageCache = new ConcurrentHashMap<>();
+
+    public static void shutdown() {
+        for (Map.Entry<String, Path> entry : remoteImageCache.entrySet()) {
+            try {
+                Files.deleteIfExists(entry.getValue());
+            } catch (IOException e) {
+                LOG.warning(String.format("Failed to delete cache file %s.", entry.getValue()), e);
+            }
+            remoteImageCache.remove(entry.getKey());
+        }
+
+        builtinImageCache.clear();
+    }

    public static void runInFX(Runnable runnable) {
        if (Platform.isFxApplicationThread()) {
@@ -280,8 +319,12 @@ public final class FXUtils {
            ScrollUtils.addSmoothScrolling(scrollPane);
    }

+    private static final Duration TOOLTIP_FAST_SHOW_DELAY = Duration.millis(50);
+    private static final Duration TOOLTIP_SLOW_SHOW_DELAY = Duration.millis(500);
+    private static final Duration TOOLTIP_SHOW_DURATION = Duration.millis(5000);
+
    public static void installFastTooltip(Node node, Tooltip tooltip) {
-        installTooltip(node, 50, 5000, 0, tooltip);
+        runInFX(() -> TooltipInstaller.INSTALLER.installTooltip(node, TOOLTIP_FAST_SHOW_DELAY, TOOLTIP_SHOW_DURATION, Duration.ZERO, tooltip));
    }

    public static void installFastTooltip(Node node, String tooltip) {
@@ -289,39 +332,13 @@ public final class FXUtils {
    }

    public static void installSlowTooltip(Node node, Tooltip tooltip) {
-        installTooltip(node, 500, 5000, 0, tooltip);
+        runInFX(() -> TooltipInstaller.INSTALLER.installTooltip(node, TOOLTIP_SLOW_SHOW_DELAY, TOOLTIP_SHOW_DURATION, Duration.ZERO, tooltip));
    }

    public static void installSlowTooltip(Node node, String tooltip) {
        installSlowTooltip(node, new Tooltip(tooltip));
    }

-    public static void installTooltip(Node node, double openDelay, double visibleDelay, double closeDelay, Tooltip tooltip) {
-        runInFX(() -> {
-            try {
-                // Java 8
-                Class<?> behaviorClass = Class.forName("javafx.scene.control.Tooltip$TooltipBehavior");
-                Constructor<?> behaviorConstructor = behaviorClass.getDeclaredConstructor(Duration.class, Duration.class, Duration.class, boolean.class);
-                behaviorConstructor.setAccessible(true);
-                Object behavior = behaviorConstructor.newInstance(new Duration(openDelay), new Duration(visibleDelay), new Duration(closeDelay), false);
-                Method installMethod = behaviorClass.getDeclaredMethod("install", Node.class, Tooltip.class);
-                installMethod.setAccessible(true);
-                installMethod.invoke(behavior, node, tooltip);
-            } catch (ReflectiveOperationException e) {
-                try {
-                    // Java 9
-                    Tooltip.class.getMethod("setShowDelay", Duration.class).invoke(tooltip, new Duration(openDelay));
-                    Tooltip.class.getMethod("setShowDuration", Duration.class).invoke(tooltip, new Duration(visibleDelay));
-                    Tooltip.class.getMethod("setHideDelay", Duration.class).invoke(tooltip, new Duration(closeDelay));
-                } catch (ReflectiveOperationException e2) {
-                    e.addSuppressed(e2);
-                    Logging.LOG.log(Level.SEVERE, "Cannot install tooltip", e);
-                }
-                Tooltip.install(node, tooltip);
-            }
-        });
-    }
-
    public static void playAnimation(Node node, String animationKey, Timeline timeline) {
        animationKey = "FXUTILS.ANIMATION." + animationKey;
        Object oldTimeline = node.getProperties().get(animationKey);
@@ -348,7 +365,7 @@ public final class FXUtils {

    public static void openFolder(File file) {
        if (!FileUtils.makeDirectory(file)) {
-            LOG.log(Level.SEVERE, "Unable to make directory " + file);
+            LOG.error("Unable to make directory " + file);
            return;
        }

@@ -359,7 +376,7 @@ public final class FXUtils {
            openCommand = "explorer.exe";
        else if (OperatingSystem.CURRENT_OS == OperatingSystem.OSX)
            openCommand = "/usr/bin/open";
-        else if (OperatingSystem.CURRENT_OS == OperatingSystem.LINUX && new File("/usr/bin/xdg-open").exists())
+        else if (OperatingSystem.CURRENT_OS.isLinuxOrBSD() && new File("/usr/bin/xdg-open").exists())
            openCommand = "/usr/bin/xdg-open";
        else
            openCommand = null;
@@ -375,7 +392,7 @@ public final class FXUtils {
                    else
                        LOG.warning("Open " + path + " failed with code " + exitCode);
                } catch (Throwable e) {
-                    LOG.log(Level.WARNING, "Unable to open " + path + " by executing " + openCommand, e);
+                    LOG.warning("Unable to open " + path + " by executing " + openCommand, e);
                }
            }

@@ -383,11 +400,27 @@ public final class FXUtils {
            try {
                java.awt.Desktop.getDesktop().open(file);
            } catch (Throwable e) {
-                LOG.log(Level.SEVERE, "Unable to open " + path + " by java.awt.Desktop.getDesktop()::open", e);
+                LOG.error("Unable to open " + path + " by java.awt.Desktop.getDesktop()::open", e);
            }
        });
    }

+    private static String which(String command) {
+        String path = System.getenv("PATH");
+        if (path == null)
+            return null;
+
+        for (String item : path.split(OperatingSystem.PATH_SEPARATOR)) {
+            try {
+                Path program = Paths.get(item, command);
+                if (Files.isExecutable(program))
+                    return program.toRealPath().toString();
+            } catch (Throwable ignored) {
+            }
+        }
+        return null;
+    }
+
    public static void showFileInExplorer(Path file) {
        String path = file.toAbsolutePath().toString();

@@ -396,6 +429,16 @@ public final class FXUtils {
            openCommands = new String[]{"explorer.exe", "/select,", path};
        else if (OperatingSystem.CURRENT_OS == OperatingSystem.OSX)
            openCommands = new String[]{"/usr/bin/open", "-R", path};
+        else if (OperatingSystem.CURRENT_OS.isLinuxOrBSD() && which("dbus-send") != null)
+            openCommands = new String[]{
+                    "dbus-send",
+                    "--print-reply",
+                    "--dest=org.freedesktop.FileManager1",
+                    "/org/freedesktop/FileManager1",
+                    "org.freedesktop.FileManager1.ShowItems",
+                    "array:string:" + file.toAbsolutePath().toUri(),
+                    "string:"
+            };
        else
            openCommands = null;

@@ -410,7 +453,7 @@ public final class FXUtils {
                    else
                        LOG.warning("Show " + path + " in explorer failed with code " + exitCode);
                } catch (Throwable e) {
-                    LOG.log(Level.WARNING, "Unable to show " + path + " in explorer", e);
+                    LOG.warning("Unable to show " + path + " in explorer", e);
                }

                // Fallback to open folder
@@ -447,18 +490,20 @@ public final class FXUtils {
                    Runtime.getRuntime().exec(new String[]{"rundll32.exe", "url.dll,FileProtocolHandler", link});
                    return;
                } catch (Throwable e) {
-                    LOG.log(Level.WARNING, "An exception occurred while calling rundll32", e);
+                    LOG.warning("An exception occurred while calling rundll32", e);
                }
-            } if (OperatingSystem.CURRENT_OS == OperatingSystem.LINUX) {
+            }
+            if (OperatingSystem.CURRENT_OS.isLinuxOrBSD()) {
                for (String browser : linuxBrowsers) {
-                    try (final InputStream is = Runtime.getRuntime().exec(new String[]{"which", browser}).getInputStream()) {
-                        if (is.read() != -1) {
+                    String path = which(browser);
+                    if (path != null) {
+                        try {
                            Runtime.getRuntime().exec(new String[]{browser, link});
                            return;
+                        } catch (Throwable ignored) {
                        }
-                    } catch (Throwable ignored) {
                    }
-                    Logging.LOG.log(Level.WARNING, "No known browser found");
+                    LOG.warning("No known browser found");
                }
            }
            try {
@@ -468,64 +513,20 @@ public final class FXUtils {
                    try {
                        Runtime.getRuntime().exec(new String[]{"/usr/bin/open", link});
                    } catch (IOException ex) {
-                        Logging.LOG.log(Level.WARNING, "Unable to open link: " + link, ex);
+                        LOG.warning("Unable to open link: " + link, ex);
                    }
-                Logging.LOG.log(Level.WARNING, "Failed to open link: " + link, e);
+                LOG.warning("Failed to open link: " + link, e);
            }
        });
    }

-    public static void showWebDialog(String title, String content) {
-        showWebDialog(title, content, 800, 480);
-    }
-
-    public static void showWebDialog(String title, String content, int width, int height) {
-        try {
-            WebStage stage = new WebStage(width, height);
-            stage.getWebView().getEngine().loadContent(content);
-            stage.setTitle(title);
-            stage.showAndWait();
-        } catch (NoClassDefFoundError | UnsatisfiedLinkError e) {
-            LOG.log(Level.WARNING, "WebView is missing or initialization failed, use JEditorPane replaced", e);
-
-            SwingUtils.initLookAndFeel();
-            SwingUtilities.invokeLater(() -> {
-                final JFrame frame = new JFrame(title);
-                frame.setSize(width, height);
-                frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-                frame.setLocationByPlatform(true);
-                frame.setIconImage(new ImageIcon(FXUtils.class.getResource("/assets/img/icon.png")).getImage());
-                frame.setLayout(new BorderLayout());
-
-                final JProgressBar progressBar = new JProgressBar();
-                progressBar.setIndeterminate(true);
-                frame.add(progressBar, BorderLayout.PAGE_START);
-
-                Schedulers.defaultScheduler().execute(() -> {
-                    final JEditorPane pane = new JEditorPane("text/html", content);
-                    pane.setEditable(false);
-                    pane.addHyperlinkListener(event -> {
-                        if (event.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
-                            openLink(event.getURL().toExternalForm());
-                        }
-                    });
-                    SwingUtilities.invokeLater(() -> {
-                        progressBar.setVisible(false);
-                        frame.add(new JScrollPane(pane), BorderLayout.CENTER);
-                    });
-                });
-
-                frame.setVisible(true);
-                frame.toFront();
-            });
-        }
-    }
-
    public static <T> void bind(JFXTextField textField, Property<T> property, StringConverter<T> converter) {
-        textField.setText(converter == null ? (String) property.getValue() : converter.toString(property.getValue()));
-        TextFieldBindingListener<T> listener = new TextFieldBindingListener<>(textField, property, converter);
-        textField.focusedProperty().addListener((ChangeListener<Boolean>) listener);
-        property.addListener(listener);
+        TextFieldBinding<T> binding = new TextFieldBinding<>(textField, property, converter);
+        binding.updateTextField();
+        textField.getProperties().put("FXUtils.bind.binding", binding);
+        textField.focusedProperty().addListener(binding.focusedListener);
+        textField.sceneProperty().addListener(binding.sceneListener);
+        property.addListener(binding.propertyListener);
    }

    public static void bindInt(JFXTextField textField, Property<Number> property) {
@@ -537,68 +538,66 @@ public final class FXUtils {
    }

    public static void unbind(JFXTextField textField, Property<?> property) {
-        TextFieldBindingListener<?> listener = new TextFieldBindingListener<>(textField, property, null);
-        textField.focusedProperty().removeListener((ChangeListener<Boolean>) listener);
-        property.removeListener(listener);
+        TextFieldBinding<?> binding = (TextFieldBinding<?>) textField.getProperties().remove("FXUtils.bind.binding");
+        if (binding != null) {
+            textField.focusedProperty().removeListener(binding.focusedListener);
+            textField.sceneProperty().removeListener(binding.sceneListener);
+            property.removeListener(binding.propertyListener);
+        }
    }

-    private static final class TextFieldBindingListener<T> implements ChangeListener<Boolean>, InvalidationListener {
-        private final int hashCode;
-        private final WeakReference<JFXTextField> textFieldRef;
-        private final WeakReference<Property<T>> propertyRef;
+    private static final class TextFieldBinding<T> {
+        private final JFXTextField textField;
+        private final Property<T> property;
        private final StringConverter<T> converter;

-        TextFieldBindingListener(JFXTextField textField, Property<T> property, StringConverter<T> converter) {
-            this.textFieldRef = new WeakReference<>(textField);
-            this.propertyRef = new WeakReference<>(property);
+        public final ChangeListener<Boolean> focusedListener;
+        public final ChangeListener<Scene> sceneListener;
+        public final InvalidationListener propertyListener;
+
+        public TextFieldBinding(JFXTextField textField, Property<T> property, StringConverter<T> converter) {
+            this.textField = textField;
+            this.property = property;
            this.converter = converter;
-            this.hashCode = System.identityHashCode(textField) ^ System.identityHashCode(property);
-        }

-        @Override
-        public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean focused) { // On TextField changed
-            JFXTextField textField = textFieldRef.get();
-            Property<T> property = this.propertyRef.get();
-
-            if (textField != null && property != null && oldValue == Boolean.TRUE && focused == Boolean.FALSE) {
-                if (textField.validate()) {
-                    String newText = textField.getText();
-                    @SuppressWarnings("unchecked")
-                    T newValue = converter == null ? (T) newText : converter.fromString(newText);
-
-                    if (!Objects.equals(newValue, property.getValue()))
-                        property.setValue(newValue);
-                } else {
-                    // Rollback to old value
-                    invalidated(null);
+            focusedListener = (observable, oldFocused, newFocused) -> {
+                if (oldFocused && !newFocused) {
+                    if (textField.validate()) {
+                        uppdateProperty();
+                    } else {
+                        // Rollback to old value
+                        updateTextField();
+                    }
                }
+            };
+
+            sceneListener = (observable, oldScene, newScene) -> {
+                if (oldScene != null && newScene == null) {
+                    // Component is being removed from scene
+                    if (textField.validate()) {
+                        uppdateProperty();
+                    }
+                }
+            };
+
+            propertyListener = observable -> {
+                updateTextField();
+            };
+        }
+
+        public void uppdateProperty() {
+            String newText = textField.getText();
+            @SuppressWarnings("unchecked")
+            T newValue = converter == null ? (T) newText : converter.fromString(newText);
+
+            if (!Objects.equals(newValue, property.getValue())) {
+                property.setValue(newValue);
            }
        }

-        @Override
-        public void invalidated(Observable observable) { // On property change
-            JFXTextField textField = textFieldRef.get();
-            Property<T> property = this.propertyRef.get();
-
-            if (textField != null && property != null) {
-                T value = property.getValue();
-                textField.setText(converter == null ? (String) value : converter.toString(value));
-            }
-        }
-
-        @Override
-        public int hashCode() {
-            return hashCode;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (!(obj instanceof TextFieldBindingListener))
-                return false;
-            TextFieldBindingListener<?> other = (TextFieldBindingListener<?>) obj;
-            return this.hashCode == other.hashCode
-                    && this.textFieldRef.get() == other.textFieldRef.get()
-                    && this.propertyRef.get() == other.propertyRef.get();
+        public void updateTextField() {
+            T value = property.getValue();
+            textField.setText(converter == null ? (String) value : converter.toString(value));
        }
    }

@@ -655,6 +654,115 @@ public final class FXUtils {
            comboBox.getSelectionModel().selectedIndexProperty().removeListener(listener);
    }

+    public static void bindAllEnabled(BooleanProperty allEnabled, BooleanProperty... children) {
+        int itemCount = children.length;
+        int childSelectedCount = 0;
+        for (BooleanProperty child : children) {
+            if (child.get())
+                childSelectedCount++;
+        }
+
+        allEnabled.set(childSelectedCount == itemCount);
+
+        class Listener implements InvalidationListener {
+            private int childSelectedCount;
+            private boolean updating = false;
+
+            public Listener(int childSelectedCount) {
+                this.childSelectedCount = childSelectedCount;
+            }
+
+            @Override
+            public void invalidated(Observable observable) {
+                if (updating)
+                    return;
+
+                updating = true;
+                try {
+                    boolean value = ((BooleanProperty) observable).get();
+
+                    if (observable == allEnabled) {
+                        for (BooleanProperty child : children) {
+                            child.setValue(value);
+                        }
+                        childSelectedCount = value ? itemCount : 0;
+                    } else {
+                        if (value)
+                            childSelectedCount++;
+                        else
+                            childSelectedCount--;
+
+                        allEnabled.set(childSelectedCount == itemCount);
+                    }
+                } finally {
+                    updating = false;
+                }
+            }
+        }
+
+        InvalidationListener listener = new Listener(childSelectedCount);
+
+        WeakInvalidationListener weakListener = new WeakInvalidationListener(listener);
+        allEnabled.addListener(listener);
+        for (BooleanProperty child : children) {
+            child.addListener(weakListener);
+        }
+    }
+
+    public static void setIcon(Stage stage) {
+        String icon;
+        if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
+            icon = "/assets/img/icon.png";
+        } else {
+            icon = "/assets/img/icon@4x.png";
+        }
+        stage.getIcons().add(newBuiltinImage(icon));
+    }
+
+    private static Image loadWebPImage(InputStream input) throws IOException {
+        WebPImageReaderSpi spi = new WebPImageReaderSpi();
+        ImageReader reader = spi.createReaderInstance(null);
+
+        try (ImageInputStream imageInput = ImageIO.createImageInputStream(input)) {
+            reader.setInput(imageInput, true, true);
+            return SwingFXUtils.toFXImage(reader.read(0, reader.getDefaultReadParam()), null);
+        } finally {
+            reader.dispose();
+        }
+    }
+
+    public static Image loadImage(Path path) throws Exception {
+        try (InputStream input = Files.newInputStream(path)) {
+            if ("webp".equalsIgnoreCase(FileUtils.getExtension(path)))
+                return loadWebPImage(input);
+            else {
+                Image image = new Image(input);
+                if (image.isError())
+                    throw image.getException();
+                return image;
+            }
+        }
+    }
+
+    public static Image loadImage(URL url) throws Exception {
+        URLConnection connection = NetworkUtils.createConnection(url);
+        if (connection instanceof HttpURLConnection) {
+            connection = NetworkUtils.resolveConnection((HttpURLConnection) connection);
+        }
+
+        try (InputStream input = connection.getInputStream()) {
+            String path = url.getPath();
+            if (path != null && "webp".equalsIgnoreCase(StringUtils.substringAfterLast(path, '.')))
+                return loadWebPImage(input);
+            else {
+                Image image = new Image(input);
+                if (image.isError())
+                    throw image.getException();
+                return image;
+            }
+        }
+    }
+
    /**
     * Suppress IllegalArgumentException since the url is supposed to be correct definitely.
     *
@@ -663,14 +771,113 @@ public final class FXUtils {
     * @see org.jackhuang.hmcl.util.CrashReporter
     * @see ResourceNotFoundError
     */
-    public static Image newImage(String url) {
+    public static Image newBuiltinImage(String url) {
        try {
-            return new Image(url);
+            return builtinImageCache.computeIfAbsent(url, Image::new);
        } catch (IllegalArgumentException e) {
            throw new ResourceNotFoundError("Cannot access image: " + url, e);
        }
    }

+    /**
+     * Suppress IllegalArgumentException since the url is supposed to be correct definitely.
+     *
+     * @param url             the url of image. The image resource should be a file within the jar.
+     * @param requestedWidth  the image's bounding box width
+     * @param requestedHeight the image's bounding box height
+     * @param preserveRatio   indicates whether to preserve the aspect ratio of
+     *                        the original image when scaling to fit the image within the
+     *                        specified bounding box
+     * @param smooth          indicates whether to use a better quality filtering
+     *                        algorithm or a faster one when scaling this image to fit within
+     *                        the specified bounding box
+     * @return the image resource within the jar.
+     * @see org.jackhuang.hmcl.util.CrashReporter
+     * @see ResourceNotFoundError
+     */
+    public static Image newBuiltinImage(String url, double requestedWidth, double requestedHeight, boolean preserveRatio, boolean smooth) {
+        try {
+            return new Image(url, requestedWidth, requestedHeight, preserveRatio, smooth);
+        } catch (IllegalArgumentException e) {
+            throw new ResourceNotFoundError("Cannot access image: " + url, e);
+        }
+    }
+
+    /**
+     * Load image from the internet. It will cache the data of images for the further usage.
+     * The cached data will be deleted when HMCL is closed or hidden.
+     *
+     * @param url the url of image. The image resource should be a file on the internet.
+     * @return the image resource within the jar.
+     */
+    public static Image newRemoteImage(String url) {
+        return newRemoteImage(url, 0, 0, false, false, false);
+    }
+
+    /**
+     * Load image from the internet. It will cache the data of images for the further usage.
+     * The cached data will be deleted when HMCL is closed or hidden.
+     *
+     * @param url             the url of image. The image resource should be a file on the internet.
+     * @param requestedWidth  the image's bounding box width
+     * @param requestedHeight the image's bounding box height
+     * @param preserveRatio   indicates whether to preserve the aspect ratio of
+     *                        the original image when scaling to fit the image within the
+     *                        specified bounding box
+     * @param smooth          indicates whether to use a better quality filtering
+     *                        algorithm or a faster one when scaling this image to fit within
+     *                        the specified bounding box
+     * @return the image resource within the jar.
+     */
+    public static Image newRemoteImage(String url, double requestedWidth, double requestedHeight, boolean preserveRatio, boolean smooth, boolean backgroundLoading) {
+        Path currentPath = remoteImageCache.get(url);
+        if (currentPath != null) {
+            if (Files.isReadable(currentPath)) {
+                try (InputStream inputStream = Files.newInputStream(currentPath)) {
+                    return new Image(inputStream, requestedWidth, requestedHeight, preserveRatio, smooth);
+                } catch (IOException e) {
+                    LOG.warning("An exception encountered while reading data from cached image file.", e);
+                }
+            }
+
+            // The file is unavailable or unreadable.
+            remoteImageCache.remove(url);
+
+            try {
+                Files.deleteIfExists(currentPath);
+            } catch (IOException e) {
+                LOG.warning("An exception encountered while deleting broken cached image file.", e);
+            }
+        }
+
+        Image image = new Image(url, requestedWidth, requestedHeight, preserveRatio, smooth, backgroundLoading);
+        image.progressProperty().addListener((observable, oldValue, newValue) -> {
+            if (newValue.doubleValue() >= 1.0 && !image.isError() && image.getPixelReader() != null && image.getWidth() > 0.0 && image.getHeight() > 0.0) {
+                Task.runAsync(() -> {
+                    Path newPath = Files.createTempFile("hmcl-net-resource-cache-", ".cache");
+                    try ( // Make sure the file is released from JVM before we put the path into remoteImageCache.
+                          OutputStream outputStream = Files.newOutputStream(newPath);
+                          PNGWriter writer = new PNGWriter(outputStream, PNGType.RGBA, PNGWriter.DEFAULT_COMPRESS_LEVEL)
+                    ) {
+                        writer.write(PNGJavaFXUtils.asArgbImage(image));
+                    } catch (IOException e) {
+                        try {
+                            Files.delete(newPath);
+                        } catch (IOException e2) {
+                            e2.addSuppressed(e);
+                            throw e2;
+                        }
+                        throw e;
+                    }
+                    if (remoteImageCache.putIfAbsent(url, newPath) != null) {
+                        Files.delete(newPath); // The image has been loaded in another task. Delete the image here in order not to pollute the tmp folder.
+                    }
+                }).start();
+            }
+        });
+        return image;
+    }
+
    public static JFXButton newRaisedButton(String text) {
        JFXButton button = new JFXButton(text);
        button.getStyleClass().add("jfx-button-raised");
@@ -678,6 +885,24 @@ public final class FXUtils {
        return button;
    }

+    public static JFXButton newBorderButton(String text) {
+        JFXButton button = new JFXButton(text);
+        button.getStyleClass().add("jfx-button-border");
+        button.setButtonType(JFXButton.ButtonType.RAISED);
+        return button;
+    }
+
+    public static Label truncatedLabel(String text, int limit) {
+        Label label = new Label();
+        if (text.length() <= limit) {
+            label.setText(text);
+        } else {
+            label.setText(StringUtils.truncate(text, limit));
+            installFastTooltip(label, text);
+        }
+        return label;
+    }
+
    public static void applyDragListener(Node node, FileFilter filter, Consumer<List<File>> callback) {
        applyDragListener(node, filter, callback, null);
    }
@@ -766,13 +991,6 @@ public final class FXUtils {
        }
    };

-    public static Runnable withJFXPopupClosing(Runnable runnable, JFXPopup popup) {
-        return () -> {
-            runnable.run();
-            popup.hide();
-        };
-    }
-
    public static void onEscPressed(Node node, Runnable action) {
        node.addEventHandler(KeyEvent.KEY_PRESSED, e -> {
            if (e.getCode() == KeyCode.ESCAPE) {
@@ -782,12 +1000,23 @@ public final class FXUtils {
        });
    }

+    public static void onClicked(Node node, Runnable action) {
+        node.addEventHandler(MouseEvent.MOUSE_CLICKED, e -> {
+            if (e.getButton() == MouseButton.PRIMARY && e.getClickCount() == 1) {
+                action.run();
+                e.consume();
+            }
+        });
+    }
+
    public static void copyText(String text) {
        ClipboardContent content = new ClipboardContent();
        content.putString(text);
        Clipboard.getSystemClipboard().setContent(content);

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

    public static List<Node> parseSegment(String segment, Consumer<String> hyperlinkAction) {
@@ -801,7 +1030,7 @@ public final class FXUtils {
            Element r = doc.getDocumentElement();

            NodeList children = r.getChildNodes();
-            List<javafx.scene.Node> texts = new ArrayList<>();
+            List<Node> texts = new ArrayList<>();
            for (int i = 0; i < children.getLength(); i++) {
                org.w3c.dom.Node node = children.item(i);

@@ -809,9 +1038,19 @@ public final class FXUtils {
                    Element element = (Element) node;
                    if ("a".equals(element.getTagName())) {
                        String href = element.getAttribute("href");
-                        JFXHyperlink hyperlink = new JFXHyperlink(element.getTextContent());
-                        hyperlink.setOnAction(e -> hyperlinkAction.accept(href));
-                        texts.add(hyperlink);
+                        Text text = new Text(element.getTextContent());
+                        onClicked(text, () -> {
+                            String link = href;
+                            try {
+                                link = new URI(href).toASCIIString();
+                            } catch (URISyntaxException ignored) {
+                            }
+                            hyperlinkAction.accept(link);
+                        });
+                        text.setCursor(Cursor.HAND);
+                        text.setFill(Color.web("#0070E0"));
+                        text.setUnderline(true);
+                        texts.add(text);
                    } else if ("b".equals(element.getTagName())) {
                        Text text = new Text(element.getTextContent());
                        text.getStyleClass().add("bold");
@@ -827,7 +1066,7 @@ public final class FXUtils {
            }
            return texts;
        } catch (SAXException | ParserConfigurationException | IOException e) {
-            LOG.log(Level.WARNING, "Failed to parse xml", e);
+            LOG.warning("Failed to parse xml", e);
            return Collections.singletonList(new Text(segment));
        }
    }
@@ -838,4 +1077,16 @@ public final class FXUtils {
        return tf;
    }

+    public static String toWeb(Color color) {
+        int r = (int) Math.round(color.getRed() * 255.0);
+        int g = (int) Math.round(color.getGreen() * 255.0);
+        int b = (int) Math.round(color.getBlue() * 255.0);
+
+        return String.format("#%02x%02x%02x", r, g, b);
+    }
+
+    public static FileChooser.ExtensionFilter getImageExtensionFilter() {
+        return new FileChooser.ExtensionFilter(i18n("extension.png"),
+                IMAGE_EXTENSIONS.stream().map(ext -> "*." + ext).toArray(String[]::new));
+    }
 }
@@ -1,6 +1,6 @@
 /*
 * Hello Minecraft! Launcher
- * Copyright (C) 2021  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2023  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
@@ -20,8 +20,6 @@ package org.jackhuang.hmcl.ui;
 import com.jfoenix.controls.JFXButton;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
@@ -41,42 +39,42 @@ import org.jackhuang.hmcl.game.*;
 import org.jackhuang.hmcl.launch.ProcessListener;
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.Log4jLevel;
-import org.jackhuang.hmcl.util.Logging;
+import org.jackhuang.hmcl.util.logging.Logger;
 import org.jackhuang.hmcl.util.Pair;
+import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.platform.Architecture;
 import org.jackhuang.hmcl.util.platform.CommandBuilder;
 import org.jackhuang.hmcl.util.platform.ManagedProcess;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;

 import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.List;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
-import java.util.logging.Level;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;

 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
-import static org.jackhuang.hmcl.ui.FXUtils.newImage;
-import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 import static org.jackhuang.hmcl.util.Pair.pair;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 public class GameCrashWindow extends Stage {
    private final Version version;
    private final String memory;
+    private final String total_memory;
    private final String java;
    private final LibraryAnalyzer analyzer;
-    private final StringProperty os = new SimpleStringProperty(OperatingSystem.SYSTEM_NAME);
-    private final StringProperty arch = new SimpleStringProperty(Architecture.SYSTEM_ARCH.getDisplayName());
    private final TextFlow reasonTextFlow = new TextFlow(new Text(i18n("game.crash.reason.unknown")));
    private final BooleanProperty loading = new SimpleBooleanProperty();
    private final TextFlow feedbackTextFlow = new TextFlow();
@@ -87,19 +85,21 @@ public class GameCrashWindow extends Stage {
    private final LaunchOptions launchOptions;
    private final View view;

-    private final Collection<Pair<String, Log4jLevel>> logs;
+    private final List<Log> logs;

-    public GameCrashWindow(ManagedProcess managedProcess, ProcessListener.ExitType exitType, DefaultGameRepository repository, Version version, LaunchOptions launchOptions, Collection<Pair<String, Log4jLevel>> logs) {
+    public GameCrashWindow(ManagedProcess managedProcess, ProcessListener.ExitType exitType, DefaultGameRepository repository, Version version, LaunchOptions launchOptions, List<Log> logs) {
        this.managedProcess = managedProcess;
        this.exitType = exitType;
        this.repository = repository;
        this.version = version;
        this.launchOptions = launchOptions;
        this.logs = logs;
-        this.analyzer = LibraryAnalyzer.analyze(version);
+        this.analyzer = LibraryAnalyzer.analyze(version, repository.getGameVersion(version).orElse(null));

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

+        total_memory = OperatingSystem.TOTAL_MEMORY + " MB";
+
        this.java = launchOptions.getJava().getArchitecture() == Architecture.SYSTEM_ARCH
                ? launchOptions.getJava().getVersion()
                : launchOptions.getJava().getVersion() + " (" + launchOptions.getJava().getArchitecture().getDisplayName() + ")";
@@ -111,86 +111,121 @@ public class GameCrashWindow extends Stage {
        setScene(new Scene(view, 800, 480));
        getScene().getStylesheets().addAll(Theme.getTheme().getStylesheets(config().getLauncherFontFamily()));
        setTitle(i18n("game.crash.title"));
-        getIcons().add(newImage("/assets/img/icon.png"));
+        FXUtils.setIcon(this);

        analyzeCrashReport();
    }

+    @SuppressWarnings("unchecked")
    private void analyzeCrashReport() {
        loading.set(true);
-        CompletableFuture.supplyAsync(() -> {
-            String rawLog = logs.stream().map(Pair::getKey).collect(Collectors.joining("\n"));
-            Set<String> keywords = Collections.emptySet();
+        Task.allOf(Task.supplyAsync(() -> {
+            String rawLog = logs.stream().map(Log::getLog).collect(Collectors.joining("\n"));
+
+            // Get the crash-report from the crash-reports/xxx, or the output of console.
            String crashReport = null;
            try {
                crashReport = CrashReportAnalyzer.findCrashReport(rawLog);
            } catch (IOException e) {
-                LOG.log(Level.WARNING, "Failed to read crash report", e);
+                LOG.warning("Failed to read crash report", e);
            }
            if (crashReport == null) {
                crashReport = CrashReportAnalyzer.extractCrashReport(rawLog);
            }
-            if (crashReport != null) {
-                keywords = CrashReportAnalyzer.findKeywordsFromCrashReport(crashReport);
+
+            return pair(CrashReportAnalyzer.anaylze(rawLog), crashReport != null ? CrashReportAnalyzer.findKeywordsFromCrashReport(crashReport) : new HashSet<>());
+        }), Task.supplyAsync(() -> {
+            Path latestLog = repository.getRunDirectory(version.getId()).toPath().resolve("logs/latest.log");
+            if (!Files.isReadable(latestLog)) {
+                return pair(new HashSet<CrashReportAnalyzer.Result>(), new HashSet<String>());
            }
-            return pair(
-                    CrashReportAnalyzer.anaylze(rawLog),
-                    keywords);
-        }).whenCompleteAsync((pair, exception) -> {
+
+            String log;
+            try {
+                log = FileUtils.readText(latestLog);
+            } catch (IOException e) {
+                LOG.warning("Failed to read logs/latest.log", e);
+                return pair(new HashSet<CrashReportAnalyzer.Result>(), new HashSet<String>());
+            }
+
+            return pair(CrashReportAnalyzer.anaylze(log), CrashReportAnalyzer.findKeywordsFromCrashReport(log));
+        })).whenComplete(Schedulers.javafx(), (taskResult, exception) -> {
            loading.set(false);

            if (exception != null) {
-                LOG.log(Level.WARNING, "Failed to analyze crash report", exception);
+                LOG.warning("Failed to analyze crash report", exception);
                reasonTextFlow.getChildren().setAll(FXUtils.parseSegment(i18n("game.crash.reason.unknown"), Controllers::onHyperlinkAction));
            } else {
-                List<CrashReportAnalyzer.Result> results = pair.getKey();
-                Set<String> keywords = pair.getValue();
+                EnumMap<CrashReportAnalyzer.Rule, CrashReportAnalyzer.Result> results = new EnumMap<>(CrashReportAnalyzer.Rule.class);
+                Set<String> keywords = new HashSet<>();
+                for (Pair<Set<CrashReportAnalyzer.Result>, Set<String>> pair : (List<Pair<Set<CrashReportAnalyzer.Result>, Set<String>>>) (List<?>) taskResult) {
+                    for (CrashReportAnalyzer.Result result : pair.getKey()) {
+                        results.put(result.getRule(), result);
+                    }
+                    keywords.addAll(pair.getValue());
+                }

-                List<Node> segments = new ArrayList<>();
-                for (CrashReportAnalyzer.Result result : results) {
+                List<Node> segments = new ArrayList<>(FXUtils.parseSegment(i18n("game.crash.feedback"), Controllers::onHyperlinkAction));
+
+                LOG.info("Number of reasons: " + results.size());
+                if (results.size() > 1) {
+                    segments.add(new Text("\n"));
+                    segments.addAll(FXUtils.parseSegment(i18n("game.crash.reason.multiple"), Controllers::onHyperlinkAction));
+                } else {
+                    segments.add(new Text("\n\n"));
+                }
+
+                for (CrashReportAnalyzer.Result result : results.values()) {
+                    String message;
                    switch (result.getRule()) {
                        case TOO_OLD_JAVA:
-                            segments.addAll(FXUtils.parseSegment(i18n("game.crash.reason.too_old_java",
-                                    CrashReportAnalyzer.getJavaVersionFromMajorVersion(Integer.parseInt(result.getMatcher().group("expected")))), Controllers::onHyperlinkAction));
+                            message = i18n("game.crash.reason.too_old_java", CrashReportAnalyzer.getJavaVersionFromMajorVersion(Integer.parseInt(result.getMatcher().group("expected"))));
                            break;
                        case MOD_RESOLUTION_CONFLICT:
                        case MOD_RESOLUTION_MISSING:
                        case MOD_RESOLUTION_COLLECTION:
-                            segments.addAll(FXUtils.parseSegment(i18n("game.crash.reason." + result.getRule().name().toLowerCase(Locale.ROOT),
+                            message = i18n("game.crash.reason." + result.getRule().name().toLowerCase(Locale.ROOT),
                                    translateFabricModId(result.getMatcher().group("sourcemod")),
                                    parseFabricModId(result.getMatcher().group("destmod")),
-                                    parseFabricModId(result.getMatcher().group("destmod"))), Controllers::onHyperlinkAction));
+                                    parseFabricModId(result.getMatcher().group("destmod")));
                            break;
                        case MOD_RESOLUTION_MISSING_MINECRAFT:
-                            segments.addAll(FXUtils.parseSegment(i18n("game.crash.reason." + result.getRule().name().toLowerCase(Locale.ROOT),
+                            message = i18n("game.crash.reason." + result.getRule().name().toLowerCase(Locale.ROOT),
                                    translateFabricModId(result.getMatcher().group("mod")),
-                                    result.getMatcher().group("version")), Controllers::onHyperlinkAction));
+                                    result.getMatcher().group("version"));
                            break;
+                        case MOD_FOREST_OPTIFINE:
                        case TWILIGHT_FOREST_OPTIFINE:
-                            segments.addAll(FXUtils.parseSegment(i18n("game.crash.reason.mod", "OptiFine"), Controllers::onHyperlinkAction));
+                        case PERFORMANT_FOREST_OPTIFINE:
+                        case JADE_FOREST_OPTIFINE:
+                        case NEOFORGE_FOREST_OPTIFINE:
+                            message = i18n("game.crash.reason.mod", "OptiFine");
+                            LOG.info("Crash cause: " + result.getRule() + ": " + i18n("game.crash.reason.mod", "OptiFine"));
                            break;
                        default:
-                            segments.addAll(FXUtils.parseSegment(i18n("game.crash.reason." + result.getRule().name().toLowerCase(Locale.ROOT),
+                            message = i18n("game.crash.reason." + result.getRule().name().toLowerCase(Locale.ROOT),
                                    Arrays.stream(result.getRule().getGroupNames()).map(groupName -> result.getMatcher().group(groupName))
-                                            .toArray()), Controllers::onHyperlinkAction));
+                                            .toArray());
                            break;
                    }
-                    segments.add(new Text("\n"));
+                    LOG.info("Crash cause: " + result.getRule() + ": " + message);
+                    segments.addAll(FXUtils.parseSegment(message, Controllers::onHyperlinkAction));
+                    segments.add(new Text("\n\n"));
                }
                if (results.isEmpty()) {
                    if (!keywords.isEmpty()) {
                        reasonTextFlow.getChildren().setAll(new Text(i18n("game.crash.reason.stacktrace", String.join(", ", keywords))));
+                        LOG.info("Crash reason unknown, but some log keywords have been found: " + String.join(", ", keywords));
                    } else {
                        reasonTextFlow.getChildren().setAll(FXUtils.parseSegment(i18n("game.crash.reason.unknown"), Controllers::onHyperlinkAction));
+                        LOG.info("Crash reason unknown");
                    }
-
-                    feedbackTextFlow.setVisible(true);
                } else {
                    feedbackTextFlow.setVisible(false);
                    reasonTextFlow.getChildren().setAll(segments);
                }
            }
-        }, Schedulers.javafx()).exceptionally(Lang::handleUncaughtException);
+        }).start();
    }

    private static final Pattern FABRIC_MOD_ID = Pattern.compile("\\{(?<modid>.*?) @ (?<version>.*?)}");
@@ -223,32 +258,36 @@ public class GameCrashWindow extends Stage {
    }

    private void showLogWindow() {
-        LogWindow logWindow = new LogWindow();
+        LogWindow logWindow = new LogWindow(managedProcess);

-        logWindow.logLine(Logging.filterForbiddenToken("Command: " + new CommandBuilder().addAll(managedProcess.getCommands())), Log4jLevel.INFO);
-        if (managedProcess.getClasspath() != null) logWindow.logLine("ClassPath: " + managedProcess.getClasspath(), Log4jLevel.INFO);
-        for (Map.Entry<String, Log4jLevel> entry : logs)
-            logWindow.logLine(entry.getKey(), entry.getValue());
-
-        logWindow.showNormal();
+        logWindow.logLine(new Log(Logger.filterForbiddenToken("Command: " + new CommandBuilder().addAll(managedProcess.getCommands())), Log4jLevel.INFO));
+        if (managedProcess.getClasspath() != null)
+            logWindow.logLine(new Log("ClassPath: " + managedProcess.getClasspath(), Log4jLevel.INFO));
+        logWindow.logLines(logs);
+        logWindow.show();
    }

    private void 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(() ->
-                        logs.stream().map(Pair::getKey).collect(Collectors.joining(OperatingSystem.LINE_SEPARATOR)))
+                        logs.stream().map(Log::getLog).collect(Collectors.joining(OperatingSystem.LINE_SEPARATOR)))
                .thenComposeAsync(logs ->
                        LogExporter.exportLogs(logFile, repository, launchOptions.getVersionName(), logs, new CommandBuilder().addAll(managedProcess.getCommands()).toString()))
-                .thenRunAsync(() -> {
-                    FXUtils.showFileInExplorer(logFile);
+                .handleAsync((result, exception) -> {
+                    Alert alert;
+
+                    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 alert = new Alert(Alert.AlertType.INFORMATION, i18n("settings.launcher.launcher_log.export.success", logFile));
                    alert.setTitle(i18n("settings.launcher.launcher_log.export"));
                    alert.showAndWait();
-                }, Schedulers.javafx())
-                .exceptionally(e -> {
-                    LOG.log(Level.WARNING, "Failed to export game crash info", e);
+
                    return null;
                });
    }
@@ -270,6 +309,9 @@ public class GameCrashWindow extends Stage {
                    case APPLICATION_ERROR:
                        title.setText(i18n("launch.failed.exited_abnormally"));
                        break;
+                    case SIGKILL:
+                        title.setText(i18n("launch.failed.sigkill"));
+                        break;
                }

                titlePane.setAlignment(Pos.CENTER);
@@ -289,9 +331,14 @@ public class GameCrashWindow extends Stage {

                TwoLineListItem version = new TwoLineListItem();
                version.getStyleClass().setAll("two-line-item-second-large");
-                version.setTitle(i18n("archive.game_version"));
+                version.setTitle(i18n("game.version"));
                version.setSubtitle(GameCrashWindow.this.version.getId());

+                TwoLineListItem total_memory = new TwoLineListItem();
+                total_memory.getStyleClass().setAll("two-line-item-second-large");
+                total_memory.setTitle(i18n("settings.physical_memory"));
+                total_memory.setSubtitle(GameCrashWindow.this.total_memory);
+
                TwoLineListItem memory = new TwoLineListItem();
                memory.getStyleClass().setAll("two-line-item-second-large");
                memory.setTitle(i18n("settings.memory"));
@@ -305,14 +352,14 @@ public class GameCrashWindow extends Stage {
                TwoLineListItem os = new TwoLineListItem();
                os.getStyleClass().setAll("two-line-item-second-large");
                os.setTitle(i18n("system.operating_system"));
-                os.subtitleProperty().bind(GameCrashWindow.this.os);
+                os.setSubtitle(Lang.requireNonNullElse(OperatingSystem.OS_RELEASE_NAME, OperatingSystem.SYSTEM_NAME));

                TwoLineListItem arch = new TwoLineListItem();
                arch.getStyleClass().setAll("two-line-item-second-large");
                arch.setTitle(i18n("system.architecture"));
-                arch.subtitleProperty().bind(GameCrashWindow.this.arch);
+                arch.setSubtitle(Architecture.SYSTEM_ARCH.getDisplayName());

-                infoPane.getChildren().setAll(launcher, version, memory, java, os, arch);
+                infoPane.getChildren().setAll(launcher, version, total_memory, memory, java, os, arch);
            }

            HBox moddedPane = new HBox(8);
@@ -339,11 +386,13 @@ public class GameCrashWindow extends Stage {
                gameDir.getStyleClass().setAll("two-line-item-second-large");
                gameDir.setTitle(i18n("game.directory"));
                gameDir.setSubtitle(launchOptions.getGameDir().getAbsolutePath());
+                FXUtils.installFastTooltip(gameDir, i18n("game.directory"));

                TwoLineListItem javaDir = new TwoLineListItem();
                javaDir.getStyleClass().setAll("two-line-item-second-large");
                javaDir.setTitle(i18n("settings.game.java_directory"));
                javaDir.setSubtitle(launchOptions.getJava().getBinary().toAbsolutePath().toString());
+                FXUtils.installFastTooltip(javaDir, i18n("settings.game.java_directory"));

                Label reasonTitle = new Label(i18n("game.crash.reason"));
                reasonTitle.getStyleClass().add("two-line-item-second-large-title");
@@ -367,15 +416,20 @@ public class GameCrashWindow extends Stage {
            HBox toolBar = new HBox();
            {
                JFXButton exportGameCrashInfoButton = FXUtils.newRaisedButton(i18n("logwindow.export_game_crash_logs"));
-                exportGameCrashInfoButton.setOnMouseClicked(e -> exportGameCrashInfo());
+                exportGameCrashInfoButton.setOnAction(e -> exportGameCrashInfo());

                JFXButton logButton = FXUtils.newRaisedButton(i18n("logwindow.title"));
-                logButton.setOnMouseClicked(e -> showLogWindow());
+                logButton.setOnAction(e -> showLogWindow());
+
+                JFXButton helpButton = FXUtils.newRaisedButton(i18n("help"));
+                helpButton.setOnAction(e -> FXUtils.openLink("https://docs.hmcl.net/help.html"));
+                FXUtils.installFastTooltip(helpButton, i18n("logwindow.help"));
+

                toolBar.setPadding(new Insets(8));
                toolBar.setSpacing(8);
                toolBar.getStyleClass().add("jfx-tool-bar");
-                toolBar.getChildren().setAll(exportGameCrashInfoButton, logButton);
+                toolBar.getChildren().setAll(exportGameCrashInfoButton, logButton, helpButton);
            }

            getChildren().setAll(titlePane, infoPane, moddedPane, gameDirPane, toolBar);
@@ -0,0 +1,266 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2024 huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui;
+
+import javafx.scene.Cursor;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.text.Text;
+import javafx.scene.text.TextFlow;
+import org.jsoup.nodes.Node;
+import org.jsoup.nodes.TextNode;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
+
+/**
+ * @author Glavo
+ */
+public final class HTMLRenderer {
+    private static URI resolveLink(Node linkNode) {
+        String href = linkNode.absUrl("href");
+        if (href.isEmpty())
+            return null;
+
+        try {
+            return new URI(href);
+        } catch (Throwable e) {
+            return null;
+        }
+    }
+
+    private final List<javafx.scene.Node> children = new ArrayList<>();
+    private final List<Node> stack = new ArrayList<>();
+
+    private boolean bold;
+    private boolean italic;
+    private boolean underline;
+    private boolean strike;
+    private boolean highlight;
+    private String headerLevel;
+    private Node hyperlink;
+
+    private final Consumer<URI> onClickHyperlink;
+
+    public HTMLRenderer(Consumer<URI> onClickHyperlink) {
+        this.onClickHyperlink = onClickHyperlink;
+    }
+
+    private void updateStyle() {
+        bold = false;
+        italic = false;
+        underline = false;
+        strike = false;
+        highlight = false;
+        headerLevel = null;
+        hyperlink = null;
+
+        for (Node node : stack) {
+            String nodeName = node.nodeName();
+            switch (nodeName) {
+                case "b":
+                case "strong":
+                    bold = true;
+                    break;
+                case "i":
+                case "em":
+                    italic = true;
+                    break;
+                case "ins":
+                    underline = true;
+                    break;
+                case "del":
+                    strike = true;
+                    break;
+                case "mark":
+                    highlight = true;
+                    break;
+                case "a":
+                    hyperlink = node;
+                    break;
+                case "h1":
+                case "h2":
+                case "h3":
+                case "h4":
+                case "h5":
+                case "h6":
+                    headerLevel = nodeName;
+                    break;
+            }
+        }
+    }
+
+    private void pushNode(Node node) {
+        stack.add(node);
+        updateStyle();
+    }
+
+    private void popNode() {
+        stack.remove(stack.size() - 1);
+        updateStyle();
+    }
+
+    private void applyStyle(Text text) {
+        if (hyperlink != null) {
+            URI target = resolveLink(hyperlink);
+            if (target != null) {
+                FXUtils.onClicked(text, () -> onClickHyperlink.accept(target));
+                text.setCursor(Cursor.HAND);
+            }
+            text.getStyleClass().add("html-hyperlink");
+        }
+
+        if (hyperlink != null || underline)
+            text.setUnderline(true);
+
+        if (strike)
+            text.setStrikethrough(true);
+
+        if (bold || highlight)
+            text.getStyleClass().add("html-bold");
+
+        if (italic)
+            text.getStyleClass().add("html-italic");
+
+        if (headerLevel != null)
+            text.getStyleClass().add("html-" + headerLevel);
+    }
+
+    private void appendText(String text) {
+        Text textNode = new Text(text);
+        applyStyle(textNode);
+        children.add(textNode);
+    }
+
+    private void appendImage(Node node) {
+        String src = node.absUrl("src");
+        URI imageUri = null;
+        try {
+            if (!src.isEmpty())
+                imageUri = URI.create(src);
+        } catch (Exception ignored) {
+        }
+
+        String alt = node.attr("alt");
+
+        if (imageUri != null) {
+            URI uri = URI.create(src);
+
+            String widthAttr = node.attr("width");
+            String heightAttr = node.attr("height");
+
+            double width = 0;
+            double height = 0;
+
+            if (!widthAttr.isEmpty() && !heightAttr.isEmpty()) {
+                try {
+                    width = Double.parseDouble(widthAttr);
+                    height = Double.parseDouble(heightAttr);
+                } catch (NumberFormatException ignored) {
+                }
+
+                if (width <= 0 || height <= 0) {
+                    width = 0;
+                    height = 0;
+                }
+            }
+
+            Image image = FXUtils.newRemoteImage(uri.toString(), width, height, true, true, false);
+            if (image.isError()) {
+                LOG.warning("Failed to load image: " + uri, image.getException());
+            } else {
+                ImageView imageView = new ImageView(image);
+                if (hyperlink != null) {
+                    URI target = resolveLink(hyperlink);
+                    if (target != null) {
+                        FXUtils.onClicked(imageView, () -> onClickHyperlink.accept(target));
+                        imageView.setCursor(Cursor.HAND);
+                    }
+                }
+                children.add(imageView);
+                return;
+            }
+        }
+
+        if (!alt.isEmpty())
+            appendText(alt);
+    }
+
+    public void appendNode(Node node) {
+        if (node instanceof TextNode) {
+            appendText(((TextNode) node).text());
+        }
+
+        String name = node.nodeName();
+        switch (name) {
+            case "img":
+                appendImage(node);
+                break;
+            case "li":
+                appendText("\n \u2022 ");
+                break;
+            case "dt":
+                appendText(" ");
+                break;
+            case "p":
+            case "h1":
+            case "h2":
+            case "h3":
+            case "h4":
+            case "h5":
+            case "h6":
+            case "tr":
+                if (!children.isEmpty())
+                    appendText("\n\n");
+                break;
+        }
+
+        if (node.childNodeSize() > 0) {
+            pushNode(node);
+            for (Node childNode : node.childNodes()) {
+                appendNode(childNode);
+            }
+            popNode();
+        }
+
+        switch (name) {
+            case "br":
+            case "dd":
+            case "p":
+            case "h1":
+            case "h2":
+            case "h3":
+            case "h4":
+            case "h5":
+            case "h6":
+                appendText("\n");
+                break;
+        }
+    }
+
+    public TextFlow render() {
+        TextFlow textFlow = new TextFlow();
+        textFlow.getStyleClass().add("html");
+        textFlow.getChildren().setAll(children);
+        return textFlow;
+    }
+}
@@ -18,10 +18,11 @@
 package org.jackhuang.hmcl.ui;

 import com.jfoenix.controls.JFXButton;
+import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;
-import javafx.beans.property.*;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.css.PseudoClass;
-import javafx.event.EventHandler;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Cursor;
@@ -30,14 +31,20 @@ import javafx.scene.control.Control;
 import javafx.scene.control.Label;
 import javafx.scene.control.Skin;
 import javafx.scene.control.SkinBase;
-import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
-import javafx.scene.input.MouseEvent;
+import javafx.scene.input.MouseButton;
 import javafx.scene.layout.*;
 import org.jackhuang.hmcl.download.LibraryAnalyzer;
 import org.jackhuang.hmcl.setting.Theme;
+import org.jackhuang.hmcl.setting.VersionIconType;
 import org.jackhuang.hmcl.ui.construct.RipplerContainer;
 import org.jackhuang.hmcl.util.i18n.I18n;
+import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;

 import static org.jackhuang.hmcl.download.LibraryAnalyzer.LibraryType.*;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
@@ -47,148 +54,259 @@ import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 */
 public class InstallerItem extends Control {
    private final String id;
-    private final String imageUrl;
-    public final StringProperty libraryVersion = new SimpleStringProperty();
-    public final StringProperty incompatibleLibraryName = new SimpleStringProperty();
-    public final StringProperty dependencyName = new SimpleStringProperty();
-    public final BooleanProperty incompatibleWithGame = new SimpleBooleanProperty();
-    public final BooleanProperty removable = new SimpleBooleanProperty();
-    public final BooleanProperty upgradable = new SimpleBooleanProperty(false);
-    public final BooleanProperty installable = new SimpleBooleanProperty(true);
-    public final ObjectProperty<EventHandler<? super MouseEvent>> removeAction = new SimpleObjectProperty<>();
-    public final ObjectProperty<EventHandler<? super MouseEvent>> action = new SimpleObjectProperty<>();
+    private final VersionIconType iconType;
+    private final Style style;
+    private final ObjectProperty<InstalledState> versionProperty = new SimpleObjectProperty<>(this, "version", null);
+    private final ObjectProperty<State> resolvedStateProperty = new SimpleObjectProperty<>(this, "resolvedState", InstallableState.INSTANCE);

-    private Style style = Style.LIST_ITEM;
+    private final ObjectProperty<Runnable> onInstall = new SimpleObjectProperty<>(this, "onInstall");
+    private final ObjectProperty<Runnable> onRemove = new SimpleObjectProperty<>(this, "onRemove");
+
+    public interface State {
+    }
+
+    public static final class InstallableState implements State {
+        public static final InstallableState INSTANCE = new InstallableState();
+
+        private InstallableState() {
+        }
+    }
+
+    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 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 enum Style {
        LIST_ITEM,
        CARD,
    }

-    public InstallerItem(LibraryAnalyzer.LibraryType id) {
-        this(id.getPatchId());
+    public InstallerItem(LibraryAnalyzer.LibraryType id, Style style) {
+        this(id.getPatchId(), style);
    }

-    public InstallerItem(String id) {
+    public InstallerItem(String id, Style style) {
        this.id = id;
+        this.style = style;

        switch (id) {
            case "game":
-                imageUrl = "/assets/img/grass.png";
+                iconType = VersionIconType.GRASS;
                break;
            case "fabric":
            case "fabric-api":
-                imageUrl = "/assets/img/fabric.png";
+                iconType = VersionIconType.FABRIC;
                break;
            case "forge":
-                imageUrl = "/assets/img/forge.png";
+                iconType = VersionIconType.FORGE;
                break;
            case "liteloader":
-                imageUrl = "/assets/img/chicken.png";
+                iconType = VersionIconType.CHICKEN;
                break;
            case "optifine":
-                imageUrl = "/assets/img/command.png";
+                iconType = VersionIconType.OPTIFINE;
                break;
            case "quilt":
            case "quilt-api":
-                imageUrl = "/assets/img/quilt.png";
+                iconType = VersionIconType.QUILT;
+                break;
+            case "neoforge":
+                iconType = VersionIconType.NEO_FORGE;
                break;
            default:
-                imageUrl = null;
+                iconType = null;
                break;
        }
    }

-    public void setStyleMode(Style style) {
-        this.style = style;
-    }
-
-    public void setState(String libraryVersion, boolean incompatibleWithGame, boolean removable) {
-        this.libraryVersion.set(libraryVersion);
-        this.incompatibleWithGame.set(incompatibleWithGame);
-        this.removable.set(removable);
-    }
-
    public String getLibraryId() {
        return id;
    }

+    public ObjectProperty<InstalledState> versionProperty() {
+        return versionProperty;
+    }
+
+    public ObjectProperty<State> resolvedStateProperty() {
+        return resolvedStateProperty;
+    }
+
+    public ObjectProperty<Runnable> onInstallProperty() {
+        return onInstall;
+    }
+
+    public Runnable getOnInstall() {
+        return onInstall.get();
+    }
+
+    public void setOnInstall(Runnable onInstall) {
+        this.onInstall.set(onInstall);
+    }
+
+    public ObjectProperty<Runnable> onRemoveProperty() {
+        return onRemove;
+    }
+
+    public Runnable getOnRemove() {
+        return onRemove.get();
+    }
+
+    public void setOnRemove(Runnable onRemove) {
+        this.onRemove.set(onRemove);
+    }
+
    @Override
    protected Skin<?> createDefaultSkin() {
        return new InstallerItemSkin(this);
    }

-    public static class InstallerItemGroup {
-        public final InstallerItem game = new InstallerItem(MINECRAFT);
-        public final InstallerItem fabric = new InstallerItem(FABRIC);
-        public final InstallerItem fabricApi = new InstallerItem(FABRIC_API);
-        public final InstallerItem forge = new InstallerItem(FORGE);
-        public final InstallerItem liteLoader = new InstallerItem(LITELOADER);
-        public final InstallerItem optiFine = new InstallerItem(OPTIFINE);
-        public final InstallerItem quilt = new InstallerItem(QUILT);
-        public final InstallerItem quiltApi = new InstallerItem(QUILT_API);
+    public final static class InstallerItemGroup {
+        private final InstallerItem game;

-        public InstallerItemGroup() {
-            forge.incompatibleLibraryName.bind(Bindings.createStringBinding(() -> {
-                if (fabric.libraryVersion.get() != null) return FABRIC.getPatchId();
-                if (quilt.libraryVersion.get() != null) return QUILT.getPatchId();
-                return null;
-            }, fabric.libraryVersion, quilt.libraryVersion));
+        private final InstallerItem[] libraries;

-            liteLoader.incompatibleLibraryName.bind(Bindings.createStringBinding(() -> {
-                if (fabric.libraryVersion.get() != null) return FABRIC.getPatchId();
-                if (quilt.libraryVersion.get() != null) return QUILT.getPatchId();
-                return null;
-            }, fabric.libraryVersion, quilt.libraryVersion));
+        private Set<InstallerItem> getIncompatibles(Map<InstallerItem, Set<InstallerItem>> incompatibleMap, InstallerItem item) {
+            return incompatibleMap.computeIfAbsent(item, it -> new HashSet<>());
+        }

-            optiFine.incompatibleLibraryName.bind(Bindings.createStringBinding(() -> {
-                if (fabric.libraryVersion.get() != null) return FABRIC.getPatchId();
-                if (quilt.libraryVersion.get() != null) return QUILT.getPatchId();
-                return null;
-            }, fabric.libraryVersion, quilt.libraryVersion));
+        private void addIncompatibles(Map<InstallerItem, Set<InstallerItem>> incompatibleMap, InstallerItem item, InstallerItem... others) {
+            Set<InstallerItem> set = getIncompatibles(incompatibleMap, item);
+            for (InstallerItem other : others) {
+                set.add(other);
+                getIncompatibles(incompatibleMap, other).add(item);
+            }
+        }

-            for (InstallerItem fabric : new InstallerItem[]{fabric, fabricApi}) {
-                fabric.incompatibleLibraryName.bind(Bindings.createStringBinding(() -> {
-                    if (forge.libraryVersion.get() != null) return FORGE.getPatchId();
-                    if (liteLoader.libraryVersion.get() != null) return LITELOADER.getPatchId();
-                    if (optiFine.libraryVersion.get() != null) return OPTIFINE.getPatchId();
-                    if (quilt.libraryVersion.get() != null) return QUILT.getPatchId();
-                    if (quiltApi.libraryVersion.get() != null) return QUILT_API.getPatchId();
-                    return null;
-                }, forge.libraryVersion, liteLoader.libraryVersion, optiFine.libraryVersion, quilt.libraryVersion, quiltApi.libraryVersion));
+        private void mutualIncompatible(Map<InstallerItem, Set<InstallerItem>> incompatibleMap, InstallerItem... items) {
+            for (InstallerItem item : items) {
+                Set<InstallerItem> set = getIncompatibles(incompatibleMap, item);
+
+                for (InstallerItem item2 : items) {
+                    if (item2 != item) {
+                        set.add(item2);
+                    }
+                }
+            }
+        }
+
+        public InstallerItemGroup(String gameVersion, Style style) {
+            game = new InstallerItem(MINECRAFT, style);
+            InstallerItem fabric = new InstallerItem(FABRIC, style);
+            InstallerItem fabricApi = new InstallerItem(FABRIC_API, style);
+            InstallerItem forge = new InstallerItem(FORGE, style);
+            InstallerItem neoForge = new InstallerItem(NEO_FORGE, style);
+            InstallerItem liteLoader = new InstallerItem(LITELOADER, style);
+            InstallerItem optiFine = new InstallerItem(OPTIFINE, style);
+            InstallerItem quilt = new InstallerItem(QUILT, style);
+            InstallerItem quiltApi = new InstallerItem(QUILT_API, style);
+
+            Map<InstallerItem, Set<InstallerItem>> incompatibleMap = new HashMap<>();
+            mutualIncompatible(incompatibleMap, forge, fabric, quilt, neoForge);
+            addIncompatibles(incompatibleMap, liteLoader, fabric, quilt, neoForge);
+            addIncompatibles(incompatibleMap, optiFine, fabric, quilt, neoForge);
+            addIncompatibles(incompatibleMap, fabricApi, forge, quiltApi, neoForge, liteLoader, optiFine);
+            addIncompatibles(incompatibleMap, quiltApi, forge, fabric, fabricApi, neoForge, liteLoader, optiFine);
+
+            for (Map.Entry<InstallerItem, Set<InstallerItem>> entry : incompatibleMap.entrySet()) {
+                InstallerItem item = entry.getKey();
+                Set<InstallerItem> incompatibleItems = entry.getValue();
+
+                Observable[] bindings = new Observable[incompatibleItems.size() + 1];
+                bindings[0] = item.versionProperty;
+                int i = 1;
+                for (InstallerItem other : incompatibleItems) {
+                    bindings[i++] = other.versionProperty;
+                }
+
+                item.resolvedStateProperty.bind(Bindings.createObjectBinding(() -> {
+                    InstalledState itemVersion = item.versionProperty.get();
+                    if (itemVersion != null) {
+                        return itemVersion;
+                    }
+
+                    for (InstallerItem other : incompatibleItems) {
+                        InstalledState otherVersion = other.versionProperty.get();
+                        if (otherVersion != null) {
+                            return new IncompatibleState(other.id, otherVersion.version);
+                        }
+                    }
+
+                    return InstallableState.INSTANCE;
+                }, bindings));
            }

-            fabricApi.dependencyName.bind(Bindings.createStringBinding(() -> {
-                if (fabric.libraryVersion.get() == null) return FABRIC.getPatchId();
-                else return null;
-            }, fabric.libraryVersion));
-
-            for (InstallerItem quilt : new InstallerItem[]{quilt, quiltApi}) {
-                quilt.incompatibleLibraryName.bind(Bindings.createStringBinding(() -> {
-                    if (fabric.libraryVersion.get() != null) return FABRIC.getPatchId();
-                    if (fabricApi.libraryVersion.get() != null) return FABRIC_API.getPatchId();
-                    if (forge.libraryVersion.get() != null) return FORGE.getPatchId();
-                    if (liteLoader.libraryVersion.get() != null) return LITELOADER.getPatchId();
-                    if (optiFine.libraryVersion.get() != null) return OPTIFINE.getPatchId();
-                    return null;
-                }, fabric.libraryVersion, fabricApi.libraryVersion, forge.libraryVersion, liteLoader.libraryVersion, optiFine.libraryVersion));
+            if (gameVersion != null) {
+                game.versionProperty.set(new InstalledState(gameVersion, false, false));
            }

-            quiltApi.dependencyName.bind(Bindings.createStringBinding(() -> {
-                if (quilt.libraryVersion.get() == null) return QUILT.getPatchId();
-                else return null;
-            }, quilt.libraryVersion));
+            InstallerItem[] all = {game, forge, neoForge, liteLoader, optiFine, fabric, fabricApi, quilt, quiltApi};
+
+            for (InstallerItem item : all) {
+                if (!item.resolvedStateProperty.isBound()) {
+                    item.resolvedStateProperty.bind(item.versionProperty);
+                }
+            }
+
+            if (gameVersion == null) {
+                this.libraries = all;
+            } else if (GameVersionNumber.compare(gameVersion, "1.13") < 0) {
+                this.libraries = new InstallerItem[]{game, forge, liteLoader, optiFine};
+            } else {
+                this.libraries = new InstallerItem[]{game, forge, neoForge, optiFine, fabric, fabricApi, quilt, quiltApi};
+            }
+        }
+
+        public InstallerItem getGame() {
+            return game;
        }

        public InstallerItem[] getLibraries() {
-            return new InstallerItem[]{game, forge, liteLoader, optiFine, fabric, fabricApi, quilt, quiltApi};
+            return libraries;
        }
    }

-    public static class InstallerItemSkin extends SkinBase<InstallerItem> {
-
+    private static final class InstallerItemSkin extends SkinBase<InstallerItem> {
        private static final PseudoClass LIST_ITEM = PseudoClass.getPseudoClass("list-item");
        private static final PseudoClass CARD = PseudoClass.getPseudoClass("card");
+        private static final WeakListenerHolder holder = new WeakListenerHolder();

        InstallerItemSkin(InstallerItem control) {
            super(control);
@@ -196,6 +314,7 @@ public class InstallerItem extends Control {
            Pane pane;
            if (control.style == Style.CARD) {
                pane = new VBox();
+                holder.add(FXUtils.onWeakChange(pane.widthProperty(), v -> FXUtils.setLimitHeight(pane, v.doubleValue() * 0.7)));
            } else {
                pane = new HBox();
            }
@@ -206,8 +325,8 @@ public class InstallerItem extends Control {
            pane.pseudoClassStateChanged(LIST_ITEM, control.style == Style.LIST_ITEM);
            pane.pseudoClassStateChanged(CARD, control.style == Style.CARD);

-            if (control.imageUrl != null) {
-                ImageView view = new ImageView(new Image(control.imageUrl));
+            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");
@@ -231,18 +350,25 @@ public class InstallerItem extends Control {
            pane.getChildren().add(statusLabel);
            HBox.setHgrow(statusLabel, Priority.ALWAYS);
            statusLabel.textProperty().bind(Bindings.createStringBinding(() -> {
-                String incompatibleWith = control.incompatibleLibraryName.get();
-                String version = control.libraryVersion.get();
-                if (control.incompatibleWithGame.get()) {
-                    return i18n("install.installer.change_version", version);
-                } else if (incompatibleWith != null) {
-                    return i18n("install.installer.incompatible", i18n("install.installer." + incompatibleWith));
-                } else if (version == null) {
+                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 (s.external) {
+                        return i18n("install.installer.external_version", s.version);
+                    }
+                    return i18n("install.installer.version", s.version);
+                } else if (state instanceof InstallableState) {
                    return i18n("install.installer.not_installed");
+                } else if (state instanceof IncompatibleState) {
+                    return i18n("install.installer.incompatible", i18n("install.installer." + ((IncompatibleState) state).incompatibleItemName));
                } else {
-                    return i18n("install.installer.version", version);
+                    throw new AssertionError("Unknown state type: " + state.getClass());
                }
-            }, control.incompatibleLibraryName, control.incompatibleWithGame, control.libraryVersion));
+            }, control.resolvedStateProperty));
            BorderPane.setMargin(statusLabel, new Insets(0, 0, 0, 8));
            BorderPane.setAlignment(statusLabel, Pos.CENTER_LEFT);

@@ -251,34 +377,65 @@ public class InstallerItem extends Control {
            buttonsContainer.setAlignment(Pos.CENTER);
            pane.getChildren().add(buttonsContainer);

-            JFXButton closeButton = new JFXButton();
-            closeButton.setGraphic(SVG.close(Theme.blackFillBinding(), -1, -1));
-            closeButton.getStyleClass().add("toggle-icon4");
-            closeButton.visibleProperty().bind(control.removable);
-            closeButton.managedProperty().bind(closeButton.visibleProperty());
-            closeButton.onMouseClickedProperty().bind(control.removeAction);
-            buttonsContainer.getChildren().add(closeButton);
+            JFXButton removeButton = new JFXButton();
+            removeButton.setGraphic(SVG.CLOSE.createIcon(Theme.blackFill(), -1, -1));
+            removeButton.getStyleClass().add("toggle-icon4");
+            if (control.id.equals(MINECRAFT.getPatchId())) {
+                removeButton.setVisible(false);
+            } else {
+                removeButton.visibleProperty().bind(Bindings.createBooleanBinding(() -> control.resolvedStateProperty.get() instanceof InstalledState, control.resolvedStateProperty));
+            }
+            removeButton.managedProperty().bind(removeButton.visibleProperty());
+            removeButton.setOnAction(e -> {
+                Runnable onRemove = control.getOnRemove();
+                if (onRemove != null)
+                    onRemove.run();
+            });
+            buttonsContainer.getChildren().add(removeButton);

-            JFXButton arrowButton = new JFXButton();
-            arrowButton.graphicProperty().bind(Bindings.createObjectBinding(() -> control.upgradable.get()
-                            ? SVG.update(Theme.blackFillBinding(), -1, -1)
-                            : SVG.arrowRight(Theme.blackFillBinding(), -1, -1),
-                    control.upgradable));
-            arrowButton.getStyleClass().add("toggle-icon4");
-            arrowButton.visibleProperty().bind(Bindings.createBooleanBinding(
-                    () -> control.installable.get() && control.incompatibleLibraryName.get() == null,
-                    control.installable, control.incompatibleLibraryName));
-            arrowButton.managedProperty().bind(arrowButton.visibleProperty());
-            arrowButton.onMouseClickedProperty().bind(control.action);
-            buttonsContainer.getChildren().add(arrowButton);
+            JFXButton installButton = new JFXButton();
+            installButton.graphicProperty().bind(Bindings.createObjectBinding(() ->
+                            control.resolvedStateProperty.get() instanceof InstallableState ?
+                                    SVG.ARROW_RIGHT.createIcon(Theme.blackFill(), -1, -1) :
+                                    SVG.UPDATE.createIcon(Theme.blackFill(), -1, -1),
+                    control.resolvedStateProperty
+            ));
+            installButton.getStyleClass().add("toggle-icon4");
+            installButton.visibleProperty().bind(Bindings.createBooleanBinding(() -> {
+                if (control.getOnInstall() == null) {
+                    return false;
+                }

-            FXUtils.onChangeAndOperate(arrowButton.visibleProperty(), clickable -> {
+                State state = control.resolvedStateProperty.get();
+                if (state instanceof InstallableState) {
+                    return true;
+                }
+                if (state instanceof InstalledState) {
+                    return !((InstalledState) state).external;
+                }
+
+                return false;
+            }, control.resolvedStateProperty, control.onInstall));
+            installButton.managedProperty().bind(installButton.visibleProperty());
+            installButton.setOnAction(e -> {
+                Runnable onInstall = control.getOnInstall();
+                if (onInstall != null)
+                    onInstall.run();
+            });
+            buttonsContainer.getChildren().add(installButton);
+
+            FXUtils.onChangeAndOperate(installButton.visibleProperty(), clickable -> {
                if (clickable) {
-                    container.onMouseClickedProperty().bind(control.action);
+                    container.setOnMouseClicked(event -> {
+                        Runnable onInstall = control.getOnInstall();
+                        if (onInstall != null && event.getButton() == MouseButton.PRIMARY && event.getClickCount() == 1) {
+                            onInstall.run();
+                            event.consume();
+                        }
+                    });
                    pane.setCursor(Cursor.HAND);
                } else {
-                    container.onMouseClickedProperty().unbind();
-                    container.onMouseClickedProperty().set(null);
+                    container.setOnMouseClicked(null);
                    pane.setCursor(Cursor.DEFAULT);
                }
            });
@@ -69,16 +69,16 @@ public class ListPageSkin extends SkinBase<ListPage<?>> {
                FXUtils.setLimitHeight(btnAdd, 40);
                btnAdd.getStyleClass().add("jfx-button-raised-round");
                btnAdd.setButtonType(JFXButton.ButtonType.RAISED);
-                btnAdd.setGraphic(SVG.plus(Theme.whiteFillBinding(), -1, -1));
-                btnAdd.setOnMouseClicked(e -> skinnable.add());
+                btnAdd.setGraphic(SVG.PLUS.createIcon(Theme.whiteFill(), -1, -1));
+                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(Theme.whiteFillBinding(), -1, -1));
-                btnRefresh.setOnMouseClicked(e -> skinnable.refresh());
+                btnRefresh.setGraphic(SVG.REFRESH.createIcon(Theme.whiteFill(), -1, -1));
+                btnRefresh.setOnAction(e -> skinnable.refresh());

                vBox.getChildren().setAll(btnAdd);

@@ -25,23 +25,29 @@ import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.*;
-import javafx.beans.value.ChangeListener;
 import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import javafx.css.PseudoClass;
 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 org.jackhuang.hmcl.game.GameDumpGenerator;
 import org.jackhuang.hmcl.game.LauncherHelper;
+import org.jackhuang.hmcl.game.Log;
 import org.jackhuang.hmcl.setting.Theme;
+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.OperatingSystem;
+import org.jackhuang.hmcl.util.platform.ManagedProcess;
+import org.jackhuang.hmcl.util.platform.SystemUtils;

 import java.io.IOException;
 import java.nio.file.Files;
@@ -50,141 +56,132 @@ import java.nio.file.Paths;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.function.Consumer;
-import java.util.logging.Level;
 import java.util.stream.Collectors;
-import java.util.stream.IntStream;

 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
-import static org.jackhuang.hmcl.ui.FXUtils.newImage;
 import static org.jackhuang.hmcl.util.Lang.thread;
-import static org.jackhuang.hmcl.util.Logging.LOG;
-import static org.jackhuang.hmcl.util.StringUtils.parseEscapeSequence;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 /**
- *
 * @author huangyuhui
 */
 public final class LogWindow extends Stage {

-    private final ArrayDeque<Log> logs = new ArrayDeque<>();
-    private final Map<Log4jLevel, SimpleIntegerProperty> levelCountMap = new EnumMap<Log4jLevel, SimpleIntegerProperty>(Log4jLevel.class) {
-        {
-            for (Log4jLevel level : Log4jLevel.values()) put(level, new SimpleIntegerProperty());
+    private static final Log4jLevel[] LEVELS = {Log4jLevel.FATAL, Log4jLevel.ERROR, Log4jLevel.WARN, Log4jLevel.INFO, Log4jLevel.DEBUG};
+
+    private final CircularArrayList<Log> logs;
+    private final Map<Log4jLevel, SimpleIntegerProperty> levelCountMap = new EnumMap<>(Log4jLevel.class);
+    private final Map<Log4jLevel, SimpleBooleanProperty> levelShownMap = new EnumMap<>(Log4jLevel.class);
+
+    {
+        for (Log4jLevel level : Log4jLevel.values()) {
+            levelCountMap.put(level, new SimpleIntegerProperty());
+            levelShownMap.put(level, new SimpleBooleanProperty(true));
        }
-    };
-    private final Map<Log4jLevel, SimpleBooleanProperty> levelShownMap = new EnumMap<Log4jLevel, SimpleBooleanProperty>(Log4jLevel.class) {
-        {
-            for (Log4jLevel level : Log4jLevel.values()) {
-                SimpleBooleanProperty property = new SimpleBooleanProperty(true);
-                put(level, property);
-            }
-        }
-    };
-    private final LogWindowImpl impl = new LogWindowImpl();
-    private final ChangeListener<Number> logLinesListener = FXUtils.onWeakChange(config().logLinesProperty(), logLines -> checkLogCount());
+    }

-    private Consumer<String> exportGameCrashInfoCallback;
+    private final LogWindowImpl impl;
+    private final ManagedProcess gameProcess;

-    private boolean stopCheckLogCount = false;
+    public LogWindow(ManagedProcess gameProcess) {
+        this(gameProcess, new CircularArrayList<>());
+    }

-    public LogWindow() {
+    public LogWindow(ManagedProcess gameProcess, CircularArrayList<Log> logs) {
+        this.logs = logs;
+        this.impl = new LogWindowImpl();
        setScene(new Scene(impl, 800, 480));
        getScene().getStylesheets().addAll(Theme.getTheme().getStylesheets(config().getLauncherFontFamily()));
        setTitle(i18n("logwindow.title"));
-        getIcons().add(newImage("/assets/img/icon.png"));
+        FXUtils.setIcon(this);

-        levelShownMap.values().forEach(property -> property.addListener((a, b, newValue) -> shakeLogs()));
+        for (SimpleBooleanProperty property : levelShownMap.values()) {
+            property.addListener(o -> shakeLogs());
+        }
+
+        this.gameProcess = gameProcess;
    }

-    public void logLine(String filteredLine, Log4jLevel level) {
-        Log log = new Log(parseEscapeSequence(filteredLine), level);
+    public void logLine(Log log) {
+        Log4jLevel level = log.getLevel();
        logs.add(log);
        if (levelShownMap.get(level).get())
            impl.listView.getItems().add(log);

-        levelCountMap.get(level).setValue(levelCountMap.get(level).getValue() + 1);
-        if (!stopCheckLogCount) checkLogCount();
+        SimpleIntegerProperty property = levelCountMap.get(log.getLevel());
+        property.set(property.get() + 1);
+        checkLogCount();
+        autoScroll();
    }

-    public void showGameCrashReport(Consumer<String> exportGameCrashInfoCallback) {
-        this.exportGameCrashInfoCallback = exportGameCrashInfoCallback;
-        this.impl.showCrashReport.set(true);
-        stopCheckLogCount = true;
-        for (Log log : impl.listView.getItems()) {
-            if (log.log.contains("Minecraft Crash Report")) {
-                Platform.runLater(() -> {
-                    impl.listView.scrollTo(log);
-                });
-                break;
-            }
+    public void logLines(List<Log> logs) {
+        for (Log log : logs) {
+            Log4jLevel level = log.getLevel();
+            this.logs.add(log);
+            if (levelShownMap.get(level).get())
+                impl.listView.getItems().add(log);
+
+            SimpleIntegerProperty property = levelCountMap.get(log.getLevel());
+            property.set(property.get() + 1);
        }
-        show();
-    }
-
-    public void showNormal() {
-        this.impl.showCrashReport.set(false);
-        show();
+        checkLogCount();
+        autoScroll();
    }

    private void shakeLogs() {
-        impl.listView.getItems().setAll(logs.stream().filter(log -> levelShownMap.get(log.level).get()).collect(Collectors.toList()));
+        impl.listView.getItems().setAll(logs.stream().filter(log -> levelShownMap.get(log.getLevel()).get()).collect(Collectors.toList()));
+        autoScroll();
    }

    private void checkLogCount() {
-        while (logs.size() > config().getLogLines()) {
+        int nRemove = logs.size() - Log.getLogLines();
+        if (nRemove <= 0)
+            return;
+
+        ObservableList<Log> items = impl.listView.getItems();
+        int itemsSize = items.size();
+        int count = 0;
+
+        for (int i = 0; i < nRemove; i++) {
            Log removedLog = logs.removeFirst();
-            if (!impl.listView.getItems().isEmpty() && impl.listView.getItems().get(0) == removedLog) {
-                impl.listView.getItems().remove(0);
-            }
+            if (itemsSize > count && items.get(count) == removedLog)
+                count++;
        }
+
+        items.remove(0, count);
    }

-    private static class Log {
-        private final String log;
-        private final Log4jLevel level;
-
-        public Log(String log, Log4jLevel level) {
-            this.log = log;
-            this.level = level;
-        }
+    private void autoScroll() {
+        if (!impl.listView.getItems().isEmpty() && impl.autoScroll.get())
+            impl.listView.scrollTo(impl.listView.getItems().size() - 1);
    }

-    public class LogWindowImpl extends Control {
+    private final class LogWindowImpl extends Control {

        private final ListView<Log> listView = new JFXListView<>();
        private final BooleanProperty autoScroll = new SimpleBooleanProperty();
-        private final List<StringProperty> buttonText = IntStream.range(0, 5).mapToObj(x -> new SimpleStringProperty()).collect(Collectors.toList());
-        private final List<BooleanProperty> showLevel = IntStream.range(0, 5).mapToObj(x -> new SimpleBooleanProperty(true)).collect(Collectors.toList());
-        private final JFXComboBox<String> cboLines = new JFXComboBox<>();
-        private final BooleanProperty showCrashReport = new SimpleBooleanProperty();
+        private final StringProperty[] buttonText = new StringProperty[LEVELS.length];
+        private final BooleanProperty[] showLevel = new BooleanProperty[LEVELS.length];
+        private final JFXComboBox<Integer> cboLines = new JFXComboBox<>();

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

-            listView.setItems(FXCollections.observableList(new CircularArrayList<>(config().getLogLines() + 1)));
+            listView.setItems(FXCollections.observableList(new CircularArrayList<>(logs.size())));

-            boolean flag = false;
-            cboLines.getItems().setAll("500", "2000", "5000", "10000");
-            for (String i : cboLines.getItems())
-                if (Integer.toString(config().getLogLines()).equals(i)) {
-                    cboLines.getSelectionModel().select(i);
-                    flag = true;
-                }
+            for (int i = 0; i < LEVELS.length; i++) {
+                buttonText[i] = new SimpleStringProperty();
+                showLevel[i] = new SimpleBooleanProperty(true);
+            }

-            if (!flag)
-                cboLines.getSelectionModel().select(2);
+            cboLines.getItems().setAll(500, 2000, 5000, 10000);
+            cboLines.setValue(Log.getLogLines());
+            cboLines.getSelectionModel().selectedItemProperty().addListener((a, b, newValue) -> config().setLogLines(newValue));

-            cboLines.getSelectionModel().selectedItemProperty().addListener((a, b, newValue) -> {
-                config().setLogLines(newValue == null ? 100 : Integer.parseInt(newValue));
-            });
-
-            Log4jLevel[] levels = new Log4jLevel[]{Log4jLevel.FATAL, Log4jLevel.ERROR, Log4jLevel.WARN, Log4jLevel.INFO, Log4jLevel.DEBUG};
-            String[] suffix = new String[]{"fatals", "errors", "warns", "infos", "debugs"};
-            for (int i = 0; i < 5; ++i) {
-                buttonText.get(i).bind(Bindings.concat(levelCountMap.get(levels[i]), " " + suffix[i]));
-                levelShownMap.get(levels[i]).bind(showLevel.get(i));
+            for (int i = 0; i < LEVELS.length; ++i) {
+                buttonText[i].bind(Bindings.concat(levelCountMap.get(LEVELS[i]), " " + LEVELS[i].name().toLowerCase(Locale.ROOT) + "s"));
+                levelShownMap.get(LEVELS[i]).bind(showLevel[i]);
            }
        }

@@ -201,9 +198,9 @@ public final class LogWindow extends Stage {
            thread(() -> {
                Path logFile = Paths.get("minecraft-exported-logs-" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH-mm-ss")) + ".log").toAbsolutePath();
                try {
-                    Files.write(logFile, logs.stream().map(x -> x.log).collect(Collectors.toList()));
+                    Files.write(logFile, logs.stream().map(Log::getLog).collect(Collectors.toList()));
                } catch (IOException e) {
-                    LOG.log(Level.WARNING, "Failed to export logs", e);
+                    LOG.warning("Failed to export logs", e);
                    return;
                }

@@ -217,9 +214,31 @@ public final class LogWindow extends Stage {
            });
        }

-        private void onExportGameCrashInfo() {
-            if (exportGameCrashInfoCallback == null) return;
-            exportGameCrashInfoCallback.accept(logs.stream().map(x -> x.log).collect(Collectors.joining(OperatingSystem.LINE_SEPARATOR)));
+        private void onExportDump(SpinnerPane pane) {
+            assert SystemUtils.supportJVMAttachment();
+
+            pane.setLoading(true);
+
+            thread(() -> {
+                Path dumpFile = Paths.get("minecraft-exported-jstack-dump-" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH-mm-ss")) + ".log").toAbsolutePath();
+
+                try {
+                    if (gameProcess.isRunning()) {
+                        GameDumpGenerator.writeDumpTo(gameProcess.getPID(), dumpFile);
+                        FXUtils.showFileInExplorer(dumpFile);
+                    }
+                } catch (Throwable e) {
+                    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();
+                    });
+                }
+
+                Platform.runLater(() -> pane.setLoading(false));
+            });
        }

        @Override
@@ -228,7 +247,7 @@ public final class LogWindow extends Stage {
        }
    }

-    private static class LogWindowSkin extends SkinBase<LogWindowImpl> {
+    private static final class LogWindowSkin extends SkinBase<LogWindowImpl> {
        private static final PseudoClass EMPTY = PseudoClass.getPseudoClass("empty");
        private static final PseudoClass FATAL = PseudoClass.getPseudoClass("fatal");
        private static final PseudoClass ERROR = PseudoClass.getPseudoClass("error");
@@ -236,18 +255,11 @@ 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 static ToggleButton createToggleButton(String backgroundColor, StringProperty buttonText, BooleanProperty showLevel) {
-            ToggleButton button = new ToggleButton();
-            button.setStyle("-fx-background-color: " + backgroundColor + ";");
-            button.getStyleClass().add("log-toggle");
-            button.textProperty().bind(buttonText);
-            button.setSelected(true);
-            showLevel.bind(button.selectedProperty());
-            return button;
-        }
+        private final Set<ListCell<Log>> selected = new HashSet<>();

-        protected LogWindowSkin(LogWindowImpl control) {
+        LogWindowSkin(LogWindowImpl control) {
            super(control);

            VBox vbox = new VBox(3);
@@ -272,13 +284,16 @@ public final class LogWindow extends Stage {

                {
                    HBox hBox = new HBox(3);
-                    hBox.getChildren().setAll(
-                            createToggleButton("#F7A699", control.buttonText.get(0), control.showLevel.get(0)),
-                            createToggleButton("#FFCCBB", control.buttonText.get(1), control.showLevel.get(1)),
-                            createToggleButton("#FFEECC", control.buttonText.get(2), control.showLevel.get(2)),
-                            createToggleButton("#FBFBFB", control.buttonText.get(3), control.showLevel.get(3)),
-                            createToggleButton("#EEE9E0", control.buttonText.get(4), control.showLevel.get(4))
-                    );
+                    for (int i = 0; i < LEVELS.length; i++) {
+                        ToggleButton button = new ToggleButton();
+                        button.setStyle("-fx-background-color: " + FXUtils.toWeb(LEVELS[i].getColor()) + ";");
+                        button.getStyleClass().add("log-toggle");
+                        button.textProperty().bind(control.buttonText[i]);
+                        button.setSelected(true);
+                        control.showLevel[i].bind(button.selectedProperty());
+                        hBox.getChildren().add(button);
+                    }
+
                    borderPane.setRight(hBox);
                }

@@ -298,7 +313,7 @@ public final class LogWindow extends Stage {
                listView.setCellFactory(x -> new ListCell<Log>() {
                    {
                        getStyleClass().add("log-window-list-cell");
-                        Region clippedContainer = (Region)listView.lookup(".clipped-container");
+                        Region clippedContainer = (Region) listView.lookup(".clipped-container");
                        if (clippedContainer != null) {
                            maxWidthProperty().bind(clippedContainer.widthProperty());
                            prefWidthProperty().bind(clippedContainer.widthProperty());
@@ -306,6 +321,32 @@ 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
@@ -318,20 +359,38 @@ public final class LogWindow extends Stage {
                        lastCell.value = this;

                        pseudoClassStateChanged(EMPTY, empty);
-                        pseudoClassStateChanged(FATAL, !empty && item.level == Log4jLevel.FATAL);
-                        pseudoClassStateChanged(ERROR, !empty && item.level == Log4jLevel.ERROR);
-                        pseudoClassStateChanged(WARN, !empty && item.level == Log4jLevel.WARN);
-                        pseudoClassStateChanged(INFO, !empty && item.level == Log4jLevel.INFO);
-                        pseudoClassStateChanged(DEBUG, !empty && item.level == Log4jLevel.DEBUG);
-                        pseudoClassStateChanged(TRACE, !empty && item.level == Log4jLevel.TRACE);
+                        pseudoClassStateChanged(FATAL, !empty && item.getLevel() == Log4jLevel.FATAL);
+                        pseudoClassStateChanged(ERROR, !empty && item.getLevel() == Log4jLevel.ERROR);
+                        pseudoClassStateChanged(WARN, !empty && item.getLevel() == Log4jLevel.WARN);
+                        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);
                        } else {
-                            setText(item.log);
+                            setText(item.getLog());
                        }
                    }
                });

+                listView.setOnKeyPressed(event -> {
+                    if (event.isControlDown() && event.getCode() == KeyCode.C) {
+                        StringBuilder stringBuilder = new StringBuilder();
+
+                        for (Log item : listView.getItems()) {
+                            if (item != null && item.isSelected()) {
+                                if (item.getLog() != null)
+                                    stringBuilder.append(item.getLog());
+                                stringBuilder.append('\n');
+                            }
+                        }
+
+                        FXUtils.copyText(stringBuilder.toString());
+                    }
+                });
+
                VBox.setVgrow(listView, Priority.ALWAYS);
                vbox.getChildren().add(listView);
            }
@@ -339,11 +398,6 @@ public final class LogWindow extends Stage {
            {
                BorderPane bottom = new BorderPane();

-                JFXButton exportGameCrashInfoButton = new JFXButton(i18n("logwindow.export_game_crash_logs"));
-                exportGameCrashInfoButton.setOnMouseClicked(e -> getSkinnable().onExportGameCrashInfo());
-                exportGameCrashInfoButton.visibleProperty().bind(getSkinnable().showCrashReport);
-                bottom.setLeft(exportGameCrashInfoButton);
-
                HBox hBox = new HBox(3);
                bottom.setRight(hBox);
                hBox.setAlignment(Pos.CENTER_RIGHT);
@@ -353,15 +407,25 @@ public final class LogWindow extends Stage {
                autoScrollCheckBox.setSelected(true);
                control.autoScroll.bind(autoScrollCheckBox.selectedProperty());

-                JFXButton terminateButton = new JFXButton(i18n("logwindow.terminate_game"));
-                terminateButton.setOnMouseClicked(e -> getSkinnable().onTerminateGame());
-
                JFXButton exportLogsButton = new JFXButton(i18n("button.export"));
-                exportLogsButton.setOnMouseClicked(e -> getSkinnable().onExportLogs());
+                exportLogsButton.setOnAction(e -> getSkinnable().onExportLogs());
+
+                JFXButton terminateButton = new JFXButton(i18n("logwindow.terminate_game"));
+                terminateButton.setOnAction(e -> getSkinnable().onTerminateGame());
+
+                SpinnerPane exportDumpPane = new SpinnerPane();
+                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")));
+                    exportDumpButton.setDisable(true);
+                }
+                exportDumpPane.setContent(exportDumpButton);

                JFXButton clearButton = new JFXButton(i18n("button.clear"));
-                clearButton.setOnMouseClicked(e -> getSkinnable().onClear());
-                hBox.getChildren().setAll(autoScrollCheckBox, exportLogsButton, terminateButton, clearButton);
+                clearButton.setOnAction(e -> getSkinnable().onClear());
+                hBox.getChildren().setAll(autoScrollCheckBox, exportLogsButton, terminateButton, exportDumpPane, clearButton);

                vbox.getChildren().add(bottom);
            }
@@ -17,7 +17,7 @@
 */
 package org.jackhuang.hmcl.ui;

-import javafx.beans.binding.ObjectBinding;
+import javafx.beans.value.ObservableValue;
 import javafx.geometry.Pos;
 import javafx.scene.Group;
 import javafx.scene.Node;
@@ -25,21 +25,106 @@ import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Paint;
 import javafx.scene.shape.SVGPath;

-public final class SVG {
-    private SVG() {
+public enum SVG {
+    GEAR("M12,15.5A3.5,3.5 0 0,1 8.5,12A3.5,3.5 0 0,1 12,8.5A3.5,3.5 0 0,1 15.5,12A3.5,3.5 0 0,1 12,15.5M19.43,12.97C19.47,12.65 19.5,12.33 19.5,12C19.5,11.67 19.47,11.34 19.43,11L21.54,9.37C21.73,9.22 21.78,8.95 21.66,8.73L19.66,5.27C19.54,5.05 19.27,4.96 19.05,5.05L16.56,6.05C16.04,5.66 15.5,5.32 14.87,5.07L14.5,2.42C14.46,2.18 14.25,2 14,2H10C9.75,2 9.54,2.18 9.5,2.42L9.13,5.07C8.5,5.32 7.96,5.66 7.44,6.05L4.95,5.05C4.73,4.96 4.46,5.05 4.34,5.27L2.34,8.73C2.21,8.95 2.27,9.22 2.46,9.37L4.57,11C4.53,11.34 4.5,11.67 4.5,12C4.5,12.33 4.53,12.65 4.57,12.97L2.46,14.63C2.27,14.78 2.21,15.05 2.34,15.27L4.34,18.73C4.46,18.95 4.73,19.03 4.95,18.95L7.44,17.94C7.96,18.34 8.5,18.68 9.13,18.93L9.5,21.58C9.54,21.82 9.75,22 10,22H14C14.25,22 14.46,21.82 14.5,21.58L14.87,18.93C15.5,18.67 16.04,18.34 16.56,17.94L19.05,18.95C19.27,19.03 19.54,18.95 19.66,18.73L21.66,15.27C21.78,15.05 21.73,14.78 21.54,14.63L19.43,12.97Z"),
+    GEAR_OUTLINE("M12,8A4,4 0 0,1 16,12A4,4 0 0,1 12,16A4,4 0 0,1 8,12A4,4 0 0,1 12,8M12,10A2,2 0 0,0 10,12A2,2 0 0,0 12,14A2,2 0 0,0 14,12A2,2 0 0,0 12,10M10,22C9.75,22 9.54,21.82 9.5,21.58L9.13,18.93C8.5,18.68 7.96,18.34 7.44,17.94L4.95,18.95C4.73,19.03 4.46,18.95 4.34,18.73L2.34,15.27C2.21,15.05 2.27,14.78 2.46,14.63L4.57,12.97L4.5,12L4.57,11L2.46,9.37C2.27,9.22 2.21,8.95 2.34,8.73L4.34,5.27C4.46,5.05 4.73,4.96 4.95,5.05L7.44,6.05C7.96,5.66 8.5,5.32 9.13,5.07L9.5,2.42C9.54,2.18 9.75,2 10,2H14C14.25,2 14.46,2.18 14.5,2.42L14.87,5.07C15.5,5.32 16.04,5.66 16.56,6.05L19.05,5.05C19.27,4.96 19.54,5.05 19.66,5.27L21.66,8.73C21.79,8.95 21.73,9.22 21.54,9.37L19.43,11L19.5,12L19.43,13L21.54,14.63C21.73,14.78 21.79,15.05 21.66,15.27L19.66,18.73C19.54,18.95 19.27,19.04 19.05,18.95L16.56,17.95C16.04,18.34 15.5,18.68 14.87,18.93L14.5,21.58C14.46,21.82 14.25,22 14,22H10M11.25,4L10.88,6.61C9.68,6.86 8.62,7.5 7.85,8.39L5.44,7.35L4.69,8.65L6.8,10.2C6.4,11.37 6.4,12.64 6.8,13.8L4.68,15.36L5.43,16.66L7.86,15.62C8.63,16.5 9.68,17.14 10.87,17.38L11.24,20H12.76L13.13,17.39C14.32,17.14 15.37,16.5 16.14,15.62L18.57,16.66L19.32,15.36L17.2,13.81C17.6,12.64 17.6,11.37 17.2,10.2L19.31,8.65L18.56,7.35L16.15,8.39C15.38,7.5 14.32,6.86 13.12,6.62L12.75,4H11.25Z"),
+    BACK("M20,11V13H8L13.5,18.5L12.08,19.92L4.16,12L12.08,4.08L13.5,5.5L8,11H20Z"),
+    CANCEL("M12 2C17.5 2 22 6.5 22 12S17.5 22 12 22 2 17.5 2 12 6.5 2 12 2M12 4C10.1 4 8.4 4.6 7.1 5.7L18.3 16.9C19.3 15.5 20 13.8 20 12C20 7.6 16.4 4 12 4M16.9 18.3L5.7 7.1C4.6 8.4 4 10.1 4 12C4 16.4 7.6 20 12 20C13.9 20 15.6 19.4 16.9 18.3Z"),
+    CHAT("M20,2A2,2 0 0,1 22,4V16A2,2 0 0,1 20,18H6L2,22V4C2,2.89 2.9,2 4,2H20M4,4V17.17L5.17,16H20V4H4M6,7H18V9H6V7M6,11H15V13H6V11Z"),
+    CLOSE("M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z"),
+    COPY("M15 16H7V6h8m.4-2H6.6A1.6 1.6 90 005 5.6V16.4a1.6 1.6 90 001.6 1.6h8.8A1.6 1.6 90 0017 16.4V5.6A1.6 1.6 90 0015.4 4M13 1H3.6A1.6 1.6 90 002 2.6V13h2V3H13V1Z"),
+    DOTS_VERTICAL("M12,16A2,2 0 0,1 14,18A2,2 0 0,1 12,20A2,2 0 0,1 10,18A2,2 0 0,1 12,16M12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12A2,2 0 0,1 12,10M12,4A2,2 0 0,1 14,6A2,2 0 0,1 12,8A2,2 0 0,1 10,6A2,2 0 0,1 12,4Z"),
+    DOTS_HORIZONTAL("M16,12A2,2 0 0,1 18,10A2,2 0 0,1 20,12A2,2 0 0,1 18,14A2,2 0 0,1 16,12M10,12A2,2 0 0,1 12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12M4,12A2,2 0 0,1 6,10A2,2 0 0,1 8,12A2,2 0 0,1 6,14A2,2 0 0,1 4,12Z"),
+    DELETE("M19,4H15.5L14.5,3H9.5L8.5,4H5V6H19M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19Z"),
+    DELETE_OUTLINE("M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19M8,9H16V19H8V9M15.5,4L14.5,3H9.5L8.5,4H5V6H19V4H15.5Z"),
+    ACCOUNT_EDIT("M21.7,13.35L20.7,14.35L18.65,12.3L19.65,11.3C19.86,11.09 20.21,11.09 20.42,11.3L21.7,12.58C21.91,12.79 21.91,13.14 21.7,13.35M12,18.94L18.06,12.88L20.11,14.93L14.06,21H12V18.94M12,14C7.58,14 4,15.79 4,18V20H10V18.11L14,14.11C13.34,14.03 12.67,14 12,14M12,4A4,4 0 0,0 8,8A4,4 0 0,0 12,12A4,4 0 0,0 16,8A4,4 0 0,0 12,4Z"),
+    EXPAND("M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"),
+    COLLAPSE("M12 8l-6 6 1.41 1.41L12 10.83l4.59 4.58L18 14z"),
+    NAVIGATE("M14,3V5H17.59L7.76,14.83L9.17,16.24L19,6.41V10H21V3M19,19H5V5H12V3H5C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V12H19V19Z"),
+    ROCKET_LAUNCH_OUTLINE("M13.13 22.19L11.5 18.36C13.07 17.78 14.54 17 15.9 16.09L13.13 22.19M5.64 12.5L1.81 10.87L7.91 8.1C7 9.46 6.22 10.93 5.64 12.5M19.22 4C19.5 4 19.75 4 19.96 4.05C20.13 5.44 19.94 8.3 16.66 11.58C14.96 13.29 12.93 14.6 10.65 15.47L8.5 13.37C9.42 11.06 10.73 9.03 12.42 7.34C15.18 4.58 17.64 4 19.22 4M19.22 2C17.24 2 14.24 2.69 11 5.93C8.81 8.12 7.5 10.53 6.65 12.64C6.37 13.39 6.56 14.21 7.11 14.77L9.24 16.89C9.62 17.27 10.13 17.5 10.66 17.5C10.89 17.5 11.13 17.44 11.36 17.35C13.5 16.53 15.88 15.19 18.07 13C23.73 7.34 21.61 2.39 21.61 2.39S20.7 2 19.22 2M14.54 9.46C13.76 8.68 13.76 7.41 14.54 6.63S16.59 5.85 17.37 6.63C18.14 7.41 18.15 8.68 17.37 9.46C16.59 10.24 15.32 10.24 14.54 9.46M8.88 16.53L7.47 15.12L8.88 16.53M6.24 22L9.88 18.36C9.54 18.27 9.21 18.12 8.91 17.91L4.83 22H6.24M2 22H3.41L8.18 17.24L6.76 15.83L2 20.59V22M2 19.17L6.09 15.09C5.88 14.79 5.73 14.47 5.64 14.12L2 17.76V19.17Z"),
+    LAUNCH_OUTLINE("M14,3V5H17.59L7.76,14.83L9.17,16.24L19,6.41V10H21V3M19,19H5V5H12V3H5C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V12H19V19Z"),
+    SCRIPT("M14,20A2,2 0 0,0 16,18V5H9A1,1 0 0,0 8,6V16H5V5A3,3 0 0,1 8,2H19A3,3 0 0,1 22,5V6H18V18L18,19A3,3 0 0,1 15,22H5A3,3 0 0,1 2,19V18H12A2,2 0 0,0 14,20Z"),
+    PENCIL("M20.71,4.04C21.1,3.65 21.1,3 20.71,2.63L18.37,0.29C18,-0.1 17.35,-0.1 16.96,0.29L15,2.25L18.75,6M17.75,7L14,3.25L4,13.25V17H7.75L17.75,7Z"),
+    PENCIL_OUTLINE("M14.06,9L15,9.94L5.92,19H5V18.08L14.06,9M17.66,3C17.41,3 17.15,3.1 16.96,3.29L15.13,5.12L18.88,8.87L20.71,7.04C21.1,6.65 21.1,6 20.71,5.63L18.37,3.29C18.17,3.09 17.92,3 17.66,3M14.06,6.19L3,17.25V21H6.75L17.81,9.94L14.06,6.19Z"),
+    REFRESH("M17.65,6.35C16.2,4.9 14.21,4 12,4A8,8 0 0,0 4,12A8,8 0 0,0 12,20C15.73,20 18.84,17.45 19.73,14H17.65C16.83,16.33 14.61,18 12,18A6,6 0 0,1 6,12A6,6 0 0,1 12,6C13.66,6 15.14,6.69 16.22,7.78L13,11H20V4L17.65,6.35Z"),
+    FOLDER_OPEN("M19,20H4C2.89,20 2,19.1 2,18V6C2,4.89 2.89,4 4,4H10L12,6H19A2,2 0 0,1 21,8H21L4,8V18L6.14,10H23.21L20.93,18.5C20.7,19.37 19.92,20 19,20Z"),
+    FOLDER_OUTLINE("M20,18H4V8H20M20,6H12L10,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V8C22,6.89 21.1,6 20,6Z"),
+    UPDATE("M21,10.12H14.22L16.96,7.3C14.23,4.6 9.81,4.5 7.08,7.2C4.35,9.91 4.35,14.28 7.08,17C9.81,19.7 14.23,19.7 16.96,17C18.32,15.65 19,14.08 19,12.1H21C21,14.08 20.12,16.65 18.36,18.39C14.85,21.87 9.15,21.87 5.64,18.39C2.14,14.92 2.11,9.28 5.62,5.81C9.13,2.34 14.76,2.34 18.27,5.81L21,3V10.12M12.5,8V12.25L16,14.33L15.28,15.54L11,13V8H12.5Z"),
+    CLOSE_CIRCLE("M12,2C17.53,2 22,6.47 22,12C22,17.53 17.53,22 12,22C6.47,22 2,17.53 2,12C2,6.47 6.47,2 12,2M15.59,7L12,10.59L8.41,7L7,8.41L10.59,12L7,15.59L8.41,17L12,13.41L15.59,17L17,15.59L13.41,12L17,8.41L15.59,7Z"),
+    CHECK_CIRCLE("M12,2A10,10 0 0,1 22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2M11,16.5L18,9.5L16.59,8.09L11,13.67L7.91,10.59L6.5,12L11,16.5Z"),
+    INFO_CIRCLE("M13,9H11V7H13M13,17H11V11H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z"),
+    HELP_CIRCLE("M15.07,11.25L14.17,12.17C13.45,12.89 13,13.5 13,15H11V14.5C11,13.39 11.45,12.39 12.17,11.67L13.41,10.41C13.78,10.05 14,9.55 14,9C14,7.89 13.1,7 12,7A2,2 0 0,0 10,9H8A4,4 0 0,1 12,5A4,4 0 0,1 16,9C16,9.88 15.64,10.67 15.07,11.25M13,19H11V17H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12C22,6.47 17.5,2 12,2Z"),
+    HELP_CIRCLE_OUTLINE("M11,18H13V16H11V18M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,6A4,4 0 0,0 8,10H10A2,2 0 0,1 12,8A2,2 0 0,1 14,10C14,12 11,11.75 11,15H13C13,12.75 16,12.5 16,10A4,4 0 0,0 12,6Z"),
+    ALERT("M13,14H11V10H13M13,18H11V16H13M1,21H23L12,2L1,21Z"),
+    ALERT_OUTLINE("M12,2L1,21H23M12,6L19.53,19H4.47M11,10V14H13V10M11,16V18H13V16"),
+    PLUS("M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z"),
+    PLUS_CIRCLE_OUTLINE("M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M13,7H11V11H7V13H11V17H13V13H17V11H13V7Z"),
+    MINUS("M19 13H5V11H19V13Z"),
+    IMPORT_ICON("M14,12L10,8V11H2V13H10V16M20,18V6C20,4.89 19.1,4 18,4H6A2,2 0 0,0 4,6V9H6V6H18V18H6V15H4V18A2,2 0 0,0 6,20H18A2,2 0 0,0 20,18Z"),
+    EXPORT("M23,12L19,8V11H10V13H19V16M1,18V6C1,4.89 1.9,4 3,4H15A2,2 0 0,1 17,6V9H15V6H3V18H15V15H17V18A2,2 0 0,1 15,20H3A2,2 0 0,1 1,18Z"),
+    OPEN_IN_NEW("M14,3V5H17.59L7.76,14.83L9.17,16.24L19,6.41V10H21V3M19,19H5V5H12V3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V12H19V19Z"),
+    TRIANGLE("M1,21H23L12,2"),
+    HOME("M10,20V14H14V20H19V12H22L12,3L2,12H5V20H10Z"),
+    VIEW_LIST("M7,5H21V7H7V5M7,13V11H21V13H7M4,4.5A1.5,1.5 0 0,1 5.5,6A1.5,1.5 0 0,1 4,7.5A1.5,1.5 0 0,1 2.5,6A1.5,1.5 0 0,1 4,4.5M4,10.5A1.5,1.5 0 0,1 5.5,12A1.5,1.5 0 0,1 4,13.5A1.5,1.5 0 0,1 2.5,12A1.5,1.5 0 0,1 4,10.5M7,19V17H21V19H7M4,16.5A1.5,1.5 0 0,1 5.5,18A1.5,1.5 0 0,1 4,19.5A1.5,1.5 0 0,1 2.5,18A1.5,1.5 0 0,1 4,16.5Z"),
+    CHECK("M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z"),
+    ARROW_RIGHT("M4,11V13H16L10.5,18.5L11.92,19.92L19.84,12L11.92,4.08L10.5,5.5L16,11H4Z"),
+    WRENCH("M22.7,19L13.6,9.9C14.5,7.6 14,4.9 12.1,3C10.1,1 7.1,0.6 4.7,1.7L9,6L6,9L1.6,4.7C0.4,7.1 0.9,10.1 2.9,12.1C4.8,14 7.5,14.5 9.8,13.6L18.9,22.7C19.3,23.1 19.9,23.1 20.3,22.7L22.6,20.4C23.1,20 23.1,19.3 22.7,19Z"),
+    WRENCH_OUTLINE("M22.61,19L13.53,9.91C14.46,7.57 14,4.81 12.09,2.91C9.79,0.61 6.21,0.4 3.66,2.26L7.5,6.11L6.08,7.5L2.25,3.69C0.39,6.23 0.6,9.82 2.9,12.11C4.76,13.97 7.47,14.46 9.79,13.59L18.9,22.7C19.29,23.09 19.92,23.09 20.31,22.7L22.61,20.4C23,20 23,19.39 22.61,19M19.61,20.59L10.15,11.13C9.54,11.58 8.86,11.85 8.15,11.95C6.79,12.15 5.36,11.74 4.32,10.7C3.37,9.76 2.93,8.5 3,7.26L6.09,10.35L10.33,6.11L7.24,3C8.5,2.95 9.73,3.39 10.68,4.33C11.76,5.41 12.17,6.9 11.92,8.29C11.8,9 11.5,9.66 11.04,10.25L20.5,19.7L19.61,20.59Z"),
+    UPLOAD("M9,16V10H5L12,3L19,10H15V16H9M5,20V18H19V20H5Z"),
+    HANGER("M12 4A3.5 3.5 0 0 0 8.5 7.5H10.5A1.5 1.5 0 0 1 12 6A1.5 1.5 0 0 1 13.5 7.5A1.5 1.5 0 0 1 12 9C11.45 9 11 9.45 11 10V11.75L2.4 18.2A1 1 0 0 0 3 20H21A1 1 0 0 0 21.6 18.2L13 11.75V10.85A3.5 3.5 0 0 0 15.5 7.5A3.5 3.5 0 0 0 12 4M12 13.5L18 18H6Z"),
+    PUZZLE("M22,13.5C22,15.26 20.7,16.72 19,16.96V20A2,2 0 0,1 17,22H13.2V21.7A2.7,2.7 0 0,0 10.5,19C9,19 7.8,20.21 7.8,21.7V22H4A2,2 0 0,1 2,20V16.2H2.3C3.79,16.2 5,15 5,13.5C5,12 3.79,10.8 2.3,10.8H2V7A2,2 0 0,1 4,5H7.04C7.28,3.3 8.74,2 10.5,2C12.26,2 13.72,3.3 13.96,5H17A2,2 0 0,1 19,7V10.04C20.7,10.28 22,11.74 22,13.5M17,15H18.5A1.5,1.5 0 0,0 20,13.5A1.5,1.5 0 0,0 18.5,12H17V7H12V5.5A1.5,1.5 0 0,0 10.5,4A1.5,1.5 0 0,0 9,5.5V7H4V9.12C5.76,9.8 7,11.5 7,13.5C7,15.5 5.75,17.2 4,17.88V20H6.12C6.8,18.25 8.5,17 10.5,17C12.5,17 14.2,18.25 14.88,20H17V15Z"),
+    CUBE("M21,16.5C21,16.88 20.79,17.21 20.47,17.38L12.57,21.82C12.41,21.94 12.21,22 12,22C11.79,22 11.59,21.94 11.43,21.82L3.53,17.38C3.21,17.21 3,16.88 3,16.5V7.5C3,7.12 3.21,6.79 3.53,6.62L11.43,2.18C11.59,2.06 11.79,2 12,2C12.21,2 12.41,2.06 12.57,2.18L20.47,6.62C20.79,6.79 21,7.12 21,7.5V16.5M12,4.15L6.04,7.5L12,10.85L17.96,7.5L12,4.15M5,15.91L11,19.29V12.58L5,9.21V15.91M19,15.91V9.21L13,12.58V19.29L19,15.91Z"),
+    PACK("M21,16.5C21,16.88 20.79,17.21 20.47,17.38L12.57,21.82C12.41,21.94 12.21,22 12,22C11.79,22 11.59,21.94 11.43,21.82L3.53,17.38C3.21,17.21 3,16.88 3,16.5V7.5C3,7.12 3.21,6.79 3.53,6.62L11.43,2.18C11.59,2.06 11.79,2 12,2C12.21,2 12.41,2.06 12.57,2.18L20.47,6.62C20.79,6.79 21,7.12 21,7.5V16.5M12,4.15L10.11,5.22L16,8.61L17.96,7.5L12,4.15M6.04,7.5L12,10.85L13.96,9.75L8.08,6.35L6.04,7.5M5,15.91L11,19.29V12.58L5,9.21V15.91M19,15.91V9.21L13,12.58V19.29L19,15.91Z"),
+    TEXTURE_BOX("M20 2H4C2.9 2 2 2.9 2 4V20C2 21.11 2.9 22 4 22H20C21.11 22 22 21.11 22 20V4C22 2.9 21.11 2 20 2M4 6L6 4H10.9L4 10.9V6M4 13.7L13.7 4H18.6L4 18.6V13.7M20 18L18 20H13.1L20 13.1V18M20 10.3L10.3 20H5.4L20 5.4V10.3Z"),
+    GAMEPAD("M6,9H8V11H10V13H8V15H6V13H4V11H6V9M18.5,9A1.5,1.5 0 0,1 20,10.5A1.5,1.5 0 0,1 18.5,12A1.5,1.5 0 0,1 17,10.5A1.5,1.5 0 0,1 18.5,9M15.5,12A1.5,1.5 0 0,1 17,13.5A1.5,1.5 0 0,1 15.5,15A1.5,1.5 0 0,1 14,13.5A1.5,1.5 0 0,1 15.5,12M17,5A7,7 0 0,1 24,12A7,7 0 0,1 17,19C15.04,19 13.27,18.2 12,16.9C10.73,18.2 8.96,19 7,19A7,7 0 0,1 0,12A7,7 0 0,1 7,5H17M7,7A5,5 0 0,0 2,12A5,5 0 0,0 7,17C8.64,17 10.09,16.21 11,15H13C13.91,16.21 15.36,17 17,17A5,5 0 0,0 22,12A5,5 0 0,0 17,7H7Z"),
+    FIRE("M17.66 11.2C17.43 10.9 17.15 10.64 16.89 10.38C16.22 9.78 15.46 9.35 14.82 8.72C13.33 7.26 13 4.85 13.95 3C13 3.23 12.17 3.75 11.46 4.32C8.87 6.4 7.85 10.07 9.07 13.22C9.11 13.32 9.15 13.42 9.15 13.55C9.15 13.77 9 13.97 8.8 14.05C8.57 14.15 8.33 14.09 8.14 13.93C8.08 13.88 8.04 13.83 8 13.76C6.87 12.33 6.69 10.28 7.45 8.64C5.78 10 4.87 12.3 5 14.47C5.06 14.97 5.12 15.47 5.29 15.97C5.43 16.57 5.7 17.17 6 17.7C7.08 19.43 8.95 20.67 10.96 20.92C13.1 21.19 15.39 20.8 17.03 19.32C18.86 17.66 19.5 15 18.56 12.72L18.43 12.46C18.22 12 17.66 11.2 17.66 11.2M14.5 17.5C14.22 17.74 13.76 18 13.4 18.1C12.28 18.5 11.16 17.94 10.5 17.28C11.69 17 12.4 16.12 12.61 15.23C12.78 14.43 12.46 13.77 12.33 13C12.21 12.26 12.23 11.63 12.5 10.94C12.69 11.32 12.89 11.7 13.13 12C13.9 13 15.11 13.44 15.37 14.8C15.41 14.94 15.43 15.08 15.43 15.23C15.46 16.05 15.1 16.95 14.5 17.5H14.5Z"),
+    MONITOR_SCREENSHOT("M9,6H5V10H7V8H9M19,10H17V12H15V14H19M21,16H3V4H21M21,2H3C1.89,2 1,2.89 1,4V16A2,2 0 0,0 3,18H10V20H8V22H16V20H14V18H21A2,2 0 0,0 23,16V4C23,2.89 22.1,2 21,2"),
+    TEXTURE("M9.29,21H12.12L21,12.12V9.29M19,21C19.55,21 20.05,20.78 20.41,20.41C20.78,20.05 21,19.55 21,19V17L17,21M5,3A2,2 0 0,0 3,5V7L7,3M11.88,3L3,11.88V14.71L14.71,3M19.5,3.08L3.08,19.5C3.17,19.85 3.35,20.16 3.59,20.41C3.84,20.65 4.15,20.83 4.5,20.92L20.93,4.5C20.74,3.8 20.2,3.26 19.5,3.08Z"),
+    ALPHA_CIRCLE_OUTLINE("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"),
+    BETA_CIRCLE_OUTLINE("M15,10.5C15,11.3 14.3,12 13.5,12C14.3,12 15,12.7 15,13.5V15A2,2 0 0,1 13,17H9V7H13A2,2 0 0,1 15,9V10.5M13,15V13H11V15H13M13,11V9H11V11H13M12,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,12A8,8 0 0,0 12,20A8,8 0 0,0 20,12A8,8 0 0,0 12,4Z"),
+    RELEASE_CIRCLE_OUTLINE("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"),
+    INFORMATION_OUTLINE("M11,9H13V7H11M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M11,17H13V11H11V17Z"),
+    HAND_HEAR_OUTLINE("M16 3.23C16.71 2.41 17.61 2 18.7 2C19.61 2 20.37 2.33 21 3C21.63 3.67 21.96 4.43 22 5.3C22 6 21.67 6.81 21 7.76S19.68 9.5 19.03 10.15C18.38 10.79 17.37 11.74 16 13C14.61 11.74 13.59 10.79 12.94 10.15S11.63 8.71 10.97 7.76C10.31 6.81 10 6 10 5.3C10 4.39 10.32 3.63 10.97 3C11.62 2.37 12.4 2.04 13.31 2C14.38 2 15.27 2.41 16 3.23M22 19V20L14 22.5L7 20.56V22H1V11H8.97L15.13 13.3C16.25 13.72 17 14.8 17 16H19C20.66 16 22 17.34 22 19M5 20V13H3V20H5M19.9 18.57C19.74 18.24 19.39 18 19 18H13.65C13.11 18 12.58 17.92 12.07 17.75L9.69 16.96L10.32 15.06L12.7 15.85C13 15.95 15 16 15 16C15 15.63 14.77 15.3 14.43 15.17L8.61 13H7V18.5L13.97 20.41L19.9 18.57Z"),
+    MOJANG("m 13.965847,0 c -1.010612,0.82802228 -1.197232,2.1950303 -1.265172,3.4179557 0.02123,1.0021189 1.341654,1.2994159 1.953117,0.590289 C 15.091158,2.6579315 14.369242,1.2738804 13.965847,0 Z M 10.913012,2.9296764 C 10.755901,3.6982508 10.628413,4.4668999 10.492533,5.2354744 8.9893533,3.9913178 7.1504705,3.0824837 5.1419856,3.2947971 3.4944341,3.4646478 0.94293227,2.6961479 0.14038761,4.645185 -0.12288102,8.3139606 0.07223999,12.01236 0.03402357,15.689629 c -0.12314178,1.222925 0.86170213,2.420422 2.14407513,2.280295 4.2207899,0.03397 8.4502143,0.04723 12.6710043,-0.0038 1.265389,0.135918 1.957646,-1.010748 2.13599,-2.0893 C 13.269608,16.437357 9.1760813,16.929609 5.7111265,15.129192 2.5986124,13.58355 2.246023,8.3138817 5.5581114,6.7979639 9.3203049,5.1758896 13.859607,8.0382886 14.942405,11.787743 15.613316,12.11046 16.284433,12.424684 16.95959,12.743154 16.624135,10.348258 16.653651,7.800456 15.579346,5.5881508 15.057054,4.7473897 14.097531,6.2714182 13.379911,5.6217388 12.416008,4.865903 11.749527,3.8128948 10.913012,2.9296713 Z"),
+    MICROSOFT("M2,3H11V12H2V3M11,22H2V13H11V22M21,3V12H12V3H21M21,22H12V13H21V22Z"),
+    ACCOUNT_OUTLINE("M12,4A4,4 0 0,1 16,8A4,4 0 0,1 12,12A4,4 0 0,1 8,8A4,4 0 0,1 12,4M12,6A2,2 0 0,0 10,8A2,2 0 0,0 12,10A2,2 0 0,0 14,8A2,2 0 0,0 12,6M12,13C14.67,13 20,14.33 20,17V20H4V17C4,14.33 9.33,13 12,13M12,14.9C9.03,14.9 5.9,16.36 5.9,17V18.1H18.1V17C18.1,16.36 14.97,14.9 12,14.9Z"),
+    ACCOUNT_GROUP_OUTLINE("M12,5A3.5,3.5 0 0,0 8.5,8.5A3.5,3.5 0 0,0 12,12A3.5,3.5 0 0,0 15.5,8.5A3.5,3.5 0 0,0 12,5M12,7A1.5,1.5 0 0,1 13.5,8.5A1.5,1.5 0 0,1 12,10A1.5,1.5 0 0,1 10.5,8.5A1.5,1.5 0 0,1 12,7M5.5,8A2.5,2.5 0 0,0 3,10.5C3,11.44 3.53,12.25 4.29,12.68C4.65,12.88 5.06,13 5.5,13C5.94,13 6.35,12.88 6.71,12.68C7.08,12.47 7.39,12.17 7.62,11.81C6.89,10.86 6.5,9.7 6.5,8.5C6.5,8.41 6.5,8.31 6.5,8.22C6.2,8.08 5.86,8 5.5,8M18.5,8C18.14,8 17.8,8.08 17.5,8.22C17.5,8.31 17.5,8.41 17.5,8.5C17.5,9.7 17.11,10.86 16.38,11.81C16.5,12 16.63,12.15 16.78,12.3C16.94,12.45 17.1,12.58 17.29,12.68C17.65,12.88 18.06,13 18.5,13C18.94,13 19.35,12.88 19.71,12.68C20.47,12.25 21,11.44 21,10.5A2.5,2.5 0 0,0 18.5,8M12,14C9.66,14 5,15.17 5,17.5V19H19V17.5C19,15.17 14.34,14 12,14M4.71,14.55C2.78,14.78 0,15.76 0,17.5V19H3V17.07C3,16.06 3.69,15.22 4.71,14.55M19.29,14.55C20.31,15.22 21,16.06 21,17.07V19H24V17.5C24,15.76 21.22,14.78 19.29,14.55M12,16C13.53,16 15.24,16.5 16.23,17H7.77C8.76,16.5 10.47,16 12,16Z"),
+    ACCOUNT_ARROW_RIGHT_OUTLINE("M19,21V19H15V17H19V15L22,18L19,21M13,18C13,18.71 13.15,19.39 13.42,20H2V17C2,14.79 5.58,13 10,13C11,13 11.96,13.09 12.85,13.26C13.68,13.42 14.44,13.64 15.11,13.92C13.83,14.83 13,16.32 13,18M4,17V18H11C11,16.96 11.23,15.97 11.64,15.08L10,15C6.69,15 4,15.9 4,17M10,4A4,4 0 0,1 14,8A4,4 0 0,1 10,12A4,4 0 0,1 6,8A4,4 0 0,1 10,4M10,6A2,2 0 0,0 8,8A2,2 0 0,0 10,10A2,2 0 0,0 12,8A2,2 0 0,0 10,6Z"),
+    STYLE_OUTLINE("M2.5 19.6L3.8 20.2V11.2L1.4 17C1 18.1 1.5 19.2 2.5 19.6M15.2 4.8L20.2 16.8L12.9 19.8L7.9 7.9V7.8L15.2 4.8M15.3 2.8C15 2.8 14.8 2.8 14.5 2.9L7.1 6C6.4 6.3 5.9 7 5.9 7.8C5.9 8 5.9 8.3 6 8.6L11 20.5C11.3 21.3 12 21.7 12.8 21.7C13.1 21.7 13.3 21.7 13.6 21.6L21 18.5C22 18.1 22.5 16.9 22.1 15.9L17.1 4C16.8 3.2 16 2.8 15.3 2.8M10.5 9.9C9.9 9.9 9.5 9.5 9.5 8.9S9.9 7.9 10.5 7.9C11.1 7.9 11.5 8.4 11.5 8.9S11.1 9.9 10.5 9.9M5.9 19.8C5.9 20.9 6.8 21.8 7.9 21.8H9.3L5.9 13.5V19.8Z"),
+    DOWNLOAD_OUTLINE("M13,5V11H14.17L12,13.17L9.83,11H11V5H13M15,3H9V9H5L12,16L19,9H15V3M19,18H5V20H19V18Z"),
+    APPLICATION_OUTLINE("M21 2H3C1.9 2 1 2.9 1 4V20C1 21.1 1.9 22 3 22H21C22.1 22 23 21.1 23 20V4C23 2.9 22.1 2 21 2M21 20H3V6H21V20Z"),
+    EARTH("M17.9,17.39C17.64,16.59 16.89,16 16,16H15V13A1,1 0 0,0 14,12H8V10H10A1,1 0 0,0 11,9V7H13A2,2 0 0,0 15,5V4.59C17.93,5.77 20,8.64 20,12C20,14.08 19.2,15.97 17.9,17.39M11,19.93C7.05,19.44 4,16.08 4,12C4,11.38 4.08,10.78 4.21,10.21L9,15V16A2,2 0 0,0 11,18M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z"),
+    BELL("M21,19V20H3V19L5,17V11C5,7.9 7.03,5.17 10,4.29C10,4.19 10,4.1 10,4A2,2 0 0,1 12,2A2,2 0 0,1 14,4C14,4.1 14,4.19 14,4.29C16.97,5.17 19,7.9 19,11V17L21,19M14,21A2,2 0 0,1 12,23A2,2 0 0,1 10,21"),
+    CONTENT_SAVE_MOVE_OUTLINE("M13 17H17V14L22 18.5L17 23V20H13V17M14 12.8C13.5 12.31 12.78 12 12 12C10.34 12 9 13.34 9 15C9 16.31 9.84 17.41 11 17.82C11.07 15.67 12.27 13.8 14 12.8M11.09 19H5V5H16.17L19 7.83V12.35C19.75 12.61 20.42 13 21 13.54V7L17 3H5C3.89 3 3 3.9 3 5V19C3 20.1 3.89 21 5 21H11.81C11.46 20.39 11.21 19.72 11.09 19M6 10H15V6H6V10Z"),
+    ACCOUNT("M12,4A4,4 0 0,1 16,8A4,4 0 0,1 12,12A4,4 0 0,1 8,8A4,4 0 0,1 12,4M12,14C16.42,14 20,15.79 20,18V20H4V18C4,15.79 7.58,14 12,14Z"),
+    SERVER("M13,19H14A1,1 0 0,1 15,20H22V22H15A1,1 0 0,1 14,23H10A1,1 0 0,1 9,22H2V20H9A1,1 0 0,1 10,19H11V17H4A1,1 0 0,1 3,16V12A1,1 0 0,1 4,11H20A1,1 0 0,1 21,12V16A1,1 0 0,1 20,17H13V19M4,3H20A1,1 0 0,1 21,4V8A1,1 0 0,1 20,9H4A1,1 0 0,1 3,8V4A1,1 0 0,1 4,3M9,7H10V5H9V7M9,15H10V13H9V15M5,5V7H7V5H5M5,13V15H7V13H5Z"),
+    MESSAGE_ALERT_OUTLINE("M13,10H11V6H13V10M13,12H11V14H13V12M22,4V16A2,2 0 0,1 20,18H6L2,22V4A2,2 0 0,1 4,2H20A2,2 0 0,1 22,4M20,4H4V17.2L5.2,16H20V4Z"),
+    CHECK_CIRCLE_OUTLINE("M12 2C6.5 2 2 6.5 2 12S6.5 22 12 22 22 17.5 22 12 17.5 2 12 2M12 20C7.59 20 4 16.41 4 12S7.59 4 12 4 20 7.59 20 12 16.41 20 12 20M16.59 7.58L10 14.17L7.41 11.59L6 13L10 17L18 9L16.59 7.58Z"),
+    CLOSE_CIRCLE_OUTLINE("M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,2C6.47,2 2,6.47 2,12C2,17.53 6.47,22 12,22C17.53,22 22,17.53 22,12C22,6.47 17.53,2 12,2M14.59,8L12,10.59L9.41,8L8,9.41L10.59,12L8,14.59L9.41,16L12,13.41L14.59,16L16,14.59L13.41,12L16,9.41L14.59,8Z"),
+    CLOCK_OUTLINE("M12,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,22C6.47,22 2,17.5 2,12A10,10 0 0,1 12,2M12.5,7V12.25L17,14.92L16.25,16.15L11,13V7H12.5Z"),
+    MAGNIFY("M9.5,3A6.5,6.5 0 0,1 16,9.5C16,11.11 15.41,12.59 14.44,13.73L14.71,14H15.5L20.5,19L19,20.5L14,15.5V14.71L13.73,14.44C12.59,15.41 11.11,16 9.5,16A6.5,6.5 0 0,1 3,9.5A6.5,6.5 0 0,1 9.5,3M9.5,5C7,5 5,7 5,9.5C5,12 7,14 9.5,14C12,14 14,12 14,9.5C14,7 12,5 9.5,5Z"),
+    MENU_UP("M7,15L12,10L17,15H7Z"),
+    MENU_DOWN("M7,10L12,15L17,10H7Z"),
+    RESTORE("M13,3A9,9 0 0,0 4,12H1L4.89,15.89L4.96,16.03L9,12H6A7,7 0 0,1 13,5A7,7 0 0,1 20,12A7,7 0 0,1 13,19C11.07,19 9.32,18.21 8.06,16.94L6.64,18.36C8.27,20 10.5,21 13,21A9,9 0 0,0 22,12A9,9 0 0,0 13,3Z"),
+    BUG("M14,12H10V10H14M14,16H10V14H14M20,8H17.19C16.74,7.22 16.12,6.55 15.37,6.04L17,4.41L15.59,3L13.42,5.17C12.96,5.06 12.5,5 12,5C11.5,5 11.04,5.06 10.59,5.17L8.41,3L7,4.41L8.62,6.04C7.88,6.55 7.26,7.22 6.81,8H4V10H6.09C6.04,10.33 6,10.66 6,11V12H4V14H6V15C6,15.34 6.04,15.67 6.09,16H4V18H6.81C7.85,19.79 9.78,21 12,21C14.22,21 16.15,19.79 17.19,18H20V16H17.91C17.96,15.67 18,15.34 18,15V14H20V12H18V11C18,10.66 17.96,10.33 17.91,10H20V8Z"),
+    DISCORD("M22,24L16.75,19L17.38,21H4.5A2.5,2.5 0 0,1 2,18.5V3.5A2.5,2.5 0 0,1 4.5,1H19.5A2.5,2.5 0 0,1 22,3.5V24M12,6.8C9.32,6.8 7.44,7.95 7.44,7.95C8.47,7.03 10.27,6.5 10.27,6.5L10.1,6.33C8.41,6.36 6.88,7.53 6.88,7.53C5.16,11.12 5.27,14.22 5.27,14.22C6.67,16.03 8.75,15.9 8.75,15.9L9.46,15C8.21,14.73 7.42,13.62 7.42,13.62C7.42,13.62 9.3,14.9 12,14.9C14.7,14.9 16.58,13.62 16.58,13.62C16.58,13.62 15.79,14.73 14.54,15L15.25,15.9C15.25,15.9 17.33,16.03 18.73,14.22C18.73,14.22 18.84,11.12 17.12,7.53C17.12,7.53 15.59,6.36 13.9,6.33L13.73,6.5C13.73,6.5 15.53,7.03 16.56,7.95C16.56,7.95 14.68,6.8 12,6.8M9.93,10.59C10.58,10.59 11.11,11.16 11.1,11.86C11.1,12.55 10.58,13.13 9.93,13.13C9.29,13.13 8.77,12.55 8.77,11.86C8.77,11.16 9.28,10.59 9.93,10.59M14.1,10.59C14.75,10.59 15.27,11.16 15.27,11.86C15.27,12.55 14.75,13.13 14.1,13.13C13.46,13.13 12.94,12.55 12.94,11.86C12.94,11.16 13.45,10.59 14.1,10.59Z"),
+    LAN("M10,2C8.89,2 8,2.89 8,4V7C8,8.11 8.89,9 10,9H11V11H2V13H6V15H5C3.89,15 3,15.89 3,17V20C3,21.11 3.89,22 5,22H9C10.11,22 11,21.11 11,20V17C11,15.89 10.11,15 9,15H8V13H16V15H15C13.89,15 13,15.89 13,17V20C13,21.11 13.89,22 15,22H19C20.11,22 21,21.11 21,20V17C21,15.89 20.11,15 19,15H18V13H22V11H13V9H14C15.11,9 16,8.11 16,7V4C16,2.89 15.11,2 14,2H10M10,4H14V7H10V4M5,17H9V20H5V17M15,17H19V20H15V17Z"),
+    THUMB_UP_OUTLINE("M5,9V21H1V9H5M9,21A2,2 0 0,1 7,19V9C7,8.45 7.22,7.95 7.59,7.59L14.17,1L15.23,2.06C15.5,2.33 15.67,2.7 15.67,3.11L15.64,3.43L14.69,8H21C22.11,8 23,8.9 23,10V12C23,12.26 22.95,12.5 22.86,12.73L19.84,19.78C19.54,20.5 18.83,21 18,21H9M9,19H18.03L21,12V10H12.21L13.34,4.68L9,9.03V19Z"),
+    THUMB_DOWN_OUTLINE("M19,15V3H23V15H19M15,3A2,2 0 0,1 17,5V15C17,15.55 16.78,16.05 16.41,16.41L9.83,23L8.77,21.94C8.5,21.67 8.33,21.3 8.33,20.88L8.36,20.57L9.31,16H3C1.89,16 1,15.1 1,14V12C1,11.74 1.05,11.5 1.14,11.27L4.16,4.22C4.46,3.5 5.17,3 6,3H15M15,5H5.97L3,12V14H11.78L10.65,19.32L15,14.97V5Z"),
+    SELECT_ALL("M9,9H15V15H9M7,17H17V7H7M15,5H17V3H15M15,21H17V19H15M19,17H21V15H19M19,9H21V7H19M19,21A2,2 0 0,0 21,19H19M19,13H21V11H19M11,21H13V19H11M9,3H7V5H9M3,17H5V15H3M5,21V19H3A2,2 0 0,0 5,21M19,3V5H21A2,2 0 0,0 19,3M13,3H11V5H13M3,9H5V7H3M7,21H9V19H7M3,13H5V11H3M3,5H5V3A2,2 0 0,0 3,5Z"),
+    JAVA("m 12.400746,23.498132 c 0,0 -1.047682,0.609185 0.745753,0.816159 2.173248,0.247515 3.284943,0.212301 5.680103,-0.241112 0,0 0.629462,0.394742 1.509642,0.737207 -5.369636,2.301245 -12.1518319,-0.133351 -7.934431,-1.312254 z m -0.656135,-3.003246 c 0,0 -1.175708,0.870569 0.619861,1.056206 2.321545,0.238977 4.155521,0.25925 7.32844,-0.35207 0,0 0.43849,0.444887 1.128765,0.688135 -6.492002,1.897965 -13.7233551,0.149351 -9.077066,-1.392271 z m 5.531806,-5.094318 c 1.322937,1.523496 -0.347807,2.894427 -0.347807,2.894427 0,0 3.359626,-1.733668 1.816908,-3.905821 -1.441364,-2.024926 -2.545591,-3.030987 3.43644,-6.5004569 0,0 -9.389665,2.3449859 -4.905541,7.5129179 z m 7.101193,10.318794 c 0,0 0.775626,0.639057 -0.854578,1.133019 C 20.42373,27.79123 10.623314,28.075018 7.9006204,26.88973 6.9222859,26.464048 8.75733,25.873001 9.3345153,25.749244 9.9362392,25.619093 10.280844,25.642568 10.280844,25.642568 9.1926195,24.875486 3.2457961,27.147927 7.2604887,27.798718 18.208875,29.573994 27.21766,26.999632 24.37761,25.718316 Z M 12.904316,17.383886 c 0,0 -4.9855587,1.184229 -1.765696,1.614178 1.359213,0.182426 4.069103,0.140825 6.594422,-0.07042 2.063359,-0.173899 4.135252,-0.544104 4.135252,-0.544104 0,0 -0.727616,0.311527 -1.253592,0.671064 -5.062375,1.331456 -14.8414526,0.711604 -12.02594,-0.649727 2.38129,-1.151156 4.316621,-1.019929 4.316621,-1.019929 z m 8.943706,4.998298 c 5.146658,-2.673583 2.766435,-5.24368 1.106361,-4.898013 -0.407551,0.08428 -0.58892,0.1579 -0.58892,0.1579 0,0 0.151501,-0.236845 0.439557,-0.339265 3.284942,-1.155424 5.812393,3.406524 -1.060485,5.213807 0,0 0.08003,-0.07147 0.103478,-0.134425 z M 18.744451,2.2855 c 0,0 2.849653,2.8506848 -2.703489,7.2344656 -4.453183,3.5164124 -1.015676,5.5221324 -0.0021,7.8127104 C 13.439893,14.987688 11.532301,12.92329 12.811497,11.001852 14.690284,8.1810394 19.893487,6.8143757 18.743384,2.2855 Z M 13.41002,29.628384 c 4.939684,0.315794 12.525242,-0.174974 12.70448,-2.512485 0,0 -0.345672,0.886571 -4.081906,1.589641 -4.216334,0.793754 -9.416337,0.700936 -12.4996379,0.192025 0,0 0.6315969,0.522768 3.8781309,0.730807 z");
+
+    private final String path;
+
+    SVG(String path) {
+        this.path = path;
    }

-    public interface SVGIcon {
-        Node createIcon(ObjectBinding<? extends Paint> fill, double width, double height);
+    public String getPath() {
+        return path;
    }

-    private static Node createSVGPath(String d, ObjectBinding<? extends Paint> fill, double width, double height) {
-        SVGPath path = new SVGPath();
-        path.getStyleClass().add("svg");
-        path.setContent(d);
-        if (fill != null)
-            path.fillProperty().bind(fill);
-
+    private static Node createIcon(SVGPath path, double width, double height) {
        if (width < 0 || height < 0) {
            StackPane pane = new StackPane(path);
            pane.setAlignment(Pos.CENTER);
@@ -54,490 +139,24 @@ public final class SVG {
        return svg;
    }

-    public static final String ARROW_RIGHT = "M4,11V13H16L10.5,18.5L11.92,19.92L19.84,12L11.92,4.08L10.5,5.5L16,11H4Z";
+    public Node createIcon(ObservableValue<? extends Paint> fill, double width, double height) {
+        SVGPath p = new SVGPath();
+        p.getStyleClass().add("svg");
+        p.setContent(path);
+        if (fill != null)
+            p.fillProperty().bind(fill);

-    // default fill: white, width: 24, height 24
-
-    public static Node gear(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M12,15.5A3.5,3.5 0 0,1 8.5,12A3.5,3.5 0 0,1 12,8.5A3.5,3.5 0 0,1 15.5,12A3.5,3.5 0 0,1 12,15.5M19.43,12.97C19.47,12.65 19.5,12.33 19.5,12C19.5,11.67 19.47,11.34 19.43,11L21.54,9.37C21.73,9.22 21.78,8.95 21.66,8.73L19.66,5.27C19.54,5.05 19.27,4.96 19.05,5.05L16.56,6.05C16.04,5.66 15.5,5.32 14.87,5.07L14.5,2.42C14.46,2.18 14.25,2 14,2H10C9.75,2 9.54,2.18 9.5,2.42L9.13,5.07C8.5,5.32 7.96,5.66 7.44,6.05L4.95,5.05C4.73,4.96 4.46,5.05 4.34,5.27L2.34,8.73C2.21,8.95 2.27,9.22 2.46,9.37L4.57,11C4.53,11.34 4.5,11.67 4.5,12C4.5,12.33 4.53,12.65 4.57,12.97L2.46,14.63C2.27,14.78 2.21,15.05 2.34,15.27L4.34,18.73C4.46,18.95 4.73,19.03 4.95,18.95L7.44,17.94C7.96,18.34 8.5,18.68 9.13,18.93L9.5,21.58C9.54,21.82 9.75,22 10,22H14C14.25,22 14.46,21.82 14.5,21.58L14.87,18.93C15.5,18.67 16.04,18.34 16.56,17.94L19.05,18.95C19.27,19.03 19.54,18.95 19.66,18.73L21.66,15.27C21.78,15.05 21.73,14.78 21.54,14.63L19.43,12.97Z",
-                fill, width, height);
-    }
-
-    public static Node gearOutline(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M12,8A4,4 0 0,1 16,12A4,4 0 0,1 12,16A4,4 0 0,1 8,12A4,4 0 0,1 12,8M12,10A2,2 0 0,0 10,12A2,2 0 0,0 12,14A2,2 0 0,0 14,12A2,2 0 0,0 12,10M10,22C9.75,22 9.54,21.82 9.5,21.58L9.13,18.93C8.5,18.68 7.96,18.34 7.44,17.94L4.95,18.95C4.73,19.03 4.46,18.95 4.34,18.73L2.34,15.27C2.21,15.05 2.27,14.78 2.46,14.63L4.57,12.97L4.5,12L4.57,11L2.46,9.37C2.27,9.22 2.21,8.95 2.34,8.73L4.34,5.27C4.46,5.05 4.73,4.96 4.95,5.05L7.44,6.05C7.96,5.66 8.5,5.32 9.13,5.07L9.5,2.42C9.54,2.18 9.75,2 10,2H14C14.25,2 14.46,2.18 14.5,2.42L14.87,5.07C15.5,5.32 16.04,5.66 16.56,6.05L19.05,5.05C19.27,4.96 19.54,5.05 19.66,5.27L21.66,8.73C21.79,8.95 21.73,9.22 21.54,9.37L19.43,11L19.5,12L19.43,13L21.54,14.63C21.73,14.78 21.79,15.05 21.66,15.27L19.66,18.73C19.54,18.95 19.27,19.04 19.05,18.95L16.56,17.95C16.04,18.34 15.5,18.68 14.87,18.93L14.5,21.58C14.46,21.82 14.25,22 14,22H10M11.25,4L10.88,6.61C9.68,6.86 8.62,7.5 7.85,8.39L5.44,7.35L4.69,8.65L6.8,10.2C6.4,11.37 6.4,12.64 6.8,13.8L4.68,15.36L5.43,16.66L7.86,15.62C8.63,16.5 9.68,17.14 10.87,17.38L11.24,20H12.76L13.13,17.39C14.32,17.14 15.37,16.5 16.14,15.62L18.57,16.66L19.32,15.36L17.2,13.81C17.6,12.64 17.6,11.37 17.2,10.2L19.31,8.65L18.56,7.35L16.15,8.39C15.38,7.5 14.32,6.86 13.12,6.62L12.75,4H11.25Z",
-                fill, width, height);
-    }
-
-    public static Node back(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath("M20,11V13H8L13.5,18.5L12.08,19.92L4.16,12L12.08,4.08L13.5,5.5L8,11H20Z", fill, width,
-                height);
-    }
-
-    public static Node cancel(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M12 2C17.5 2 22 6.5 22 12S17.5 22 12 22 2 17.5 2 12 6.5 2 12 2M12 4C10.1 4 8.4 4.6 7.1 5.7L18.3 16.9C19.3 15.5 20 13.8 20 12C20 7.6 16.4 4 12 4M16.9 18.3L5.7 7.1C4.6 8.4 4 10.1 4 12C4 16.4 7.6 20 12 20C13.9 20 15.6 19.4 16.9 18.3Z",
-                fill, width, height);
-    }
-
-    public static Node close(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z",
-                fill, width, height);
-    }
-
-    public static Node copy(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M19,21H8V7H19M19,5H8A2,2 0 0,0 6,7V21A2,2 0 0,0 8,23H19A2,2 0 0,0 21,21V7A2,2 0 0,0 19,5M16,1H4A2,2 0 0,0 2,3V17H4V3H16V1Z",
-                fill, width, height);
-    }
-
-    public static Node dotsVertical(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M12,16A2,2 0 0,1 14,18A2,2 0 0,1 12,20A2,2 0 0,1 10,18A2,2 0 0,1 12,16M12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12A2,2 0 0,1 12,10M12,4A2,2 0 0,1 14,6A2,2 0 0,1 12,8A2,2 0 0,1 10,6A2,2 0 0,1 12,4Z",
-                fill, width, height);
-    }
-
-    public static Node dotsHorizontal(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M16,12A2,2 0 0,1 18,10A2,2 0 0,1 20,12A2,2 0 0,1 18,14A2,2 0 0,1 16,12M10,12A2,2 0 0,1 12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12M4,12A2,2 0 0,1 6,10A2,2 0 0,1 8,12A2,2 0 0,1 6,14A2,2 0 0,1 4,12Z",
-                fill, width, height);
-    }
-
-    public static Node delete(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath("M19,4H15.5L14.5,3H9.5L8.5,4H5V6H19M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19Z", fill,
-                width, height);
-    }
-
-    public static Node deleteOutline(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19M8,9H16V19H8V9M15.5,4L14.5,3H9.5L8.5,4H5V6H19V4H15.5Z",
-                fill, width, height);
-    }
-
-    public static Node accountEdit(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M21.7,13.35L20.7,14.35L18.65,12.3L19.65,11.3C19.86,11.09 20.21,11.09 20.42,11.3L21.7,12.58C21.91,12.79 21.91,13.14 21.7,13.35M12,18.94L18.06,12.88L20.11,14.93L14.06,21H12V18.94M12,14C7.58,14 4,15.79 4,18V20H10V18.11L14,14.11C13.34,14.03 12.67,14 12,14M12,4A4,4 0 0,0 8,8A4,4 0 0,0 12,12A4,4 0 0,0 16,8A4,4 0 0,0 12,4Z",
-                fill, width, height);
-    }
-
-    public static Node expand(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath("M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z", fill, width, height);
-    }
-
-    public static Node collapse(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath("M12 8l-6 6 1.41 1.41L12 10.83l4.59 4.58L18 14z", fill, width, height);
-    }
-
-    public static Node navigate(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M14,3V5H17.59L7.76,14.83L9.17,16.24L19,6.41V10H21V3M19,19H5V5H12V3H5C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V12H19V19Z",
-                fill, width, height);
-    }
-
-    public static Node rocketLaunchOutline(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M13.13 22.19L11.5 18.36C13.07 17.78 14.54 17 15.9 16.09L13.13 22.19M5.64 12.5L1.81 10.87L7.91 8.1C7 9.46 6.22 10.93 5.64 12.5M19.22 4C19.5 4 19.75 4 19.96 4.05C20.13 5.44 19.94 8.3 16.66 11.58C14.96 13.29 12.93 14.6 10.65 15.47L8.5 13.37C9.42 11.06 10.73 9.03 12.42 7.34C15.18 4.58 17.64 4 19.22 4M19.22 2C17.24 2 14.24 2.69 11 5.93C8.81 8.12 7.5 10.53 6.65 12.64C6.37 13.39 6.56 14.21 7.11 14.77L9.24 16.89C9.62 17.27 10.13 17.5 10.66 17.5C10.89 17.5 11.13 17.44 11.36 17.35C13.5 16.53 15.88 15.19 18.07 13C23.73 7.34 21.61 2.39 21.61 2.39S20.7 2 19.22 2M14.54 9.46C13.76 8.68 13.76 7.41 14.54 6.63S16.59 5.85 17.37 6.63C18.14 7.41 18.15 8.68 17.37 9.46C16.59 10.24 15.32 10.24 14.54 9.46M8.88 16.53L7.47 15.12L8.88 16.53M6.24 22L9.88 18.36C9.54 18.27 9.21 18.12 8.91 17.91L4.83 22H6.24M2 22H3.41L8.18 17.24L6.76 15.83L2 20.59V22M2 19.17L6.09 15.09C5.88 14.79 5.73 14.47 5.64 14.12L2 17.76V19.17Z",
-                fill, width, height);
-    }
-
-    public static Node launchOutline(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M14,3V5H17.59L7.76,14.83L9.17,16.24L19,6.41V10H21V3M19,19H5V5H12V3H5C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V12H19V19Z",
-                fill, width, height);
-    }
-
-    public static Node script(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M14,20A2,2 0 0,0 16,18V5H9A1,1 0 0,0 8,6V16H5V5A3,3 0 0,1 8,2H19A3,3 0 0,1 22,5V6H18V18L18,19A3,3 0 0,1 15,22H5A3,3 0 0,1 2,19V18H12A2,2 0 0,0 14,20Z",
-                fill, width, height);
-    }
-
-    public static Node pencil(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M20.71,4.04C21.1,3.65 21.1,3 20.71,2.63L18.37,0.29C18,-0.1 17.35,-0.1 16.96,0.29L15,2.25L18.75,6M17.75,7L14,3.25L4,13.25V17H7.75L17.75,7Z",
-                fill, width, height);
-    }
-
-    public static Node pencilOutline(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M14.06,9L15,9.94L5.92,19H5V18.08L14.06,9M17.66,3C17.41,3 17.15,3.1 16.96,3.29L15.13,5.12L18.88,8.87L20.71,7.04C21.1,6.65 21.1,6 20.71,5.63L18.37,3.29C18.17,3.09 17.92,3 17.66,3M14.06,6.19L3,17.25V21H6.75L17.81,9.94L14.06,6.19Z",
-                fill, width, height);
-    }
-
-    public static Node refresh(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M17.65,6.35C16.2,4.9 14.21,4 12,4A8,8 0 0,0 4,12A8,8 0 0,0 12,20C15.73,20 18.84,17.45 19.73,14H17.65C16.83,16.33 14.61,18 12,18A6,6 0 0,1 6,12A6,6 0 0,1 12,6C13.66,6 15.14,6.69 16.22,7.78L13,11H20V4L17.65,6.35Z",
-                fill, width, height);
-    }
-
-    public static Node folderOpen(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M19,20H4C2.89,20 2,19.1 2,18V6C2,4.89 2.89,4 4,4H10L12,6H19A2,2 0 0,1 21,8H21L4,8V18L6.14,10H23.21L20.93,18.5C20.7,19.37 19.92,20 19,20Z",
-                fill, width, height);
+        return createIcon(p, width, height);
    }

-    public static Node folderOutline(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M20,18H4V8H20M20,6H12L10,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V8C22,6.89 21.1,6 20,6Z",
-                fill, width, height);
-    }
-
-    public static Node update(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M21,10.12H14.22L16.96,7.3C14.23,4.6 9.81,4.5 7.08,7.2C4.35,9.91 4.35,14.28 7.08,17C9.81,19.7 14.23,19.7 16.96,17C18.32,15.65 19,14.08 19,12.1H21C21,14.08 20.12,16.65 18.36,18.39C14.85,21.87 9.15,21.87 5.64,18.39C2.14,14.92 2.11,9.28 5.62,5.81C9.13,2.34 14.76,2.34 18.27,5.81L21,3V10.12M12.5,8V12.25L16,14.33L15.28,15.54L11,13V8H12.5Z",
-                fill, width, height);
-    }
-
-    public static Node closeCircle(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M12,2C17.53,2 22,6.47 22,12C22,17.53 17.53,22 12,22C6.47,22 2,17.53 2,12C2,6.47 6.47,2 12,2M15.59,7L12,10.59L8.41,7L7,8.41L10.59,12L7,15.59L8.41,17L12,13.41L15.59,17L17,15.59L13.41,12L17,8.41L15.59,7Z",
-                fill, width, height);
-    }
-
-    public static Node checkCircle(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M12,2A10,10 0 0,1 22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2M11,16.5L18,9.5L16.59,8.09L11,13.67L7.91,10.59L6.5,12L11,16.5Z",
-                fill, width, height);
-    }
-
-    public static Node infoCircle(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M13,9H11V7H13M13,17H11V11H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z",
-                fill, width, height);
-    }
-
-    public static Node helpCircle(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M15.07,11.25L14.17,12.17C13.45,12.89 13,13.5 13,15H11V14.5C11,13.39 11.45,12.39 12.17,11.67L13.41,10.41C13.78,10.05 14,9.55 14,9C14,7.89 13.1,7 12,7A2,2 0 0,0 10,9H8A4,4 0 0,1 12,5A4,4 0 0,1 16,9C16,9.88 15.64,10.67 15.07,11.25M13,19H11V17H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12C22,6.47 17.5,2 12,2Z",
-                fill, width, height);
-    }
-
-    public static Node helpCircleOutline(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M11,18H13V16H11V18M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,6A4,4 0 0,0 8,10H10A2,2 0 0,1 12,8A2,2 0 0,1 14,10C14,12 11,11.75 11,15H13C13,12.75 16,12.5 16,10A4,4 0 0,0 12,6Z",
-                fill, width, height);
-    }
-
-    public static Node alert(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath("M13,14H11V10H13M13,18H11V16H13M1,21H23L12,2L1,21Z", fill, width, height);
-    }
-
-    public static Node alertOutline(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath("M12,2L1,21H23M12,6L19.53,19H4.47M11,10V14H13V10M11,16V18H13V16", fill, width, height);
-    }
-
-    public static Node plus(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath("M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z", fill, width, height);
-    }
-
-    public static Node plusCircleOutline(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M13,7H11V11H7V13H11V17H13V13H17V11H13V7Z",
-                fill, width, height);
-    }
-
-    public static Node importIcon(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M14,12L10,8V11H2V13H10V16M20,18V6C20,4.89 19.1,4 18,4H6A2,2 0 0,0 4,6V9H6V6H18V18H6V15H4V18A2,2 0 0,0 6,20H18A2,2 0 0,0 20,18Z",
-                fill, width, height);
-    }
-
-    public static Node export(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M23,12L19,8V11H10V13H19V16M1,18V6C1,4.89 1.9,4 3,4H15A2,2 0 0,1 17,6V9H15V6H3V18H15V15H17V18A2,2 0 0,1 15,20H3A2,2 0 0,1 1,18Z",
-                fill, width, height);
-    }
-
-    public static Node openInNew(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M14,3V5H17.59L7.76,14.83L9.17,16.24L19,6.41V10H21V3M19,19H5V5H12V3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V12H19V19Z",
-                fill, width, height);
-    }
-
-    public static Node triangle(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath("M1,21H23L12,2", fill, width, height);
-    }
-
-    public static Node home(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath("M10,20V14H14V20H19V12H22L12,3L2,12H5V20H10Z", fill, width, height);
-    }
-
-    public static Node viewList(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M7,5H21V7H7V5M7,13V11H21V13H7M4,4.5A1.5,1.5 0 0,1 5.5,6A1.5,1.5 0 0,1 4,7.5A1.5,1.5 0 0,1 2.5,6A1.5,1.5 0 0,1 4,4.5M4,10.5A1.5,1.5 0 0,1 5.5,12A1.5,1.5 0 0,1 4,13.5A1.5,1.5 0 0,1 2.5,12A1.5,1.5 0 0,1 4,10.5M7,19V17H21V19H7M4,16.5A1.5,1.5 0 0,1 5.5,18A1.5,1.5 0 0,1 4,19.5A1.5,1.5 0 0,1 2.5,18A1.5,1.5 0 0,1 4,16.5Z",
-                fill, width, height);
-    }
-
-    public static Node check(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath("M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z", fill, width, height);
-    }
-
-    public static Node arrowRight(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(ARROW_RIGHT, fill, width,
-                height);
-    }
-
-    public static Node wrench(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M22.7,19L13.6,9.9C14.5,7.6 14,4.9 12.1,3C10.1,1 7.1,0.6 4.7,1.7L9,6L6,9L1.6,4.7C0.4,7.1 0.9,10.1 2.9,12.1C4.8,14 7.5,14.5 9.8,13.6L18.9,22.7C19.3,23.1 19.9,23.1 20.3,22.7L22.6,20.4C23.1,20 23.1,19.3 22.7,19Z",
-                fill, width, height);
-    }
-
-    public static Node wrenchOutline(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M22.61,19L13.53,9.91C14.46,7.57 14,4.81 12.09,2.91C9.79,0.61 6.21,0.4 3.66,2.26L7.5,6.11L6.08,7.5L2.25,3.69C0.39,6.23 0.6,9.82 2.9,12.11C4.76,13.97 7.47,14.46 9.79,13.59L18.9,22.7C19.29,23.09 19.92,23.09 20.31,22.7L22.61,20.4C23,20 23,19.39 22.61,19M19.61,20.59L10.15,11.13C9.54,11.58 8.86,11.85 8.15,11.95C6.79,12.15 5.36,11.74 4.32,10.7C3.37,9.76 2.93,8.5 3,7.26L6.09,10.35L10.33,6.11L7.24,3C8.5,2.95 9.73,3.39 10.68,4.33C11.76,5.41 12.17,6.9 11.92,8.29C11.8,9 11.5,9.66 11.04,10.25L20.5,19.7L19.61,20.59Z",
-                fill, width, height);
-    }
+    public Node createIcon(Paint fill, double width, double height) {
+        SVGPath p = new SVGPath();
+        p.getStyleClass().add("svg");
+        p.setContent(path);
+        if (fill != null)
+            p.fillProperty().set(fill);

-    public static Node upload(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath("M9,16V10H5L12,3L19,10H15V16H9M5,20V18H19V20H5Z", fill, width, height);
+        return createIcon(p, width, height);
    }

-    public static Node hanger(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M12 4A3.5 3.5 0 0 0 8.5 7.5H10.5A1.5 1.5 0 0 1 12 6A1.5 1.5 0 0 1 13.5 7.5A1.5 1.5 0 0 1 12 9C11.45 9 11 9.45 11 10V11.75L2.4 18.2A1 1 0 0 0 3 20H21A1 1 0 0 0 21.6 18.2L13 11.75V10.85A3.5 3.5 0 0 0 15.5 7.5A3.5 3.5 0 0 0 12 4M12 13.5L18 18H6Z",
-                fill, width, height);
-    }
-
-    public static Node puzzle(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M22,13.5C22,15.26 20.7,16.72 19,16.96V20A2,2 0 0,1 17,22H13.2V21.7A2.7,2.7 0 0,0 10.5,19C9,19 7.8,20.21 7.8,21.7V22H4A2,2 0 0,1 2,20V16.2H2.3C3.79,16.2 5,15 5,13.5C5,12 3.79,10.8 2.3,10.8H2V7A2,2 0 0,1 4,5H7.04C7.28,3.3 8.74,2 10.5,2C12.26,2 13.72,3.3 13.96,5H17A2,2 0 0,1 19,7V10.04C20.7,10.28 22,11.74 22,13.5M17,15H18.5A1.5,1.5 0 0,0 20,13.5A1.5,1.5 0 0,0 18.5,12H17V7H12V5.5A1.5,1.5 0 0,0 10.5,4A1.5,1.5 0 0,0 9,5.5V7H4V9.12C5.76,9.8 7,11.5 7,13.5C7,15.5 5.75,17.2 4,17.88V20H6.12C6.8,18.25 8.5,17 10.5,17C12.5,17 14.2,18.25 14.88,20H17V15Z",
-                fill, width, height);
-    }
-
-    public static Node cube(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M21,16.5C21,16.88 20.79,17.21 20.47,17.38L12.57,21.82C12.41,21.94 12.21,22 12,22C11.79,22 11.59,21.94 11.43,21.82L3.53,17.38C3.21,17.21 3,16.88 3,16.5V7.5C3,7.12 3.21,6.79 3.53,6.62L11.43,2.18C11.59,2.06 11.79,2 12,2C12.21,2 12.41,2.06 12.57,2.18L20.47,6.62C20.79,6.79 21,7.12 21,7.5V16.5M12,4.15L6.04,7.5L12,10.85L17.96,7.5L12,4.15M5,15.91L11,19.29V12.58L5,9.21V15.91M19,15.91V9.21L13,12.58V19.29L19,15.91Z",
-                fill, width, height);
-    }
-
-    public static Node pack(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M21,16.5C21,16.88 20.79,17.21 20.47,17.38L12.57,21.82C12.41,21.94 12.21,22 12,22C11.79,22 11.59,21.94 11.43,21.82L3.53,17.38C3.21,17.21 3,16.88 3,16.5V7.5C3,7.12 3.21,6.79 3.53,6.62L11.43,2.18C11.59,2.06 11.79,2 12,2C12.21,2 12.41,2.06 12.57,2.18L20.47,6.62C20.79,6.79 21,7.12 21,7.5V16.5M12,4.15L10.11,5.22L16,8.61L17.96,7.5L12,4.15M6.04,7.5L12,10.85L13.96,9.75L8.08,6.35L6.04,7.5M5,15.91L11,19.29V12.58L5,9.21V15.91M19,15.91V9.21L13,12.58V19.29L19,15.91Z",
-                fill, width, height);
-    }
-
-    public static Node textureBox(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M20 2H4C2.9 2 2 2.9 2 4V20C2 21.11 2.9 22 4 22H20C21.11 22 22 21.11 22 20V4C22 2.9 21.11 2 20 2M4 6L6 4H10.9L4 10.9V6M4 13.7L13.7 4H18.6L4 18.6V13.7M20 18L18 20H13.1L20 13.1V18M20 10.3L10.3 20H5.4L20 5.4V10.3Z",
-                fill, width, height);
-    }
-
-    public static Node gamepad(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M6,9H8V11H10V13H8V15H6V13H4V11H6V9M18.5,9A1.5,1.5 0 0,1 20,10.5A1.5,1.5 0 0,1 18.5,12A1.5,1.5 0 0,1 17,10.5A1.5,1.5 0 0,1 18.5,9M15.5,12A1.5,1.5 0 0,1 17,13.5A1.5,1.5 0 0,1 15.5,15A1.5,1.5 0 0,1 14,13.5A1.5,1.5 0 0,1 15.5,12M17,5A7,7 0 0,1 24,12A7,7 0 0,1 17,19C15.04,19 13.27,18.2 12,16.9C10.73,18.2 8.96,19 7,19A7,7 0 0,1 0,12A7,7 0 0,1 7,5H17M7,7A5,5 0 0,0 2,12A5,5 0 0,0 7,17C8.64,17 10.09,16.21 11,15H13C13.91,16.21 15.36,17 17,17A5,5 0 0,0 22,12A5,5 0 0,0 17,7H7Z",
-                fill, width, height);
-    }
-
-    public static Node fire(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M17.66 11.2C17.43 10.9 17.15 10.64 16.89 10.38C16.22 9.78 15.46 9.35 14.82 8.72C13.33 7.26 13 4.85 13.95 3C13 3.23 12.17 3.75 11.46 4.32C8.87 6.4 7.85 10.07 9.07 13.22C9.11 13.32 9.15 13.42 9.15 13.55C9.15 13.77 9 13.97 8.8 14.05C8.57 14.15 8.33 14.09 8.14 13.93C8.08 13.88 8.04 13.83 8 13.76C6.87 12.33 6.69 10.28 7.45 8.64C5.78 10 4.87 12.3 5 14.47C5.06 14.97 5.12 15.47 5.29 15.97C5.43 16.57 5.7 17.17 6 17.7C7.08 19.43 8.95 20.67 10.96 20.92C13.1 21.19 15.39 20.8 17.03 19.32C18.86 17.66 19.5 15 18.56 12.72L18.43 12.46C18.22 12 17.66 11.2 17.66 11.2M14.5 17.5C14.22 17.74 13.76 18 13.4 18.1C12.28 18.5 11.16 17.94 10.5 17.28C11.69 17 12.4 16.12 12.61 15.23C12.78 14.43 12.46 13.77 12.33 13C12.21 12.26 12.23 11.63 12.5 10.94C12.69 11.32 12.89 11.7 13.13 12C13.9 13 15.11 13.44 15.37 14.8C15.41 14.94 15.43 15.08 15.43 15.23C15.46 16.05 15.1 16.95 14.5 17.5H14.5Z",
-                fill, width, height);
-    }
-
-    public static Node monitorScreenshot(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M9,6H5V10H7V8H9M19,10H17V12H15V14H19M21,16H3V4H21M21,2H3C1.89,2 1,2.89 1,4V16A2,2 0 0,0 3,18H10V20H8V22H16V20H14V18H21A2,2 0 0,0 23,16V4C23,2.89 22.1,2 21,2",
-                fill, width, height);
-    }
-
-    public static Node texture(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M9.29,21H12.12L21,12.12V9.29M19,21C19.55,21 20.05,20.78 20.41,20.41C20.78,20.05 21,19.55 21,19V17L17,21M5,3A2,2 0 0,0 3,5V7L7,3M11.88,3L3,11.88V14.71L14.71,3M19.5,3.08L3.08,19.5C3.17,19.85 3.35,20.16 3.59,20.41C3.84,20.65 4.15,20.83 4.5,20.92L20.93,4.5C20.74,3.8 20.2,3.26 19.5,3.08Z",
-                fill, width, height);
-    }
-
-    public static Node alphaCircleOutline(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "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",
-                fill, width, height);
-    }
-
-    public static Node betaCircleOutline(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M15,10.5C15,11.3 14.3,12 13.5,12C14.3,12 15,12.7 15,13.5V15A2,2 0 0,1 13,17H9V7H13A2,2 0 0,1 15,9V10.5M13,15V13H11V15H13M13,11V9H11V11H13M12,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,12A8,8 0 0,0 12,20A8,8 0 0,0 20,12A8,8 0 0,0 12,4Z",
-                fill, width, height);
-    }
-
-    public static Node releaseCircleOutline(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "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",
-                fill, width, height);
-    }
-
-    public static Node informationOutline(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M11,9H13V7H11M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M11,17H13V11H11V17Z",
-                fill, width, height);
-    }
-
-    public static Node handHearOutline(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M16 3.23C16.71 2.41 17.61 2 18.7 2C19.61 2 20.37 2.33 21 3C21.63 3.67 21.96 4.43 22 5.3C22 6 21.67 6.81 21 7.76S19.68 9.5 19.03 10.15C18.38 10.79 17.37 11.74 16 13C14.61 11.74 13.59 10.79 12.94 10.15S11.63 8.71 10.97 7.76C10.31 6.81 10 6 10 5.3C10 4.39 10.32 3.63 10.97 3C11.62 2.37 12.4 2.04 13.31 2C14.38 2 15.27 2.41 16 3.23M22 19V20L14 22.5L7 20.56V22H1V11H8.97L15.13 13.3C16.25 13.72 17 14.8 17 16H19C20.66 16 22 17.34 22 19M5 20V13H3V20H5M19.9 18.57C19.74 18.24 19.39 18 19 18H13.65C13.11 18 12.58 17.92 12.07 17.75L9.69 16.96L10.32 15.06L12.7 15.85C13 15.95 15 16 15 16C15 15.63 14.77 15.3 14.43 15.17L8.61 13H7V18.5L13.97 20.41L19.9 18.57Z",
-                fill, width, height);
-    }
-
-    public static Node mojang(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "m 13.965847,0 c -1.010612,0.82802228 -1.197232,2.1950303 -1.265172,3.4179557 0.02123,1.0021189 1.341654,1.2994159 1.953117,0.590289 C 15.091158,2.6579315 14.369242,1.2738804 13.965847,0 Z M 10.913012,2.9296764 C 10.755901,3.6982508 10.628413,4.4668999 10.492533,5.2354744 8.9893533,3.9913178 7.1504705,3.0824837 5.1419856,3.2947971 3.4944341,3.4646478 0.94293227,2.6961479 0.14038761,4.645185 -0.12288102,8.3139606 0.07223999,12.01236 0.03402357,15.689629 c -0.12314178,1.222925 0.86170213,2.420422 2.14407513,2.280295 4.2207899,0.03397 8.4502143,0.04723 12.6710043,-0.0038 1.265389,0.135918 1.957646,-1.010748 2.13599,-2.0893 C 13.269608,16.437357 9.1760813,16.929609 5.7111265,15.129192 2.5986124,13.58355 2.246023,8.3138817 5.5581114,6.7979639 9.3203049,5.1758896 13.859607,8.0382886 14.942405,11.787743 15.613316,12.11046 16.284433,12.424684 16.95959,12.743154 16.624135,10.348258 16.653651,7.800456 15.579346,5.5881508 15.057054,4.7473897 14.097531,6.2714182 13.379911,5.6217388 12.416008,4.865903 11.749527,3.8128948 10.913012,2.9296713 Z",
-                fill, width, height);
-    }
-
-    public static Node microsoft(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M2,3H11V12H2V3M11,22H2V13H11V22M21,3V12H12V3H21M21,22H12V13H21V22Z",
-                fill, width, height);
-    }
-
-    public static Node accountOutline(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M12,4A4,4 0 0,1 16,8A4,4 0 0,1 12,12A4,4 0 0,1 8,8A4,4 0 0,1 12,4M12,6A2,2 0 0,0 10,8A2,2 0 0,0 12,10A2,2 0 0,0 14,8A2,2 0 0,0 12,6M12,13C14.67,13 20,14.33 20,17V20H4V17C4,14.33 9.33,13 12,13M12,14.9C9.03,14.9 5.9,16.36 5.9,17V18.1H18.1V17C18.1,16.36 14.97,14.9 12,14.9Z",
-                fill, width, height);
-    }
-
-    public static Node accountGroupOutline(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M12,5A3.5,3.5 0 0,0 8.5,8.5A3.5,3.5 0 0,0 12,12A3.5,3.5 0 0,0 15.5,8.5A3.5,3.5 0 0,0 12,5M12,7A1.5,1.5 0 0,1 13.5,8.5A1.5,1.5 0 0,1 12,10A1.5,1.5 0 0,1 10.5,8.5A1.5,1.5 0 0,1 12,7M5.5,8A2.5,2.5 0 0,0 3,10.5C3,11.44 3.53,12.25 4.29,12.68C4.65,12.88 5.06,13 5.5,13C5.94,13 6.35,12.88 6.71,12.68C7.08,12.47 7.39,12.17 7.62,11.81C6.89,10.86 6.5,9.7 6.5,8.5C6.5,8.41 6.5,8.31 6.5,8.22C6.2,8.08 5.86,8 5.5,8M18.5,8C18.14,8 17.8,8.08 17.5,8.22C17.5,8.31 17.5,8.41 17.5,8.5C17.5,9.7 17.11,10.86 16.38,11.81C16.5,12 16.63,12.15 16.78,12.3C16.94,12.45 17.1,12.58 17.29,12.68C17.65,12.88 18.06,13 18.5,13C18.94,13 19.35,12.88 19.71,12.68C20.47,12.25 21,11.44 21,10.5A2.5,2.5 0 0,0 18.5,8M12,14C9.66,14 5,15.17 5,17.5V19H19V17.5C19,15.17 14.34,14 12,14M4.71,14.55C2.78,14.78 0,15.76 0,17.5V19H3V17.07C3,16.06 3.69,15.22 4.71,14.55M19.29,14.55C20.31,15.22 21,16.06 21,17.07V19H24V17.5C24,15.76 21.22,14.78 19.29,14.55M12,16C13.53,16 15.24,16.5 16.23,17H7.77C8.76,16.5 10.47,16 12,16Z",
-                fill, width, height);
-    }
-
-    public static Node accountArrowRightOutline(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M19,21V19H15V17H19V15L22,18L19,21M13,18C13,18.71 13.15,19.39 13.42,20H2V17C2,14.79 5.58,13 10,13C11,13 11.96,13.09 12.85,13.26C13.68,13.42 14.44,13.64 15.11,13.92C13.83,14.83 13,16.32 13,18M4,17V18H11C11,16.96 11.23,15.97 11.64,15.08L10,15C6.69,15 4,15.9 4,17M10,4A4,4 0 0,1 14,8A4,4 0 0,1 10,12A4,4 0 0,1 6,8A4,4 0 0,1 10,4M10,6A2,2 0 0,0 8,8A2,2 0 0,0 10,10A2,2 0 0,0 12,8A2,2 0 0,0 10,6Z",
-                fill, width, height);
-    }
-
-    public static Node styleOutline(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M2.5 19.6L3.8 20.2V11.2L1.4 17C1 18.1 1.5 19.2 2.5 19.6M15.2 4.8L20.2 16.8L12.9 19.8L7.9 7.9V7.8L15.2 4.8M15.3 2.8C15 2.8 14.8 2.8 14.5 2.9L7.1 6C6.4 6.3 5.9 7 5.9 7.8C5.9 8 5.9 8.3 6 8.6L11 20.5C11.3 21.3 12 21.7 12.8 21.7C13.1 21.7 13.3 21.7 13.6 21.6L21 18.5C22 18.1 22.5 16.9 22.1 15.9L17.1 4C16.8 3.2 16 2.8 15.3 2.8M10.5 9.9C9.9 9.9 9.5 9.5 9.5 8.9S9.9 7.9 10.5 7.9C11.1 7.9 11.5 8.4 11.5 8.9S11.1 9.9 10.5 9.9M5.9 19.8C5.9 20.9 6.8 21.8 7.9 21.8H9.3L5.9 13.5V19.8Z",
-                fill, width, height);
-    }
-
-    public static Node downloadOutline(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M13,5V11H14.17L12,13.17L9.83,11H11V5H13M15,3H9V9H5L12,16L19,9H15V3M19,18H5V20H19V18Z",
-                fill, width, height);
-    }
-
-    public static Node applicationOutline(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M21 2H3C1.9 2 1 2.9 1 4V20C1 21.1 1.9 22 3 22H21C22.1 22 23 21.1 23 20V4C23 2.9 22.1 2 21 2M21 20H3V6H21V20Z",
-                fill, width, height);
-    }
-
-    public static Node earth(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M17.9,17.39C17.64,16.59 16.89,16 16,16H15V13A1,1 0 0,0 14,12H8V10H10A1,1 0 0,0 11,9V7H13A2,2 0 0,0 15,5V4.59C17.93,5.77 20,8.64 20,12C20,14.08 19.2,15.97 17.9,17.39M11,19.93C7.05,19.44 4,16.08 4,12C4,11.38 4.08,10.78 4.21,10.21L9,15V16A2,2 0 0,0 11,18M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z",
-                fill, width, height);
-    }
-
-    public static Node bell(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M21,19V20H3V19L5,17V11C5,7.9 7.03,5.17 10,4.29C10,4.19 10,4.1 10,4A2,2 0 0,1 12,2A2,2 0 0,1 14,4C14,4.1 14,4.19 14,4.29C16.97,5.17 19,7.9 19,11V17L21,19M14,21A2,2 0 0,1 12,23A2,2 0 0,1 10,21",
-                fill, width, height);
-    }
-
-    public static Node contentSaveMoveOutline(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M13 17H17V14L22 18.5L17 23V20H13V17M14 12.8C13.5 12.31 12.78 12 12 12C10.34 12 9 13.34 9 15C9 16.31 9.84 17.41 11 17.82C11.07 15.67 12.27 13.8 14 12.8M11.09 19H5V5H16.17L19 7.83V12.35C19.75 12.61 20.42 13 21 13.54V7L17 3H5C3.89 3 3 3.9 3 5V19C3 20.1 3.89 21 5 21H11.81C11.46 20.39 11.21 19.72 11.09 19M6 10H15V6H6V10Z",
-                fill, width, height);
-    }
-
-    public static Node account(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M12,4A4,4 0 0,1 16,8A4,4 0 0,1 12,12A4,4 0 0,1 8,8A4,4 0 0,1 12,4M12,14C16.42,14 20,15.79 20,18V20H4V18C4,15.79 7.58,14 12,14Z",
-                fill, width, height);
-    }
-
-    public static Node server(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M13,19H14A1,1 0 0,1 15,20H22V22H15A1,1 0 0,1 14,23H10A1,1 0 0,1 9,22H2V20H9A1,1 0 0,1 10,19H11V17H4A1,1 0 0,1 3,16V12A1,1 0 0,1 4,11H20A1,1 0 0,1 21,12V16A1,1 0 0,1 20,17H13V19M4,3H20A1,1 0 0,1 21,4V8A1,1 0 0,1 20,9H4A1,1 0 0,1 3,8V4A1,1 0 0,1 4,3M9,7H10V5H9V7M9,15H10V13H9V15M5,5V7H7V5H5M5,13V15H7V13H5Z",
-                fill, width, height);
-    }
-
-    public static Node messageAlertOutline(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M13,10H11V6H13V10M13,12H11V14H13V12M22,4V16A2,2 0 0,1 20,18H6L2,22V4A2,2 0 0,1 4,2H20A2,2 0 0,1 22,4M20,4H4V17.2L5.2,16H20V4Z",
-                fill, width, height);
-    }
-
-    public static Node checkCircleOutline(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M12 2C6.5 2 2 6.5 2 12S6.5 22 12 22 22 17.5 22 12 17.5 2 12 2M12 20C7.59 20 4 16.41 4 12S7.59 4 12 4 20 7.59 20 12 16.41 20 12 20M16.59 7.58L10 14.17L7.41 11.59L6 13L10 17L18 9L16.59 7.58Z",
-                fill, width, height);
-    }
-
-    public static Node closeCircleOutline(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,2C6.47,2 2,6.47 2,12C2,17.53 6.47,22 12,22C17.53,22 22,17.53 22,12C22,6.47 17.53,2 12,2M14.59,8L12,10.59L9.41,8L8,9.41L10.59,12L8,14.59L9.41,16L12,13.41L14.59,16L16,14.59L13.41,12L16,9.41L14.59,8Z",
-                fill, width, height);
-    }
-
-    public static Node clockOutline(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M12,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,22C6.47,22 2,17.5 2,12A10,10 0 0,1 12,2M12.5,7V12.25L17,14.92L16.25,16.15L11,13V7H12.5Z",
-                fill, width, height);
-    }
-
-    public static Node magnify(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M9.5,3A6.5,6.5 0 0,1 16,9.5C16,11.11 15.41,12.59 14.44,13.73L14.71,14H15.5L20.5,19L19,20.5L14,15.5V14.71L13.73,14.44C12.59,15.41 11.11,16 9.5,16A6.5,6.5 0 0,1 3,9.5A6.5,6.5 0 0,1 9.5,3M9.5,5C7,5 5,7 5,9.5C5,12 7,14 9.5,14C12,14 14,12 14,9.5C14,7 12,5 9.5,5Z",
-                fill, width, height);
-    }
-
-    public static Node menuUp(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M7,15L12,10L17,15H7Z",
-                fill, width, height);
-    }
-
-    public static Node menuDown(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M7,10L12,15L17,10H7Z",
-                fill, width, height);
-    }
-
-    public static Node restore(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M13,3A9,9 0 0,0 4,12H1L4.89,15.89L4.96,16.03L9,12H6A7,7 0 0,1 13,5A7,7 0 0,1 20,12A7,7 0 0,1 13,19C11.07,19 9.32,18.21 8.06,16.94L6.64,18.36C8.27,20 10.5,21 13,21A9,9 0 0,0 22,12A9,9 0 0,0 13,3Z",
-                fill, width, height);
-    }
-
-    public static Node bug(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M14,12H10V10H14M14,16H10V14H14M20,8H17.19C16.74,7.22 16.12,6.55 15.37,6.04L17,4.41L15.59,3L13.42,5.17C12.96,5.06 12.5,5 12,5C11.5,5 11.04,5.06 10.59,5.17L8.41,3L7,4.41L8.62,6.04C7.88,6.55 7.26,7.22 6.81,8H4V10H6.09C6.04,10.33 6,10.66 6,11V12H4V14H6V15C6,15.34 6.04,15.67 6.09,16H4V18H6.81C7.85,19.79 9.78,21 12,21C14.22,21 16.15,19.79 17.19,18H20V16H17.91C17.96,15.67 18,15.34 18,15V14H20V12H18V11C18,10.66 17.96,10.33 17.91,10H20V8Z",
-                fill, width, height);
-    }
-
-    public static Node discord(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M22,24L16.75,19L17.38,21H4.5A2.5,2.5 0 0,1 2,18.5V3.5A2.5,2.5 0 0,1 4.5,1H19.5A2.5,2.5 0 0,1 22,3.5V24M12,6.8C9.32,6.8 7.44,7.95 7.44,7.95C8.47,7.03 10.27,6.5 10.27,6.5L10.1,6.33C8.41,6.36 6.88,7.53 6.88,7.53C5.16,11.12 5.27,14.22 5.27,14.22C6.67,16.03 8.75,15.9 8.75,15.9L9.46,15C8.21,14.73 7.42,13.62 7.42,13.62C7.42,13.62 9.3,14.9 12,14.9C14.7,14.9 16.58,13.62 16.58,13.62C16.58,13.62 15.79,14.73 14.54,15L15.25,15.9C15.25,15.9 17.33,16.03 18.73,14.22C18.73,14.22 18.84,11.12 17.12,7.53C17.12,7.53 15.59,6.36 13.9,6.33L13.73,6.5C13.73,6.5 15.53,7.03 16.56,7.95C16.56,7.95 14.68,6.8 12,6.8M9.93,10.59C10.58,10.59 11.11,11.16 11.1,11.86C11.1,12.55 10.58,13.13 9.93,13.13C9.29,13.13 8.77,12.55 8.77,11.86C8.77,11.16 9.28,10.59 9.93,10.59M14.1,10.59C14.75,10.59 15.27,11.16 15.27,11.86C15.27,12.55 14.75,13.13 14.1,13.13C13.46,13.13 12.94,12.55 12.94,11.86C12.94,11.16 13.45,10.59 14.1,10.59Z",
-                fill, width, height);
-    }
-
-    public static Node lan(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M10,2C8.89,2 8,2.89 8,4V7C8,8.11 8.89,9 10,9H11V11H2V13H6V15H5C3.89,15 3,15.89 3,17V20C3,21.11 3.89,22 5,22H9C10.11,22 11,21.11 11,20V17C11,15.89 10.11,15 9,15H8V13H16V15H15C13.89,15 13,15.89 13,17V20C13,21.11 13.89,22 15,22H19C20.11,22 21,21.11 21,20V17C21,15.89 20.11,15 19,15H18V13H22V11H13V9H14C15.11,9 16,8.11 16,7V4C16,2.89 15.11,2 14,2H10M10,4H14V7H10V4M5,17H9V20H5V17M15,17H19V20H15V17Z",
-                fill, width, height);
-    }
-
-    public static Node thumbUpOutline(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M5,9V21H1V9H5M9,21A2,2 0 0,1 7,19V9C7,8.45 7.22,7.95 7.59,7.59L14.17,1L15.23,2.06C15.5,2.33 15.67,2.7 15.67,3.11L15.64,3.43L14.69,8H21C22.11,8 23,8.9 23,10V12C23,12.26 22.95,12.5 22.86,12.73L19.84,19.78C19.54,20.5 18.83,21 18,21H9M9,19H18.03L21,12V10H12.21L13.34,4.68L9,9.03V19Z",
-                fill, width, height);
-    }
-
-    public static Node thumbDownOutline(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M19,15V3H23V15H19M15,3A2,2 0 0,1 17,5V15C17,15.55 16.78,16.05 16.41,16.41L9.83,23L8.77,21.94C8.5,21.67 8.33,21.3 8.33,20.88L8.36,20.57L9.31,16H3C1.89,16 1,15.1 1,14V12C1,11.74 1.05,11.5 1.14,11.27L4.16,4.22C4.46,3.5 5.17,3 6,3H15M15,5H5.97L3,12V14H11.78L10.65,19.32L15,14.97V5Z",
-                fill, width, height);
-    }
-
-    public static Node selectAll(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath(
-                "M9,9H15V15H9M7,17H17V7H7M15,5H17V3H15M15,21H17V19H15M19,17H21V15H19M19,9H21V7H19M19,21A2,2 0 0,0 21,19H19M19,13H21V11H19M11,21H13V19H11M9,3H7V5H9M3,17H5V15H3M5,21V19H3A2,2 0 0,0 5,21M19,3V5H21A2,2 0 0,0 19,3M13,3H11V5H13M3,9H5V7H3M7,21H9V19H7M3,13H5V11H3M3,5H5V3A2,2 0 0,0 3,5Z",
-                fill, width, height);
-    }
 }
@@ -85,32 +85,32 @@ public abstract class ToolbarListPageSkin<T extends ListPageBase<? extends Node>
        return stackPane;
    }

-    public static JFXButton createToolbarButton(String text, SVG.SVGIcon creator, Runnable onClick) {
+    public static JFXButton createToolbarButton(String text, SVG svg, Runnable onClick) {
        JFXButton ret = new JFXButton();
        ret.getStyleClass().add("jfx-tool-bar-button");
        ret.textFillProperty().bind(Theme.foregroundFillBinding());
-        ret.setGraphic(wrap(creator.createIcon(Theme.foregroundFillBinding(), -1, -1)));
+        ret.setGraphic(wrap(svg.createIcon(Theme.foregroundFillBinding(), -1, -1)));
        ret.setText(text);
-        ret.setOnMouseClicked(e -> onClick.run());
+        ret.setOnAction(e -> onClick.run());
        return ret;
    }

-    public static JFXButton createToolbarButton2(String text, SVG.SVGIcon creator, Runnable onClick) {
+    public static JFXButton createToolbarButton2(String text, SVG svg, Runnable onClick) {
        JFXButton ret = new JFXButton();
        ret.getStyleClass().add("jfx-tool-bar-button");
-        ret.setGraphic(wrap(creator.createIcon(Theme.blackFillBinding(), -1, -1)));
+        ret.setGraphic(wrap(svg.createIcon(Theme.blackFill(), -1, -1)));
        ret.setText(text);
-        ret.setOnMouseClicked(e -> onClick.run());
+        ret.setOnAction(e -> onClick.run());
        return ret;
    }

-    public static JFXButton createDecoratorButton(String tooltip, SVG.SVGIcon creator, Runnable onClick) {
+    public static JFXButton createDecoratorButton(String tooltip, SVG svg, Runnable onClick) {
        JFXButton ret = new JFXButton();
        ret.getStyleClass().add("jfx-decorator-button");
        ret.textFillProperty().bind(Theme.foregroundFillBinding());
-        ret.setGraphic(wrap(creator.createIcon(Theme.foregroundFillBinding(), -1, -1)));
+        ret.setGraphic(wrap(svg.createIcon(Theme.foregroundFillBinding(), -1, -1)));
        FXUtils.installFastTooltip(ret, tooltip);
-        ret.setOnMouseClicked(e -> onClick.run());
+        ret.setOnAction(e -> onClick.run());
        return ret;
    }

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

 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXDialogLayout;
-import javafx.concurrent.Worker;
 import javafx.scene.control.Label;
-import javafx.scene.web.WebEngine;
-import javafx.scene.web.WebView;
-import org.jackhuang.hmcl.Metadata;
+import javafx.scene.control.ProgressIndicator;
+import javafx.scene.control.ScrollPane;
+import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
+import org.jackhuang.hmcl.ui.construct.JFXHyperlink;
 import org.jackhuang.hmcl.upgrade.RemoteVersion;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Node;

-import java.util.logging.Level;
+import java.io.IOException;
+import java.net.URL;

 import static org.jackhuang.hmcl.Metadata.CHANGELOG_URL;
 import static org.jackhuang.hmcl.ui.FXUtils.onEscPressed;
-import static org.jackhuang.hmcl.util.Logging.LOG;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;

-public class UpgradeDialog extends JFXDialogLayout {
+public final class UpgradeDialog extends JFXDialogLayout {
    public UpgradeDialog(RemoteVersion remoteVersion, Runnable updateRunnable) {
-        {
-            setHeading(new Label(i18n("update.changelog")));
-        }
+        maxWidthProperty().bind(Controllers.getScene().widthProperty().multiply(0.7));
+        maxHeightProperty().bind(Controllers.getScene().heightProperty().multiply(0.7));

-        {
-            String url = CHANGELOG_URL + remoteVersion.getChannel().channelName + ".html#nowchange";
-            try {
-                WebView webView = new WebView();
-                webView.getEngine().setUserDataDirectory(Metadata.HMCL_DIRECTORY.toFile());
-                WebEngine engine = webView.getEngine();
-                engine.load(url);
-                engine.getLoadWorker().stateProperty().addListener((observable, oldValue, newValue) -> {
-                    if (newValue == Worker.State.FAILED) {
-                        LOG.warning("Failed to load update log, trying to open it in browser");
-                        FXUtils.openLink(url);
-                        setBody();
-                    }
-                });
-                setBody(webView);
-            } catch (NoClassDefFoundError | UnsatisfiedLinkError e) {
-                LOG.log(Level.WARNING, "WebView is missing or initialization failed", e);
+        setHeading(new Label(i18n("update.changelog")));
+        setBody(new ProgressIndicator());
+
+        String url = CHANGELOG_URL + remoteVersion.getChannel().channelName + ".html";
+        Task.supplyAsync(Schedulers.io(), () -> {
+            Document document = Jsoup.parse(new URL(url), 30 * 1000);
+            Node node = document.selectFirst("#nowchange");
+            if (node == null)
+                throw new IOException("Cannot find #nowchange in document");
+
+            HTMLRenderer renderer = new HTMLRenderer(uri -> {
+                LOG.info("Open link: " + uri);
+                FXUtils.openLink(uri.toString());
+            });
+
+            do {
+                renderer.appendNode(node);
+                node = node.nextSibling();
+            } while (node != null);
+
+            return renderer.render();
+        }).whenComplete(Schedulers.javafx(), (result, exception) -> {
+            if (exception == null) {
+                ScrollPane scrollPane = new ScrollPane(result);
+                scrollPane.setFitToWidth(true);
+                setBody(scrollPane);
+            } else {
+                LOG.warning("Failed to load update log, trying to open it in browser");
                FXUtils.openLink(url);
+                setBody();
            }
-        }
+        }).start();

-        {
-            JFXButton updateButton = new JFXButton(i18n("update.accept"));
-            updateButton.getStyleClass().add("dialog-accept");
-            updateButton.setOnMouseClicked(e -> updateRunnable.run());
+        JFXHyperlink openInBrowser = new JFXHyperlink(i18n("web.view_in_browser"));
+        openInBrowser.setExternalLink(url);

-            JFXButton cancelButton = new JFXButton(i18n("button.cancel"));
-            cancelButton.getStyleClass().add("dialog-cancel");
-            cancelButton.setOnMouseClicked(e -> fireEvent(new DialogCloseEvent()));
+        JFXButton updateButton = new JFXButton(i18n("update.accept"));
+        updateButton.getStyleClass().add("dialog-accept");
+        updateButton.setOnAction(e -> updateRunnable.run());

-            setActions(updateButton, cancelButton);
-            onEscPressed(this, cancelButton::fire);
-        }
+        JFXButton cancelButton = new JFXButton(i18n("button.cancel"));
+        cancelButton.getStyleClass().add("dialog-cancel");
+        cancelButton.setOnAction(e -> fireEvent(new DialogCloseEvent()));
+
+        setActions(openInBrowser, updateButton, cancelButton);
+        onEscPressed(this, cancelButton::fire);
    }
 }
@@ -0,0 +1,75 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2024 huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui;
+
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.layout.Background;
+import javafx.scene.layout.BackgroundFill;
+import javafx.scene.paint.Color;
+import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.ui.construct.SpinnerPane;
+import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
+
+/**
+ * @author Glavo
+ */
+public final class WebPage extends SpinnerPane implements DecoratorPage {
+
+    private final ObjectProperty<DecoratorPage.State> stateProperty;
+
+    public WebPage(String title, String content) {
+        this.stateProperty = new SimpleObjectProperty<>(DecoratorPage.State.fromTitle(title));
+        this.setBackground(new Background(new BackgroundFill(Color.WHITE, null, null)));
+
+        Task.supplyAsync(() -> {
+            Document document = Jsoup.parseBodyFragment(content);
+            HTMLRenderer renderer = new HTMLRenderer(uri -> {
+                Controllers.confirm(i18n("web.open_in_browser", uri), i18n("message.confirm"), () -> {
+                    FXUtils.openLink(uri.toString());
+                }, null);
+            });
+            renderer.appendNode(document);
+            return renderer.render();
+        }).whenComplete(Schedulers.javafx(), ((result, exception) -> {
+            if (exception == null) {
+                ScrollPane scrollPane = new ScrollPane();
+                scrollPane.setFitToWidth(true);
+                scrollPane.setContent(result);
+                setContent(scrollPane);
+                setFailedReason(null);
+            } else {
+                LOG.warning("Failed to load content", exception);
+                setFailedReason(i18n("web.failed"));
+            }
+        })).start();
+    }
+
+    @Override
+    public ReadOnlyObjectProperty<DecoratorPage.State> stateProperty() {
+        return stateProperty;
+    }
+}
@@ -1,73 +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.JFXProgressBar;
-import javafx.beans.binding.Bindings;
-import javafx.scene.Scene;
-import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.StackPane;
-import javafx.scene.web.WebEngine;
-import javafx.scene.web.WebView;
-import javafx.stage.Stage;
-import org.jackhuang.hmcl.Metadata;
-import org.jackhuang.hmcl.setting.Theme;
-
-import static org.jackhuang.hmcl.setting.ConfigHolder.config;
-import static org.jackhuang.hmcl.ui.FXUtils.newImage;
-
-public class WebStage extends Stage {
-    protected final StackPane pane = new StackPane();
-    protected final JFXProgressBar progressBar = new JFXProgressBar();
-    protected final WebView webView = new WebView();
-    protected final WebEngine webEngine = webView.getEngine();
-
-    public WebStage() {
-        this(800, 480);
-    }
-
-    public WebStage(int width, int height) {
-        setScene(new Scene(pane, width, height));
-        getScene().getStylesheets().addAll(Theme.getTheme().getStylesheets(config().getLauncherFontFamily()));
-        getIcons().add(newImage("/assets/img/icon.png"));
-        webView.getEngine().setUserDataDirectory(Metadata.HMCL_DIRECTORY.toFile());
-        webView.setContextMenuEnabled(false);
-        progressBar.progressProperty().bind(webView.getEngine().getLoadWorker().progressProperty());
-
-        progressBar.visibleProperty().bind(Bindings.createBooleanBinding(() -> {
-            switch (webView.getEngine().getLoadWorker().getState()) {
-                case SUCCEEDED:
-                case FAILED:
-                case CANCELLED:
-                    return false;
-                default:
-                    return true;
-            }
-        }, webEngine.getLoadWorker().stateProperty()));
-
-        BorderPane borderPane = new BorderPane();
-        borderPane.setPickOnBounds(false);
-        borderPane.setTop(progressBar);
-        progressBar.prefWidthProperty().bind(borderPane.widthProperty());
-        pane.getChildren().setAll(webView, borderPane);
-    }
-
-    public WebView getWebView() {
-        return webView;
-    }
-}
@@ -27,7 +27,6 @@ import javafx.scene.control.Tooltip;
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
-import org.jackhuang.hmcl.auth.yggdrasil.TextureModel;
 import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
 import org.jackhuang.hmcl.game.TexturesLoader;
 import org.jackhuang.hmcl.setting.Accounts;
@@ -58,7 +57,7 @@ public class AccountAdvancedListItem extends AdvancedListItem {
                tooltip.setText(i18n("account.create"));

                TexturesLoader.unbindAvatar(canvas);
-                TexturesLoader.drawAvatar(canvas, TexturesLoader.getDefaultSkin(TextureModel.STEVE).getImage());
+                TexturesLoader.drawAvatar(canvas, TexturesLoader.getDefaultSkinImage());

            } else {
                titleProperty().bind(BindingMapping.of(account, Account::getCharacter));
@@ -32,17 +32,14 @@ import org.jackhuang.hmcl.auth.AuthenticationException;
 import org.jackhuang.hmcl.auth.CredentialExpiredException;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
-import org.jackhuang.hmcl.auth.microsoft.MicrosoftAccount;
 import org.jackhuang.hmcl.auth.offline.OfflineAccount;
 import org.jackhuang.hmcl.auth.yggdrasil.CompleteGameProfile;
 import org.jackhuang.hmcl.auth.yggdrasil.TextureType;
-import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
 import org.jackhuang.hmcl.setting.Accounts;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.DialogController;
-import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
 import org.jackhuang.hmcl.util.skin.InvalidSkinException;
 import org.jackhuang.hmcl.util.skin.NormalizedSkin;
@@ -54,11 +51,10 @@ import java.io.IOException;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.CancellationException;
-import java.util.logging.Level;

 import static java.util.Collections.emptySet;
 import static javafx.beans.binding.Bindings.createBooleanBinding;
-import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 public class AccountListItem extends RadioButton {
@@ -109,31 +105,27 @@ public class AccountListItem extends RadioButton {
                } catch (CancellationException e1) {
                    // ignore cancellation
                } catch (Exception e1) {
-                    LOG.log(Level.WARNING, "Failed to refresh " + account + " with password", e1);
+                    LOG.warning("Failed to refresh " + account + " with password", e1);
                    throw e1;
                }
            } catch (AuthenticationException e) {
-                LOG.log(Level.WARNING, "Failed to refresh " + account + " with token", e);
+                LOG.warning("Failed to refresh " + account + " with token", e);
                throw e;
            }
        });
    }

    public ObservableBooleanValue canUploadSkin() {
-        if (account instanceof YggdrasilAccount) {
-            if (account instanceof AuthlibInjectorAccount) {
-                AuthlibInjectorAccount aiAccount = (AuthlibInjectorAccount) account;
-                ObjectBinding<Optional<CompleteGameProfile>> profile = aiAccount.getYggdrasilService().getProfileRepository().binding(aiAccount.getUUID());
-                return createBooleanBinding(() -> {
-                    Set<TextureType> uploadableTextures = profile.get()
-                            .map(AuthlibInjectorAccount::getUploadableTextures)
-                            .orElse(emptySet());
-                    return uploadableTextures.contains(TextureType.SKIN);
-                }, profile);
-            } else {
-                return createBooleanBinding(() -> true);
-            }
-        } else if (account instanceof OfflineAccount || account instanceof MicrosoftAccount) {
+        if (account instanceof AuthlibInjectorAccount) {
+            AuthlibInjectorAccount aiAccount = (AuthlibInjectorAccount) account;
+            ObjectBinding<Optional<CompleteGameProfile>> profile = aiAccount.getYggdrasilService().getProfileRepository().binding(aiAccount.getUUID());
+            return createBooleanBinding(() -> {
+                Set<TextureType> uploadableTextures = profile.get()
+                        .map(AuthlibInjectorAccount::getUploadableTextures)
+                        .orElse(emptySet());
+                return uploadableTextures.contains(TextureType.SKIN);
+            }, profile);
+        } else if (account instanceof OfflineAccount || account.canUploadSkin()) {
            return createBooleanBinding(() -> true);
        } else {
            return createBooleanBinding(() -> false);
@@ -149,11 +141,7 @@ public class AccountListItem extends RadioButton {
            Controllers.dialog(new OfflineAccountSkinPane((OfflineAccount) account));
            return null;
        }
-        if (account instanceof MicrosoftAccount) {
-            FXUtils.openLink("https://www.minecraft.net/msaprofile/mygames/editskin");
-            return null;
-        }
-        if (!(account instanceof YggdrasilAccount)) {
+        if (!account.canUploadSkin()) {
            return null;
        }

@@ -179,7 +167,7 @@ public class AccountListItem extends RadioButton {
                    NormalizedSkin skin = new NormalizedSkin(skinImg);
                    String model = skin.isSlim() ? "slim" : "";
                    LOG.info("Uploading skin [" + selectedFile + "], model [" + model + "]");
-                    ((YggdrasilAccount) account).uploadSkin(model, selectedFile.toPath());
+                    account.uploadSkin(skin.isSlim(), selectedFile.toPath());
                })
                .thenComposeAsync(refreshAsync())
                .whenComplete(Schedulers.javafx(), e -> {
@@ -42,10 +42,9 @@ import org.jackhuang.hmcl.ui.SVG;
 import org.jackhuang.hmcl.ui.construct.SpinnerPane;
 import org.jackhuang.hmcl.util.javafx.BindingMapping;

-import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

-public class AccountListItemSkin extends SkinBase<AccountListItem> {
+public final class AccountListItemSkin extends SkinBase<AccountListItem> {

    public AccountListItemSkin(AccountListItem skinnable) {
        super(skinnable);
@@ -94,7 +93,7 @@ public class AccountListItemSkin extends SkinBase<AccountListItem> {
        JFXButton btnMove = new JFXButton();
        SpinnerPane spinnerMove = new SpinnerPane();
        spinnerMove.getStyleClass().add("small-spinner-pane");
-        btnMove.setOnMouseClicked(e -> {
+        btnMove.setOnAction(e -> {
            Account account = skinnable.getAccount();
            Accounts.getAccounts().remove(account);
            if (account.isPortable()) {
@@ -117,11 +116,11 @@ public class AccountListItemSkin extends SkinBase<AccountListItem> {
        });
        btnMove.getStyleClass().add("toggle-icon4");
        if (skinnable.getAccount().isPortable()) {
-            btnMove.setGraphic(SVG.earth(Theme.blackFillBinding(), -1, -1));
-            runInFX(() -> FXUtils.installFastTooltip(btnMove, i18n("account.move_to_global")));
+            btnMove.setGraphic(SVG.EARTH.createIcon(Theme.blackFill(), -1, -1));
+            FXUtils.installFastTooltip(btnMove, i18n("account.move_to_global"));
        } else {
-            btnMove.setGraphic(SVG.export(Theme.blackFillBinding(), -1, -1));
-            runInFX(() -> FXUtils.installFastTooltip(btnMove, i18n("account.move_to_portable")));
+            btnMove.setGraphic(SVG.EXPORT.createIcon(Theme.blackFill(), -1, -1));
+            FXUtils.installFastTooltip(btnMove, i18n("account.move_to_portable"));
        }
        spinnerMove.setContent(btnMove);
        right.getChildren().add(spinnerMove);
@@ -129,7 +128,7 @@ public class AccountListItemSkin extends SkinBase<AccountListItem> {
        JFXButton btnRefresh = new JFXButton();
        SpinnerPane spinnerRefresh = new SpinnerPane();
        spinnerRefresh.getStyleClass().setAll("small-spinner-pane");
-        btnRefresh.setOnMouseClicked(e -> {
+        btnRefresh.setOnAction(e -> {
            spinnerRefresh.showSpinner();
            skinnable.refreshAsync()
                    .whenComplete(Schedulers.javafx(), ex -> {
@@ -142,14 +141,14 @@ public class AccountListItemSkin extends SkinBase<AccountListItem> {
                    .start();
        });
        btnRefresh.getStyleClass().add("toggle-icon4");
-        btnRefresh.setGraphic(SVG.refresh(Theme.blackFillBinding(), -1, -1));
-        runInFX(() -> FXUtils.installFastTooltip(btnRefresh, i18n("button.refresh")));
+        btnRefresh.setGraphic(SVG.REFRESH.createIcon(Theme.blackFill(), -1, -1));
+        FXUtils.installFastTooltip(btnRefresh, i18n("button.refresh"));
        spinnerRefresh.setContent(btnRefresh);
        right.getChildren().add(spinnerRefresh);

        JFXButton btnUpload = new JFXButton();
        SpinnerPane spinnerUpload = new SpinnerPane();
-        btnUpload.setOnMouseClicked(e -> {
+        btnUpload.setOnAction(e -> {
            Task<?> uploadTask = skinnable.uploadSkin();
            if (uploadTask != null) {
                spinnerUpload.showSpinner();
@@ -159,20 +158,30 @@ public class AccountListItemSkin extends SkinBase<AccountListItem> {
            }
        });
        btnUpload.getStyleClass().add("toggle-icon4");
-        btnUpload.setGraphic(SVG.hanger(Theme.blackFillBinding(), -1, -1));
-        runInFX(() -> FXUtils.installFastTooltip(btnUpload, i18n("account.skin.upload")));
+        btnUpload.setGraphic(SVG.HANGER.createIcon(Theme.blackFill(), -1, -1));
+        FXUtils.installFastTooltip(btnUpload, i18n("account.skin.upload"));
        spinnerUpload.managedProperty().bind(spinnerUpload.visibleProperty());
        spinnerUpload.visibleProperty().bind(skinnable.canUploadSkin());
        spinnerUpload.setContent(btnUpload);
        spinnerUpload.getStyleClass().add("small-spinner-pane");
        right.getChildren().add(spinnerUpload);

+        JFXButton btnCopyUUID = new JFXButton();
+        SpinnerPane spinnerCopyUUID = new SpinnerPane();
+        spinnerCopyUUID.getStyleClass().add("small-spinner-pane");
+        btnUpload.getStyleClass().add("toggle-icon4");
+        btnCopyUUID.setOnAction(e -> FXUtils.copyText(skinnable.getAccount().getUUID().toString()));
+        btnCopyUUID.setGraphic(SVG.COPY.createIcon(Theme.blackFill(), -1, -1));
+        FXUtils.installFastTooltip(btnCopyUUID, i18n("account.copy_uuid"));
+        spinnerCopyUUID.setContent(btnCopyUUID);
+        right.getChildren().add(spinnerCopyUUID);
+
        JFXButton btnRemove = new JFXButton();
-        btnRemove.setOnMouseClicked(e -> skinnable.remove());
+        btnRemove.setOnAction(e -> Controllers.confirm(i18n("button.remove.confirm"), i18n("button.remove"), skinnable::remove, null));
        btnRemove.getStyleClass().add("toggle-icon4");
        BorderPane.setAlignment(btnRemove, Pos.CENTER);
-        btnRemove.setGraphic(SVG.delete(Theme.blackFillBinding(), -1, -1));
-        runInFX(() -> FXUtils.installFastTooltip(btnRemove, i18n("button.delete")));
+        btnRemove.setGraphic(SVG.DELETE_OUTLINE.createIcon(Theme.blackFill(), -1, -1));
+        FXUtils.installFastTooltip(btnRemove, i18n("button.delete"));
        right.getChildren().add(btnRemove);
        root.setRight(right);

@@ -44,10 +44,10 @@ import org.jackhuang.hmcl.util.javafx.BindingMapping;
 import org.jackhuang.hmcl.util.javafx.MappedObservableList;

 import java.net.URI;
-import java.util.logging.Level;
+import java.util.Locale;

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

@@ -96,30 +96,22 @@ public class AccountListPage extends DecoratorAnimatedPage implements DecoratorP
                VBox boxMethods = new VBox();
                {
                    boxMethods.getStyleClass().add("advanced-list-box-content");
-                    boxMethods.getChildren().add(new ClassTitle(i18n("account.create")));
+                    boxMethods.getChildren().add(new ClassTitle(i18n("account.create").toUpperCase(Locale.ROOT)));
                    FXUtils.setLimitWidth(boxMethods, 200);

                    AdvancedListItem offlineItem = new AdvancedListItem();
                    offlineItem.getStyleClass().add("navigation-drawer-item");
                    offlineItem.setActionButtonVisible(false);
                    offlineItem.setTitle(i18n("account.methods.offline"));
-                    offlineItem.setLeftGraphic(wrap(SVG::account));
+                    offlineItem.setLeftGraphic(wrap(SVG.ACCOUNT));
                    offlineItem.setOnAction(e -> Controllers.dialog(new CreateAccountPane(Accounts.FACTORY_OFFLINE)));
                    boxMethods.getChildren().add(offlineItem);

-                    AdvancedListItem mojangItem = new AdvancedListItem();
-                    mojangItem.getStyleClass().add("navigation-drawer-item");
-                    mojangItem.setActionButtonVisible(false);
-                    mojangItem.setTitle(i18n("account.methods.yggdrasil"));
-                    mojangItem.setLeftGraphic(wrap(SVG::mojang));
-                    mojangItem.setOnAction(e -> Controllers.dialog(new CreateAccountPane(Accounts.FACTORY_MOJANG)));
-                    boxMethods.getChildren().add(mojangItem);
-
                    AdvancedListItem microsoftItem = new AdvancedListItem();
                    microsoftItem.getStyleClass().add("navigation-drawer-item");
                    microsoftItem.setActionButtonVisible(false);
                    microsoftItem.setTitle(i18n("account.methods.microsoft"));
-                    microsoftItem.setLeftGraphic(wrap(SVG::microsoft));
+                    microsoftItem.setLeftGraphic(wrap(SVG.MICROSOFT));
                    microsoftItem.setOnAction(e -> Controllers.dialog(new CreateAccountPane(Accounts.FACTORY_MICROSOFT)));
                    boxMethods.getChildren().add(microsoftItem);

@@ -127,16 +119,18 @@ public class AccountListPage extends DecoratorAnimatedPage implements DecoratorP
                    authServerItems = MappedObservableList.create(skinnable.authServersProperty(), server -> {
                        AdvancedListItem item = new AdvancedListItem();
                        item.getStyleClass().add("navigation-drawer-item");
-                        item.setLeftGraphic(wrap(SVG::server));
+                        item.setLeftGraphic(wrap(SVG.SERVER));
                        item.setOnAction(e -> Controllers.dialog(new CreateAccountPane(server)));

                        JFXButton btnRemove = new JFXButton();
                        btnRemove.setOnAction(e -> {
-                            skinnable.authServersProperty().remove(server);
+                            Controllers.confirm(i18n("button.remove.confirm"), i18n("button.remove"), () -> {
+                                skinnable.authServersProperty().remove(server);
+                            }, null);
                            e.consume();
                        });
                        btnRemove.getStyleClass().add("toggle-icon4");
-                        btnRemove.setGraphic(SVG.close(Theme.blackFillBinding(), 14, 14));
+                        btnRemove.setGraphic(SVG.CLOSE.createIcon(Theme.blackFill(), 14, 14));
                        item.setRightGraphic(btnRemove);

                        ObservableValue<String> title = BindingMapping.of(server, AuthlibInjectorServer::getName);
@@ -145,7 +139,7 @@ public class AccountListPage extends DecoratorAnimatedPage implements DecoratorP
                        try {
                            host = URI.create(server.getUrl()).getHost();
                        } catch (IllegalArgumentException e) {
-                            LOG.log(Level.WARNING, "Unparsable authlib-injector server url " + server.getUrl(), e);
+                            LOG.warning("Unparsable authlib-injector server url " + server.getUrl(), e);
                        }
                        item.subtitleProperty().set(host);
                        Tooltip tooltip = new Tooltip();
@@ -164,7 +158,7 @@ public class AccountListPage extends DecoratorAnimatedPage implements DecoratorP
                    addAuthServerItem.setTitle(i18n("account.injector.add"));
                    addAuthServerItem.setSubtitle(i18n("account.methods.authlib_injector"));
                    addAuthServerItem.setActionButtonVisible(false);
-                    addAuthServerItem.setLeftGraphic(wrap(SVG::plusCircleOutline));
+                    addAuthServerItem.setLeftGraphic(wrap(SVG.PLUS_CIRCLE_OUTLINE));
                    addAuthServerItem.setOnAction(e -> Controllers.dialog(new AddAuthlibInjectorServerPane()));
                    VBox.setMargin(addAuthServerItem, new Insets(0, 0, 12, 0));
                }
@@ -33,12 +33,12 @@ import org.jackhuang.hmcl.ui.construct.SpinnerPane;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.io.NetworkUtils;

+import javax.net.ssl.SSLException;
 import java.io.IOException;
-import java.util.logging.Level;

 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 import static org.jackhuang.hmcl.ui.FXUtils.onEscPressed;
-import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 public final class AddAuthlibInjectorServerPane extends TransitionPane implements DialogAware {
@@ -147,7 +147,7 @@ public final class AddAuthlibInjectorServerPane extends TransitionPane implement
            confirmServerPane.setActions(prevButton, cancelButton, finishButton);
        }

-        this.setContent(addServerPane, ContainerAnimations.NONE.getAnimationProducer());
+        this.setContent(addServerPane, ContainerAnimations.NONE);

        lblCreationWarning.maxWidthProperty().bind(((FlowPane) lblCreationWarning.getParent()).widthProperty());
        btnAddNext.disableProperty().bind(txtServerUrl.textProperty().isEmpty());
@@ -162,7 +162,9 @@ public final class AddAuthlibInjectorServerPane extends TransitionPane implement
    }

    private String resolveFetchExceptionMessage(Throwable exception) {
-        if (exception instanceof IOException) {
+        if (exception instanceof SSLException) {
+            return i18n("account.failed.ssl");
+        } else if (exception instanceof IOException) {
            return i18n("account.failed.connect_injector_server");
        } else {
            return exception.getClass().getName() + ": " + exception.getLocalizedMessage();
@@ -196,9 +198,9 @@ public final class AddAuthlibInjectorServerPane extends TransitionPane implement

                lblServerWarning.setVisible("http".equals(NetworkUtils.toURL(serverBeingAdded.getUrl()).getProtocol()));

-                this.setContent(confirmServerPane, ContainerAnimations.SWIPE_LEFT.getAnimationProducer());
+                this.setContent(confirmServerPane, ContainerAnimations.SWIPE_LEFT);
            } else {
-                LOG.log(Level.WARNING, "Failed to resolve auth server: " + url, exception);
+                LOG.warning("Failed to resolve auth server: " + url, exception);
                lblCreationWarning.setText(resolveFetchExceptionMessage(exception));
            }
        }).start();
@@ -206,7 +208,7 @@ public final class AddAuthlibInjectorServerPane extends TransitionPane implement
    }

    private void onAddPrev() {
-        this.setContent(addServerPane, ContainerAnimations.SWIPE_RIGHT.getAnimationProducer());
+        this.setContent(addServerPane, ContainerAnimations.SWIPE_RIGHT);
    }

    private void onAddFinish() {
@@ -24,27 +24,21 @@ import com.jfoenix.controls.JFXProgressBar;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.control.Label;
-import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import org.jackhuang.hmcl.auth.AuthInfo;
 import org.jackhuang.hmcl.auth.ClassicAccount;
 import org.jackhuang.hmcl.auth.NoSelectedCharacterException;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
-import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
-import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilService;
 import org.jackhuang.hmcl.setting.Accounts;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
-import org.jackhuang.hmcl.ui.construct.JFXHyperlink;
 import org.jackhuang.hmcl.ui.construct.RequiredValidator;

 import java.util.function.Consumer;
-import java.util.logging.Level;

 import static org.jackhuang.hmcl.ui.FXUtils.onEscPressed;
-import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 public class ClassicAccountLoginDialog extends StackPane {
@@ -84,20 +78,6 @@ public class ClassicAccountLoginDialog extends StackPane {
            txtPassword.setPromptText(i18n("account.password"));

            body.getChildren().setAll(usernameLabel, txtPassword);
-
-            if (oldAccount instanceof YggdrasilAccount && !(oldAccount instanceof AuthlibInjectorAccount)) {
-                HBox linkPane = new HBox(8);
-                body.getChildren().add(linkPane);
-
-                JFXHyperlink migrationLink = new JFXHyperlink(i18n("account.methods.yggdrasil.migration"));
-                migrationLink.setExternalLink(YggdrasilService.PROFILE_URL);
-
-                JFXHyperlink migrationHowLink = new JFXHyperlink(i18n("account.methods.yggdrasil.migration.how"));
-                migrationHowLink.setExternalLink(YggdrasilService.MIGRATION_FAQ_URL);
-
-                linkPane.getChildren().setAll(migrationLink, migrationHowLink);
-            }
-
            dialogLayout.setBody(body);
        }

@@ -128,7 +108,7 @@ public class ClassicAccountLoginDialog extends StackPane {
                    fireEvent(new DialogCloseEvent());
                    progressBar.setVisible(false);
                }, e -> {
-                    LOG.log(Level.INFO, "Failed to login with password: " + oldAccount, e);
+                    LOG.info("Failed to login with password: " + oldAccount, e);
                    if (e instanceof NoSelectedCharacterException) {
                        fireEvent(new DialogCloseEvent());
                    } else {
@@ -44,7 +44,6 @@ import org.jackhuang.hmcl.auth.authlibinjector.BoundAuthlibInjectorAccountFactor
 import org.jackhuang.hmcl.auth.microsoft.MicrosoftAccountFactory;
 import org.jackhuang.hmcl.auth.offline.OfflineAccountFactory;
 import org.jackhuang.hmcl.auth.yggdrasil.GameProfile;
-import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccountFactory;
 import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilService;
 import org.jackhuang.hmcl.game.OAuthServer;
 import org.jackhuang.hmcl.game.TexturesLoader;
@@ -66,9 +65,11 @@ import org.jetbrains.annotations.Nullable;

 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.CountDownLatch;
+import java.util.regex.Pattern;

 import static java.util.Collections.emptyList;
 import static java.util.Collections.unmodifiableList;
@@ -80,6 +81,7 @@ import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 import static org.jackhuang.hmcl.util.javafx.ExtendedProperties.classPropertyFor;

 public class CreateAccountPane extends JFXDialogLayout implements DialogAware {
+    private static final Pattern USERNAME_CHECKER_PATTERN = Pattern.compile("^[A-Za-z0-9_]+$");

    private boolean showMethodSwitcher;
    private AccountFactory<?> factory;
@@ -222,35 +224,52 @@ public class CreateAccountPane extends JFXDialogLayout implements DialogAware {
            additionalData = null;
        }

-        logging.set(true);
-        deviceCode.set(null);
+        Runnable doCreate = () -> {
+            logging.set(true);
+            deviceCode.set(null);

-        loginTask = Task.supplyAsync(() -> factory.create(new DialogCharacterSelector(), username, password, null, additionalData))
-                .whenComplete(Schedulers.javafx(), account -> {
-                    int oldIndex = Accounts.getAccounts().indexOf(account);
-                    if (oldIndex == -1) {
-                        Accounts.getAccounts().add(account);
-                    } else {
-                        // adding an already-added account
-                        // instead of discarding the new account, we first remove the existing one then add the new one
-                        Accounts.getAccounts().remove(oldIndex);
-                        Accounts.getAccounts().add(oldIndex, account);
-                    }
+            loginTask = Task.supplyAsync(() -> factory.create(new DialogCharacterSelector(), username, password, null, additionalData))
+                    .whenComplete(Schedulers.javafx(), account -> {
+                        int oldIndex = Accounts.getAccounts().indexOf(account);
+                        if (oldIndex == -1) {
+                            Accounts.getAccounts().add(account);
+                        } else {
+                            // adding an already-added account
+                            // instead of discarding the new account, we first remove the existing one then add the new one
+                            Accounts.getAccounts().remove(oldIndex);
+                            Accounts.getAccounts().add(oldIndex, account);
+                        }

-                    // select the new account
-                    Accounts.setSelectedAccount(account);
+                        // select the new account
+                        Accounts.setSelectedAccount(account);

-                    spinner.hideSpinner();
-                    fireEvent(new DialogCloseEvent());
-                }, exception -> {
-                    if (exception instanceof NoSelectedCharacterException) {
+                        spinner.hideSpinner();
                        fireEvent(new DialogCloseEvent());
-                    } else {
-                        lblErrorMessage.setText(Accounts.localizeErrorMessage(exception));
+                    }, exception -> {
+                        if (exception instanceof NoSelectedCharacterException) {
+                            fireEvent(new DialogCloseEvent());
+                        } else {
+                            lblErrorMessage.setText(Accounts.localizeErrorMessage(exception));
+                        }
+                        body.setDisable(false);
+                        spinner.hideSpinner();
+                    }).executor(true);
+        };
+
+        if (factory instanceof OfflineAccountFactory && username != null && !USERNAME_CHECKER_PATTERN.matcher(username).matches()) {
+            Controllers.confirm(
+                    i18n("account.methods.offline.name.invalid"), i18n("message.warning"),
+                    MessageDialogPane.MessageType.WARNING,
+                    doCreate,
+                    () -> {
+                        lblErrorMessage.setText(i18n("account.methods.offline.name.invalid"));
+                        body.setDisable(false);
+                        spinner.hideSpinner();
                    }
-                    body.setDisable(false);
-                    spinner.hideSpinner();
-                }).executor(true);
+            );
+        } else {
+            doCreate.run();
+        }
    }

    private void onCancel() {
@@ -278,7 +297,7 @@ public class CreateAccountPane extends JFXDialogLayout implements DialogAware {
                        hintPane.setSegment(i18n("account.methods.microsoft.hint"));
                    }
                });
-                hintPane.setOnMouseClicked(e -> {
+                FXUtils.onClicked(hintPane, () -> {
                    if (deviceCode.get() != null) {
                        FXUtils.copyText(deviceCode.get().getUserCode());
                    }
@@ -293,12 +312,12 @@ public class CreateAccountPane extends JFXDialogLayout implements DialogAware {
                birthLink.setExternalLink("https://support.microsoft.com/account-billing/837badbc-999e-54d2-2617-d19206b9540a");
                JFXHyperlink profileLink = new JFXHyperlink(i18n("account.methods.microsoft.profile"));
                profileLink.setExternalLink("https://account.live.com/editprof.aspx");
-                JFXHyperlink purchaseLink = new JFXHyperlink(i18n("account.methods.yggdrasil.purchase"));
+                JFXHyperlink purchaseLink = new JFXHyperlink(i18n("account.methods.microsoft.purchase"));
                purchaseLink.setExternalLink(YggdrasilService.PURCHASE_URL);
                JFXHyperlink deauthorizeLink = new JFXHyperlink(i18n("account.methods.microsoft.deauthorize"));
                deauthorizeLink.setExternalLink("https://account.live.com/consent/Edit?client_id=000000004C794E0A");
                JFXHyperlink forgotpasswordLink = new JFXHyperlink(i18n("account.methods.forgot_password"));
-                forgotpasswordLink.setExternalLink("https://www.minecraft.net/password/forgot");
+                forgotpasswordLink.setExternalLink("https://account.live.com/ResetPassword.aspx");
                JFXHyperlink createProfileLink = new JFXHyperlink(i18n("account.methods.microsoft.makegameidsettings"));
                createProfileLink.setExternalLink("https://www.minecraft.net/msaprofile/mygames/editprofile");
                box.getChildren().setAll(profileLink, birthLink, purchaseLink, deauthorizeLink, forgotpasswordLink, createProfileLink);
@@ -325,24 +344,6 @@ public class CreateAccountPane extends JFXDialogLayout implements DialogAware {
            }

            detailsPane = vbox;
-        } else if (factory == Accounts.FACTORY_MOJANG) {
-            VBox vbox = new VBox(8);
-            HintPane hintPane = new HintPane(MessageDialogPane.MessageType.WARNING);
-            hintPane.setText(i18n("account.methods.yggdrasil.migration.hint"));
-
-            HBox linkPane = new HBox(8);
-
-            JFXHyperlink migrationLink = new JFXHyperlink(i18n("account.methods.yggdrasil.migration"));
-            migrationLink.setOnAction(e -> FXUtils.openLink(YggdrasilService.PROFILE_URL));
-
-            JFXHyperlink migrationHowLink = new JFXHyperlink(i18n("account.methods.yggdrasil.migration.how"));
-            migrationHowLink.setOnAction(e -> FXUtils.openLink(YggdrasilService.MIGRATION_FAQ_URL));
-
-            linkPane.getChildren().setAll(migrationLink, migrationHowLink);
-
-            vbox.getChildren().setAll(hintPane, linkPane);
-            detailsPane = vbox;
-            btnAccept.setDisable(true);
        } else {
            detailsPane = new AccountDetailsInputPane(factory, btnAccept::fire);
            btnAccept.disableProperty().bind(((AccountDetailsInputPane) detailsPane).validProperty().not());
@@ -353,7 +354,7 @@ public class CreateAccountPane extends JFXDialogLayout implements DialogAware {
    private static class AccountDetailsInputPane extends GridPane {

        // ==== authlib-injector hyperlinks ====
-        private static final String[] ALLOWED_LINKS = { "homepage", "register" };
+        private static final String[] ALLOWED_LINKS = {"homepage", "register"};

        private static List<Hyperlink> createHyperlinks(AuthlibInjectorServer server) {
            if (server == null) {
@@ -459,7 +460,7 @@ public class CreateAccountPane extends JFXDialogLayout implements DialogAware {
                linksContainer.setMinWidth(USE_PREF_SIZE);

                JFXButton btnAddServer = new JFXButton();
-                btnAddServer.setGraphic(SVG.plus(Theme.blackFillBinding(), 20, 20));
+                btnAddServer.setGraphic(SVG.PLUS.createIcon(Theme.blackFill(), 20, 20));
                btnAddServer.getStyleClass().add("toggle-icon4");
                btnAddServer.setOnAction(e -> {
                    Controllers.dialog(new AddAuthlibInjectorServerPane());
@@ -507,29 +508,11 @@ public class CreateAccountPane extends JFXDialogLayout implements DialogAware {
                rowIndex++;
            }

-            if (factory instanceof YggdrasilAccountFactory) {
-                HBox box = new HBox();
-                GridPane.setColumnSpan(box, 2);
-
-                JFXHyperlink migrationLink = new JFXHyperlink(i18n("account.methods.yggdrasil.migration"));
-                migrationLink.setExternalLink("https://aka.ms/MinecraftMigration");
-
-                JFXHyperlink migrationHowLink = new JFXHyperlink(i18n("account.methods.yggdrasil.migration.how"));
-                migrationHowLink.setExternalLink("https://help.minecraft.net/hc/articles/4411173197709");
-
-                JFXHyperlink purchaseLink = new JFXHyperlink(i18n("account.methods.yggdrasil.purchase"));
-                purchaseLink.setExternalLink(YggdrasilService.PURCHASE_URL);
-
-                box.getChildren().setAll(migrationLink, migrationHowLink, purchaseLink);
-                add(box, 0, rowIndex);
-
-                rowIndex++;
-            }
-
            if (factory instanceof OfflineAccountFactory) {
                txtUsername.setPromptText(i18n("account.methods.offline.name.special_characters"));
+                FXUtils.installFastTooltip(txtUsername, i18n("account.methods.offline.name.special_characters"));

-                JFXHyperlink purchaseLink = new JFXHyperlink(i18n("account.methods.yggdrasil.purchase"));
+                JFXHyperlink purchaseLink = new JFXHyperlink(i18n("account.methods.microsoft.purchase"));
                purchaseLink.setExternalLink(YggdrasilService.PURCHASE_URL);
                HBox linkPane = new HBox(purchaseLink);
                GridPane.setColumnSpan(linkPane, 2);
@@ -600,9 +583,7 @@ public class CreateAccountPane extends JFXDialogLayout implements DialogAware {
        }

        private boolean requiresEmailAsUsername() {
-            if (factory instanceof YggdrasilAccountFactory) {
-                return true;
-            } else if ((factory instanceof AuthlibInjectorAccountFactory) && this.server != null) {
+            if ((factory instanceof AuthlibInjectorAccountFactory) && this.server != null) {
                return !server.isNonEmailLogin();
            }
            return false;
@@ -657,7 +638,7 @@ public class CreateAccountPane extends JFXDialogLayout implements DialogAware {
            StackPane.setAlignment(cancel, Pos.BOTTOM_RIGHT);
            cancel.setOnAction(e -> latch.countDown());

-            listBox.startCategory(i18n("account.choose"));
+            listBox.startCategory(i18n("account.choose").toUpperCase(Locale.ROOT));

            setCenter(listBox);

@@ -677,7 +658,7 @@ public class CreateAccountPane extends JFXDialogLayout implements DialogAware {
                    TexturesLoader.bindAvatar(portraitCanvas, service, profile.getId());

                    IconedItem accountItem = new IconedItem(portraitCanvas, profile.getName());
-                    accountItem.setOnMouseClicked(e -> {
+                    FXUtils.onClicked(accountItem, () -> {
                        selectedProfile = profile;
                        latch.countDown();
                    });
@@ -21,9 +21,8 @@ import org.jackhuang.hmcl.ui.construct.JFXHyperlink;
 import org.jackhuang.hmcl.ui.construct.MessageDialogPane;

 import java.util.function.Consumer;
-import java.util.logging.Level;

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

 public class OAuthAccountLoginDialog extends DialogPane {
@@ -59,7 +58,7 @@ public class OAuthAccountLoginDialog extends DialogPane {
                );
            }
        });
-        hintPane.setOnMouseClicked(e -> {
+        FXUtils.onClicked(hintPane, () -> {
            if (deviceCode.get() != null) {
                FXUtils.copyText(deviceCode.get().getUserCode());
            }
@@ -70,7 +69,7 @@ public class OAuthAccountLoginDialog extends DialogPane {
        birthLink.setOnAction(e -> FXUtils.openLink("https://support.microsoft.com/account-billing/how-to-change-a-birth-date-on-a-microsoft-account-837badbc-999e-54d2-2617-d19206b9540a"));
        JFXHyperlink profileLink = new JFXHyperlink(i18n("account.methods.microsoft.profile"));
        profileLink.setOnAction(e -> FXUtils.openLink("https://account.live.com/editprof.aspx"));
-        JFXHyperlink purchaseLink = new JFXHyperlink(i18n("account.methods.yggdrasil.purchase"));
+        JFXHyperlink purchaseLink = new JFXHyperlink(i18n("account.methods.microsoft.purchase"));
        purchaseLink.setOnAction(e -> FXUtils.openLink(YggdrasilService.PURCHASE_URL));
        box.getChildren().setAll(profileLink, birthLink, purchaseLink);
        GridPane.setColumnSpan(box, 2);
@@ -96,7 +95,7 @@ public class OAuthAccountLoginDialog extends DialogPane {
                        success.accept(authInfo);
                        onSuccess();
                    } else {
-                        LOG.log(Level.INFO, "Failed to login when credentials expired: " + account, exception);
+                        LOG.info("Failed to login when credentials expired: " + account, exception);
                        onFailure(Accounts.localizeErrorMessage(exception));
                    }
                }).start();
@@ -25,16 +25,16 @@ import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.geometry.Insets;
 import javafx.scene.control.Label;
-import javafx.scene.image.Image;
 import javafx.scene.input.DragEvent;
 import javafx.scene.input.TransferMode;
 import javafx.scene.layout.*;
-import moe.mickey.minecraft.skin.fx.SkinCanvas;
-import moe.mickey.minecraft.skin.fx.animation.SkinAniRunning;
-import moe.mickey.minecraft.skin.fx.animation.SkinAniWavingArms;
+import org.jackhuang.hmcl.ui.skin.SkinCanvas;
+import org.jackhuang.hmcl.ui.skin.animation.SkinAniRunning;
+import org.jackhuang.hmcl.ui.skin.animation.SkinAniWavingArms;
 import org.jackhuang.hmcl.auth.offline.OfflineAccount;
 import org.jackhuang.hmcl.auth.offline.Skin;
 import org.jackhuang.hmcl.auth.yggdrasil.TextureModel;
+import org.jackhuang.hmcl.game.TexturesLoader;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
@@ -42,11 +42,11 @@ import org.jackhuang.hmcl.ui.construct.*;

 import java.io.File;
 import java.util.Arrays;
-import java.util.logging.Level;
+import java.util.UUID;

 import static org.jackhuang.hmcl.ui.FXUtils.onEscPressed;
 import static org.jackhuang.hmcl.ui.FXUtils.stringConverter;
-import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 public class OfflineAccountSkinPane extends StackPane {
@@ -71,7 +71,7 @@ public class OfflineAccountSkinPane extends StackPane {

        BorderPane pane = new BorderPane();

-        SkinCanvas canvas = new SkinCanvas(SkinCanvas.STEVE, 300, 300, true);
+        SkinCanvas canvas = new SkinCanvas(TexturesLoader.getDefaultSkinImage(), 300, 300, true);
        StackPane canvasPane = new StackPane(canvas);
        canvasPane.setPrefWidth(300);
        canvasPane.setPrefHeight(300);
@@ -116,11 +116,11 @@ public class OfflineAccountSkinPane extends StackPane {
        ));

        modelCombobox.setConverter(stringConverter(model -> i18n("account.skin.model." + model.modelName)));
-        modelCombobox.getItems().setAll(TextureModel.STEVE, TextureModel.ALEX);
+        modelCombobox.getItems().setAll(TextureModel.WIDE, TextureModel.SLIM);

        if (account.getSkin() == null) {
            skinItem.setSelectedData(Skin.Type.DEFAULT);
-            modelCombobox.setValue(TextureModel.STEVE);
+            modelCombobox.setValue(TextureModel.WIDE);
        } else {
            skinItem.setSelectedData(account.getSkin().getType());
            cslApiField.setText(account.getSkin().getCslApi());
@@ -133,16 +133,21 @@ public class OfflineAccountSkinPane extends StackPane {
            getSkin().load(account.getUsername())
                    .whenComplete(Schedulers.javafx(), (result, exception) -> {
                        if (exception != null) {
-                            LOG.log(Level.WARNING, "Failed to load skin", exception);
+                            LOG.warning("Failed to load skin", exception);
                            Controllers.showToast(i18n("message.failed"));
                        } else {
+                            UUID uuid = this.account.getUUID();
                            if (result == null || result.getSkin() == null && result.getCape() == null) {
-                                canvas.updateSkin(getDefaultTexture(), isDefaultSlim(), null);
+                                canvas.updateSkin(
+                                        TexturesLoader.getDefaultSkin(uuid).getImage(),
+                                        TexturesLoader.getDefaultModel(uuid) == TextureModel.SLIM,
+                                        null
+                                );
                                return;
                            }
                            canvas.updateSkin(
-                                    result.getSkin() != null ? result.getSkin().getImage() : getDefaultTexture(),
-                                    result.getModel() == TextureModel.ALEX,
+                                    result.getSkin() != null ? result.getSkin().getImage() : TexturesLoader.getDefaultSkin(uuid).getImage(),
+                                    result.getModel() == TextureModel.SLIM,
                                    result.getCape() != null ? result.getCape().getImage() : null);
                        }
                    }).start();
@@ -198,17 +203,4 @@ public class OfflineAccountSkinPane extends StackPane {
    private Skin getSkin() {
        return new Skin(skinItem.getSelectedData(), cslApiField.getText(), modelCombobox.getValue(), skinSelector.getValue(), capeSelector.getValue());
    }
-
-    private boolean isDefaultSlim() {
-        return TextureModel.detectUUID(account.getUUID()) == TextureModel.ALEX;
-    }
-
-    private Image getDefaultTexture() {
-        if (isDefaultSlim()) {
-            return SkinCanvas.ALEX;
-        } else {
-            return SkinCanvas.STEVE;
-        }
-    }
-
 }
@@ -1,6 +1,6 @@
 /*
 * Hello Minecraft! Launcher
- * Copyright (C) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2020 huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -27,165 +27,225 @@ import org.jetbrains.annotations.Nullable;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.function.Consumer;
-import java.util.function.Function;

-public enum ContainerAnimations {
-    NONE(c -> {
-        c.getPreviousNode().setTranslateX(0);
-        c.getPreviousNode().setTranslateY(0);
-        c.getPreviousNode().setScaleX(1);
-        c.getPreviousNode().setScaleY(1);
-        c.getPreviousNode().setOpacity(1);
-        c.getCurrentNode().setTranslateX(0);
-        c.getCurrentNode().setTranslateY(0);
-        c.getCurrentNode().setScaleX(1);
-        c.getCurrentNode().setScaleY(1);
-        c.getCurrentNode().setOpacity(1);
-    }, c -> Collections.emptyList()),
+public enum ContainerAnimations implements AnimationProducer {
+    NONE {
+        @Override
+        public void init(AnimationHandler c) {
+            c.getPreviousNode().setTranslateX(0);
+            c.getPreviousNode().setTranslateY(0);
+            c.getPreviousNode().setScaleX(1);
+            c.getPreviousNode().setScaleY(1);
+            c.getPreviousNode().setOpacity(1);
+            c.getCurrentNode().setTranslateX(0);
+            c.getCurrentNode().setTranslateY(0);
+            c.getCurrentNode().setScaleX(1);
+            c.getCurrentNode().setScaleY(1);
+            c.getCurrentNode().setOpacity(1);
+        }
+
+        @Override
+        public List<KeyFrame> animate(AnimationHandler c) {
+            return Collections.emptyList();
+        }
+    },

    /**
     * A fade between the old and new view
     */
-    FADE(c -> {
-        c.getPreviousNode().setTranslateX(0);
-        c.getPreviousNode().setTranslateY(0);
-        c.getPreviousNode().setScaleX(1);
-        c.getPreviousNode().setScaleY(1);
-        c.getPreviousNode().setOpacity(1);
-        c.getCurrentNode().setTranslateX(0);
-        c.getCurrentNode().setTranslateY(0);
-        c.getCurrentNode().setScaleX(1);
-        c.getCurrentNode().setScaleY(1);
-        c.getCurrentNode().setOpacity(0);
-    }, c ->
-            Arrays.asList(new KeyFrame(Duration.ZERO,
+    FADE {
+        @Override
+        public void init(AnimationHandler c) {
+            c.getPreviousNode().setTranslateX(0);
+            c.getPreviousNode().setTranslateY(0);
+            c.getPreviousNode().setScaleX(1);
+            c.getPreviousNode().setScaleY(1);
+            c.getPreviousNode().setOpacity(1);
+            c.getCurrentNode().setTranslateX(0);
+            c.getCurrentNode().setTranslateY(0);
+            c.getCurrentNode().setScaleX(1);
+            c.getCurrentNode().setScaleY(1);
+            c.getCurrentNode().setOpacity(0);
+        }
+
+        @Override
+        public List<KeyFrame> animate(AnimationHandler c) {
+            return Arrays.asList(new KeyFrame(Duration.ZERO,
                            new KeyValue(c.getPreviousNode().opacityProperty(), 1, Interpolator.EASE_BOTH),
                            new KeyValue(c.getCurrentNode().opacityProperty(), 0, Interpolator.EASE_BOTH)),
                    new KeyFrame(c.getDuration(),
                            new KeyValue(c.getPreviousNode().opacityProperty(), 0, Interpolator.EASE_BOTH),
-                            new KeyValue(c.getCurrentNode().opacityProperty(), 1, Interpolator.EASE_BOTH)))),
+                            new KeyValue(c.getCurrentNode().opacityProperty(), 1, Interpolator.EASE_BOTH)));
+        }
+    },

    /**
     * A fade between the old and new view
     */
-    FADE_IN(c -> {
-        c.getCurrentNode().setTranslateX(0);
-        c.getCurrentNode().setTranslateY(0);
-        c.getCurrentNode().setScaleX(1);
-        c.getCurrentNode().setScaleY(1);
-        c.getCurrentNode().setOpacity(0);
-    }, c ->
-            Arrays.asList(new KeyFrame(Duration.ZERO,
+    FADE_IN {
+        @Override
+        public void init(AnimationHandler c) {
+            c.getCurrentNode().setTranslateX(0);
+            c.getCurrentNode().setTranslateY(0);
+            c.getCurrentNode().setScaleX(1);
+            c.getCurrentNode().setScaleY(1);
+            c.getCurrentNode().setOpacity(0);
+        }
+
+        @Override
+        public List<KeyFrame> animate(AnimationHandler c) {
+            return Arrays.asList(new KeyFrame(Duration.ZERO,
                            new KeyValue(c.getCurrentNode().opacityProperty(), 0, FXUtils.SINE)),
                    new KeyFrame(c.getDuration(),
-                            new KeyValue(c.getCurrentNode().opacityProperty(), 1, FXUtils.SINE)))),
+                            new KeyValue(c.getCurrentNode().opacityProperty(), 1, FXUtils.SINE)));
+        }
+    },

    /**
     * A fade between the old and new view
     */
-    FADE_OUT(c -> {
-        c.getCurrentNode().setTranslateX(0);
-        c.getCurrentNode().setTranslateY(0);
-        c.getCurrentNode().setScaleX(1);
-        c.getCurrentNode().setScaleY(1);
-        c.getCurrentNode().setOpacity(1);
-    }, c ->
-            Arrays.asList(new KeyFrame(Duration.ZERO,
+    FADE_OUT {
+        @Override
+        public void init(AnimationHandler c) {
+            c.getCurrentNode().setTranslateX(0);
+            c.getCurrentNode().setTranslateY(0);
+            c.getCurrentNode().setScaleX(1);
+            c.getCurrentNode().setScaleY(1);
+            c.getCurrentNode().setOpacity(1);
+        }
+
+        @Override
+        public List<KeyFrame> animate(AnimationHandler c) {
+            return Arrays.asList(new KeyFrame(Duration.ZERO,
                            new KeyValue(c.getCurrentNode().opacityProperty(), 1, FXUtils.SINE)),
                    new KeyFrame(c.getDuration(),
-                            new KeyValue(c.getCurrentNode().opacityProperty(), 0, FXUtils.SINE)))),
+                            new KeyValue(c.getCurrentNode().opacityProperty(), 0, FXUtils.SINE)));
+        }
+    },
    /**
     * A zoom effect
     */
-    ZOOM_IN(c -> {
-        c.getPreviousNode().setTranslateX(0);
-        c.getPreviousNode().setTranslateY(0);
-        c.getPreviousNode().setScaleX(1);
-        c.getPreviousNode().setScaleY(1);
-        c.getPreviousNode().setOpacity(1);
-        c.getCurrentNode().setTranslateX(0);
-        c.getCurrentNode().setTranslateY(0);
-    }, c ->
-            Arrays.asList(new KeyFrame(Duration.ZERO,
+    ZOOM_IN {
+        @Override
+        public void init(AnimationHandler c) {
+            c.getPreviousNode().setTranslateX(0);
+            c.getPreviousNode().setTranslateY(0);
+            c.getPreviousNode().setScaleX(1);
+            c.getPreviousNode().setScaleY(1);
+            c.getPreviousNode().setOpacity(1);
+            c.getCurrentNode().setTranslateX(0);
+            c.getCurrentNode().setTranslateY(0);
+        }
+
+        @Override
+        public List<KeyFrame> animate(AnimationHandler c) {
+            return Arrays.asList(new KeyFrame(Duration.ZERO,
                            new KeyValue(c.getPreviousNode().scaleXProperty(), 1, Interpolator.EASE_BOTH),
                            new KeyValue(c.getPreviousNode().scaleYProperty(), 1, Interpolator.EASE_BOTH),
                            new KeyValue(c.getPreviousNode().opacityProperty(), 1, Interpolator.EASE_BOTH)),
                    new KeyFrame(c.getDuration(),
                            new KeyValue(c.getPreviousNode().scaleXProperty(), 4, Interpolator.EASE_BOTH),
                            new KeyValue(c.getPreviousNode().scaleYProperty(), 4, Interpolator.EASE_BOTH),
-                            new KeyValue(c.getPreviousNode().opacityProperty(), 0, Interpolator.EASE_BOTH)))),
+                            new KeyValue(c.getPreviousNode().opacityProperty(), 0, Interpolator.EASE_BOTH)));
+        }
+    },
    /**
     * A zoom effect
     */
-    ZOOM_OUT(c -> {
-        c.getPreviousNode().setTranslateX(0);
-        c.getPreviousNode().setTranslateY(0);
-        c.getPreviousNode().setScaleX(1);
-        c.getPreviousNode().setScaleY(1);
-        c.getPreviousNode().setOpacity(1);
-        c.getCurrentNode().setTranslateX(0);
-        c.getCurrentNode().setTranslateY(0);
-    }, c ->
-            (Arrays.asList(new KeyFrame(Duration.ZERO,
+    ZOOM_OUT {
+        @Override
+        public void init(AnimationHandler c) {
+            c.getPreviousNode().setTranslateX(0);
+            c.getPreviousNode().setTranslateY(0);
+            c.getPreviousNode().setScaleX(1);
+            c.getPreviousNode().setScaleY(1);
+            c.getPreviousNode().setOpacity(1);
+            c.getCurrentNode().setTranslateX(0);
+            c.getCurrentNode().setTranslateY(0);
+        }
+
+        @Override
+        public List<KeyFrame> animate(AnimationHandler c) {
+            return Arrays.asList(new KeyFrame(Duration.ZERO,
                            new KeyValue(c.getPreviousNode().scaleXProperty(), 1, Interpolator.EASE_BOTH),
                            new KeyValue(c.getPreviousNode().scaleYProperty(), 1, Interpolator.EASE_BOTH),
                            new KeyValue(c.getPreviousNode().opacityProperty(), 1, Interpolator.EASE_BOTH)),
                    new KeyFrame(c.getDuration(),
                            new KeyValue(c.getPreviousNode().scaleXProperty(), 0, Interpolator.EASE_BOTH),
                            new KeyValue(c.getPreviousNode().scaleYProperty(), 0, Interpolator.EASE_BOTH),
-                            new KeyValue(c.getPreviousNode().opacityProperty(), 0, Interpolator.EASE_BOTH))))),
+                            new KeyValue(c.getPreviousNode().opacityProperty(), 0, Interpolator.EASE_BOTH)));
+        }
+    },
    /**
     * A swipe effect
     */
-    SWIPE_LEFT(c -> {
-        c.getPreviousNode().setScaleX(1);
-        c.getPreviousNode().setScaleY(1);
-        c.getPreviousNode().setOpacity(0);
-        c.getPreviousNode().setTranslateX(0);
-        c.getCurrentNode().setScaleX(1);
-        c.getCurrentNode().setScaleY(1);
-        c.getCurrentNode().setOpacity(1);
-        c.getCurrentNode().setTranslateX(c.getCurrentRoot().getWidth());
-    }, c ->
-            Arrays.asList(new KeyFrame(Duration.ZERO,
+    SWIPE_LEFT {
+        @Override
+        public void init(AnimationHandler c) {
+            c.getPreviousNode().setScaleX(1);
+            c.getPreviousNode().setScaleY(1);
+            c.getPreviousNode().setOpacity(0);
+            c.getPreviousNode().setTranslateX(0);
+            c.getCurrentNode().setScaleX(1);
+            c.getCurrentNode().setScaleY(1);
+            c.getCurrentNode().setOpacity(1);
+            c.getCurrentNode().setTranslateX(c.getCurrentRoot().getWidth());
+        }
+
+        @Override
+        public List<KeyFrame> animate(AnimationHandler c) {
+            return Arrays.asList(new KeyFrame(Duration.ZERO,
                            new KeyValue(c.getCurrentNode().translateXProperty(), c.getCurrentRoot().getWidth(), Interpolator.EASE_BOTH),
                            new KeyValue(c.getPreviousNode().translateXProperty(), 0, Interpolator.EASE_BOTH)),
                    new KeyFrame(c.getDuration(),
                            new KeyValue(c.getCurrentNode().translateXProperty(), 0, Interpolator.EASE_BOTH),
-                            new KeyValue(c.getPreviousNode().translateXProperty(), -c.getCurrentRoot().getWidth(), Interpolator.EASE_BOTH)))),
+                            new KeyValue(c.getPreviousNode().translateXProperty(), -c.getCurrentRoot().getWidth(), Interpolator.EASE_BOTH)));
+        }
+    },

    /**
     * A swipe effect
     */
-    SWIPE_RIGHT(c -> {
-        c.getPreviousNode().setScaleX(1);
-        c.getPreviousNode().setScaleY(1);
-        c.getPreviousNode().setOpacity(0);
-        c.getPreviousNode().setTranslateX(0);
-        c.getCurrentNode().setScaleX(1);
-        c.getCurrentNode().setScaleY(1);
-        c.getCurrentNode().setOpacity(1);
-        c.getCurrentNode().setTranslateX(-c.getCurrentRoot().getWidth());
-    }, c ->
-            Arrays.asList(new KeyFrame(Duration.ZERO,
+    SWIPE_RIGHT {
+        @Override
+        public void init(AnimationHandler c) {
+            c.getPreviousNode().setScaleX(1);
+            c.getPreviousNode().setScaleY(1);
+            c.getPreviousNode().setOpacity(0);
+            c.getPreviousNode().setTranslateX(0);
+            c.getCurrentNode().setScaleX(1);
+            c.getCurrentNode().setScaleY(1);
+            c.getCurrentNode().setOpacity(1);
+            c.getCurrentNode().setTranslateX(-c.getCurrentRoot().getWidth());
+        }
+
+        @Override
+        public List<KeyFrame> animate(AnimationHandler c) {
+            return Arrays.asList(new KeyFrame(Duration.ZERO,
                            new KeyValue(c.getCurrentNode().translateXProperty(), -c.getCurrentRoot().getWidth(), Interpolator.EASE_BOTH),
                            new KeyValue(c.getPreviousNode().translateXProperty(), 0, Interpolator.EASE_BOTH)),
                    new KeyFrame(c.getDuration(),
                            new KeyValue(c.getCurrentNode().translateXProperty(), 0, Interpolator.EASE_BOTH),
-                            new KeyValue(c.getPreviousNode().translateXProperty(), c.getCurrentRoot().getWidth(), Interpolator.EASE_BOTH)))),
+                            new KeyValue(c.getPreviousNode().translateXProperty(), c.getCurrentRoot().getWidth(), Interpolator.EASE_BOTH)));
+        }
+    },

-    SWIPE_LEFT_FADE_SHORT(c -> {
-        c.getPreviousNode().setScaleX(1);
-        c.getPreviousNode().setScaleY(1);
-        c.getPreviousNode().setOpacity(0);
-        c.getPreviousNode().setTranslateX(0);
-        c.getCurrentNode().setScaleX(1);
-        c.getCurrentNode().setScaleY(1);
-        c.getCurrentNode().setOpacity(1);
-        c.getCurrentNode().setTranslateX(c.getCurrentRoot().getWidth());
-    }, c ->
-            Arrays.asList(new KeyFrame(Duration.ZERO,
+    SWIPE_LEFT_FADE_SHORT {
+        @Override
+        public void init(AnimationHandler c) {
+            c.getPreviousNode().setScaleX(1);
+            c.getPreviousNode().setScaleY(1);
+            c.getPreviousNode().setOpacity(0);
+            c.getPreviousNode().setTranslateX(0);
+            c.getCurrentNode().setScaleX(1);
+            c.getCurrentNode().setScaleY(1);
+            c.getCurrentNode().setOpacity(1);
+            c.getCurrentNode().setTranslateX(c.getCurrentRoot().getWidth());
+        }
+
+        @Override
+        public List<KeyFrame> animate(AnimationHandler c) {
+            return Arrays.asList(new KeyFrame(Duration.ZERO,
                            new KeyValue(c.getCurrentNode().translateXProperty(), 50, Interpolator.EASE_BOTH),
                            new KeyValue(c.getPreviousNode().translateXProperty(), 0, Interpolator.EASE_BOTH),
                            new KeyValue(c.getCurrentNode().opacityProperty(), 0, Interpolator.EASE_BOTH),
@@ -194,19 +254,26 @@ public enum ContainerAnimations {
                            new KeyValue(c.getCurrentNode().translateXProperty(), 0, Interpolator.EASE_BOTH),
                            new KeyValue(c.getPreviousNode().translateXProperty(), -50, Interpolator.EASE_BOTH),
                            new KeyValue(c.getCurrentNode().opacityProperty(), 1, Interpolator.EASE_BOTH),
-                            new KeyValue(c.getPreviousNode().opacityProperty(), 0, Interpolator.EASE_BOTH)))),
+                            new KeyValue(c.getPreviousNode().opacityProperty(), 0, Interpolator.EASE_BOTH)));
+        }
+    },

-    SWIPE_RIGHT_FADE_SHORT(c -> {
-        c.getPreviousNode().setScaleX(1);
-        c.getPreviousNode().setScaleY(1);
-        c.getPreviousNode().setOpacity(0);
-        c.getPreviousNode().setTranslateX(0);
-        c.getCurrentNode().setScaleX(1);
-        c.getCurrentNode().setScaleY(1);
-        c.getCurrentNode().setOpacity(1);
-        c.getCurrentNode().setTranslateX(c.getCurrentRoot().getWidth());
-    }, c ->
-            Arrays.asList(new KeyFrame(Duration.ZERO,
+    SWIPE_RIGHT_FADE_SHORT {
+        @Override
+        public void init(AnimationHandler c) {
+            c.getPreviousNode().setScaleX(1);
+            c.getPreviousNode().setScaleY(1);
+            c.getPreviousNode().setOpacity(0);
+            c.getPreviousNode().setTranslateX(0);
+            c.getCurrentNode().setScaleX(1);
+            c.getCurrentNode().setScaleY(1);
+            c.getCurrentNode().setOpacity(1);
+            c.getCurrentNode().setTranslateX(c.getCurrentRoot().getWidth());
+        }
+
+        @Override
+        public List<KeyFrame> animate(AnimationHandler c) {
+            return Arrays.asList(new KeyFrame(Duration.ZERO,
                            new KeyValue(c.getCurrentNode().translateXProperty(), -50, Interpolator.EASE_BOTH),
                            new KeyValue(c.getPreviousNode().translateXProperty(), 0, Interpolator.EASE_BOTH),
                            new KeyValue(c.getCurrentNode().opacityProperty(), 0, Interpolator.EASE_BOTH),
@@ -215,38 +282,12 @@ public enum ContainerAnimations {
                            new KeyValue(c.getCurrentNode().translateXProperty(), 0, Interpolator.EASE_BOTH),
                            new KeyValue(c.getPreviousNode().translateXProperty(), 50, Interpolator.EASE_BOTH),
                            new KeyValue(c.getCurrentNode().opacityProperty(), 1, Interpolator.EASE_BOTH),
-                            new KeyValue(c.getPreviousNode().opacityProperty(), 0, Interpolator.EASE_BOTH))));
+                            new KeyValue(c.getPreviousNode().opacityProperty(), 0, Interpolator.EASE_BOTH)));
+        }
+    };

-    private final AnimationProducer animationProducer;
    private ContainerAnimations opposite;

-    ContainerAnimations(Consumer<AnimationHandler> init, Function<AnimationHandler, List<KeyFrame>> animationProducer) {
-        this.animationProducer = new AnimationProducer() {
-            @Override
-            public void init(AnimationHandler handler) {
-                init.accept(handler);
-            }
-
-            @Override
-            public List<KeyFrame> animate(AnimationHandler handler) {
-                return animationProducer.apply(handler);
-            }
-
-            @Override
-            public @Nullable AnimationProducer opposite() {
-                return opposite != null ? opposite.getAnimationProducer() : null;
-            }
-        };
-    }
-
-    public AnimationProducer getAnimationProducer() {
-        return animationProducer;
-    }
-
-    public ContainerAnimations getOpposite() {
-        return opposite;
-    }
-
    static {
        NONE.opposite = NONE;
        FADE.opposite = FADE;
@@ -257,4 +298,15 @@ public enum ContainerAnimations {
        ZOOM_IN.opposite = ZOOM_OUT;
        ZOOM_OUT.opposite = ZOOM_IN;
    }
+
+    @Override
+    public abstract void init(AnimationHandler handler);
+
+    @Override
+    public abstract List<KeyFrame> animate(AnimationHandler handler);
+
+    @Override
+    public @Nullable ContainerAnimations opposite() {
+        return opposite;
+    }
 }
@@ -25,7 +25,6 @@ import javafx.scene.control.Control;
 import javafx.scene.control.Skin;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
-import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.util.Pair;
@@ -42,7 +41,7 @@ public class AdvancedListItem extends Control {

    public AdvancedListItem() {
        getStyleClass().add("advanced-list-item");
-        addEventHandler(MouseEvent.MOUSE_CLICKED, e -> fireEvent(new ActionEvent()));
+        FXUtils.onClicked(this, () -> fireEvent(new ActionEvent()));
    }

    public Node getLeftGraphic() {
@@ -17,21 +17,36 @@
 */
 package org.jackhuang.hmcl.ui.construct;

+import javafx.scene.Cursor;
+import javafx.scene.Node;
 import javafx.scene.control.Label;
+import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.TextFlow;
+import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.SVG;

-public class AnnouncementCard extends VBox {
+public final class AnnouncementCard extends VBox {

-    public AnnouncementCard(String title, String content) {
-        TextFlow tf = FXUtils.segmentToTextFlow(content, Controllers::onHyperlinkAction);
+    public AnnouncementCard(String title, String content, Runnable onClose) {
+        TextFlow body = FXUtils.segmentToTextFlow(content, Controllers::onHyperlinkAction);
+        body.setLineSpacing(4);

-        Label label = new Label(title);
-        label.getStyleClass().add("title");
-        getChildren().setAll(label, tf);
-        setSpacing(14);
+        BorderPane titleBar = new BorderPane();
+        titleBar.getStyleClass().add("title");
+        titleBar.setLeft(new Label(title));
+
+        if (onClose != null) {
+            Node hideNode = SVG.CLOSE.createIcon(Theme.blackFill(), 20, 20);
+            hideNode.setOnMouseClicked(e -> onClose.run());
+            hideNode.setCursor(Cursor.HAND);
+            titleBar.setRight(hideNode);
+        }
+
+        getChildren().setAll(titleBar, body);
+        setSpacing(16);
        getStyleClass().addAll("card", "announcement");
    }
 }
@@ -25,9 +25,6 @@ import javafx.animation.Timeline;
 import javafx.application.Platform;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
-import javafx.event.ActionEvent;
-import javafx.event.Event;
-import javafx.event.EventHandler;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
@@ -85,7 +82,7 @@ final class ComponentListCell extends StackPane {

            VBox groupNode = new VBox();

-            Node expandIcon = SVG.expand(Theme.blackFillBinding(), 20, 20);
+            Node expandIcon = SVG.EXPAND.createIcon(Theme.blackFill(), 20, 20);
            JFXButton expandButton = new JFXButton();
            expandButton.setGraphic(expandIcon);
            expandButton.getStyleClass().add("options-list-item-expand-button");
@@ -139,7 +136,7 @@ final class ComponentListCell extends StackPane {
            container.getChildren().setAll(content);
            groupNode.getChildren().add(container);

-            EventHandler<Event> onExpand = e -> {
+            Runnable onExpand = () -> {
                if (expandAnimation != null && expandAnimation.getStatus() == Animation.Status.RUNNING) {
                    expandAnimation.stop();
                }
@@ -182,8 +179,8 @@ final class ComponentListCell extends StackPane {
                });
            };

-            headerRippler.setOnMouseClicked(onExpand);
-            expandButton.setOnAction((EventHandler<ActionEvent>) (Object) onExpand);
+            FXUtils.onClicked(headerRippler, onExpand);
+            expandButton.setOnAction(e -> onExpand.run());

            expandedProperty().addListener((a, b, newValue) -> expandIcon.setRotate(newValue ? 180 : 0));

@@ -58,9 +58,9 @@ public class FileItem extends BorderPane {
        setLeft(left);

        JFXButton right = new JFXButton();
-        right.setGraphic(SVG.pencil(Theme.blackFillBinding(), 15, 15));
+        right.setGraphic(SVG.PENCIL.createIcon(Theme.blackFill(), 15, 15));
        right.getStyleClass().add("toggle-icon4");
-        right.setOnMouseClicked(e -> onExplore());
+        right.setOnAction(e -> onExplore());
        FXUtils.installFastTooltip(right, i18n("button.edit"));
        setRight(right);

@@ -81,7 +81,7 @@ public class FileSelector extends HBox {
        FXUtils.bindString(customField, valueProperty());

        JFXButton selectButton = new JFXButton();
-        selectButton.setGraphic(SVG.folderOpen(Theme.blackFillBinding(), 15, 15));
+        selectButton.setGraphic(SVG.FOLDER_OPEN.createIcon(Theme.blackFill(), 15, 15));
        selectButton.setOnAction(e -> {
            if (directory) {
                DirectoryChooser chooser = new DirectoryChooser();
@@ -21,6 +21,7 @@ import static javafx.collections.FXCollections.emptyObservableList;
 import static javafx.collections.FXCollections.observableList;
 import static javafx.collections.FXCollections.singletonObservableList;

+import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.util.javafx.BindingMapping;

 import com.jfoenix.controls.JFXComboBox;
@@ -34,6 +35,8 @@ public class FontComboBox extends JFXComboBox<String> {
    private boolean loaded = false;

    public FontComboBox() {
+        setMinWidth(260);
+
        styleProperty().bind(Bindings.concat("-fx-font-family: \"", valueProperty(), "\""));

        setCellFactory(listView -> new JFXListCell<String>() {
@@ -51,7 +54,7 @@ public class FontComboBox extends JFXComboBox<String> {
        itemsProperty().bind(BindingMapping.of(valueProperty())
                        .map(value -> value == null ? emptyObservableList() : singletonObservableList(value)));

-        setOnMouseClicked(e -> {
+        FXUtils.onClicked(this, () -> {
            if (loaded)
                return;
            itemsProperty().unbind();
@@ -45,31 +45,30 @@ public class HintPane extends VBox {
    public HintPane(MessageDialogPane.MessageType type) {
        setFillWidth(true);
        getStyleClass().addAll("hint", type.name().toLowerCase(Locale.ROOT));
-        HBox hbox = new HBox();
-        hbox.setAlignment(Pos.CENTER_LEFT);

+        SVG svg;
        switch (type) {
            case INFO:
-                hbox.getChildren().add(SVG.informationOutline(Theme.blackFillBinding(), 16, 16));
+                svg = SVG.INFORMATION_OUTLINE;
                break;
            case ERROR:
-                hbox.getChildren().add(SVG.closeCircleOutline(Theme.blackFillBinding(), 16, 16));
+                svg = SVG.CLOSE_CIRCLE_OUTLINE;
                break;
            case SUCCESS:
-                hbox.getChildren().add(SVG.checkCircleOutline(Theme.blackFillBinding(), 16, 16));
+                svg = SVG.CHECK_CIRCLE_OUTLINE;
                break;
            case WARNING:
-                hbox.getChildren().add(SVG.alertOutline(Theme.blackFillBinding(), 16, 16));
+                svg = SVG.ALERT_OUTLINE;
                break;
            case QUESTION:
-                hbox.getChildren().add(SVG.helpCircleOutline(Theme.blackFillBinding(), 16, 16));
+                svg = SVG.HELP_CIRCLE_OUTLINE;
                break;
            default:
                throw new IllegalArgumentException("Unrecognized message box message type " + type);
        }

-
-        hbox.getChildren().add(new Text(type.getDisplayName()));
+        HBox hbox = new HBox(svg.createIcon(Theme.blackFill(), 16, 16), new Text(type.getDisplayName()));
+        hbox.setAlignment(Pos.CENTER_LEFT);
        flow.getChildren().setAll(label);
        getChildren().setAll(hbox, flow);
        label.textProperty().bind(text);
@@ -17,16 +17,26 @@
 */
 package org.jackhuang.hmcl.ui.construct;

-import javafx.scene.Node;
+import com.jfoenix.controls.JFXPopup;
+import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.SVG;

 public class IconedMenuItem extends IconedItem {

-    public IconedMenuItem(Node node, String text, Runnable action) {
-        super(node, text);
+    public IconedMenuItem(SVG icon, String text, Runnable action, JFXPopup popup) {
+        super(icon != null ? FXUtils.limitingSize(icon.createIcon(Theme.blackFill(), 14, 14), 14, 14) : null, text);

        getStyleClass().setAll("iconed-menu-item");
-        setOnMouseClicked(e -> action.run());
+
+        if (popup == null) {
+            FXUtils.onClicked(this, action);
+        } else {
+            FXUtils.onClicked(this, () -> {
+                action.run();
+                popup.hide();
+            });
+        }
    }

    public IconedMenuItem addTooltip(String tooltip) {
@@ -17,7 +17,6 @@ import javafx.scene.layout.Priority;
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
-import org.jackhuang.hmcl.util.Lazy;
 import org.jackhuang.hmcl.util.StringUtils;

 public class IconedTwoLineListItem extends HBox {
@@ -29,13 +28,8 @@ public class IconedTwoLineListItem extends HBox {

    private final ImageView imageView = new ImageView();
    private final TwoLineListItem twoLineListItem = new TwoLineListItem();
-    private final Lazy<JFXButton> externalLinkButton = new Lazy<>(() -> {
-        JFXButton button = new JFXButton();
-        button.getStyleClass().add("toggle-icon4");
-        button.setGraphic(SVG.openInNew(Theme.blackFillBinding(), -1, -1));
-        button.setOnAction(e -> FXUtils.openLink(externalLink.get()));
-        return button;
-    });
+    private JFXButton externalLinkButton;
+
    @SuppressWarnings("FieldCanBeLocal")
    private final InvalidationListener observer;

@@ -52,7 +46,7 @@ public class IconedTwoLineListItem extends HBox {
            getChildren().clear();
            if (image.get() != null) getChildren().add(imageView);
            getChildren().add(twoLineListItem);
-            if (StringUtils.isNotBlank(externalLink.get())) getChildren().add(externalLinkButton.get());
+            if (StringUtils.isNotBlank(externalLink.get())) getChildren().add(getExternalLinkButton());
        }, image, externalLink);
    }

@@ -111,4 +105,14 @@ public class IconedTwoLineListItem extends HBox {
    public ImageView getImageView() {
        return imageView;
    }
+
+    public JFXButton getExternalLinkButton() {
+        if (externalLinkButton == null) {
+            externalLinkButton = new JFXButton();
+            externalLinkButton.getStyleClass().add("toggle-icon4");
+            externalLinkButton.setGraphic(SVG.OPEN_IN_NEW.createIcon(Theme.blackFill(), -1, -1));
+            externalLinkButton.setOnAction(e -> FXUtils.openLink(externalLink.get()));
+        }
+        return externalLinkButton;
+    }
 }
@@ -23,12 +23,12 @@ import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
+import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.geometry.Pos;
 import javafx.scene.control.Label;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
-import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
@@ -44,8 +44,8 @@ public final class ImagePickerItem extends BorderPane {
    private final ImageView imageView;

    private final StringProperty title = new SimpleStringProperty(this, "title");
-    private final ObjectProperty<EventHandler<? super MouseEvent>> onSelectButtonClicked = new SimpleObjectProperty<>(this, "onSelectButtonClicked");
-    private final ObjectProperty<EventHandler<? super MouseEvent>> onDeleteButtonClicked = new SimpleObjectProperty<>(this, "onDeleteButtonClicked");
+    private final ObjectProperty<EventHandler<ActionEvent>> onSelectButtonClicked = new SimpleObjectProperty<>(this, "onSelectButtonClicked");
+    private final ObjectProperty<EventHandler<ActionEvent>> onDeleteButtonClicked = new SimpleObjectProperty<>(this, "onDeleteButtonClicked");
    private final ObjectProperty<Image> image = new SimpleObjectProperty<>(this, "image");

    public ImagePickerItem() {
@@ -54,13 +54,13 @@ public final class ImagePickerItem extends BorderPane {
        imageView.setPreserveRatio(true);

        JFXButton selectButton = new JFXButton();
-        selectButton.setGraphic(SVG.pencil(Theme.blackFillBinding(), 20, 20));
-        selectButton.onMouseClickedProperty().bind(onSelectButtonClicked);
+        selectButton.setGraphic(SVG.PENCIL.createIcon(Theme.blackFill(), 20, 20));
+        selectButton.onActionProperty().bind(onSelectButtonClicked);
        selectButton.getStyleClass().add("toggle-icon4");

        JFXButton deleteButton = new JFXButton();
-        deleteButton.setGraphic(SVG.close(Theme.blackFillBinding(), 20, 20));
-        deleteButton.onMouseClickedProperty().bind(onDeleteButtonClicked);
+        deleteButton.setGraphic(SVG.CLOSE.createIcon(Theme.blackFill(), 20, 20));
+        deleteButton.onActionProperty().bind(onDeleteButtonClicked);
        deleteButton.getStyleClass().add("toggle-icon4");

        FXUtils.installFastTooltip(selectButton, i18n("button.edit"));
@@ -93,27 +93,27 @@ public final class ImagePickerItem extends BorderPane {
        this.title.set(title);
    }

-    public EventHandler<? super MouseEvent> getOnSelectButtonClicked() {
+    public EventHandler<ActionEvent> getOnSelectButtonClicked() {
        return onSelectButtonClicked.get();
    }

-    public ObjectProperty<EventHandler<? super MouseEvent>> onSelectButtonClickedProperty() {
+    public ObjectProperty<EventHandler<ActionEvent>> onSelectButtonClickedProperty() {
        return onSelectButtonClicked;
    }

-    public void setOnSelectButtonClicked(EventHandler<? super MouseEvent> onSelectButtonClicked) {
+    public void setOnSelectButtonClicked(EventHandler<ActionEvent> onSelectButtonClicked) {
        this.onSelectButtonClicked.set(onSelectButtonClicked);
    }

-    public EventHandler<? super MouseEvent> getOnDeleteButtonClicked() {
+    public EventHandler<ActionEvent> getOnDeleteButtonClicked() {
        return onDeleteButtonClicked.get();
    }

-    public ObjectProperty<EventHandler<? super MouseEvent>> onDeleteButtonClickedProperty() {
+    public ObjectProperty<EventHandler<ActionEvent>> onDeleteButtonClickedProperty() {
        return onDeleteButtonClicked;
    }

-    public void setOnDeleteButtonClicked(EventHandler<? super MouseEvent> onDeleteButtonClicked) {
+    public void setOnDeleteButtonClicked(EventHandler<ActionEvent> onDeleteButtonClicked) {
        this.onDeleteButtonClicked.set(onDeleteButtonClicked);
    }

@@ -27,6 +27,7 @@ import org.jackhuang.hmcl.util.FutureCallback;

 import java.util.concurrent.CompletableFuture;

+import static org.jackhuang.hmcl.ui.FXUtils.onEscPressed;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 public class InputDialogPane extends JFXDialogLayout {
@@ -68,6 +69,8 @@ public class InputDialogPane extends JFXDialogLayout {
                lblCreationWarning.setText(msg);
            });
        });
+
+        onEscPressed(this, cancelButton::fire);
    }

    public CompletableFuture<String> getCompletableFuture() {
@@ -27,13 +27,13 @@ public class JFXHyperlink extends Hyperlink {
    public JFXHyperlink() {
        super();

-        setGraphic(SVG.launchOutline(Theme.blackFillBinding(), 16, 16));
+        setGraphic(SVG.LAUNCH_OUTLINE.createIcon(Theme.blackFill(), 16, 16));
    }

    public JFXHyperlink(String text) {
        super(text);

-        setGraphic(SVG.launchOutline(Theme.blackFillBinding(), 16, 16));
+        setGraphic(SVG.LAUNCH_OUTLINE.createIcon(Theme.blackFill(), 16, 16));
    }

    public void setExternalLink(String externalLink) {
@@ -81,8 +81,8 @@ public class MenuUpDownButton extends Control {
            label.setStyle("-fx-text-fill: black;");
            label.textProperty().bind(control.text);

-            Node up = SVG.menuUp(Theme.blackFillBinding(), 16, 16);
-            Node down = SVG.menuDown(Theme.blackFillBinding(), 16, 16);
+            Node up = SVG.MENU_UP.createIcon(Theme.blackFill(), 16, 16);
+            Node down = SVG.MENU_DOWN.createIcon(Theme.blackFill(), 16, 16);

            JFXButton button = new JFXButton();
            button.setGraphic(content);
@@ -71,25 +71,27 @@ public final class MessageDialogPane extends HBox {
        graphic.setTranslateY(10);
        graphic.setMinSize(40, 40);
        graphic.setMaxSize(40, 40);
+        SVG svg;
        switch (type) {
            case INFO:
-                graphic.setGraphic(SVG.infoCircle(Theme.blackFillBinding(), 40, 40));
+                svg = SVG.INFO_CIRCLE;
                break;
            case ERROR:
-                graphic.setGraphic(SVG.closeCircle(Theme.blackFillBinding(), 40, 40));
+                svg = SVG.CLOSE_CIRCLE;
                break;
            case SUCCESS:
-                graphic.setGraphic(SVG.checkCircle(Theme.blackFillBinding(), 40, 40));
+                svg = SVG.CHECK_CIRCLE;
                break;
            case WARNING:
-                graphic.setGraphic(SVG.alert(Theme.blackFillBinding(), 40, 40));
+                svg = SVG.ALERT;
                break;
            case QUESTION:
-                graphic.setGraphic(SVG.helpCircle(Theme.blackFillBinding(), 40, 40));
+                svg = SVG.HELP_CIRCLE;
                break;
            default:
                throw new IllegalArgumentException("Unrecognized message box message type " + type);
        }
+        graphic.setGraphic(svg.createIcon(Theme.blackFill(), 40, 40));

        VBox vbox = new VBox();
        HBox.setHgrow(vbox, Priority.ALWAYS);
@@ -164,6 +166,16 @@ public final class MessageDialogPane extends HBox {
            return this;
        }

+        public Builder addAction(String text, @Nullable Runnable action) {
+            JFXButton btnAction = new JFXButton(text);
+            btnAction.getStyleClass().add("dialog-accept");
+            if (action != null) {
+                btnAction.setOnAction(e -> action.run());
+            }
+            dialog.addButton(btnAction);
+            return this;
+        }
+
        public Builder ok(@Nullable Runnable ok) {
            JFXButton btnOk = new JFXButton(i18n("button.ok"));
            btnOk.getStyleClass().add("dialog-accept");
@@ -21,7 +21,6 @@ import com.jfoenix.controls.JFXRadioButton;
 import com.jfoenix.controls.JFXTextField;
 import com.jfoenix.validation.base.ValidatorBase;
 import javafx.beans.property.*;
-import javafx.collections.ObservableList;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
@@ -40,7 +39,7 @@ import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;

-public class MultiFileItem<T> extends VBox {
+public final class MultiFileItem<T> extends VBox {
    private final ObjectProperty<T> selectedData = new SimpleObjectProperty<>(this, "selectedData");
    private final ObjectProperty<T> fallbackData = new SimpleObjectProperty<>(this, "fallbackData");

@@ -57,7 +56,7 @@ public class MultiFileItem<T> extends VBox {
            if (toggleSelectedListener != null)
                toggleSelectedListener.accept(newValue);

-            selectedData.set((T) newValue.getUserData());
+            selectedData.set(newValue != null ? (T) newValue.getUserData() : null);
        });
        selectedData.addListener((a, b, newValue) -> {
            Optional<Toggle> selecting = group.getToggles().stream()
@@ -114,6 +113,7 @@ public class MultiFileItem<T> extends VBox {
    public static class Option<T> {
        protected final String title;
        protected String subtitle;
+        protected String tooltip;
        protected final T data;
        protected final BooleanProperty selected = new SimpleBooleanProperty();
        protected final JFXRadioButton left = new JFXRadioButton();
@@ -140,6 +140,11 @@ public class MultiFileItem<T> extends VBox {
            return this;
        }

+        public Option<T> setTooltip(String tooltip) {
+            this.tooltip = tooltip;
+            return this;
+        }
+
        public boolean isSelected() {
            return left.isSelected();
        }
@@ -161,6 +166,8 @@ public class MultiFileItem<T> extends VBox {
            BorderPane.setAlignment(left, Pos.CENTER_LEFT);
            left.setToggleGroup(group);
            left.setUserData(data);
+            if (StringUtils.isNotBlank(tooltip))
+                FXUtils.installFastTooltip(left, tooltip);
            pane.setLeft(left);

            if (StringUtils.isNotBlank(subtitle)) {
@@ -176,13 +183,17 @@ public class MultiFileItem<T> extends VBox {
        }
    }

-    public static class StringOption<T> extends Option<T> {
-        private JFXTextField customField = new JFXTextField();
+    public static final class StringOption<T> extends Option<T> {
+        private final JFXTextField customField = new JFXTextField();

        public StringOption(String title, T data) {
            super(title, data);
        }

+        public JFXTextField getCustomField() {
+            return customField;
+        }
+
        public String getValue() {
            return customField.getText();
        }
@@ -196,7 +207,7 @@ public class MultiFileItem<T> extends VBox {
        }

        public StringOption<T> bindBidirectional(Property<String> property) {
-            customField.textProperty().bindBidirectional(property);
+            FXUtils.bindString(customField, property);
            return this;
        }

@@ -230,8 +241,8 @@ public class MultiFileItem<T> extends VBox {
        }
    }

-    public static class FileOption<T> extends Option<T> {
-        private FileSelector selector = new FileSelector();
+    public static final class FileOption<T> extends Option<T> {
+        private final FileSelector selector = new FileSelector();

        public FileOption(String title, T data) {
            super(title, data);
@@ -264,8 +275,9 @@ public class MultiFileItem<T> extends VBox {
            return this;
        }

-        public ObservableList<FileChooser.ExtensionFilter> getExtensionFilters() {
-            return selector.getExtensionFilters();
+        public FileOption<T> addExtensionFilter(FileChooser.ExtensionFilter filter) {
+            selector.getExtensionFilters().add(filter);
+            return this;
        }

        @Override
@@ -31,11 +31,11 @@ import org.jackhuang.hmcl.ui.animation.AnimationProducer;
 import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
 import org.jackhuang.hmcl.ui.animation.TransitionPane;
 import org.jackhuang.hmcl.ui.wizard.Navigation;
-import org.jackhuang.hmcl.util.Logging;

 import java.util.Optional;
 import java.util.Stack;
-import java.util.logging.Level;
+
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;

 public class Navigator extends TransitionPane {
    private static final String PROPERTY_DIALOG_CLOSE_HANDLER = Navigator.class.getName() + ".closeListener";
@@ -65,7 +65,7 @@ public class Navigator extends TransitionPane {
        if (from == node)
            return;

-        Logging.LOG.info("Navigate to " + node);
+        LOG.info("Navigate to " + node);

        stack.push(node);
        backable.set(canGoBack());
@@ -104,11 +104,11 @@ public class Navigator extends TransitionPane {

        if (stack.peek() != from) {
            // Allow page to be closed multiple times.
-            Logging.LOG.log(Level.INFO, "Closing already closed page: " + from, new Throwable());
+            LOG.info("Closing already closed page: " + from, new Throwable());
            return;
        }

-        Logging.LOG.info("Closed page " + from);
+        LOG.info("Closed page " + from);

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

        NavigationEvent navigated = new NavigationEvent(this, node, Navigation.NavigationDirection.PREVIOUS, NavigationEvent.NAVIGATED);
@@ -61,9 +61,7 @@ public class OptionToggleButton extends StackPane {
        toggleButton.setSize(8);
        FXUtils.setLimitHeight(toggleButton, 30);

-        container.setOnMouseClicked(e -> {
-            toggleButton.setSelected(!toggleButton.isSelected());
-        });
+        FXUtils.onClicked(container, () -> toggleButton.setSelected(!toggleButton.isSelected()));

        FXUtils.onChangeAndOperate(subtitleProperty(), subtitle -> {
            if (StringUtils.isNotBlank(subtitle)) {
@@ -32,7 +32,6 @@ import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
 import org.jackhuang.hmcl.ui.animation.TransitionPane;
-import org.jackhuang.hmcl.util.javafx.BindingMapping;

@DefaultProperty("content")
 public class SpinnerPane extends Control {
@@ -101,18 +100,19 @@ public class SpinnerPane extends Control {
        return onFailedActionProperty().get();
    }

-    private ObjectProperty<EventHandler<Event>> onFailedAction = new SimpleObjectProperty<EventHandler<Event>>(this, "onFailedAction") {
+    private final ObjectProperty<EventHandler<Event>> onFailedAction = new SimpleObjectProperty<EventHandler<Event>>(this, "onFailedAction") {
        @Override
        protected void invalidated() {
            setEventHandler(FAILED_ACTION, get());
        }
    };
+
    @Override
-    protected Skin createDefaultSkin() {
+    protected SkinBase<SpinnerPane> createDefaultSkin() {
        return new Skin(this);
    }

-    private static class Skin extends SkinBase<SpinnerPane> {
+    private static final class Skin extends SkinBase<SpinnerPane> {
        private final JFXSpinner spinner = new JFXSpinner();
        private final StackPane contentPane = new StackPane();
        private final StackPane topPane = new StackPane();
@@ -122,20 +122,18 @@ public class SpinnerPane extends Control {
        @SuppressWarnings("FieldCanBeLocal") // prevent from gc.
        private final InvalidationListener observer;

-        protected Skin(SpinnerPane control) {
+        Skin(SpinnerPane control) {
            super(control);

            topPane.getChildren().setAll(spinner);
            topPane.getStyleClass().add("notice-pane");
            failedPane.getStyleClass().add("notice-pane");
            failedPane.getChildren().setAll(failedReasonLabel);
-            failedPane.onMouseClickedProperty().bind(
-                    BindingMapping.of(control.onFailedAction)
-                            .map(actionHandler -> (e -> {
-                                if (actionHandler != null) {
-                                    actionHandler.handle(new Event(FAILED_ACTION));
-                                }
-                            })));
+            FXUtils.onClicked(failedPane, () -> {
+                EventHandler<Event> action = control.getOnFailedAction();
+                if (action != null)
+                    action.handle(new Event(FAILED_ACTION));
+            });

            FXUtils.onChangeAndOperate(getSkinnable().content, newValue -> {
                if (newValue == null) {
@@ -148,12 +146,12 @@ public class SpinnerPane extends Control {

            observer = FXUtils.observeWeak(() -> {
                if (getSkinnable().getFailedReason() != null) {
-                    root.setContent(failedPane, ContainerAnimations.FADE.getAnimationProducer());
+                    root.setContent(failedPane, ContainerAnimations.FADE);
                    failedReasonLabel.setText(getSkinnable().getFailedReason());
                } else if (getSkinnable().isLoading()) {
-                    root.setContent(topPane, ContainerAnimations.FADE.getAnimationProducer());
+                    root.setContent(topPane, ContainerAnimations.FADE);
                } else {
-                    root.setContent(contentPane, ContainerAnimations.FADE.getAnimationProducer());
+                    root.setContent(contentPane, ContainerAnimations.FADE);
                }
            }, getSkinnable().loadingProperty(), getSkinnable().failedReasonProperty());
        }
@@ -19,11 +19,12 @@ package org.jackhuang.hmcl.ui.construct;

 import javafx.scene.Node;
 import javafx.scene.layout.StackPane;
-import org.jackhuang.hmcl.util.Logging;

 import java.util.Optional;
 import java.util.Stack;

+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
+
 public class StackContainerPane extends StackPane {
    private final Stack<Node> stack = new Stack<>();

@@ -39,7 +40,7 @@ public class StackContainerPane extends StackPane {
        stack.push(node);
        getChildren().setAll(node);

-        Logging.LOG.info(this + " " + stack);
+        LOG.info(this + " " + stack);
    }

    public void pop(Node node) {
@@ -49,7 +50,7 @@ public class StackContainerPane extends StackPane {
        else
            getChildren().setAll(stack.peek());

-        Logging.LOG.info(this + " " + stack + ", removed: " + flag + ", object: " + node);
+        LOG.info(this + " " + stack + ", removed: " + flag + ", object: " + node);
    }

    public boolean isEmpty() {
@@ -30,7 +30,6 @@ import javafx.geometry.Insets;
 import javafx.geometry.Side;
 import javafx.scene.Node;
 import javafx.scene.control.*;
-import javafx.scene.input.MouseButton;
 import javafx.scene.layout.*;
 import javafx.scene.paint.Color;
 import javafx.scene.transform.Rotate;
@@ -39,6 +38,7 @@ import javafx.util.Duration;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.util.javafx.MappedObservableList;

+@SuppressWarnings("deprecation")
 public class TabHeader extends Control implements TabControl, PageAware {

    public TabHeader(Tab<?>... tabs) {
@@ -593,11 +593,9 @@ public class TabHeader extends Control implements TabControl, PageAware {

                FXUtils.onChangeAndOperate(tab.selectedProperty(), selected -> inner.pseudoClassStateChanged(SELECTED_PSEUDOCLASS_STATE, selected));

-                this.setOnMouseClicked(event -> {
-                    if (event.getButton() == MouseButton.PRIMARY) {
-                        this.setOpacity(1);
-                        getSkinnable().getSelectionModel().select(tab);
-                    }
+                FXUtils.onClicked(this, () -> {
+                    this.setOpacity(1);
+                    getSkinnable().getSelectionModel().select(tab);
                });
            }
        }
@@ -88,7 +88,9 @@ public class TaskExecutorDialogPane extends BorderPane {

        btnCancel.setOnAction(e -> {
            Optional.ofNullable(executor).ifPresent(TaskExecutor::cancel);
-            onCancel.getCancellationAction().accept(this);
+            if (onCancel.getCancellationAction() != null) {
+                onCancel.getCancellationAction().accept(this);
+            }
        });

        speedEventHandler = speedEvent -> {
@@ -34,12 +34,15 @@ import org.jackhuang.hmcl.download.forge.ForgeNewInstallTask;
 import org.jackhuang.hmcl.download.forge.ForgeOldInstallTask;
 import org.jackhuang.hmcl.download.game.GameAssetDownloadTask;
 import org.jackhuang.hmcl.download.game.GameInstallTask;
-import org.jackhuang.hmcl.download.java.JavaDownloadTask;
+import org.jackhuang.hmcl.download.java.mojang.MojangJavaDownloadTask;
 import org.jackhuang.hmcl.download.liteloader.LiteLoaderInstallTask;
+import org.jackhuang.hmcl.download.neoforge.NeoForgeInstallTask;
+import org.jackhuang.hmcl.download.neoforge.NeoForgeOldInstallTask;
 import org.jackhuang.hmcl.download.optifine.OptiFineInstallTask;
 import org.jackhuang.hmcl.download.quilt.QuiltAPIInstallTask;
 import org.jackhuang.hmcl.download.quilt.QuiltInstallTask;
 import org.jackhuang.hmcl.game.HMCLModpackInstallTask;
+import org.jackhuang.hmcl.java.JavaInstallTask;
 import org.jackhuang.hmcl.mod.MinecraftInstanceTask;
 import org.jackhuang.hmcl.mod.ModpackInstallTask;
 import org.jackhuang.hmcl.mod.ModpackUpdateTask;
@@ -123,6 +126,8 @@ public final class TaskListPane extends StackPane {
                    task.setName(i18n("install.installer.install", i18n("install.installer.game")));
                } else if (task instanceof ForgeNewInstallTask || task instanceof ForgeOldInstallTask) {
                    task.setName(i18n("install.installer.install", i18n("install.installer.forge")));
+                } else if (task instanceof NeoForgeInstallTask || task instanceof NeoForgeOldInstallTask) {
+                    task.setName(i18n("install.installer.install", i18n("install.installer.neoforge")));
                } else if (task instanceof LiteLoaderInstallTask) {
                    task.setName(i18n("install.installer.install", i18n("install.installer.liteloader")));
                } else if (task instanceof OptiFineInstallTask) {
@@ -155,8 +160,10 @@ public final class TaskListPane extends StackPane {
                    task.setName(i18n("modpack.export"));
                } else if (task instanceof MinecraftInstanceTask) {
                    task.setName(i18n("modpack.scan"));
-                } else if (task instanceof JavaDownloadTask) {
+                } else if (task instanceof MojangJavaDownloadTask) {
                    task.setName(i18n("download.java"));
+                } else if (task instanceof JavaInstallTask) {
+                    task.setName(i18n("java.install"));
                }

                Platform.runLater(() -> {
@@ -248,6 +255,7 @@ public final class TaskListPane extends StackPane {
                case "hmcl.install.assets": message = i18n("assets.download"); break;
                case "hmcl.install.game": message = i18n("install.installer.install", i18n("install.installer.game") + " " + stageValue); break;
                case "hmcl.install.forge": message = i18n("install.installer.install", i18n("install.installer.forge") + " " + stageValue); break;
+                case "hmcl.install.neoforge": message = i18n("install.installer.install", i18n("install.installer.neoforge") + " " + stageValue); break;
                case "hmcl.install.liteloader": message = i18n("install.installer.install", i18n("install.installer.liteloader") + " " + stageValue); break;
                case "hmcl.install.optifine": message = i18n("install.installer.install", i18n("install.installer.optifine") + " " + stageValue); break;
                case "hmcl.install.fabric": message = i18n("install.installer.install", i18n("install.installer.fabric") + " " + stageValue); break;
@@ -262,21 +270,21 @@ public final class TaskListPane extends StackPane {
            BorderPane.setMargin(title, new Insets(0, 0, 0, 8));
            setPadding(new Insets(0, 0, 8, 4));
            setCenter(title);
-            setLeft(FXUtils.limitingSize(SVG.dotsHorizontal(Theme.blackFillBinding(), 14, 14), 14, 14));
+            setLeft(FXUtils.limitingSize(SVG.DOTS_HORIZONTAL.createIcon(Theme.blackFill(), 14, 14), 14, 14));
        }

        public void begin() {
            if (started) return;
            started = true;
-            setLeft(FXUtils.limitingSize(SVG.arrowRight(Theme.blackFillBinding(), 14, 14), 14, 14));
+            setLeft(FXUtils.limitingSize(SVG.ARROW_RIGHT.createIcon(Theme.blackFill(), 14, 14), 14, 14));
        }

        public void fail() {
-            setLeft(FXUtils.limitingSize(SVG.close(Theme.blackFillBinding(), 14, 14), 14, 14));
+            setLeft(FXUtils.limitingSize(SVG.CLOSE.createIcon(Theme.blackFill(), 14, 14), 14, 14));
        }

        public void succeed() {
-            setLeft(FXUtils.limitingSize(SVG.check(Theme.blackFillBinding(), 14, 14), 14, 14));
+            setLeft(FXUtils.limitingSize(SVG.CHECK.createIcon(Theme.blackFill(), 14, 14), 14, 14));
        }

        public void count() {
@@ -301,7 +309,7 @@ public final class TaskListPane extends StackPane {
        private final Label title = new Label();
        private final Label state = new Label();
        private final DoubleBinding binding = Bindings.createDoubleBinding(() ->
-                        getWidth() - getPadding().getLeft() - getPadding().getRight(),
+                        getWidth() - getPadding().getLeft() - getPadding().getRight() - getInsets().getLeft() - getInsets().getRight(),
                paddingProperty(), widthProperty());

        public ProgressListNode(Task<?> task) {
@@ -30,6 +30,8 @@ import javafx.scene.Node;
 import javafx.scene.image.Image;
 import javafx.scene.input.DragEvent;
 import javafx.scene.input.KeyEvent;
+import javafx.scene.input.MouseButton;
+import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.*;
 import javafx.scene.paint.Color;
 import javafx.stage.Stage;
@@ -47,9 +49,10 @@ import org.jackhuang.hmcl.ui.construct.Navigator;
 import org.jackhuang.hmcl.ui.construct.StackContainerPane;
 import org.jackhuang.hmcl.ui.wizard.Refreshable;
 import org.jackhuang.hmcl.ui.wizard.WizardProvider;
-import org.jackhuang.hmcl.util.io.NetworkUtils;
+import org.jetbrains.annotations.Nullable;

 import java.io.IOException;
+import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -58,15 +61,13 @@ import java.util.Locale;
 import java.util.Optional;
 import java.util.Random;
 import java.util.concurrent.CompletableFuture;
-import java.util.logging.Level;
 import java.util.stream.Stream;

-import static java.util.logging.Level.WARNING;
 import static java.util.stream.Collectors.toList;
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
-import static org.jackhuang.hmcl.ui.FXUtils.newImage;
+import static org.jackhuang.hmcl.ui.FXUtils.newBuiltinImage;
 import static org.jackhuang.hmcl.ui.FXUtils.onEscPressed;
-import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 import static org.jackhuang.hmcl.util.io.FileUtils.getExtension;

 public class DecoratorController {
@@ -142,6 +143,18 @@ public class DecoratorController {

        // press ESC to go back
        onEscPressed(navigator, this::back);
+
+        try {
+            // For JavaFX 12+
+            MouseButton button = MouseButton.valueOf("BACK");
+            navigator.addEventFilter(MouseEvent.MOUSE_CLICKED, e -> {
+                if (e.getButton() == button) {
+                    back();
+                    e.consume();
+                }
+            });
+        } catch (IllegalArgumentException ignored) {
+        }
    }

    public Decorator getDecorator() {
@@ -164,15 +177,20 @@ public class DecoratorController {
            case CUSTOM:
                String backgroundImage = config().getBackgroundImage();
                if (backgroundImage != null)
-                    image = tryLoadImage(Paths.get(backgroundImage)).orElse(null);
+                    image = tryLoadImage(Paths.get(backgroundImage));
                break;
            case NETWORK:
                String backgroundImageUrl = config().getBackgroundImageUrl();
-                if (backgroundImageUrl != null && NetworkUtils.isURL(backgroundImageUrl))
-                    image = tryLoadImage(backgroundImageUrl).orElse(null);
+                if (backgroundImageUrl != null) {
+                    try {
+                        image = FXUtils.loadImage(new URL(backgroundImageUrl));
+                    } catch (Exception e) {
+                        LOG.warning("Couldn't load background image", e);
+                    }
+                }
                break;
            case CLASSIC:
-                image = newImage("/assets/img/background-classic.jpg");
+                image = newBuiltinImage("/assets/img/background-classic.jpg");
                break;
            case TRANSLUCENT:
                return new Background(new BackgroundFill(new Color(1, 1, 1, 0.5), CornerRadii.EMPTY, Insets.EMPTY));
@@ -183,84 +201,61 @@ public class DecoratorController {
        return new Background(new BackgroundImage(image, BackgroundRepeat.NO_REPEAT, BackgroundRepeat.NO_REPEAT, BackgroundPosition.DEFAULT, new BackgroundSize(800, 480, false, false, true, true)));
    }

-    private volatile Image defaultBackground;
-
    /**
     * Load background image from bg/, background.png, background.jpg, background.gif
     */
    private Image loadDefaultBackgroundImage() {
-        Optional<Image> image = randomImageIn(Paths.get("bg"));
-        if (!image.isPresent()) {
-            image = tryLoadImage(Paths.get("background.png"));
-        }
-        if (!image.isPresent()) {
-            image = tryLoadImage(Paths.get("background.jpg"));
-        }
-        if (!image.isPresent()) {
-            image = tryLoadImage(Paths.get("background.gif"));
+        Image image = randomImageIn(Paths.get("bg"));
+        if (image != null)
+            return image;
+
+        for (String extension : FXUtils.IMAGE_EXTENSIONS) {
+            image = tryLoadImage(Paths.get("background." + extension));
+            if (image != null)
+                return image;
        }

-        return image.orElseGet(() -> {
-            if (defaultBackground == null)
-                defaultBackground = newImage("/assets/img/background.jpg");
-            return defaultBackground;
-        });
+        return newBuiltinImage("/assets/img/background.jpg");
    }

-    private Optional<Image> randomImageIn(Path imageDir) {
+    private @Nullable Image randomImageIn(Path imageDir) {
        if (!Files.isDirectory(imageDir)) {
-            return Optional.empty();
+            return null;
        }

        List<Path> candidates;
        try (Stream<Path> stream = Files.list(imageDir)) {
            candidates = stream
+                    .filter(it -> FXUtils.IMAGE_EXTENSIONS.contains(getExtension(it).toLowerCase(Locale.ROOT)))
                    .filter(Files::isReadable)
-                    .filter(it -> {
-                        String ext = getExtension(it).toLowerCase(Locale.ROOT);
-                        return ext.equals("png") || ext.equals("jpg") || ext.equals("gif");
-                    })
                    .collect(toList());
        } catch (IOException e) {
-            LOG.log(Level.WARNING, "Failed to list files in ./bg", e);
-            return Optional.empty();
+            LOG.warning("Failed to list files in ./bg", e);
+            return null;
        }

        Random rnd = new Random();
-        while (candidates.size() > 0) {
+        while (!candidates.isEmpty()) {
            int selected = rnd.nextInt(candidates.size());
-            Optional<Image> loaded = tryLoadImage(candidates.get(selected));
-            if (loaded.isPresent()) {
+            Image loaded = tryLoadImage(candidates.get(selected));
+            if (loaded != null)
                return loaded;
-            } else {
+            else
                candidates.remove(selected);
-            }
        }
-        return Optional.empty();
+        return null;
    }

-    private Optional<Image> tryLoadImage(Path path) {
+    private @Nullable Image tryLoadImage(Path path) {
        if (!Files.isReadable(path))
-            return Optional.empty();
+            return null;

-        return tryLoadImage(path.toAbsolutePath().toUri().toString());
-    }
-
-    private Optional<Image> tryLoadImage(String url) {
-        Image img;
        try {
-            img = new Image(url);
-        } catch (IllegalArgumentException e) {
-            LOG.log(WARNING, "Couldn't load background image", e);
-            return Optional.empty();
+            return FXUtils.loadImage(path);
+        } catch (Exception e) {
+            LOG.warning("Couldn't load background image", e);
+            return null;
        }
-
-        if (img.getException() != null) {
-            LOG.log(WARNING, "Couldn't load background image", img.getException());
-            return Optional.empty();
-        }
-
-        return Optional.of(img);
    }

    // ==== Navigation ====
@@ -433,7 +428,7 @@ public class DecoratorController {
    public void startWizard(WizardProvider wizardProvider, String category) {
        FXUtils.checkFxUserThread();

-        navigator.navigate(new DecoratorWizardDisplayer(wizardProvider, category), ContainerAnimations.FADE.getAnimationProducer());
+        navigator.navigate(new DecoratorWizardDisplayer(wizardProvider, category), ContainerAnimations.FADE);
    }

    // ==== Authlib Injector DnD ====
@@ -18,10 +18,8 @@
 package org.jackhuang.hmcl.ui.decorator;

 import com.jfoenix.controls.JFXButton;
-import com.jfoenix.svg.SVGGlyph;
 import javafx.beans.binding.Bindings;
 import javafx.collections.ListChangeListener;
-import javafx.css.PseudoClass;
 import javafx.geometry.Bounds;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
@@ -29,11 +27,10 @@ import javafx.scene.Cursor;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.control.SkinBase;
+import javafx.scene.effect.BlurType;
+import javafx.scene.effect.DropShadow;
 import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.AnchorPane;
-import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.StackPane;
+import javafx.scene.layout.*;
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
@@ -44,13 +41,8 @@ import org.jackhuang.hmcl.ui.animation.AnimationProducer;
 import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
 import org.jackhuang.hmcl.ui.animation.TransitionPane;
 import org.jackhuang.hmcl.ui.wizard.Navigation;
-import org.jackhuang.hmcl.util.Lang;

 public class DecoratorSkin extends SkinBase<Decorator> {
-    private static final PseudoClass TRANSPARENT = PseudoClass.getPseudoClass("transparent");
-    private static final SVGGlyph minus = Lang.apply(new SVGGlyph(0, "MINUS", "M804.571 420.571v109.714q0 22.857-16 38.857t-38.857 16h-694.857q-22.857 0-38.857-16t-16-38.857v-109.714q0-22.857 16-38.857t38.857-16h694.857q22.857 0 38.857 16t16 38.857z", Color.WHITE),
-        glyph -> { glyph.setSize(12, 2); glyph.setTranslateY(4); });
-
    private final StackPane root, parent;
    private final StackPane titleContainer;
    private final Stage primaryStage;
@@ -69,14 +61,13 @@ public class DecoratorSkin extends SkinBase<Decorator> {

        primaryStage = control.getPrimaryStage();

-        minus.fillProperty().bind(Theme.foregroundFillBinding());
-
        Decorator skinnable = getSkinnable();
        root = new StackPane();
        root.getStyleClass().add("window");

        StackPane shadowContainer = new StackPane();
        shadowContainer.getStyleClass().add("body");
+        shadowContainer.setEffect(new DropShadow(BlurType.ONE_PASS_BOX, Color.rgb(0, 0, 0, 0.4), 10, 0.3, 0.0, 0.0));

        parent = new StackPane();
        Rectangle clip = new Rectangle();
@@ -141,6 +132,8 @@ public class DecoratorSkin extends SkinBase<Decorator> {
        titleContainer.setPickOnBounds(false);
        titleContainer.getStyleClass().addAll("jfx-tool-bar");

+        // Maybe, we can automatically identify whether the top part of the picture is light-coloured or dark when the title is transparent,
+        // and decide whether the whole top bar should be rendered in white or black. TODO
        FXUtils.onChangeAndOperate(skinnable.titleTransparentProperty(), titleTransparent -> {
            if (titleTransparent) {
                wrapper.backgroundProperty().bind(skinnable.contentBackgroundProperty());
@@ -172,11 +165,11 @@ public class DecoratorSkin extends SkinBase<Decorator> {
                if (s.isAnimate()) {
                    AnimationProducer animation;
                    if (skinnable.getNavigationDirection() == Navigation.NavigationDirection.NEXT) {
-                        animation = ContainerAnimations.SWIPE_LEFT_FADE_SHORT.getAnimationProducer();
+                        animation = ContainerAnimations.SWIPE_LEFT_FADE_SHORT;
                    } else if (skinnable.getNavigationDirection() == Navigation.NavigationDirection.PREVIOUS) {
-                        animation = ContainerAnimations.SWIPE_RIGHT_FADE_SHORT.getAnimationProducer();
+                        animation = ContainerAnimations.SWIPE_RIGHT_FADE_SHORT;
                    } else {
-                        animation = ContainerAnimations.FADE.getAnimationProducer();
+                        animation = ContainerAnimations.FADE;
                    }
                    skinnable.setNavigationDirection(Navigation.NavigationDirection.START);
                    navBarPane.setContent(node, animation);
@@ -194,19 +187,22 @@ public class DecoratorSkin extends SkinBase<Decorator> {
            buttonsContainer.setAlignment(Pos.TOP_RIGHT);
            buttonsContainer.setMaxHeight(40);
            {
+                JFXButton btnHelp = new JFXButton();
+                btnHelp.setGraphic(SVG.HELP_CIRCLE_OUTLINE.createIcon(Theme.foregroundFillBinding(), -1, -1));
+                btnHelp.getStyleClass().add("jfx-decorator-button");
+                btnHelp.setOnAction(e -> FXUtils.openLink("https://docs.hmcl.net/help.html"));
+
                JFXButton btnMin = new JFXButton();
-                StackPane pane = new StackPane(minus);
-                pane.setAlignment(Pos.CENTER);
-                btnMin.setGraphic(pane);
+                btnMin.setGraphic(SVG.MINUS.createIcon(Theme.foregroundFillBinding(), -1, -1));
                btnMin.getStyleClass().add("jfx-decorator-button");
                btnMin.setOnAction(e -> skinnable.minimize());

                JFXButton btnClose = new JFXButton();
-                btnClose.setGraphic(SVG.close(Theme.foregroundFillBinding(), -1, -1));
+                btnClose.setGraphic(SVG.CLOSE.createIcon(Theme.foregroundFillBinding(), -1, -1));
                btnClose.getStyleClass().add("jfx-decorator-button");
                btnClose.setOnAction(e -> skinnable.close());

-                buttonsContainer.getChildren().setAll(btnMin, btnClose);
+                buttonsContainer.getChildren().setAll(btnHelp, btnMin, btnClose);
            }
            AnchorPane layer = new AnchorPane();
            layer.setPickOnBounds(false);
@@ -229,9 +225,9 @@ public class DecoratorSkin extends SkinBase<Decorator> {

            if (canBack) {
                JFXButton backNavButton = new JFXButton();
-                backNavButton.setGraphic(SVG.back(Theme.foregroundFillBinding(), -1, -1));
+                backNavButton.setGraphic(SVG.BACK.createIcon(Theme.foregroundFillBinding(), -1, -1));
                backNavButton.getStyleClass().add("jfx-decorator-button");
-                backNavButton.ripplerFillProperty().bind(Theme.whiteFillBinding());
+                backNavButton.ripplerFillProperty().set(Theme.whiteFill());
                backNavButton.onActionProperty().bind(skinnable.onBackNavButtonActionProperty());
                backNavButton.visibleProperty().set(canBack);

@@ -240,14 +236,14 @@ public class DecoratorSkin extends SkinBase<Decorator> {

            if (canClose) {
                JFXButton closeNavButton = new JFXButton();
-                closeNavButton.setGraphic(SVG.close(Theme.foregroundFillBinding(), -1, -1));
+                closeNavButton.setGraphic(SVG.CLOSE.createIcon(Theme.foregroundFillBinding(), -1, -1));
                closeNavButton.getStyleClass().add("jfx-decorator-button");
-                closeNavButton.ripplerFillProperty().bind(Theme.whiteFillBinding());
+                closeNavButton.ripplerFillProperty().set(Theme.whiteFill());
                closeNavButton.onActionProperty().bind(skinnable.onCloseNavButtonActionProperty());
                if (showCloseAsHome)
-                    closeNavButton.setGraphic(SVG.home(Theme.foregroundFillBinding(), -1, -1));
+                    closeNavButton.setGraphic(SVG.HOME.createIcon(Theme.foregroundFillBinding(), -1, -1));
                else
-                    closeNavButton.setGraphic(SVG.close(Theme.foregroundFillBinding(), -1, -1));
+                    closeNavButton.setGraphic(SVG.CLOSE.createIcon(Theme.foregroundFillBinding(), -1, -1));

                navLeft.getChildren().add(closeNavButton);
            }
@@ -286,9 +282,9 @@ public class DecoratorSkin extends SkinBase<Decorator> {
                HBox navRight = new HBox();
                navRight.setAlignment(Pos.CENTER_RIGHT);
                JFXButton refreshNavButton = new JFXButton();
-                refreshNavButton.setGraphic(SVG.refresh(Theme.foregroundFillBinding(), -1, -1));
+                refreshNavButton.setGraphic(SVG.REFRESH.createIcon(Theme.foregroundFillBinding(), -1, -1));
                refreshNavButton.getStyleClass().add("jfx-decorator-button");
-                refreshNavButton.ripplerFillProperty().bind(Theme.whiteFillBinding());
+                refreshNavButton.ripplerFillProperty().set(Theme.whiteFill());
                refreshNavButton.onActionProperty().bind(skinnable.onRefreshNavButtonActionProperty());

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