feat: custom zipfilesystem.

2021-10-24 17:21:47 +08:00
749 changed files with 24110 additions and 63747 deletions
@@ -0,0 +1,29 @@
+# 公告
+
+提交前请确保你的启动器版本是**最新的开发版**，可以在启动器设置中更换更新通道至开发版获取更新。
+
+**如果你在阅读完本公告后仍然希望在此处发布 issue，请将公告内容删去，并按照下面的模板填入相关信息。**
+
+
+
+我们发现，对于不经常检查邮箱的人来说，GitHub Issues 的反馈效率太低，时隔几个小时甚至一天的情况很多。
+为了改善反馈效率，并将积极为 HMCL 提供问题反馈和建议的人聚集起来，我们希望在这里反馈的人可以在 [Discord频道](https://discord.gg/jVvC7HfM6U)  [开黑啦频道](https://kaihei.co/Kx7n3t) 中反馈信息，**而不在 GitHub Issues 中反馈问题**。
+
+如果你希望在 QQ 群中反馈问题，请[赞助 HMCL](https://afdian.net/@huanghongxun) 后申请加入群聊，也请将下面的信息表填好直接发在群中，加快我们的沟通速度。
+
+
+
+# 问题提交
+
+*完整地填下面的问题提交表对我们很重要，这可以加快我们分析问题原因的速度。*
+
+* 启动器版本：
+* 操作系统：
+* Java 版本：
+* 错误截图（最好请将整个电脑屏幕的截图发上来）：
+* 游戏版本（如果是启动通过启动器自带的自动安装功能安装的游戏）：
+* 对游戏做的修改（是否自行通过安装器安装 Rift 等 API，以及 mod）：
+* 游戏崩溃报告（如果有）：
+* 启动器崩溃报告（如果有）：
+* 启动器日志文件（出现问题后点击启动器设置中的【导出启动器日志】按钮）：
+* 问题描述（如何触发问题）：
@@ -1,53 +0,0 @@
-name: Bug 反馈 | Bug Feedback
-description: 
-  反馈一个 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/) 下载最新快照版本。
-    
-        如果你的问题并不属于上述两类，你可以选取另一种 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
-      description: 请输入您遇到 BUG 的平台。 Please enter the platform on which you encountered the bug. 
-      placeholder: e.g. Windows 11
-    validations:
-      required: true
-  - type: textarea
-    id: bug-report
-    attributes:
-      label: 问题描述 | Problem Description
-      description: 请尽可能地详细描述你所遇到的问题，并描述如何重新触发这个问题。 Please describe the problem you met in as much detail as possible. Besides, please describe how to trigger this problem again.
-      placeholder: |
-        1. 点击 HMCL 上的某个按钮 | Click a button named ...
-        2. 向下翻页 | Scroll down
-        3. ...
-    validations:
-      required: true
-  - type: textarea
-    id: hmcl-crash-report-or-logs
-    attributes:
-      label: 启动器崩溃报告 / 启动器日志文件 | Launcher Crash Report / Launcher Log File
-      description: |
-        如果您的启动器崩溃了，请将崩溃报告填入（或将文件拖入）下方。
-        如果您的启动器没有崩溃，请在遇到问题后不要退出启动器，在启动器的【设置】>【通用】>【调试】一栏中点击“导出启动器日志”，并将导出的日志拖到下方的输入栏中。 
-        **请注意：启动器崩溃报告或日志文件是诊断问题的重要依据，请务必上传！**
-        
-        If your launcher crashes, please fill it in (or drag the file in) below.
-        If your launcher doesn't crash, please DO NOT EXIT your launcher, click "Export Launcher Log" in the [Settings] > [General] > [Debug] column of the launcher, and drag the exported log to the input field below.
-        **Attention: The crash report or the log file is the key to solve the problem. Please update it!**
-    validations:
-      required: true
@@ -1,11 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - 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 频道。| 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.
@@ -1,22 +0,0 @@
-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
@@ -1,46 +0,0 @@
-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,25 +1,23 @@
 name: Check Style

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

 jobs:
  build:
+
    runs-on: ubuntu-latest
+
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
+      - name: Checkout submodules
+        run: git submodule update --init --recursive
      - name: Set up JDK 11
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v1
        with:
          distribution: 'zulu'
          java-version: '11'
-          java-package: 'jdk+fx'
+          java-package: jdk+fx
      - name: Check style main
-        run: ./gradlew checkstyleMain --no-daemon
+        run: ./gradlew checkstyleMain
      - name: Check style test
-        run: ./gradlew checkstyleTest --no-daemon
+        run: ./gradlew checkstyleTest
@@ -1,23 +1,21 @@
 name: Check Translations

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

 jobs:
  build:
+
    runs-on: ubuntu-latest
+
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
+      - name: Checkout submodules
+        run: git submodule update --init --recursive
      - name: Set up JDK 11
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v1
        with:
          distribution: 'zulu'
          java-version: '11'
-          java-package: 'jdk+fx'
+          java-package: jdk+fx
      - name: Check style test
-        run: ./gradlew checkTranslations --no-daemon
+        run: ./gradlew checkTranslations
@@ -1,19 +1,18 @@
 name: Check Update

 on:
-  workflow_dispatch:
-  schedule:
-    - cron: '30 * * * *'
-
-permissions:
-  contents: write
+  push:
+    branches:
+      - javafx

 jobs:
-  dev-check-update:
-    if: ${{ github.repository_owner == 'HMCL-dev' }}
+  check-update:
+    if: ${{ github.repository_owner == 'huanghongxun' }}
    runs-on: ubuntu-latest
+    env:
+      HMCL_BASE_VERSION: '3.4'
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
      - name: Fetch tags
        run: git fetch --all --tags
      - name: Install tools
@@ -21,15 +20,15 @@ jobs:
      - name: Fetch last version
        run: |
          wget -O ci.json https://ci.huangyuhui.net/job/HMCL/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_BUILD_NUMBER=`cat ci.json | jq -M -r '.id'`
+          export HMCL_VERSION="$HMCL_BASE_VERSION.$HMCL_BUILD_NUMBER"
          export HMCL_COMMIT_SHA=`cat ci.json | jq -M -r '.actions[] | select(._class == "hudson.plugins.git.util.BuildData") | .lastBuiltRevision.SHA1'`

+          if [ "${#HMCL_BUILD_NUMBER}" != 3 ]; then exit 1; fi
          if [ "${#HMCL_COMMIT_SHA}" != 40 ]; then exit 1; fi

+          echo "HMCL_BUILD_NUMBER=$HMCL_BUILD_NUMBER" >> $GITHUB_ENV
          echo "HMCL_VERSION=$HMCL_VERSION" >> $GITHUB_ENV
          echo "HMCL_COMMIT_SHA=$HMCL_COMMIT_SHA" >> $GITHUB_ENV
          echo "HMCL_TAG_NAME=v$HMCL_VERSION" >> $GITHUB_ENV
@@ -39,24 +38,18 @@ jobs:
        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.exe.sha1"
          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"
+          wget "$DOWNLOAD_BASE_URL/HMCL-$HMCL_VERSION.jar.sha1"
        env:
-          DOWNLOAD_BASE_URL: https://ci.huangyuhui.net/job/HMCL/lastSuccessfulBuild/artifact/HMCL/build/libs
+          DOWNLOAD_BASE_URL: https://ci.huangyuhui.net/job/HMCL/${{ env.HMCL_BUILD_NUMBER }}/artifact/HMCL/build/libs
      - name: Generate release note
        if: ${{ env.continue == 'true' }}
        run: |
-          echo "The full changelogs can be found on the website: https://docs.hmcl.net/changelog/dev.html" >> RELEASE_NOTE
-          echo "Notice: changelogs are written in Chinese." >> RELEASE_NOTE
+          echo "HMCL v$HMCL_VERSION" >> RELEASE_NOTE
          echo "" >> RELEASE_NOTE
-          echo "| File Name | SHA-256 Checksum |"  >> RELEASE_NOTE
-          echo "| ---  | --- |" >> RELEASE_NOTE
-          echo "| HMCL-$HMCL_VERSION.exe | $(cat HMCL-$HMCL_VERSION.exe.sha256) |" >> RELEASE_NOTE
-          echo "| HMCL-$HMCL_VERSION.jar | $(cat HMCL-$HMCL_VERSION.jar.sha256) |" >> RELEASE_NOTE
-          echo "| HMCL-$HMCL_VERSION.sh  | $(cat HMCL-$HMCL_VERSION.sh.sha256) |"  >> RELEASE_NOTE
+          echo "The full changelogs can be found on the website: https://hmcl.huangyuhui.net/changelog/dev.html" >> RELEASE_NOTE
+          echo "Notice: changelogs are written in Chinese." >> RELEASE_NOTE
      - name: Create release
        if: ${{ env.continue == 'true' }}
        uses: softprops/action-gh-release@v1
@@ -64,72 +57,11 @@ jobs:
          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 }}.sh
+            HMCL-${{ env.HMCL_VERSION }}.jar.sha1
          target_commitish: ${{ env.HMCL_COMMIT_SHA }}
          name: ${{ env.HMCL_TAG_NAME }}
          tag_name: ${{ env.HMCL_TAG_NAME }}
-  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 | $(cat HMCL-$HMCL_VERSION.exe.sha256) |" >> RELEASE_NOTE
-          echo "| HMCL-$HMCL_VERSION.jar | $(cat HMCL-$HMCL_VERSION.jar.sha256) |" >> RELEASE_NOTE
-          echo "| HMCL-$HMCL_VERSION.sh  | $(cat HMCL-$HMCL_VERSION.sh.sha256) |"  >> RELEASE_NOTE
-      - name: Create release
-        if: ${{ env.continue == 'true' }}
-        uses: softprops/action-gh-release@v1
-        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 }}
@@ -1,21 +0,0 @@
-name: Sync to Gitee
-
-on:
-  push
-
-jobs:
-  run:
-    if: ${{ github.repository_owner == 'HMCL-dev' }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Mirror GitHub to Gitee
-        uses: Yikun/hub-mirror-action@v1.4
-        with:
-          src: github/HMCL-dev
-          dst: gitee/huanghongxun
-          static_list: 'HMCL'
-          force_update: true
-          debug: true
-          dst_key: ${{ secrets.GITEE_SYNC_BOT_PRIVATE_KEY }}
-          dst_token: ${{ secrets.GITEE_SYNC_BOT_TOKEN }}
-          cache_path: /github/workspace/hub-mirror-cache
@@ -1,11 +1,6 @@
 name: Java CI

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

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

    steps:
-    - uses: actions/checkout@v4
-    - name: Set up JDK 8
-      uses: actions/setup-java@v4
+    - uses: actions/checkout@v2
+    - name: Checkout submodules
+      run: git submodule update --init --recursive
+    - name: Set up JDK 11
+      uses: actions/setup-java@v2
      with:
        distribution: 'zulu'
-        java-version: 8
-        java-package: 'jdk+fx'
+        java-version: '11'
+        java-package: jdk+fx
    - name: Build with Gradle
-      run: ./gradlew build --no-daemon
-      env:
-        MICROSOFT_AUTH_ID: ${{ secrets.MICROSOFT_AUTH_ID }}
-        MICROSOFT_AUTH_SECRET: ${{ secrets.MICROSOFT_AUTH_SECRET }}
-        CURSEFORGE_API_KEY: ${{ secrets.CURSEFORGE_API_KEY }}
+      run: ./gradlew build
    - name: Get short SHA
      run: echo "SHORT_SHA=${GITHUB_SHA::7}" >> $GITHUB_ENV
    - name: Upload Artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v2
      with:
        name: HMCL-${{ env.SHORT_SHA }}
        path: HMCL/build/libs
@@ -0,0 +1,44 @@
+name: Create Release
+
+on:
+  push:
+    tags:
+      - "v*.*.*"
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check and set HMCL version
+        run: |
+          export HMCL_VERSION=`echo ${{ github.ref }} | awk '{print substr($0,12)}'`
+          echo "HMCL_VERSION=$HMCL_VERSION" >> $GITHUB_ENV
+
+          if [ -z `echo $HMCL_VERSION | grep "^[0-9]\.[0-9]\.[0-9]\{3\}\$"` ]; then
+            exit 1
+          fi
+
+          echo "HMCL_BUILD_NUMBER=`echo $HMCL_VERSION | awk '{print substr($0,5)}'`" >> $GITHUB_ENV
+      - name: Download artifacts
+        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.jar"
+          wget "$DOWNLOAD_BASE_URL/HMCL-$HMCL_VERSION.jar.sha1"
+        env:
+          DOWNLOAD_BASE_URL: https://ci.huangyuhui.net/job/HMCL/${{ env.HMCL_BUILD_NUMBER }}/artifact/HMCL/build/libs
+      - name: Generate release note
+        run: |
+          echo "HMCL v$HMCL_VERSION" >> RELEASE_NOTE
+          echo "" >> RELEASE_NOTE
+          echo "The full changelogs can be found on the website: https://hmcl.huangyuhui.net/changelog/dev.html" >> RELEASE_NOTE
+          echo "Notice: changelogs are written in Chinese." >> RELEASE_NOTE
+      - name: Create release
+        uses: softprops/action-gh-release@v1
+        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
@@ -12,27 +12,25 @@ hs_err_pid*
 .mine*
 /externalgames
 NVIDIA
-minecraft-exported-crash-info*

 # gradle build
 /build/
 /HMCL/build/
 /HMCLCore/build/
 /HMCLTransformerDiscoveryService/build/
-/minecraft/libraries/HMCLTransformerDiscoveryService/build/

 # idea
 .idea
 /out/
 /HMCL/out/
 /HMCLCore/out/
-/minecraft/libraries/HMCLTransformerDiscoveryService/out/
+/HMCLTransformerDiscoveryService/out/

 # eclipse
 /bin/
 /HMCL/bin/
 /HMCLCore/bin/
-/minecraft/libraries/HMCLTransformerDiscoveryService/bin/
+/HMCLTransformerDiscoveryService/bin/
 .classpath
 .project
 .settings
@@ -46,9 +44,6 @@ minecraft-exported-crash-info*
 # macos
 .DS_Store

-# vscode
-.vscode/
-
 # test
 /hmcl.json
 /.hmcl.json
@@ -0,0 +1,3 @@
+[submodule "JSTUN"]
+	path = JSTUN
+	url = https://github.com/huanghongxun/JSTUN
@@ -0,0 +1,14 @@
+language: java
+jdk:
+- oraclejdk8
+branches:
+  only:
+  - master
+before_install:
+- chmod +x gradlew
+script: "bash ./gradlew clean build --stacktrace"
+before_cache:
+- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
+cache:
+  directories:
+  - "$HOME/.gradle/caches/"
@@ -0,0 +1,313 @@
+buildscript {
+    repositories {
+        gradlePluginPortal()
+        maven { url 'https://jitpack.io' }
+    }
+    dependencies {
+        classpath 'org.tukaani:xz:1.8'
+        classpath 'org.glavo:pack200:0.3.0'
+
+        classpath 'com.guardsquare:proguard-gradle:7.1.0'  // The ProGuard Gradle plugin.
+    }
+}
+
+plugins {
+    id 'application'
+    id 'com.github.johnrengelman.shadow' version '7.0.0'
+}
+
+import java.nio.file.FileSystems
+import java.security.KeyFactory
+import java.security.MessageDigest
+import java.security.Signature
+import java.security.spec.PKCS8EncodedKeySpec
+import java.util.jar.JarFile
+import java.util.jar.JarOutputStream
+import java.util.zip.GZIPOutputStream
+import java.util.zip.ZipFile
+import java.nio.file.Files
+
+import org.tukaani.xz.LZMA2Options
+import org.tukaani.xz.XZOutputStream
+import org.glavo.pack200.Pack200
+
+def dev = null
+def shortcommit = System.getenv("GITHUB_SHA")?.toLowerCase()?.substring(0, 7) ?: null
+if (shortcommit != null && !shortcommit.isEmpty()) dev = "dev-" + shortcommit
+def buildnumber = System.getenv("BUILD_NUMBER") ?: dev ?: "SNAPSHOT"
+if (System.getenv("BUILD_NUMBER") != null && System.getenv("BUILD_NUMBER_OFFSET") != null)
+    buildnumber = (Integer.parseInt(System.getenv("BUILD_NUMBER")) - Integer.parseInt(System.getenv("BUILD_NUMBER_OFFSET"))).toString()
+def versionroot = System.getenv("VERSION_ROOT") ?: "3.4"
+def microsoftAuthId = System.getenv("MICROSOFT_AUTH_ID") ?: ""
+def microsoftAuthSecret = System.getenv("MICROSOFT_AUTH_SECRET") ?: ""
+def versionType = System.getenv("VERSION_TYPE") ?: "nightly"
+version = versionroot + '.' + buildnumber
+
+mainClassName = 'org.jackhuang.hmcl.Main'
+
+dependencies {
+    implementation project(":HMCLCore")
+    implementation rootProject.files("lib/JFoenix.jar")
+
+    implementation group: 'de.javawi.jstun', name: 'jstun', version: '0.7.4'
+}
+
+def digest(String algorithm, byte[] bytes) {
+    return MessageDigest.getInstance(algorithm).digest(bytes)
+}
+
+def createChecksum(File file) {
+    def algorithm = "SHA-1"
+    def suffix = "sha1"
+    new File(file.parentFile, file.name + "." + suffix).text = digest(algorithm, file.bytes).encodeHex().toString() + "\n"
+}
+
+def attachSignature(File jar) {
+    def keyLocation = System.getenv("HMCL_SIGNATURE_KEY");
+    if (keyLocation == null)
+        return
+    def privatekey = KeyFactory.getInstance("RSA").generatePrivate(new PKCS8EncodedKeySpec(new File(keyLocation).bytes))
+
+    def signer = Signature.getInstance("SHA512withRSA")
+    signer.initSign(privatekey)
+    new ZipFile(jar).withCloseable { zip ->
+        zip.stream()
+                .sorted(Comparator.comparing { it.name })
+                .filter { it.name != "META-INF/hmcl_signature" }
+                .forEach {
+                    signer.update(digest("SHA-512", it.name.getBytes("UTF-8")))
+                    signer.update(digest("SHA-512", zip.getInputStream(it).bytes))
+                }
+    }
+    def signature = signer.sign()
+
+    FileSystems.newFileSystem(URI.create("jar:" + jar.toURI()), [:]).withCloseable { zipfs ->
+        Files.newOutputStream(zipfs.getPath("META-INF/hmcl_signature")).withCloseable { it << signature }
+    }
+}
+
+ext.packer = Pack200.newPacker()
+packer.properties()["pack.effort"] = "9"
+ext.unpacker = Pack200.newUnpacker()
+
+// Pack200 does not guarantee that unpacked .class file is bit-wise same as the .class file before packing
+// because of shrinking. So we should pack .class files and unpack it to make sure that after unpacking
+// .class files remain the same.
+def repack(File file) {
+    def packed = new ByteArrayOutputStream()
+    new JarFile(file).withCloseable { packer.pack(it, packed) }
+    new JarOutputStream(file.newOutputStream()).withCloseable { unpacker.unpack(new ByteArrayInputStream(packed.toByteArray()), it) }
+}
+
+sourceSets {
+    java11 {
+        java {
+            srcDirs = ['src/main/java11']
+        }
+    }
+}
+
+compileJava11Java {
+    if(JavaVersion.current() < JavaVersion.VERSION_11) {
+        javaCompiler = javaToolchains.compilerFor {
+            languageVersion = JavaLanguageVersion.of(11)
+        }
+    }
+    options.compilerArgs.add('--add-exports=java.base/jdk.internal.loader=ALL-UNNAMED')
+    sourceCompatibility = 11
+    targetCompatibility = 11
+}
+
+shadowJar {
+    classifier = "shadow"
+
+    manifest {
+        attributes 'Created-By': 'Copyright(c) 2013-2021 huangyuhui.',
+                'Main-Class': mainClassName,
+                'Multi-Release': 'true',
+                'Implementation-Version': project.version,
+                'Microsoft-Auth-Id': microsoftAuthId,
+                'Microsoft-Auth-Secret': microsoftAuthSecret,
+                'Build-Channel': versionType,
+                'Class-Path': 'pack200.jar',
+                'Add-Opens': [
+                        'java.base/java.lang',
+                        'java.base/java.lang.reflect',
+                        'javafx.graphics/javafx.css',
+                        'javafx.base/com.sun.javafx.runtime',
+                        'javafx.controls/com.sun.javafx.scene.control.behavior',
+                        'javafx.controls/javafx.scene.control.skin',
+                        'javafx.controls/com.sun.javafx.scene.control',
+                        'javafx.base/com.sun.javafx.binding',
+                        'javafx.base/com.sun.javafx.event',
+                        'javafx.graphics/com.sun.javafx.stage'
+                ].join(" "),
+                'Add-Exports': [
+                        'java.base/jdk.internal.loader',
+                        'javafx.controls/com.sun.javafx.scene.control.behavior',
+                        'javafx.controls/javafx.scene.control.skin',
+                        'javafx.controls/com.sun.javafx.scene.control',
+                        'javafx.base/com.sun.javafx.binding',
+                        'javafx.graphics/com.sun.javafx.stage',
+                        'javafx.base/com.sun.javafx.event'
+                ].join(" ")
+    }
+}
+
+task proguard(type: proguard.gradle.ProGuardTask) {
+    dependsOn shadowJar
+    injars shadowJar
+
+    outjars "${buildDir}/libs/${project.name}-${project.version}-proguard.jar"
+
+    dontobfuscate
+    dontoptimize
+
+    keep 'class org.jackhuang.** { *; }'
+    keep 'class com.jfoenix.** { *; }'
+    keep 'class com.google.gson.** { *; }'
+    keep 'class com.github.steveice10.opennbt.** { *; }' // TagRegistry use reflection to create object instance
+
+    keep 'class * extends com.google.gson.TypeAdapter'
+    keep 'class * implements com.google.gson.TypeAdapterFactory'
+    keep 'class * implements com.google.gson.JsonSerializer'
+    keep 'class * implements com.google.gson.JsonDeserializer'
+
+    printusage "${buildDir}/libs/proguard-shrinking-details.txt"
+
+    System.out.println(new File(".").absolutePath)
+
+    dontwarn 'com.nqzero.**'
+    dontwarn 'org.slf4j.**'
+    dontwarn 'org.jackhuang.hmcl.util.Pack200Utils'
+    dontwarn 'com.sun.javafx.**'
+    dontwarn 'com.jfoenix.**'
+    dontwarn 'org.apache.**'
+
+    adaptclassstrings
+
+    // next block taken verbatim from Proguard's documentation examples:
+
+    libraryjars files(configurations.compileClasspath.collect())
+
+    keepattributes 'SourceFile,LineNumberTable'
+    keepattributes '*Annotation*'
+    keepattributes 'Signature'
+
+    var javaHome = System.getProperty('java.home')
+
+    // Automatically handle the Java version of this build.
+    if (System.getProperty('java.version').startsWith('1.')) {
+        // Before Java 9, the runtime classes were packaged in a single jar file.
+        libraryjars "${javaHome}/lib/rt.jar"
+        libraryjars "${javaHome}/lib/ext/jfxrt.jar"
+    } else {
+        // As of Java 9, the runtime classes are packaged in modular jmod files.
+        libraryjars "${javaHome}/jmods/java.base.jmod", jarfilter: '!**.jar', filter: '!module-info.class'
+        libraryjars "${javaHome}/jmods/java.desktop.jmod", jarfilter: '!**.jar', filter: '!module-info.class'
+        libraryjars "${javaHome}/jmods/java.logging.jmod", jarfilter: '!**.jar', filter: '!module-info.class'
+        libraryjars "${javaHome}/jmods/java.management.jmod", jarfilter: '!**.jar', filter: '!module-info.class'
+        libraryjars "${javaHome}/jmods/java.sql.jmod", jarfilter: '!**.jar', filter: '!module-info.class'
+        libraryjars "${javaHome}/jmods/java.xml.jmod", jarfilter: '!**.jar', filter: '!module-info.class'
+
+        libraryjars "${javaHome}/jmods/jdk.management.jmod", jarfilter: '!**.jar', filter: '!module-info.class'
+        libraryjars "${javaHome}/jmods/jdk.unsupported.jmod", jarfilter: '!**.jar', filter: '!module-info.class'
+
+        if (new File("${javaHome}/jmods/javafx.base.jmod").exists()) {
+            libraryjars "${javaHome}/jmods/javafx.base.jmod", jarfilter: '!**.jar', filter: '!module-info.class'
+            libraryjars "${javaHome}/jmods/javafx.controls.jmod", jarfilter: '!**.jar', filter: '!module-info.class'
+            libraryjars "${javaHome}/jmods/javafx.graphics.jmod", jarfilter: '!**.jar', filter: '!module-info.class'
+            libraryjars "${javaHome}/jmods/javafx.media.jmod", jarfilter: '!**.jar', filter: '!module-info.class'
+            libraryjars "${javaHome}/jmods/javafx.fxml.jmod", jarfilter: '!**.jar', filter: '!module-info.class'
+            libraryjars "${javaHome}/jmods/javafx.web.jmod", jarfilter: '!**.jar', filter: '!module-info.class'
+        }
+    }
+}
+
+task finalJar(type: Jar) {
+    dependsOn proguard
+
+    manifest = shadowJar.manifest
+
+    from { proguard.outJarFiles.collect { zipTree(it)} }
+
+    into('/') {
+        from { shadowJar.outputs.files.collect { zipTree(it) } }
+        include("META-INF/versions/**")
+    }
+
+    doLast {
+        repack(jar.archivePath) // see repack()
+        attachSignature(jar.archivePath)
+        createChecksum(jar.archivePath)
+    }
+}
+
+jar {
+    enabled = false
+    dependsOn finalJar
+}
+
+def createExecutable(String suffix, String header) {
+    def output = new File(jar.archivePath.parentFile, jar.archivePath.name[0..-4] + suffix)
+    output.bytes = new File(project.projectDir, header).bytes
+    output << jar.archivePath.bytes
+    createChecksum(output)
+}
+
+processResources {
+    ext.convertToBSS = { String resource ->
+        // exclude resource
+        doFirst {
+            def cssFile = new File(this.projectDir, "src/main/resources/" + resource)
+            def bssFile = new File(this.projectDir, "build/compiled-resources/" + resource[0..-4] + "bss")
+            bssFile.parentFile.mkdirs()
+            javaexec {
+                classpath = sourceSets.main.compileClasspath
+                mainClass = "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 java11Classes
+}
+
+task makePack(dependsOn: jar) {
+    ext.outputPath = new File(jar.archivePath.parentFile, jar.archivePath.name[0..-4] + "pack")
+    doLast {
+        outputPath.newOutputStream().withCloseable { out ->
+            new JarFile(jar.archivePath).withCloseable { jarFile -> packer.pack(jarFile, out) }
+        }
+        createChecksum(outputPath)
+    }
+}
+
+task makePackXz(dependsOn: makePack) doLast {
+    def packXz = new File(makePack.outputPath.parentFile, makePack.outputPath.name + ".xz")
+    // Our CI server does not have enough memory space to compress file at highest level.
+    new XZOutputStream(packXz.newOutputStream(), new LZMA2Options(5)).withCloseable { it << makePack.outputPath.bytes }
+    createChecksum(packXz)
+}
+
+task makePackGz(dependsOn: makePack) doLast {
+    def packGz = new File(makePack.outputPath.parentFile, makePack.outputPath.name + ".gz")
+    new GZIPOutputStream(packGz.newOutputStream()).withCloseable { it << makePack.outputPath.bytes }
+    createChecksum(packGz)
+}
+
+
+task makeExecutables(dependsOn: jar) doLast {
+    createExecutable("exe", "src/main/resources/assets/HMCLauncher.exe")
+}
+
+build.dependsOn makePackXz
+build.dependsOn makePackGz
+build.dependsOn makeExecutables
@@ -1,252 +0,0 @@
-import java.net.URI
-import java.nio.file.FileSystems
-import java.nio.file.Files
-import java.security.KeyFactory
-import java.security.MessageDigest
-import java.security.Signature
-import java.security.spec.PKCS8EncodedKeySpec
-import java.util.zip.ZipFile
-
-plugins {
-    id("com.github.johnrengelman.shadow") version "7.1.2"
-}
-
-val isOfficial = System.getenv("HMCL_SIGNATURE_KEY") != null
-        || (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")?.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 versionType = System.getenv("VERSION_TYPE") ?: if (isOfficial) "nightly" else "unofficial"
-
-val microsoftAuthId = System.getenv("MICROSOFT_AUTH_ID") ?: ""
-val microsoftAuthSecret = System.getenv("MICROSOFT_AUTH_SECRET") ?: ""
-val curseForgeApiKey = System.getenv("CURSEFORGE_API_KEY") ?: ""
-
-version = "$versionRoot.$buildNumber"
-
-dependencies {
-    implementation(project(":HMCLCore"))
-    implementation("libs:JFoenix")
-}
-
-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"
-    )
-
-    algorithms.forEach { (algorithm, ext) ->
-        File(file.parentFile, "${file.name}.$ext").writeText(
-            digest(algorithm, file.readBytes()).joinToString(separator = "", postfix = "\n") { "%02x".format(it) }
-        )
-    }
-}
-
-fun attachSignature(jar: File) {
-    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)
-    ZipFile(jar).use { zip ->
-        zip.stream()
-            .sorted(Comparator.comparing { it.name })
-            .filter { it.name != "META-INF/hmcl_signature" }
-            .forEach {
-                signer.update(digest("SHA-512", it.name.toByteArray()))
-                signer.update(digest("SHA-512", zip.getInputStream(it).readBytes()))
-            }
-    }
-    val signature = signer.sign()
-    FileSystems.newFileSystem(URI.create("jar:" + jar.toURI()), emptyMap<String, Any>()).use { zipfs ->
-        Files.newOutputStream(zipfs.getPath("META-INF/hmcl_signature")).use { it.write(signature) }
-    }
-}
-
-val java11 = sourceSets.create("java11") {
-    java {
-        srcDir("src/main/java11")
-    }
-}
-
-tasks.getByName<JavaCompile>(java11.compileJavaTaskName) {
-    if (JavaVersion.current() < JavaVersion.VERSION_11) {
-        javaCompiler.set(javaToolchains.compilerFor {
-            languageVersion.set(JavaLanguageVersion.of(11))
-        })
-    }
-    options.compilerArgs.add("--add-exports=java.base/jdk.internal.loader=ALL-UNNAMED")
-    sourceCompatibility = "11"
-    targetCompatibility = "11"
-}
-
-tasks.jar {
-    enabled = false
-    dependsOn(tasks["shadowJar"])
-}
-
-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/**")
-
-    minimize {
-        exclude(dependency("com.google.code.gson:.*:.*"))
-        exclude(dependency("libs:JFoenix:.*"))
-    }
-
-    manifest {
-        attributes(
-            "Created-By" to "Copyright(c) 2013-2024 huangyuhui.",
-            "Main-Class" to "org.jackhuang.hmcl.Main",
-            "Multi-Release" to "true",
-            "Implementation-Version" to project.version,
-            "Microsoft-Auth-Id" to microsoftAuthId,
-            "Microsoft-Auth-Secret" to microsoftAuthSecret,
-            "CurseForge-Api-Key" to curseForgeApiKey,
-            "Build-Channel" to versionType,
-            "Class-Path" to "pack200.jar",
-            "Add-Opens" to listOf(
-                "java.base/java.lang",
-                "java.base/java.lang.reflect",
-                "java.base/jdk.internal.loader",
-                "javafx.base/com.sun.javafx.binding",
-                "javafx.base/com.sun.javafx.event",
-                "javafx.base/com.sun.javafx.runtime",
-                "javafx.graphics/javafx.css",
-                "javafx.graphics/com.sun.javafx.stage",
-                "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",
-                "jdk.attach/sun.tools.attach"
-            ).joinToString(" ")
-        )
-
-        System.getenv("GITHUB_SHA")?.also {
-            attributes("GitHub-SHA" to it)
-        }
-    }
-
-    doLast {
-        attachSignature(jarPath)
-        createChecksum(jarPath)
-    }
-}
-
-fun createExecutable(suffix: String, header: String) {
-    val output = File(jarPath.parentFile, jarPath.nameWithoutExtension + '.' + suffix)
-
-    output.outputStream().use {
-        it.write(File(project.projectDir, header).readBytes())
-        it.write(jarPath.readBytes())
-    }
-
-    createChecksum(output)
-}
-
-tasks.processResources {
-    into("META-INF/versions/11") {
-        from(sourceSets["java11"].output)
-    }
-    dependsOn(tasks["java11Classes"])
-}
-
-val makeExecutables = tasks.create("makeExecutables") {
-    dependsOn(tasks.jar)
-    doLast {
-        createExecutable("exe", "src/main/resources/assets/HMCLauncher.exe")
-        createExecutable("sh", "src/main/resources/assets/HMCLauncher.sh")
-    }
-}
-
-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)
-
-    group = "application"
-
-    classpath = files(jarPath)
-    workingDir = rootProject.rootDir
-
-    val vmOptions = parseToolOptions(System.getenv("HMCL_JAVA_OPTS"))
-    jvmArgs(vmOptions)
-
-    doFirst {
-        logger.quiet("HMCL_JAVA_OPTS: $vmOptions")
-    }
-}
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg width="800px" height="800px" viewBox="0 -28.5 256 256" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
-    <g>
-        <path d="M216.856339,16.5966031 C200.285002,8.84328665 182.566144,3.2084988 164.041564,0 C161.766523,4.11318106 159.108624,9.64549908 157.276099,14.0464379 C137.583995,11.0849896 118.072967,11.0849896 98.7430163,14.0464379 C96.9108417,9.64549908 94.1925838,4.11318106 91.8971895,0 C73.3526068,3.2084988 55.6133949,8.86399117 39.0420583,16.6376612 C5.61752293,67.146514 -3.4433191,116.400813 1.08711069,164.955721 C23.2560196,181.510915 44.7403634,191.567697 65.8621325,198.148576 C71.0772151,190.971126 75.7283628,183.341335 79.7352139,175.300261 C72.104019,172.400575 64.7949724,168.822202 57.8887866,164.667963 C59.7209612,163.310589 61.5131304,161.891452 63.2445898,160.431257 C105.36741,180.133187 151.134928,180.133187 192.754523,160.431257 C194.506336,161.891452 196.298154,163.310589 198.110326,164.667963 C191.183787,168.842556 183.854737,172.420929 176.223542,175.320965 C180.230393,183.341335 184.861538,190.991831 190.096624,198.16893 C211.238746,191.588051 232.743023,181.531619 254.911949,164.955721 C260.227747,108.668201 245.831087,59.8662432 216.856339,16.5966031 Z M85.4738752,135.09489 C72.8290281,135.09489 62.4592217,123.290155 62.4592217,108.914901 C62.4592217,94.5396472 72.607595,82.7145587 85.4738752,82.7145587 C98.3405064,82.7145587 108.709962,94.5189427 108.488529,108.914901 C108.508531,123.290155 98.3405064,135.09489 85.4738752,135.09489 Z M170.525237,135.09489 C157.88039,135.09489 147.510584,123.290155 147.510584,108.914901 C147.510584,94.5396472 157.658606,82.7145587 170.525237,82.7145587 C183.391518,82.7145587 193.761324,94.5189427 193.539891,108.914901 C193.539891,123.290155 183.391518,135.09489 170.525237,135.09489 Z" fill="#5865F2" fill-rule="nonzero">
-␍</path>
-    </g>
-</svg>
@@ -1 +0,0 @@
-<svg viewBox="0 -0.5 52 56" shape-rendering="crispEdges" xmlns="http://www.w3.org/2000/svg"><path stroke="#38342a" d="M28 0h4m-4 1h4m-4 1h4m-4 1h4m-8 1h4m4 0h4M24 5h4m4 0h4M24 6h4m4 0h4M24 7h4m4 0h4M24 8h4m8 0h4M24 9h4m8 0h4m-16 1h4m8 0h4m-16 1h4m8 0h4m-20 1h4m4 0h4m8 0h4m-24 1h4m4 0h4m8 0h4m-24 1h4m4 0h4m8 0h4m-24 1h4m4 0h4m8 0h4m-28 1h4m12 0h4m8 0h4m-32 1h4m12 0h4m8 0h4m-32 1h4m12 0h4m8 0h4m-32 1h4m12 0h4m8 0h4m-36 1h4m20 0h4m4 0h8m-40 1h4m20 0h4m4 0h8m-40 1h4m20 0h4m4 0h8m-40 1h4m20 0h4m4 0h8M8 24h4m28 0h4m4 0h4M8 25h4m28 0h4m4 0h4M8 26h4m28 0h4m4 0h4M8 27h4m28 0h4m4 0h4M4 28h4m32 0h8M4 29h4m32 0h8M4 30h4m32 0h8M4 31h4m32 0h8M0 32h4m32 0h4M0 33h4m32 0h4M0 34h4m32 0h4M0 35h4m32 0h4M0 36h4m28 0h4M0 37h4m28 0h4M0 38h4m28 0h4M0 39h4m28 0h4M4 40h4m20 0h4M4 41h4m20 0h4M4 42h4m20 0h4M4 43h4m20 0h4M8 44h4m12 0h4M8 45h4m12 0h4M8 46h4m12 0h4M8 47h4m12 0h4m-16 1h4m4 0h8m-16 1h4m4 0h8m-16 1h4m4 0h8m-16 1h4m4 0h8m-12 1h8m-8 1h8m-8 1h8m-8 1h8"/><path stroke="#dbd0b4" d="M28 4h4m-4 1h4m-4 1h4m-4 1h4m0 1h4m-4 1h4m-4 1h4m-4 1h4m-12 1h4m8 0h4m-16 1h4m8 0h4m-16 1h4m8 0h4m-16 1h4m8 0h4m-16 1h8m8 0h4m-20 1h8m8 0h4m-20 1h8m8 0h4m-20 1h8m8 0h4m-28 1h8m4 0h8m-20 1h8m4 0h8m-20 1h8m4 0h8m-20 1h8m4 0h8m-24 1h16m-16 1h16m-16 1h16m-16 1h16M8 28h8m4 0h12M8 29h8m4 0h12M8 30h8m4 0h12M8 31h8m4 0h12M8 32h12m8 0h4M8 33h12m8 0h4M8 34h12m8 0h4M8 35h12m8 0h4m-20 1h12m-12 1h12m-12 1h12m-12 1h12m-8 1h8m-8 1h8m-8 1h8m-8 1h8"/><path stroke="#c6bca5" d="M28 8h4m-4 1h4m-4 1h4m-4 1h4m-12 5h4m-4 1h4m-4 1h4m-4 1h4m0 1h4m-4 1h4m-4 1h4m-4 1h4m0 1h8m-8 1h8m-8 1h8m-8 1h8m-20 1h4m-4 1h4m-4 1h4m-4 1h4m0 1h8m-8 1h8m-8 1h8m-8 1h8"/><path stroke="#bcb29c" d="M32 12h4m-4 1h4m-4 1h4m-4 1h4m0 1h4m-4 1h4m-4 1h4m-4 1h4m0 1h4m-4 1h4m-4 1h4m-4 1h4m-8 1h4m-4 1h4m-4 1h4m-4 1h4m-8 1h8m-8 1h8m-8 1h8m-8 1h8m-8 1h4m-4 1h4m-4 1h4m-4 1h4m-12 1h8m-8 1h8m-8 1h8m-8 1h8m-8 1h4m-4 1h4m-4 1h4m-4 1h4m-8 1h4m-4 1h4m-4 1h4m-4 1h4"/><path stroke="#807a6d" d="M44 24h4m-4 1h4m-4 1h4m-4 1h4"/><path stroke="#aea694" d="M4 32h4m-4 1h4m-4 1h4m-4 1h4m0 1h4m-4 1h4m-4 1h4m-4 1h4m0 1h4m-4 1h4m-4 1h4m-4 1h4m0 1h4m-4 1h4m-4 1h4m-4 1h4"/><path stroke="#9a927e" d="M4 36h4m-4 1h4m-4 1h4m-4 1h4m0 1h4m-4 1h4m-4 1h4m-4 1h4m0 1h4m-4 1h4m-4 1h4m-4 1h4m0 1h4m-4 1h4m-4 1h4m-4 1h4"/></svg>
@@ -19,7 +19,6 @@
 import json
 import codecs
 import re
-import sys
 from urllib.parse import urlparse, parse_qs

 S = ';'
@@ -27,21 +26,18 @@ S = ';'
 MOD_SEPARATOR = ','

 CURSEFORGE_PATTERN1 = re.compile(
-    r'^/(minecraft|Minecraft|minecraft-bedrock)/(mc-mods|modpacks|customization|mc-addons|texture-packs|customization/configuration|addons)/+(?P<modid>[\w-]+)(/(.*?))?$')
+    r'^/minecraft/(mc-mods|customization|mc-addons|customization/configuration)/(?P<modid>[\w-]+)(/(.*?))?$')
 CURSEFORGE_PATTERN2 = re.compile(
    r'^/projects/(?P<modid>[\w-]+)(/(.*?))?$')
 CURSEFORGE_PATTERN3 = re.compile(
    r'^/mc-mods/minecraft/(?P<modid>[\w-]+)(/(.*?))?$')
-CURSEFORGE_PATTERN4 = re.compile(
-    r'^/legacy/mc-mods/minecraft/(\d+)-(?P<modid>[\w-]+)'
-)


 def parseCurseforge(url):
    res = urlparse(url)
    if res.scheme not in ['http', 'https']:
        return ''
-    for pattern in [CURSEFORGE_PATTERN1, CURSEFORGE_PATTERN2, CURSEFORGE_PATTERN3, CURSEFORGE_PATTERN4]:
+    for pattern in [CURSEFORGE_PATTERN1, CURSEFORGE_PATTERN2, CURSEFORGE_PATTERN3]:
        match = pattern.match(res.path)
        if match:
            return match.group('modid')
@@ -49,7 +45,7 @@ def parseCurseforge(url):


 MCMOD_PATTERN = re.compile(
-    r'^http(s)?://www\.mcmod\.cn/(class|modpack)/(?P<modid>\d+)\.html$')
+    r'^http(s)?://www\.mcmod\.cn/class/(?P<modid>\d+)\.html$')


 def parseMcmod(url):
@@ -58,16 +54,32 @@ def parseMcmod(url):
        return match.group('modid')
    return ''

-skip = [
-    'Minecraft',
-    'The Building Game'
-]
+
+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 ''


 if __name__ == '__main__':
-    json_name = sys.argv[1] or 'data.json'
-
-    with codecs.open(json_name, mode='r', encoding='utf-8-sig') as jsonfile, codecs.open('data.csv', mode='w', encoding='utf-8') as outfile:
+    with codecs.open('data.json', mode='r', encoding='utf-8-sig') as jsonfile, codecs.open('data.csv', mode='w', encoding='utf-8') as outfile:
        data = json.load(jsonfile)

        for mod in data:
@@ -75,9 +87,6 @@ if __name__ == '__main__':
            sub_name = mod['name']['sub']
            abbr = mod['name']['abbr']

-            if sub_name in skip:
-                continue
-
            if S in chinese_name:
                print('Error! ' + chinese_name)
                exit(1)
@@ -87,11 +96,12 @@ if __name__ == '__main__':
                exit(1)

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

            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']:
@@ -106,9 +116,14 @@ 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']:
+            if 'list' in mod['modid']:
                for id in mod['modid']['list']:
                    if MOD_SEPARATOR in id:
                        print('Error mod id!' + id)
@@ -118,6 +133,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}{mod_ids}{S}{chinese_name}{S}{sub_name}{S}{abbr}\n')
+                f'{curseforge_id}{S}{mcmod_id}{S}{mcbbs_id}{S}{mod_ids}{S}{chinese_name}{S}{sub_name}{S}{abbr}\n')

    print('Success!')
@@ -1,4 +1,4 @@
-package org.jackhuang.hmcl.ui.skin;
+package moe.mickey.minecraft.skin.fx;

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

 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;

-import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.LinkedList;
 import java.util.List;

 public class SkinAnimation {
@@ -12,8 +12,9 @@ public class SkinAnimation {
    protected int weight, left;
    protected List<SkinTransition> transitions;

+    @Deprecated
    public SkinAnimation() {
-        this.transitions = new ArrayList<>();
+        this.transitions = new LinkedList<>();
    }

    public SkinAnimation(int weight, SkinTransition... transitions) {
@@ -1,16 +1,15 @@
-package org.jackhuang.hmcl.ui.skin;
+package moe.mickey.minecraft.skin.fx;

 import javafx.animation.AnimationTimer;

-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
+import java.util.LinkedList;
 import java.util.Random;

 public class SkinAnimationPlayer {

    protected final Random random = new Random();
-    protected List<SkinAnimation> animations = new ArrayList<>();
+    protected LinkedList<SkinAnimation> animations = new LinkedList<>();
    protected SkinAnimation playing;
    protected boolean running;
    protected int weightedSum = 0;
@@ -29,7 +28,7 @@ public class SkinAnimationPlayer {
                }
                playing = tmp;
                if (playing == null && animations.size() > 0)
-                    playing = animations.get(animations.size() - 1);
+                    playing = animations.getLast();
                if (playing != null) {
                    playing.playFromStart();
                    lastPlayTime = now;
@@ -1,10 +1,9 @@
-package org.jackhuang.hmcl.ui.skin;
+package moe.mickey.minecraft.skin.fx;

 import javafx.scene.*;
 import javafx.scene.image.Image;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.input.ScrollEvent;
-import javafx.scene.paint.Color;
 import javafx.scene.paint.Material;
 import javafx.scene.paint.PhongMaterial;
 import javafx.scene.shape.Shape3D;
@@ -12,17 +11,18 @@ import javafx.scene.transform.Rotate;
 import javafx.scene.transform.Scale;
 import javafx.scene.transform.Translate;

-import org.jetbrains.annotations.Nullable;
-
 public class SkinCanvas extends Group {

+    public static final Image ALEX = new Image(SkinCanvas.class.getResourceAsStream("/assets/img/alex.png"));
+    public static final Image STEVE = new Image(SkinCanvas.class.getResourceAsStream("/assets/img/steve.png"));
+
    public static final SkinCube ALEX_LARM = new SkinCube(3, 12, 4, 14F / 64F, 16F / 64F, 32F / 64F, 48F / 64F, 0F, true);
    public static final SkinCube ALEX_RARM = new SkinCube(3, 12, 4, 14F / 64F, 16F / 64F, 40F / 64F, 16F / 64F, 0F, true);

    public static final SkinCube STEVEN_LARM = new SkinCube(4, 12, 4, 16F / 64F, 16F / 64F, 32F / 64F, 48F / 64F, 0F, false);
    public static final SkinCube STEVEN_RARM = new SkinCube(4, 12, 4, 16F / 64F, 16F / 64F, 40F / 64F, 16F / 64F, 0F, false);

-    protected Image srcSkin, skin, srcCape, cape;
+    protected Image srcSkin, skin;
    protected boolean isSlim;

    protected double preW, preH;
@@ -45,8 +45,6 @@ public class SkinCanvas extends Group {
    public final SkinCube llegInside = new SkinCube(4, 12, 4, 16F / 64F, 16F / 64F, 16F / 64F, 48F / 64F, 0F, false);
    public final SkinCube rlegInside = new SkinCube(4, 12, 4, 16F / 64F, 16F / 64F, 0F, 16F / 64F, 0F, false);

-    public final SkinCube capeCube = new SkinCube(10, 16, 1, 22F / 64F, 17F / 32F, 0F, 0F, 0F, false);
-
    public final SkinGroup head = new SkinGroup(
            new Rotate(0, 0, headInside.getHeight() / 2, 0, Rotate.X_AXIS),
            new Rotate(0, Rotate.Y_AXIS),
@@ -84,13 +82,6 @@ public class SkinCanvas extends Group {
            rlegOuter, rlegInside
    );

-    public final SkinGroup capeGroup = new SkinGroup(
-            new Rotate(0, 0, -capeCube.getHeight() / 2, 0, Rotate.X_AXIS),
-            new Rotate(0, Rotate.Y_AXIS),
-            new Rotate(0, Rotate.Z_AXIS),
-            capeCube
-    );
-
    protected PerspectiveCamera camera = new PerspectiveCamera(true);

    protected Rotate xRotate = new Rotate(0, Rotate.X_AXIS);
@@ -99,10 +90,10 @@ public class SkinCanvas extends Group {
    protected Translate translate = new Translate(0, 0, -80);
    protected Scale scale = new Scale(1, 1);

-    protected SkinAnimationPlayer animationPlayer = new SkinAnimationPlayer();
+    protected SkinAnimationPlayer animationplayer = new SkinAnimationPlayer();

-    public SkinAnimationPlayer getAnimationPlayer() {
-        return animationPlayer;
+    public SkinAnimationPlayer getAnimationplayer() {
+        return animationplayer;
    }

    public Image getSrcSkin() {
@@ -113,21 +104,20 @@ public class SkinCanvas extends Group {
        return skin;
    }

-    public void updateSkin(Image skin, boolean isSlim, final @Nullable Image cape) {
+    public void updateSkin(Image skin, boolean isSlim) {
        if (SkinHelper.isNoRequest(skin) && SkinHelper.isSkin(skin)) {
            this.srcSkin = skin;
            this.skin = SkinHelper.x32Tox64(skin);
-            this.srcCape = cape;
-            this.cape = cape == null ? null : cape.getWidth() < 256 ? SkinHelper.enlarge(cape, 4, 8) : cape;
            int multiple = Math.max((int) (1024 / skin.getWidth()), 1);
            if (multiple > 1)
-                this.skin = SkinHelper.enlarge(this.skin, multiple, multiple);
-            updateSkinModel(isSlim, cape != null);
+                this.skin = SkinHelper.enlarge(this.skin, multiple);
+            if (this.isSlim != isSlim)
+                updateSkinModel(isSlim);
            bindMaterial(root);
        }
    }

-    protected void updateSkinModel(boolean isSlim, boolean hasCape) {
+    protected void updateSkinModel(boolean isSlim) {
        this.isSlim = isSlim;
        FunctionHelper.alwaysB(SkinMultipleCubes::setWidth, isSlim ? 3 : 4, larmOuter, rarmOuter);
        FunctionHelper.alwaysB(SkinCube::setWidth, isSlim ? 3D : 4D, larmInside, rarmInside);
@@ -144,8 +134,10 @@ public class SkinCanvas extends Group {

        larm.getZRotate().setPivotX(-larmInside.getWidth() / 2);
        rarm.getZRotate().setPivotX(+rarmInside.getWidth() / 2);
+    }

-        capeGroup.setVisible(hasCape);
+    public SkinCanvas(double preW, double preH) {
+        this(STEVE, preW, preH, true);
    }

    public SkinCanvas(Image skin, double preW, double preH, boolean msaa) {
@@ -157,17 +149,17 @@ public class SkinCanvas extends Group {
        init();
    }

-    protected Material createMaterial(final Image image) {
+    protected Material createMaterial() {
        PhongMaterial material = new PhongMaterial();
-        material.setDiffuseMap(image);
+        material.setDiffuseMap(skin);
        return material;
    }

    protected void bindMaterial(Group group) {
-        Material material = createMaterial(skin);
+        Material material = createMaterial();
        for (Node node : group.getChildren())
            if (node instanceof Shape3D)
-                ((Shape3D) node).setMaterial(node == capeCube ? createMaterial(cape) : material);
+                ((Shape3D) node).setMaterial(material);
            else if (node instanceof SkinMultipleCubes)
                ((SkinMultipleCubes) node).updateSkin(skin);
            else if (node instanceof Group)
@@ -186,11 +178,6 @@ public class SkinCanvas extends Group {
        lleg.setTranslateY(+(bodyInside.getHeight() + llegInside.getHeight()) / 2);
        rleg.setTranslateY(+(bodyInside.getHeight() + rlegInside.getHeight()) / 2);

-        capeGroup.setTranslateY(+(capeCube.getHeight() - bodyOuter.getHeight()) / 2);
-        capeGroup.setTranslateZ(-(bodyInside.getDepth() + bodyOuter.getDepth()) / 2);
-
-        capeGroup.getTransforms().addAll(new Rotate(180, Rotate.Y_AXIS), new Rotate(10, Rotate.X_AXIS));
-
        root.getTransforms().addAll(xRotate);

        root.getChildren().addAll(
@@ -199,20 +186,15 @@ public class SkinCanvas extends Group {
                larm,
                rarm,
                lleg,
-                rleg,
-                capeGroup
+                rleg
        );
-        updateSkin(skin, false, null);
+        updateSkin(skin, false);

        return root;
    }

    protected SubScene createSubScene() {
        Group group = new Group();
-
-        AmbientLight light = new AmbientLight(Color.WHITE);
-        group.getChildren().add(light);
-
        group.getChildren().add(createPlayerModel());
        group.getTransforms().add(zRotate);

@@ -1,8 +1,10 @@
-package org.jackhuang.hmcl.ui.skin;
+package moe.mickey.minecraft.skin.fx;

+import javafx.scene.image.Image;
 import javafx.scene.shape.Mesh;
 import javafx.scene.shape.MeshView;
 import javafx.scene.shape.TriangleMesh;
+import org.apache.commons.lang3.ArrayUtils;

 public class SkinCube extends MeshView {

@@ -18,86 +20,78 @@ public class SkinCube extends MeshView {
            width /= 2F;
            height /= 2F;
            depth /= 2F;
+
            return new float[]{
-                    -width, -height, +depth, // P0
-                    +width, -height, +depth, // P1
-                    -width, +height, +depth, // P2
-                    +width, +height, +depth, // P3
-                    -width, -height, -depth, // P4
-                    +width, -height, -depth, // P5
-                    -width, +height, -depth, // P6
-                    +width, +height, -depth  // P7
+                    -width, -height, depth,        // P0
+                    width, -height, depth,        // P1
+                    -width, height, depth,        // P2
+                    width, height, depth,        // P3
+                    -width, -height, -depth,    // P4
+                    width, -height, -depth,    // P5
+                    -width, height, -depth,    // P6
+                    width, height, -depth        // P7
            };
        }

        public static float[] createTexCoords(float width, float height, float depth, float scaleX, float scaleY,
-                float startX, float startY, boolean isSlim) {
+                                              float startX, float startY, boolean isSlim) {
            float x = (width + depth) * 2, y = height + depth, half_width = width / x * scaleX, half_depth = depth / x * scaleX,
                    top_x = depth / x * scaleX + startX, top_y = startY, arm4 = isSlim ? half_depth : half_width,
                    bottom_x = startX, middle_y = depth / y * scaleY + top_y, bottom_y = scaleY + top_y;
            return new float[]{
                    top_x, top_y,                                    // T0  ---
-                    top_x + half_width, top_y,                       // T1   |
-                    top_x + half_width * 2, top_y,                   // T2  ---
-                    bottom_x, middle_y,                              // T3  ---
-                    bottom_x + half_depth, middle_y,                 // T4   |
+                    top_x + half_width, top_y,                        // T1   |
+                    top_x + half_width * 2, top_y,                    // T2  ---
+                    bottom_x, middle_y,                                // T3  ---
+                    bottom_x + half_depth, middle_y,                // T4   |
                    bottom_x + half_depth + half_width, middle_y,    // T5   |
-                    bottom_x + scaleX - arm4, middle_y,              // T6   |
-                    bottom_x + scaleX, middle_y,                     // T7  ---
-                    bottom_x, bottom_y,                              // T8  ---
-                    bottom_x + half_depth, bottom_y,                 // T9   |
+                    bottom_x + scaleX - arm4, middle_y,                // T6   |
+                    bottom_x + scaleX, middle_y,                    // T7  ---
+                    bottom_x, bottom_y,                                // T8  ---
+                    bottom_x + half_depth, bottom_y,                // T9   |
                    bottom_x + half_depth + half_width, bottom_y,    // T10  |
-                    bottom_x + scaleX - arm4, bottom_y,              // T11  |
-                    bottom_x + scaleX, bottom_y                      // T12 ---
+                    bottom_x + scaleX - arm4, bottom_y,                // T11  |
+                    bottom_x + scaleX, bottom_y                        // T12 ---
            };
        }

        public static int[] createFaces() {
-            int[] faces = {
+            int[] faces = new int[]{
                    // TOP
                    5, 0, 4, 1, 0, 5,    //P5,T0, P4,T1, P0,T5
                    5, 0, 0, 5, 1, 4,    //P5,T0, P0,T5, P1,T4
                    // RIGHT
-                    0, 5, 4, 6, 6, 11,   //P0,T4 ,P4,T3, P6,T8
-                    0, 5, 6, 11, 2, 10,  //P0,T4 ,P6,T8, P2,T9
+                    0, 5, 4, 6, 6, 11,    //P0,T4 ,P4,T3, P6,T8
+                    0, 5, 6, 11, 2, 10,    //P0,T4 ,P6,T8, P2,T9
                    // FRONT
-                    1, 4, 0, 5, 2, 10,   //P1,T5, P0,T4, P2,T9
-                    1, 4, 2, 10, 3, 9,   //P1,T5, P2,T9, P3,T10
+                    1, 4, 0, 5, 2, 10,    //P1,T5, P0,T4, P2,T9
+                    1, 4, 2, 10, 3, 9,    //P1,T5, P2,T9, P3,T10
                    // LEFT
                    5, 3, 1, 4, 3, 9,    //P5,T6, P1,T5, P3,T10
                    5, 3, 3, 9, 7, 8,    //P5,T6, P3,T10,P7,T11
                    // BACK
-                    4, 6, 5, 7, 7, 12,   //P4,T6, P5,T7, P7,T12
-                    4, 6, 7, 12, 6, 11,  //P4,T6, P7,T12,P6,T11
+                    4, 6, 5, 7, 7, 12,    //P4,T6, P5,T7, P7,T12
+                    4, 6, 7, 12, 6, 11,    //P4,T6, P7,T12,P6,T11
                    // BOTTOM
                    3, 5, 2, 6, 6, 2,    //P3,T2, P2,T1, P6,T5
-                    3, 5, 6, 2, 7, 1     //P3,T2, P6,T5, P7,T6
+                    3, 5, 6, 2, 7, 1    //P3,T2, P6,T5, P7,T6
            };

            int[] copy = faces.clone();
-
-            for (int i = 0, mid = copy.length >> 1, j = copy.length - 1; i < mid; i++, j--) {
-                int tmp = copy[i];
-                copy[i] = copy[j];
-                copy[j] = tmp;
-            }
-
+            ArrayUtils.reverse(copy);
            for (int i = 0; i < copy.length; i += 2) {
                int tmp = copy[i];
                copy[i] = copy[i + 1];
                copy[i + 1] = tmp;
            }
-
-            int[] result = new int[faces.length + copy.length];
-            System.arraycopy(faces, 0, result, 0, faces.length);
-            System.arraycopy(copy, 0, result, faces.length, copy.length);
-            return result;
+            return ArrayUtils.addAll(faces, copy);
        }

    }

    private double width, height, depth;
    private boolean isSlim;
+    private Image skin;
    private Mesh model;

    public SkinCube(float width, float height, float depth, float scaleX, float scaleY, float startX, float startY, float enlarge, boolean isSlim) {
@@ -1,4 +1,4 @@
-package org.jackhuang.hmcl.ui.skin;
+package moe.mickey.minecraft.skin.fx;

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

 import javafx.scene.image.Image;
 import javafx.scene.image.PixelReader;
@@ -10,12 +10,12 @@ public final class SkinHelper {
    private SkinHelper() {
    }

-    public static class PixelCopier {
+    public static class PixelCopyer {

        protected Image srcImage;
        protected WritableImage newImage;

-        public PixelCopier(Image srcImage, WritableImage newImage) {
+        public PixelCopyer(Image srcImage, WritableImage newImage) {
            this.srcImage = srcImage;
            this.newImage = newImage;
        }
@@ -70,53 +70,53 @@ public final class SkinHelper {
    }

    public static Image x32Tox64(Image srcSkin) {
-        if (srcSkin.getHeight() == srcSkin.getWidth())
+        if (srcSkin.getHeight() == 64)
            return srcSkin;

        WritableImage newSkin = new WritableImage((int) srcSkin.getWidth(), (int) srcSkin.getHeight() * 2);
-        PixelCopier copier = new PixelCopier(srcSkin, newSkin);
+        PixelCopyer copyer = new PixelCopyer(srcSkin, newSkin);
        // HEAD & HAT
-        copier.copy(0 / 64F, 0 / 32F, 0 / 64F, 0 / 64F, 64 / 64F, 16 / 32F);
+        copyer.copy(0 / 64F, 0 / 32F, 0 / 64F, 0 / 64F, 64 / 64F, 16 / 32F);
        // LEFT-LEG
-        x32Tox64(copier, 0 / 64F, 16 / 32F, 16 / 64F, 48 / 64F, 4 / 64F, 12 / 32F, 4 / 64F);
+        x32Tox64(copyer, 0 / 64F, 16 / 32F, 16 / 64F, 48 / 64F, 4 / 64F, 12 / 32F, 4 / 64F);
        // RIGHT-LEG
-        copier.copy(0 / 64F, 16 / 32F, 0 / 64F, 16 / 64F, 16 / 64F, 16 / 32F);
+        copyer.copy(0 / 64F, 16 / 32F, 0 / 64F, 16 / 64F, 16 / 64F, 16 / 32F);
        // BODY
-        copier.copy(16 / 64F, 16 / 32F, 16 / 64F, 16 / 64F, 24 / 64F, 16 / 32F);
+        copyer.copy(16 / 64F, 16 / 32F, 16 / 64F, 16 / 64F, 24 / 64F, 16 / 32F);
        // LEFT-ARM
-        x32Tox64(copier, 40 / 64F, 16 / 32F, 32 / 64F, 48 / 64F, 4 / 64F, 12 / 32F, 4 / 64F);
+        x32Tox64(copyer, 40 / 64F, 16 / 32F, 32 / 64F, 48 / 64F, 4 / 64F, 12 / 32F, 4 / 64F);
        // RIGHT-ARM
-        copier.copy(40 / 64F, 16 / 32F, 40 / 64F, 16 / 64F, 16 / 64F, 16 / 32F);
+        copyer.copy(40 / 64F, 16 / 32F, 40 / 64F, 16 / 64F, 16 / 64F, 16 / 32F);

        return newSkin;
    }

-    static void x32Tox64(PixelCopier copier, float srcX, float srcY, float toX, float toY, float width, float height, float depth) {
+    static void x32Tox64(PixelCopyer copyer, float srcX, float srcY, float toX, float toY, float width, float height, float depth) {
        // TOP
-        copier.copy(srcX + depth, srcY, toX + depth, toY, width, depth * 2, true, false);
+        copyer.copy(srcX + depth, srcY, toX + depth, toY, width, depth * 2, true, false);
        // BOTTOM
-        copier.copy(srcX + depth + width, srcY, toX + depth + width, toY, width, depth * 2, true, false);
+        copyer.copy(srcX + depth + width, srcY, toX + depth + width, toY, width, depth * 2, true, false);
        // INS
-        copier.copy(srcX, srcY + depth * 2, toX + width + depth, toY + depth, depth, height, true, false);
+        copyer.copy(srcX, srcY + depth * 2, toX + width + depth, toY + depth, depth, height, true, false);
        // OUTS
-        copier.copy(srcX + width + depth, srcY + depth * 2, toX, toY + depth, depth, height, true, false);
+        copyer.copy(srcX + width + depth, srcY + depth * 2, toX, toY + depth, depth, height, true, false);
        // FRONT
-        copier.copy(srcX + depth, srcY + depth * 2, toX + depth, toY + depth, width, height, true, false);
+        copyer.copy(srcX + depth, srcY + depth * 2, toX + depth, toY + depth, width, height, true, false);
        // BACK
-        copier.copy(srcX + width + depth * 2, srcY + depth * 2, toX + width + depth * 2, toY + depth, width, height, true, false);
+        copyer.copy(srcX + width + depth * 2, srcY + depth * 2, toX + width + depth * 2, toY + depth, width, height, true, false);
    }

-    public static Image enlarge(Image srcSkin, int multipleX, int multipleY) {
-        WritableImage newSkin = new WritableImage((int) srcSkin.getWidth() * multipleX, (int) srcSkin.getHeight() * multipleY);
+    public static Image enlarge(Image srcSkin, int multiple) {
+        WritableImage newSkin = new WritableImage((int) srcSkin.getWidth() * multiple, (int) srcSkin.getHeight() * multiple);
        PixelReader reader = srcSkin.getPixelReader();
        PixelWriter writer = newSkin.getPixelWriter();

        for (int x = 0, lenX = (int) srcSkin.getWidth(); x < lenX; x++)
            for (int y = 0, lenY = (int) srcSkin.getHeight(); y < lenY; y++)
-                for (int mx = 0; mx < multipleX; mx++)
-                    for (int my = 0; my < multipleY; my++) {
+                for (int mx = 0; mx < multiple; mx++)
+                    for (int my = 0; my < multiple; my++) {
                        int argb = reader.getArgb(x, y);
-                        writer.setArgb(x * multipleX + mx, y * multipleY + my, argb);
+                        writer.setArgb(x * multiple + mx, y * multiple + my, argb);
                    }

        return newSkin;
@@ -1,4 +1,4 @@
-package org.jackhuang.hmcl.ui.skin;
+package moe.mickey.minecraft.skin.fx;

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

 import javafx.animation.Transition;
 import javafx.beans.value.WritableValue;
@@ -19,7 +19,6 @@ public class SkinTransition extends Transition {
        return count;
    }

-    @SafeVarargs
    public SkinTransition(Duration duration, Function<Double, Double> expression, WritableValue<Number>... observables) {
        setCycleDuration(duration);
        this.expression = expression;
@@ -1,10 +1,10 @@
-package org.jackhuang.hmcl.ui.skin.animation;
+package moe.mickey.minecraft.skin.fx.animation;

 import javafx.util.Duration;
-import org.jackhuang.hmcl.ui.skin.FunctionHelper;
-import org.jackhuang.hmcl.ui.skin.SkinAnimation;
-import org.jackhuang.hmcl.ui.skin.SkinCanvas;
-import org.jackhuang.hmcl.ui.skin.SkinTransition;
+import moe.mickey.minecraft.skin.fx.FunctionHelper;
+import moe.mickey.minecraft.skin.fx.SkinAnimation;
+import moe.mickey.minecraft.skin.fx.SkinCanvas;
+import moe.mickey.minecraft.skin.fx.SkinTransition;

 public final class SkinAniRunning extends SkinAnimation {

@@ -1,10 +1,10 @@
-package org.jackhuang.hmcl.ui.skin.animation;
+package moe.mickey.minecraft.skin.fx.animation;

 import javafx.util.Duration;
-import org.jackhuang.hmcl.ui.skin.FunctionHelper;
-import org.jackhuang.hmcl.ui.skin.SkinAnimation;
-import org.jackhuang.hmcl.ui.skin.SkinCanvas;
-import org.jackhuang.hmcl.ui.skin.SkinTransition;
+import moe.mickey.minecraft.skin.fx.FunctionHelper;
+import moe.mickey.minecraft.skin.fx.SkinAnimation;
+import moe.mickey.minecraft.skin.fx.SkinCanvas;
+import moe.mickey.minecraft.skin.fx.SkinTransition;

 public final class SkinAniWavingArms extends SkinAnimation {

@@ -19,41 +19,36 @@ 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;
 import javafx.stage.Stage;
 import org.jackhuang.hmcl.setting.ConfigHolder;
 import org.jackhuang.hmcl.setting.SambaException;
-import org.jackhuang.hmcl.task.AsyncTaskExecutor;
 import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.task.AsyncTaskExecutor;
+import org.jackhuang.hmcl.ui.AwtUtils;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.upgrade.UpdateChecker;
 import org.jackhuang.hmcl.upgrade.UpdateHandler;
 import org.jackhuang.hmcl.util.CrashReporter;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.StringUtils;
-import org.jackhuang.hmcl.util.io.JarUtils;
+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.OperatingSystem;

+import java.awt.*;
 import java.io.File;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.lang.management.ManagementFactory;
-import java.net.CookieHandler;
-import java.net.CookieManager;
-import java.nio.file.Files;
-import java.nio.file.Path;
+import java.net.*;
 import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
 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.Logger.LOG;
+import static org.jackhuang.hmcl.util.Logging.LOG;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 public final class Launcher extends Application {
@@ -65,43 +60,14 @@ public final class Launcher extends Application {

        CookieHandler.setDefault(COOKIE_MANAGER);

-        LOG.info("JavaFX Version: " + System.getProperty("javafx.runtime.version"));
-        try {
-            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.warning("Failed to get prism pipeline", e);
-        }
-
        try {
            try {
                ConfigHolder.init();
            } catch (SambaException ignored) {
                Main.showWarningAndContinue(i18n("fatal.samba"));
            } catch (IOException e) {
-                LOG.error("Failed to load config", e);
-                checkConfigInTempDir();
-                checkConfigOwner();
-                Main.showErrorAndExit(i18n("fatal.config_loading_failure", ConfigHolder.configLocation().getParent()));
-            }
-
-            // 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()) {
-                if (showAlert(AlertType.WARNING, i18n("fatal.config_change_owner_root"), ButtonType.YES, ButtonType.NO) == ButtonType.NO)
-                    return;
-            }
-
-            if (Metadata.HMCL_DIRECTORY.toString().indexOf('=') >= 0) {
-                Main.showWarningAndContinue(i18n("fatal.illegal_char"));
+                LOG.log(Level.SEVERE, "Failed to load config", e);
+                Main.showErrorAndExit(i18n("fatal.config_loading_failure", Paths.get("").toAbsolutePath().normalize()));
            }

            // runLater to ensure ConfigHolder.init() finished initialization
@@ -111,6 +77,8 @@ public final class Launcher extends Application {
                Platform.setImplicitExit(false);
                Controllers.initialize(primaryStage);

+                initIcon();
+
                UpdateChecker.init();

                primaryStage.show();
@@ -120,100 +88,20 @@ 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();
-
-        String tmpdir = System.getProperty("java.io.tmpdir");
-        if (StringUtils.isNotBlank(tmpdir) && configPath.startsWith(tmpdir))
-            return true;
-
-        String[] tempFolderNames = {"Temp", "Cache", "Caches"};
-        for (String name : tempFolderNames) {
-            if (configPath.contains(File.separator + name + File.separator))
-                return true;
-        }
-
-        if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
-            return configPath.contains("\\Temporary Internet Files\\")
-                    || configPath.contains("\\INetCache\\")
-                    || configPath.contains("\\$Recycle.Bin\\")
-                    || configPath.contains("\\recycler\\");
-        } else if (OperatingSystem.CURRENT_OS.isLinuxOrBSD()) {
-            return configPath.startsWith("/tmp/")
-                    || configPath.startsWith("/var/tmp/")
-                    || configPath.startsWith("/var/cache/")
-                    || configPath.startsWith("/dev/shm/")
-                    || configPath.contains("/Trash/");
-        } else if (OperatingSystem.CURRENT_OS == OperatingSystem.OSX) {
-            return configPath.startsWith("/var/folders/")
-                    || configPath.startsWith("/private/var/folders/")
-                    || configPath.startsWith("/tmp/")
-                    || configPath.startsWith("/private/tmp/")
-                    || configPath.startsWith("/var/tmp/")
-                    || configPath.startsWith("/private/var/tmp/")
-                    || configPath.contains("/.Trash/");
-        } else {
-            return false;
-        }
-    }
-
-    private static void checkConfigInTempDir() {
-        if (ConfigHolder.isNewlyCreated() && isConfigInTempDir()
-                && showAlert(AlertType.WARNING, i18n("fatal.config_in_temp_dir"), ButtonType.YES, ButtonType.NO) == ButtonType.NO) {
-            Main.exit(0);
-        }
-    }
-
-    private static void checkConfigOwner() {
-        if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS)
-            return;
-
-        String userName = System.getProperty("user.name");
-        String owner;
-        try {
-            owner = Files.getOwner(ConfigHolder.configLocation()).getName();
-        } catch (IOException ioe) {
-            LOG.warning("Failed to get file owner", ioe);
-            return;
-        }
-
-        if (Files.isWritable(ConfigHolder.configLocation()) || userName.equals("root") || userName.equals(owner))
-            return;
-
-        ArrayList<String> files = new ArrayList<>();
-        files.add(ConfigHolder.configLocation().toString());
-        if (Files.exists(Metadata.HMCL_DIRECTORY))
-            files.add(Metadata.HMCL_DIRECTORY.toString());
-
-        Path mcDir = Paths.get(".minecraft").toAbsolutePath().normalize();
-        if (Files.exists(mcDir))
-            files.add(mcDir.toString());
-
-        String command = new CommandBuilder().add("sudo", "chown", "-R", userName).addAll(files).toString();
-        ButtonType copyAndExit = new ButtonType(i18n("button.copy_and_exit"));
-
-        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));
-        }
-        Main.exit(1);
-    }
-
    @Override
    public void stop() throws Exception {
+        super.stop();
        Controllers.onApplicationStop();
-        LOG.shutdown();
+    }
+
+    private void initIcon() {
+        Toolkit toolkit = Toolkit.getDefaultToolkit();
+        Image image = toolkit.getImage(Launcher.class.getResource("/assets/img/icon.png"));
+        AwtUtils.setAppleIcon(image);
    }

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

@@ -222,29 +110,17 @@ public final class Launcher extends Application {

        try {
            LOG.info("*** " + Metadata.TITLE + " ***");
-            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("Operating System: " + 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: " + System.getProperty("user.dir"));
+            LOG.info("Current Directory: " + Paths.get("").toAbsolutePath());
            LOG.info("HMCL Directory: " + Metadata.HMCL_DIRECTORY);
-            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"));
-            }
+            ManagementFactory.getMemoryPoolMXBeans().stream().filter(bean -> bean.getName().equals("Metaspace")).findAny()
+                    .ifPresent(bean -> LOG.info("Metaspace: " + bean.getUsage().getUsed() / 1024 / 1024 + "MB"));

            launch(Launcher.class, args);
        } catch (Throwable e) { // Fucking JavaFX will suppress the exception and will break our crash reporter.
@@ -278,5 +154,34 @@ public final class Launcher extends Application {
        });
    }

+    public static List<File> getCurrentJarFiles() {
+        List<File> result = new LinkedList<>();
+        if (Launcher.class.getClassLoader() instanceof URLClassLoader) {
+            URL[] urls = ((URLClassLoader) Launcher.class.getClassLoader()).getURLs();
+            for (URL u : urls)
+                try {
+                    File f = new File(u.toURI());
+                    if (f.isFile() && (f.getName().endsWith(".exe") || f.getName().endsWith(".jar")))
+                        result.add(f);
+                } catch (URISyntaxException e) {
+                    return null;
+                }
+        } else {
+            try {
+                File jarFile = new File(URLDecoder.decode(Launcher.class.getProtectionDomain().getCodeSource().getLocation().getPath(), "UTF-8"));
+                String ext = FileUtils.getExtension(jarFile);
+                if ("jar".equals(ext) || "exe".equals(ext))
+                    result.add(jarFile);
+            } catch (UnsupportedEncodingException e) {
+                LOG.log(Level.WARNING, "Failed to decode jar path", e);
+                return null;
+            }
+        }
+        if (result.isEmpty())
+            return null;
+        else
+            return result;
+    }
+
    public static final CrashReporter CRASH_REPORTER = new CrashReporter(true);
 }
@@ -17,17 +17,13 @@
 */
 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.java.JavaRuntime;
-import org.jackhuang.hmcl.util.platform.OperatingSystem;

 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManagerFactory;
+import javax.swing.*;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -41,9 +37,10 @@ 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.Logger.LOG;
+import static org.jackhuang.hmcl.util.Logging.LOG;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 public final class Main {
@@ -52,35 +49,35 @@ public final class Main {
    }

    public static void main(String[] args) {
-        System.getProperties().putIfAbsent("java.net.useSystemProxies", "true");
-        System.getProperties().putIfAbsent("javafx.autoproxy.disable", "true");
-        System.getProperties().putIfAbsent("http.agent", "HMCL/" + Metadata.VERSION);
+        System.setProperty("java.net.useSystemProxies", "true");
+        System.setProperty("http.agent", "HMCL/" + Metadata.VERSION);
+        System.setProperty("javafx.autoproxy.disable", "true");
+        // Fix title bar not displaying in GTK systems
+        System.setProperty("jdk.gtk.version", "2");

-        LOG.start(Metadata.HMCL_DIRECTORY.resolve("logs"));
+        // Use System look and feel
+        initLookAndFeel();

        checkDirectoryPath();

-        if (JavaRuntime.CURRENT_VERSION < 9)
-            // This environment check will take ~300ms
-            thread(Main::fixLetsEncrypt, "CA Certificate Check", true);
+        // 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);
+    private static void initLookAndFeel() {
+        if (System.getProperty("swing.defaultlaf") == null) {
+            try {
+                UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+            } catch (Throwable ignored) {
+            }
+        }
    }

    private static void checkDirectoryPath() {
@@ -96,27 +93,14 @@ public final class Main {
        try {
            SelfDependencyPatcher.patch();
        } catch (SelfDependencyPatcher.PatchException e) {
-            LOG.error("unable to patch JVM", e);
+            LOG.log(Level.SEVERE, "unable to patch JVM", e);
            showErrorAndExit(i18n("fatal.javafx.missing"));
        } catch (SelfDependencyPatcher.IncompatibleVersionException e) {
-            LOG.error("unable to patch JVM", e);
+            LOG.log(Level.SEVERE, "unable to patch JVM", e);
            showErrorAndExit(i18n("fatal.javafx.incompatible"));
        } catch (CancellationException e) {
-            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"));
+            LOG.log(Level.SEVERE, "User cancels downloading JavaFX", e);
+            System.exit(0);
        }
    }

@@ -126,17 +110,8 @@ public final class Main {
    static void showErrorAndExit(String message) {
        System.err.println(message);
        System.err.println("A fatal error has occurred, forcibly exiting.");
-
-        try {
-            if (Platform.isFxApplicationThread()) {
-                new Alert(Alert.AlertType.ERROR, message).showAndWait();
-                exit(1);
-            }
-        } catch (Throwable ignored) {
-        }
-
-        SwingUtils.showErrorDialog(message);
-        exit(1);
+        JOptionPane.showMessageDialog(null, message, "Error", JOptionPane.ERROR_MESSAGE);
+        System.exit(1);
    }

    /**
@@ -145,19 +120,10 @@ public final class Main {
    static void showWarningAndContinue(String message) {
        System.err.println(message);
        System.err.println("Potential issues have been detected.");
-
-        try {
-            if (Platform.isFxApplicationThread()) {
-                new Alert(Alert.AlertType.WARNING, message).showAndWait();
-                return;
-            }
-        } catch (Throwable ignored) {
-        }
-
-        SwingUtils.showWarningDialog(message);
+        JOptionPane.showMessageDialog(null, message, "Warning", JOptionPane.WARNING_MESSAGE);
    }

-    private static void fixLetsEncrypt() {
+    static void fixLetsEncrypt() {
        try {
            KeyStore defaultKeyStore = KeyStore.getInstance(KeyStore.getDefaultType());
            Path ksPath = Paths.get(System.getProperty("java.home"), "lib", "security", "cacerts");
@@ -184,9 +150,8 @@ public final class Main {
            tls.init(null, instance.getTrustManagers(), null);
            HttpsURLConnection.setDefaultSSLSocketFactory(tls.getSocketFactory());
            LOG.info("Added Lets Encrypt root certificates as additional trust");
-        } catch (KeyStoreException | IOException | NoSuchAlgorithmException | CertificateException |
-                 KeyManagementException e) {
-            LOG.error("Failed to load lets encrypt certificate. Expect problems", e);
+        } catch (KeyStoreException | IOException | NoSuchAlgorithmException | CertificateException | KeyManagementException e) {
+            LOG.log(Level.SEVERE, "Failed to load lets encrypt certificate. Expect problems", e);
        }
    }
 }
@@ -17,8 +17,8 @@
 */
 package org.jackhuang.hmcl;

-import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.io.JarUtils;
+import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;

 import java.nio.file.Path;
@@ -32,40 +32,34 @@ public final class Metadata {

    public static final String NAME = "HMCL";
    public static final String FULL_NAME = "Hello Minecraft! Launcher";
-    public static final String VERSION = System.getProperty("hmcl.version.override", JarUtils.getManifestAttribute("Implementation-Version", "@develop@"));
+    public static final String VERSION = System.getProperty("hmcl.version.override", JarUtils.thisJar().flatMap(JarUtils::getImplementationVersion).orElse("@develop@"));

    public static final String TITLE = NAME + " " + VERSION;
    public static final String FULL_TITLE = FULL_NAME + " v" + VERSION;

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

-    public static final String BUILD_CHANNEL = JarUtils.getManifestAttribute("Build-Channel", "nightly");
-    public static final String GITHUB_SHA = JarUtils.getManifestAttribute("GitHub-SHA", null);
+    public static final String BUILD_CHANNEL = JarUtils.thisJar().flatMap(JarUtils::getManifest).map(manifest -> manifest.getMainAttributes().getValue("Build-Channel")).orElse("nightly");

    public static final Path MINECRAFT_DIRECTORY = OperatingSystem.getWorkingDirectory("minecraft");
-    public static final Path HMCL_DIRECTORY;
+    public static final Path HMCL_DIRECTORY = getHMCLDirectory();

-    static {
-        String hmclHome = System.getProperty("hmcl.home");
-        if (hmclHome == null) {
-            if (OperatingSystem.CURRENT_OS.isLinuxOrBSD()) {
-                String xdgData = System.getenv("XDG_DATA_HOME");
-                if (StringUtils.isNotBlank(xdgData)) {
-                    HMCL_DIRECTORY = Paths.get(xdgData, "hmcl").toAbsolutePath();
-                } else {
-                    HMCL_DIRECTORY = Paths.get(System.getProperty("user.home", "."), ".local", "share", "hmcl").toAbsolutePath();
-                }
-            } else {
-                HMCL_DIRECTORY = OperatingSystem.getWorkingDirectory("hmcl");
+    private static Path getHMCLDirectory() {
+        String home = System.getProperty("user.home", ".");
+        if (OperatingSystem.CURRENT_OS == OperatingSystem.LINUX) {
+            // to fulfill XDG standard.
+            String xdgCache = System.getenv("XDG_CACHE_HOME");
+            if (StringUtils.isNotBlank(xdgCache)) {
+                return Paths.get(xdgCache, "hmcl");
            }
-        } else {
-            HMCL_DIRECTORY = Paths.get(hmclHome).toAbsolutePath().normalize();
+            return Paths.get(home, ".cache", "hmcl");
        }
+        return OperatingSystem.getWorkingDirectory("hmcl");
    }

    public static boolean isStable() {
@@ -1,54 +0,0 @@
-package org.jackhuang.hmcl.countly;
-
-import org.jackhuang.hmcl.Metadata;
-import org.jackhuang.hmcl.util.StringUtils;
-import org.jackhuang.hmcl.util.platform.Architecture;
-import org.jackhuang.hmcl.util.platform.OperatingSystem;
-
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-
-public class CrashReport {
-
-    private final Thread thread;
-    private final Throwable throwable;
-    private final String stackTrace;
-
-    public CrashReport(Thread thread, Throwable throwable) {
-        this.thread = thread;
-        this.throwable = throwable;
-        stackTrace = StringUtils.getStackTrace(throwable);
-    }
-
-    public Throwable getThrowable() {
-        return this.throwable;
-    }
-
-    public boolean shouldBeReport() {
-        if (!stackTrace.contains("org.jackhuang"))
-            return false;
-
-        if (throwable instanceof VirtualMachineError)
-            return false;
-
-        return true;
-    }
-
-    public String getDisplayText() {
-        return "---- Hello Minecraft! Crash Report ----\n" +
-                "  Version: " + Metadata.VERSION + "\n" +
-                "  Time: " + DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(LocalDateTime.now()) + "\n" +
-                "  Thread: " + thread + "\n" +
-                "\n  Content: \n    " +
-                stackTrace + "\n\n" +
-                "-- System Details --\n" +
-                "  Operating System: " + OperatingSystem.SYSTEM_NAME + ' ' + OperatingSystem.SYSTEM_VERSION + "\n" +
-                "  System Architecture: " + Architecture.SYSTEM_ARCH_NAME + "\n" +
-                "  Java Architecture: " + Architecture.CURRENT_ARCH_NAME + "\n" +
-                "  Java Version: " + System.getProperty("java.version") + ", " + System.getProperty("java.vendor") + "\n" +
-                "  Java VM Version: " + System.getProperty("java.vm.name") + " (" + System.getProperty("java.vm.info") + "), " + System.getProperty("java.vm.vendor") + "\n" +
-                "  JVM Max Memory: " + Runtime.getRuntime().maxMemory() + "\n" +
-                "  JVM Total Memory: " + Runtime.getRuntime().totalMemory() + "\n" +
-                "  JVM Free Memory: " + Runtime.getRuntime().freeMemory() + "\n";
-    }
-}
@@ -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 static org.jackhuang.hmcl.util.logging.Logger.LOG;
+import java.util.logging.Level;

 /**
 * @author huangyuhui
@@ -59,60 +59,15 @@ public final class HMCLGameLauncher extends DefaultLauncher {

    private void generateOptionsTxt() {
        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;
+        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 (configFolder.isDirectory()) {
-            if (findFiles(configFolder, "options.txt")) {
-                return;
-            }
-        }
-
-        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);
-            }
-        }
-    }
-
-    private boolean findFiles(File folder, String fileName) {
-        File[] fs = folder.listFiles();
-        if (fs != null) {
-            for (File f : fs) {
-                if (f.isDirectory())
-                    if (f.listFiles((dir, name) -> name.equals(fileName)) != null)
-                        return true;
-                if (f.getName().equals(fileName))
-                    return true;
-            }
-        }
-        return false;
    }

    @Override
@@ -20,42 +20,36 @@ package org.jackhuang.hmcl.game;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonParseException;
+import com.google.gson.reflect.TypeToken;
 import javafx.scene.image.Image;
 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.download.LibraryAnalyzer;
-import org.jackhuang.hmcl.event.Event;
-import org.jackhuang.hmcl.event.EventManager;
-import org.jackhuang.hmcl.mod.ModAdviser;
 import org.jackhuang.hmcl.mod.Modpack;
 import org.jackhuang.hmcl.mod.ModpackConfiguration;
-import org.jackhuang.hmcl.mod.ModpackProvider;
+import org.jackhuang.hmcl.mod.mcbbs.McbbsModpackLocalInstallTask;
+import org.jackhuang.hmcl.mod.mcbbs.McbbsModpackManifest;
 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.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.java.JavaRuntime;
+import org.jackhuang.hmcl.util.platform.JavaVersion;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
 import org.jackhuang.hmcl.util.versioning.VersionNumber;
-import org.jetbrains.annotations.Nullable;

 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.time.Instant;
 import java.util.*;
-import java.util.stream.Collectors;
+import java.util.logging.Level;
 import java.util.stream.Stream;

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

 public class HMCLGameRepository extends DefaultGameRepository {
    private final Profile profile;
@@ -64,8 +58,6 @@ public class HMCLGameRepository extends DefaultGameRepository {
    private final Map<String, VersionSetting> localVersionSettings = new HashMap<>();
    private final Set<String> beingModpackVersions = new HashSet<>();

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

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

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

@@ -165,7 +157,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);
@@ -176,7 +168,17 @@ public class HMCLGameRepository extends DefaultGameRepository {
        File srcGameDir = getRunDirectory(srcId);
        File dstGameDir = getRunDirectory(dstId);

-        List<String> blackList = new ArrayList<>(ModAdviser.MODPACK_BLACK_LIST);
+        List<String> blackList = new ArrayList<>(Arrays.asList(
+                "regex:(.*?)\\.log",
+                "usernamecache.json", "usercache.json", // Minecraft
+                "launcher_profiles.json", "launcher.pack.lzma", // Minecraft Launcher
+                "backup", "pack.json", "launcher.jar", "cache", // HMCL
+                ".curseclient", // Curse
+                ".fabric", ".mixin.out", // Fabric
+                "jars", "logs", "versions", "assets", "libraries", "crash-reports", "NVIDIA", "AMD", "screenshots", "natives", "native", "$native", "server-resource-packs", // Minecraft
+                "downloads", // Curse
+                "asm", "backups", "TCNodeTracker", "CustomDISkins", "data", "CustomSkinLoader/caches" // Mods
+        ));
        blackList.add(srcId + ".jar");
        blackList.add(srcId + ".json");
        if (!copySaves)
@@ -229,7 +231,6 @@ public class HMCLGameRepository extends DefaultGameRepository {
     *
     * @return corresponding version setting, null if the version has no its own version setting.
     */
-    @Nullable
    public VersionSetting getLocalVersionSetting(String id) {
        if (!localVersionSettings.containsKey(id))
            loadLocalVersionSetting(id);
@@ -239,15 +240,6 @@ public class HMCLGameRepository extends DefaultGameRepository {
        return setting;
    }

-    @Nullable
-    public VersionSetting getLocalVersionSettingOrCreate(String id) {
-        VersionSetting vs = getLocalVersionSetting(id);
-        if (vs == null) {
-            vs = createLocalVersionSetting(id);
-        }
-        return vs;
-    }
-
    public VersionSetting getVersionSetting(String id) {
        VersionSetting vs = getLocalVersionSetting(id);
        if (vs == null || vs.isUsesGlobal()) {
@@ -258,92 +250,22 @@ public class HMCLGameRepository extends DefaultGameRepository {
            return vs;
    }

-    public Optional<File> getVersionIconFile(String id) {
-        File root = getVersionRoot(id);
-
-        File iconFile = new File(root, "icon.png");
-        if (iconFile.exists()) {
-            return Optional.of(iconFile);
-        }
-
-        iconFile = new File(root, "icon.jpg");
-        if (iconFile.exists()) {
-            return Optional.of(iconFile);
-        }
-
-        iconFile = new File(root, "icon.bmp");
-        if (iconFile.exists()) {
-            return Optional.of(iconFile);
-        }
-
-        iconFile = new File(root, "icon.gif");
-        if (iconFile.exists()) {
-            return Optional.of(iconFile);
-        }
-
-        return Optional.empty();
-    }
-
-    public void setVersionIconFile(String id, File iconFile) throws IOException {
-        String ext = FileUtils.getExtension(iconFile).toLowerCase(Locale.ROOT);
-        if (!ext.equals("png") && !ext.equals("jpg") && !ext.equals("bmp") && !ext.equals("gif")) {
-            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);
-
-        new File(root, "icon.png").delete();
-        new File(root, "icon.jpg").delete();
-        new File(root, "icon.bmp").delete();
-        new File(root, "icon.gif").delete();
+    public File getVersionIconFile(String id) {
+        return new File(getVersionRoot(id), "icon.png");
    }

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

-        VersionSetting vs = getLocalVersionSettingOrCreate(id);
-        VersionIconType iconType = vs != null ? Lang.requireNonNullElse(vs.getVersionIcon(), VersionIconType.DEFAULT) : VersionIconType.DEFAULT;
-
-        if (iconType == VersionIconType.DEFAULT) {
-            Version version = getVersion(id).resolve(this);
-            Optional<File> iconFile = getVersionIconFile(id);
-            if (iconFile.isPresent()) {
-                try (InputStream inputStream = new FileInputStream(iconFile.get())) {
-                    return new Image(inputStream);
-                } catch (IOException e) {
-                    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 iconType.getIcon();
-        }
+        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");
    }

    public boolean saveVersionSetting(String id) {
@@ -357,7 +279,7 @@ public class HMCLGameRepository extends DefaultGameRepository {
            FileUtils.writeText(file, GSON.toJson(localVersionSettings.get(id)));
            return true;
        } catch (IOException e) {
-            LOG.error("Unable to save version setting of " + id, e);
+            LOG.log(Level.SEVERE, "Unable to save version setting of " + id, e);
            return false;
        }
    }
@@ -383,7 +305,7 @@ public class HMCLGameRepository extends DefaultGameRepository {
            vs.setUsesGlobal(true);
    }

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

        LaunchOptions.Builder builder = new LaunchOptions.Builder()
@@ -393,24 +315,14 @@ public class HMCLGameRepository extends DefaultGameRepository {
                .setVersionName(version)
                .setProfileName(Metadata.TITLE)
                .setGameArguments(StringUtils.tokenize(vs.getMinecraftArgs()))
-                .setOverrideJavaArguments(StringUtils.tokenize(vs.getJavaArgs()))
-                .setMaxMemory(vs.isNoJVMArgs() && vs.isAutoMemory() ? null : (int)(getAllocatedMemory(
+                .setJavaArguments(StringUtils.tokenize(vs.getJavaArgs()))
+                .setMaxMemory((int)(getAllocatedMemory(
                        vs.getMaxMemory() * 1024L * 1024L,
-                        OperatingSystem.getPhysicalMemoryStatus().getAvailable(),
+                        OperatingSystem.getPhysicalMemoryStatus().orElse(OperatingSystem.PhysicalMemoryStatus.INVALID).getAvailable(),
                        vs.isAutoMemory()
                ) / 1024 / 1024))
                .setMinMemory(vs.getMinMemory())
                .setMetaspace(Lang.toIntOrNull(vs.getPermSize()))
-                .setEnvironmentVariables(
-                        Lang.mapOf(StringUtils.tokenize(vs.getEnvironmentVariables())
-                                .stream()
-                                .map(it -> {
-                                    int idx = it.indexOf('=');
-                                    return idx >= 0 ? pair(it.substring(0, idx), it.substring(idx + 1)) : pair(it, "");
-                                })
-                                .collect(Collectors.toList())
-                        )
-                )
                .setWidth(vs.getWidth())
                .setHeight(vs.getHeight())
                .setFullscreen(vs.isFullscreen())
@@ -422,11 +334,8 @@ public class HMCLGameRepository extends DefaultGameRepository {
                .setNativesDirType(vs.getNativesDirType())
                .setNativesDir(vs.getNativesDir())
                .setProcessPriority(vs.getProcessPriority())
-                .setRenderer(vs.getRenderer())
                .setUseNativeGLFW(vs.isUseNativeGLFW())
-                .setUseNativeOpenAL(vs.isUseNativeOpenAL())
-                .setDaemon(!makeLaunchScript && vs.getLauncherVisibility().isDaemon())
-                .setJavaAgents(javaAgents);
+                .setUseNativeOpenAL(vs.isUseNativeOpenAL());
        if (config().hasProxy()) {
            builder.setProxy(ProxyManager.getProxy());
            if (config().hasProxyAuth()) {
@@ -440,16 +349,16 @@ public class HMCLGameRepository extends DefaultGameRepository {
            try {
                String jsonText = FileUtils.readText(json);
                ModpackConfiguration<?> modpackConfiguration = JsonUtils.GSON.fromJson(jsonText, ModpackConfiguration.class);
-                ModpackProvider provider = ModpackHelper.getProviderByType(modpackConfiguration.getType());
-                if (provider != null) provider.injectLaunchOptions(jsonText, builder);
+                if (McbbsModpackLocalInstallTask.MODPACK_TYPE.equals(modpackConfiguration.getType())) {
+                    ModpackConfiguration<McbbsModpackManifest> config = JsonUtils.GSON.fromJson(FileUtils.readText(json), new TypeToken<ModpackConfiguration<McbbsModpackManifest>>() {
+                    }.getType());
+                    config.getManifest().injectLaunchOptions(builder);
+                }
            } catch (IOException | JsonParseException e) {
                e.printStackTrace();
            }
        }

-        if (vs.isAutoMemory() && builder.getJavaArguments().stream().anyMatch(it -> it.startsWith("-Xmx")))
-            builder.setMaxMemory(null);
-
        return builder.create();
    }

@@ -496,7 +405,7 @@ public class HMCLGameRepository extends DefaultGameRepository {
            return false;

        if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS &&
-                FORBIDDEN_VERSION_IDS.contains(id.toLowerCase(Locale.ROOT)))
+                FORBIDDEN_VERSION_IDS.contains(id.toLowerCase()))
            return false;

        return OperatingSystem.isNameValid(id);
@@ -520,20 +429,6 @@ public class HMCLGameRepository extends DefaultGameRepository {
    }

    public static long getAllocatedMemory(long minimum, long available, boolean auto) {
-        if (auto) {
-            available -= 384 * 1024 * 1024; // Reserve 384MiB memory for off-heap memory and HMCL itself
-            if (available <= 0) {
-                return minimum;
-            }
-
-            final long threshold = 8L * 1024 * 1024 * 1024;
-            final long suggested = Math.min(available <= threshold
-                            ? (long) (available * 0.8)
-                            : (long) (threshold * 0.8 + (available - threshold) * 0.2),
-                    16384L * 1024 * 1024);
-            return Math.max(minimum, suggested);
-        } else {
-            return minimum;
-        }
+        return auto ? Math.max(minimum, (long) (available * 0.8)) : minimum;
    }
 }
@@ -18,6 +18,7 @@
 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;
@@ -32,8 +33,7 @@ import org.jackhuang.hmcl.util.io.FileUtils;

 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
+import java.util.LinkedList;
 import java.util.List;

 public final class HMCLModpackInstallTask extends Task<Void> {
@@ -42,8 +42,8 @@ public final class HMCLModpackInstallTask extends Task<Void> {
    private final HMCLGameRepository repository;
    private final DefaultDependencyManager dependency;
    private final Modpack modpack;
-    private final List<Task<?>> dependencies = new ArrayList<>(1);
-    private final List<Task<?>> dependents = new ArrayList<>(4);
+    private final List<Task<?>> dependencies = new LinkedList<>();
+    private final List<Task<?>> dependents = new LinkedList<>();

    public HMCLModpackInstallTask(Profile profile, File zipFile, Modpack modpack, String name) {
        dependency = profile.getDependency();
@@ -66,15 +66,16 @@ public final class HMCLModpackInstallTask extends Task<Void> {
        ModpackConfiguration<Modpack> config = null;
        try {
            if (json.exists()) {
-                config = JsonUtils.GSON.fromJson(FileUtils.readText(json), ModpackConfiguration.typeOf(Modpack.class));
+                config = JsonUtils.GSON.fromJson(FileUtils.readText(json), new TypeToken<ModpackConfiguration<Modpack>>() {
+                }.getType());

-                if (!HMCLModpackProvider.INSTANCE.getName().equals(config.getType()))
+                if (!MODPACK_TYPE.equals(config.getType()))
                    throw new IllegalArgumentException("Version " + name + " is not a HMCL modpack. Cannot update this version.");
            }
        } catch (JsonParseException | IOException ignore) {
        }
-        dependents.add(new ModpackInstallTask<>(zipFile, run, modpack.getEncoding(), Collections.singletonList("/minecraft"), it -> !"pack.json".equals(it), config));
-        dependents.add(new MinecraftInstanceTask<>(zipFile, modpack.getEncoding(), Collections.singletonList("/minecraft"), modpack, HMCLModpackProvider.INSTANCE, modpack.getName(), modpack.getVersion(), repository.getModpackConfiguration(name)).withStage("hmcl.modpack"));
+        dependents.add(new ModpackInstallTask<>(zipFile, run, modpack.getEncoding(), "/minecraft", it -> !"pack.json".equals(it), config));
+        dependents.add(new MinecraftInstanceTask<>(zipFile, modpack.getEncoding(), "/minecraft", modpack, MODPACK_TYPE, modpack.getName(), modpack.getVersion(), repository.getModpackConfiguration(name)).withStage("hmcl.modpack"));
    }

    @Override
@@ -91,7 +92,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, null);
+        LibraryAnalyzer analyzer = LibraryAnalyzer.analyze(originalVersion);
        Task<Version> libraryTask = Task.supplyAsync(() -> originalVersion);
        // reinstall libraries
        // libraries of Forge and OptiFine should be obtained by installation.
@@ -103,4 +104,6 @@ public final class HMCLModpackInstallTask extends Task<Void> {

        dependencies.add(libraryTask.thenComposeAsync(repository::saveAsync));
    }
+
+    public static final String MODPACK_TYPE = "HMCL";
 }
@@ -1,6 +1,6 @@
 /*
 * Hello Minecraft! Launcher
- * Copyright (C) 2022  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
@@ -18,60 +18,42 @@
 package org.jackhuang.hmcl.game;

 import com.google.gson.JsonParseException;
-import org.apache.commons.compress.archivers.zip.ZipFile;
 import org.jackhuang.hmcl.download.DefaultDependencyManager;
-import org.jackhuang.hmcl.mod.MismatchedModpackTypeException;
 import org.jackhuang.hmcl.mod.Modpack;
-import org.jackhuang.hmcl.mod.ModpackProvider;
-import org.jackhuang.hmcl.mod.ModpackUpdateTask;
-import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
-import org.jackhuang.hmcl.util.io.CompressingUtils;
+import org.jackhuang.hmcl.util.io.FileUtils;

 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.Charset;
-import java.nio.file.Path;
+import java.nio.file.FileSystem;

-public final class HMCLModpackProvider implements ModpackProvider {
-    public static final HMCLModpackProvider INSTANCE = new HMCLModpackProvider();
-
-    @Override
-    public String getName() {
-        return "HMCL";
+/**
+ * @author huangyuhui
+ */
+public final class HMCLModpackManager {
+    private HMCLModpackManager() {
    }

-    @Override
-    public Task<?> createCompletionTask(DefaultDependencyManager dependencyManager, String version) {
-        return null;
-    }
-
-    @Override
-    public Task<?> createUpdateTask(DefaultDependencyManager dependencyManager, String name, File zipFile, Modpack modpack) throws MismatchedModpackTypeException {
-        if (!(modpack.getManifest() instanceof HMCLModpackManifest))
-            throw new MismatchedModpackTypeException(getName(), modpack.getManifest().getProvider().getName());
-
-        if (!(dependencyManager.getGameRepository() instanceof HMCLGameRepository)) {
-            throw new IllegalArgumentException("HMCLModpackProvider requires HMCLGameRepository");
-        }
-
-        HMCLGameRepository repository = (HMCLGameRepository) dependencyManager.getGameRepository();
-        Profile profile = repository.getProfile();
-
-        return new ModpackUpdateTask(dependencyManager.getGameRepository(), name, new HMCLModpackInstallTask(profile, zipFile, modpack, name));
-    }
-
-    @Override
-    public Modpack readManifest(ZipFile file, Path path, Charset encoding) throws IOException, JsonParseException {
-        String manifestJson = CompressingUtils.readTextZipEntry(file, "modpack.json");
+    /**
+     * Read the manifest in a HMCL modpack.
+     *
+     * @param fs     a HMCL modpack file.
+     * @param encoding encoding of modpack zip file.
+     * @return the manifest of HMCL modpack.
+     * @throws IOException        if the file is not a valid zip file.
+     * @throws JsonParseException if the manifest.json is missing or malformed.
+     */
+    public static Modpack readHMCLModpackManifest(FileSystem fs, Charset encoding) throws IOException, JsonParseException {
+        String manifestJson = FileUtils.readText(fs.getPath("modpack.json"));
        Modpack manifest = JsonUtils.fromNonNullJson(manifestJson, HMCLModpack.class).setEncoding(encoding);
-        String gameJson = CompressingUtils.readTextZipEntry(file, "minecraft/pack.json");
+        String gameJson = FileUtils.readText(fs.getPath("minecraft/pack.json"));
        Version game = JsonUtils.fromNonNullJson(gameJson, Version.class);
        if (game.getJar() == null)
            if (StringUtils.isBlank(manifest.getVersion()))
-                throw new JsonParseException("Cannot recognize the game version of modpack " + file + ".");
+                throw new JsonParseException("Cannot recognize the game version of modpack");
            else
                manifest.setManifest(HMCLModpackManifest.INSTANCE);
        else
@@ -85,5 +67,4 @@ public final class HMCLModpackProvider implements ModpackProvider {
            return new HMCLModpackInstallTask(((HMCLGameRepository) dependencyManager.getGameRepository()).getProfile(), zipFile, this, name);
        }
    }
-
 }
@@ -17,16 +17,8 @@
 */
 package org.jackhuang.hmcl.game;

-import org.jackhuang.hmcl.mod.ModpackManifest;
-import org.jackhuang.hmcl.mod.ModpackProvider;
-
-public final class HMCLModpackManifest implements ModpackManifest {
+public final class HMCLModpackManifest {
    public static final HMCLModpackManifest INSTANCE = new HMCLModpackManifest();

    private HMCLModpackManifest() {}
-
-    @Override
-    public ModpackProvider getProvider() {
-        return HMCLModpackProvider.INSTANCE;
-    }
 }
@@ -0,0 +1,38 @@
+/*
+ * 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);
+    }
+}
@@ -1,130 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2022  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.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.*;
-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 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);
-        }
-
-        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
-    public Stream<Category> getCategories() throws IOException {
-        return getBackedRemoteModRepository().getCategories();
-    }
-
-    @Override
-    public Optional<RemoteMod.Version> getRemoteVersionByLocalFile(LocalModFile localModFile, Path file) throws IOException {
-        return getBackedRemoteModRepository().getRemoteVersionByLocalFile(localModFile, file);
-    }
-
-    @Override
-    public RemoteMod getModById(String id) throws IOException {
-        return getBackedRemoteModRepository().getModById(id);
-    }
-
-    @Override
-    public RemoteMod.File getModFile(String modId, String fileId) throws IOException {
-        return getBackedRemoteModRepository().getModFile(modId, fileId);
-    }
-
-    @Override
-    public Stream<RemoteMod.Version> getRemoteVersionsById(String id) throws IOException {
-        return getBackedRemoteModRepository().getRemoteVersionsById(id);
-    }
-}
@@ -1,72 +0,0 @@
-/*
- * 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,27 +17,21 @@
 */
 package org.jackhuang.hmcl.game;

-import org.jackhuang.hmcl.util.logging.Logger;
+import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.util.Logging;
 import org.jackhuang.hmcl.util.StringUtils;
-import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.io.Zipper;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;

 import java.io.IOException;
 import java.io.UncheckedIOException;
-import java.lang.management.ManagementFactory;
-import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.nio.file.attribute.FileTime;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;

-import static org.jackhuang.hmcl.util.logging.Logger.LOG;
-
 public final class LogExporter {
    private LogExporter() {
    }
@@ -64,14 +58,15 @@ public final class LogExporter {

        return CompletableFuture.runAsync(() -> {
            try (Zipper zipper = new Zipper(zipFile)) {
-                processLogs(runDirectory.resolve("liteconfig"), "*.log", "liteconfig", zipper);
-                processLogs(runDirectory.resolve("logs"), "*.log", "logs", zipper);
-                processLogs(runDirectory, "*.log", "runDirectory", zipper);
-                processLogs(runDirectory.resolve("crash-reports"), "*.txt", "crash-reports", zipper);
-
-                zipper.putTextFile(LOG.getLogs(), "hmcl.log");
+                if (Files.exists(runDirectory.resolve("logs").resolve("debug.log"))) {
+                    zipper.putFile(runDirectory.resolve("logs").resolve("debug.log"), "debug.log");
+                }
+                if (Files.exists(runDirectory.resolve("logs").resolve("latest.log"))) {
+                    zipper.putFile(runDirectory.resolve("logs").resolve("latest.log"), "latest.log");
+                }
+                zipper.putTextFile(Logging.getLogs(), "hmcl.log");
                zipper.putTextFile(logs, "minecraft.log");
-                zipper.putTextFile(Logger.filterForbiddenToken(launchScript), OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS ? "launch.bat" : "launch.sh");
+                zipper.putTextFile(launchScript, OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS ? "launch.bat" : "launch.sh");

                for (String id : versions) {
                    Path versionJson = baseDirectory.resolve("versions").resolve(id).resolve(id + ".json");
@@ -82,28 +77,6 @@ public final class LogExporter {
            } catch (IOException e) {
                throw new UncheckedIOException(e);
            }
-        });
-    }
-
-    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);
-        }
+        }, Schedulers.io());
    }
 }
@@ -18,16 +18,17 @@
 package org.jackhuang.hmcl.game;

 import com.google.gson.JsonParseException;
-import org.apache.commons.compress.archivers.zip.ZipFile;
+import com.google.gson.reflect.TypeToken;
 import org.jackhuang.hmcl.mod.*;
-import org.jackhuang.hmcl.mod.curse.CurseModpackProvider;
+import org.jackhuang.hmcl.mod.curse.CurseCompletionException;
+import org.jackhuang.hmcl.mod.curse.CurseInstallTask;
+import org.jackhuang.hmcl.mod.curse.CurseManifest;
+import org.jackhuang.hmcl.mod.mcbbs.McbbsModpackLocalInstallTask;
 import org.jackhuang.hmcl.mod.mcbbs.McbbsModpackManifest;
-import org.jackhuang.hmcl.mod.mcbbs.McbbsModpackProvider;
-import org.jackhuang.hmcl.mod.modrinth.ModrinthModpackProvider;
 import org.jackhuang.hmcl.mod.multimc.MultiMCInstanceConfiguration;
-import org.jackhuang.hmcl.mod.multimc.MultiMCModpackProvider;
+import org.jackhuang.hmcl.mod.multimc.MultiMCModpackInstallTask;
+import org.jackhuang.hmcl.mod.server.ServerModpackLocalInstallTask;
 import org.jackhuang.hmcl.mod.server.ServerModpackManifest;
-import org.jackhuang.hmcl.mod.server.ServerModpackProvider;
 import org.jackhuang.hmcl.mod.server.ServerModpackRemoteInstallTask;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Profiles;
@@ -40,7 +41,7 @@ import org.jackhuang.hmcl.util.function.ExceptionalRunnable;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.io.CompressingUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
-import org.jetbrains.annotations.Nullable;
+import org.jackhuang.hmcl.util.io.ZipFileSystem;

 import java.io.File;
 import java.io.FileNotFoundException;
@@ -51,53 +52,47 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
-import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Stream;

-import static org.jackhuang.hmcl.util.Lang.mapOf;
 import static org.jackhuang.hmcl.util.Lang.toIterable;
-import static org.jackhuang.hmcl.util.Pair.pair;

 public final class ModpackHelper {
    private ModpackHelper() {}

-    private static final Map<String, ModpackProvider> providers = mapOf(
-            pair(CurseModpackProvider.INSTANCE.getName(), CurseModpackProvider.INSTANCE),
-            pair(McbbsModpackProvider.INSTANCE.getName(), McbbsModpackProvider.INSTANCE),
-            pair(ModrinthModpackProvider.INSTANCE.getName(), ModrinthModpackProvider.INSTANCE),
-            pair(MultiMCModpackProvider.INSTANCE.getName(), MultiMCModpackProvider.INSTANCE),
-            pair(ServerModpackProvider.INSTANCE.getName(), ServerModpackProvider.INSTANCE),
-            pair(HMCLModpackProvider.INSTANCE.getName(), HMCLModpackProvider.INSTANCE)
-    );
-
-    @Nullable
-    public static ModpackProvider getProviderByType(String type) {
-        return providers.get(type);
-    }
-
-    public static boolean isFileModpackByExtension(File file) {
-        String ext = FileUtils.getExtension(file);
-        return "zip".equals(ext) || "mrpack".equals(ext);
-    }
-
    public static Modpack readModpackManifest(Path file, Charset charset) throws UnsupportedModpackException, ManuallyCreatedModpackException {
-        try (ZipFile zipFile = CompressingUtils.openZipFile(file, charset)) {
-            // Order for trying detecting manifest is necessary here.
-            // Do not change to iterating providers.
-            for (ModpackProvider provider : new ModpackProvider[]{
-                    McbbsModpackProvider.INSTANCE,
-                    CurseModpackProvider.INSTANCE,
-                    ModrinthModpackProvider.INSTANCE,
-                    HMCLModpackProvider.INSTANCE,
-                    MultiMCModpackProvider.INSTANCE,
-                    ServerModpackProvider.INSTANCE}) {
-                try {
-                    return provider.readManifest(zipFile, file, charset);
-                } catch (Exception ignored) {
-                }
+        try (ZipFileSystem zfs = CompressingUtils.createReadOnlyZipFileSystem(file, charset)) {
+            try {
+                return McbbsModpackManifest.readManifest(zfs, charset);
+            } catch (Exception ignored) {
+                // ignore it, not a valid MCBBS modpack.
            }
+
+            try {
+                return CurseManifest.readCurseForgeModpackManifest(zfs, charset);
+            } catch (Exception e) {
+                // ignore it, not a valid CurseForge modpack.
+            }
+
+            try {
+                return HMCLModpackManager.readHMCLModpackManifest(zfs, charset);
+            } catch (Exception e) {
+                // ignore it, not a valid HMCL modpack.
+            }
+
+            try {
+                return MultiMCInstanceConfiguration.readMultiMCModpackManifest(zfs, file, charset);
+            } catch (Exception e) {
+                // ignore it, not a valid MultiMC modpack.
+            }
+
+            try {
+                return ServerModpackManifest.readManifest(zfs, charset);
+            } catch (Exception e) {
+                // ignore it, not a valid Server modpack.
+            }
+
        } catch (IOException ignored) {
        }

@@ -140,12 +135,24 @@ public final class ModpackHelper {
            throw new FileNotFoundException(file.getPath());
        else
            try {
-                return JsonUtils.GSON.fromJson(FileUtils.readText(file), ModpackConfiguration.class);
+                return JsonUtils.GSON.fromJson(FileUtils.readText(file), new TypeToken<ModpackConfiguration<?>>() {
+                }.getType());
            } catch (JsonParseException e) {
                throw new IOException("Malformed modpack configuration");
            }
    }

+    private static String getManifestType(Object manifest) throws UnsupportedModpackException {
+        if (manifest instanceof HMCLModpackManifest)
+            return HMCLModpackInstallTask.MODPACK_TYPE;
+        else if (manifest instanceof MultiMCInstanceConfiguration)
+            return MultiMCModpackInstallTask.MODPACK_TYPE;
+        else if (manifest instanceof CurseManifest)
+            return CurseInstallTask.MODPACK_TYPE;
+        else
+            throw new UnsupportedModpackException();
+    }
+
    public static Task<?> getInstallTask(Profile profile, ServerModpackManifest manifest, String name, Modpack modpack) {
        profile.getRepository().markVersionAsModpack(name);

@@ -159,7 +166,7 @@ public final class ModpackHelper {
        };

        ExceptionalConsumer<Exception, ?> failure = ex -> {
-            if (ex instanceof ModpackCompletionException && !(ex.getCause() instanceof FileNotFoundException)) {
+            if (ex instanceof CurseCompletionException && !(ex.getCause() instanceof FileNotFoundException)) {
                success.run();
                // This is tolerable and we will not delete the game
            }
@@ -201,7 +208,7 @@ public final class ModpackHelper {
        };

        ExceptionalConsumer<Exception, ?> failure = ex -> {
-            if (ex instanceof ModpackCompletionException && !(ex.getCause() instanceof FileNotFoundException)) {
+            if (ex instanceof CurseCompletionException && !(ex.getCause() instanceof FileNotFoundException)) {
                success.run();
                // This is tolerable and we will not delete the game
            }
@@ -230,13 +237,38 @@ public final class ModpackHelper {
        }
    }

-    public static Task<?> getUpdateTask(Profile profile, File zipFile, Charset charset, String name, ModpackConfiguration<?> configuration) throws UnsupportedModpackException, ManuallyCreatedModpackException, MismatchedModpackTypeException {
+    public static Task<Void> getUpdateTask(Profile profile, File zipFile, Charset charset, String name, ModpackConfiguration<?> configuration) throws UnsupportedModpackException, ManuallyCreatedModpackException, MismatchedModpackTypeException {
        Modpack modpack = ModpackHelper.readModpackManifest(zipFile.toPath(), charset);
-        ModpackProvider provider = getProviderByType(configuration.getType());
-        if (provider == null) {
-            throw new UnsupportedModpackException();
+
+        switch (configuration.getType()) {
+            case CurseInstallTask.MODPACK_TYPE:
+                if (!(modpack.getManifest() instanceof CurseManifest))
+                    throw new MismatchedModpackTypeException(CurseInstallTask.MODPACK_TYPE, getManifestType(modpack.getManifest()));
+
+                return new ModpackUpdateTask(profile.getRepository(), name, new CurseInstallTask(profile.getDependency(), zipFile, modpack, (CurseManifest) modpack.getManifest(), name));
+            case MultiMCModpackInstallTask.MODPACK_TYPE:
+                if (!(modpack.getManifest() instanceof MultiMCInstanceConfiguration))
+                    throw new MismatchedModpackTypeException(MultiMCModpackInstallTask.MODPACK_TYPE, getManifestType(modpack.getManifest()));
+
+                return new ModpackUpdateTask(profile.getRepository(), name, new MultiMCModpackInstallTask(profile.getDependency(), zipFile, modpack, (MultiMCInstanceConfiguration) modpack.getManifest(), name));
+            case HMCLModpackInstallTask.MODPACK_TYPE:
+                if (!(modpack.getManifest() instanceof HMCLModpackManifest))
+                    throw new MismatchedModpackTypeException(HMCLModpackInstallTask.MODPACK_TYPE, getManifestType(modpack.getManifest()));
+
+                return new ModpackUpdateTask(profile.getRepository(), name, new HMCLModpackInstallTask(profile, zipFile, modpack, name));
+            case McbbsModpackLocalInstallTask.MODPACK_TYPE:
+                if (!(modpack.getManifest() instanceof McbbsModpackManifest))
+                    throw new MismatchedModpackTypeException(McbbsModpackLocalInstallTask.MODPACK_TYPE, getManifestType(modpack.getManifest()));
+
+                return new ModpackUpdateTask(profile.getRepository(), name, new McbbsModpackLocalInstallTask(profile.getDependency(), zipFile, modpack, (McbbsModpackManifest) modpack.getManifest(), name));
+            case ServerModpackLocalInstallTask.MODPACK_TYPE:
+                if (!(modpack.getManifest() instanceof ServerModpackManifest))
+                    throw new MismatchedModpackTypeException(ServerModpackLocalInstallTask.MODPACK_TYPE, getManifestType(modpack.getManifest()));
+
+                return new ModpackUpdateTask(profile.getRepository(), name, new ServerModpackLocalInstallTask(profile.getDependency(), zipFile, modpack, (ServerModpackManifest) modpack.getManifest(), name));
+            default:
+                throw new UnsupportedModpackException();
        }
-        return provider.createUpdateTask(profile.getDependency(), name, zipFile, modpack);
    }

    public static void toVersionSetting(MultiMCInstanceConfiguration c, VersionSetting vs) {
@@ -23,20 +23,22 @@ 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;
 import org.jackhuang.hmcl.util.io.NetworkUtils;

 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 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 {
@@ -79,7 +81,7 @@ public final class OAuthServer extends NanoHTTPD implements OAuth.Session {
            try {
                session.parseBody(files);
            } catch (IOException e) {
-                LOG.warning("Failed to read post data", e);
+                Logging.LOG.log(Level.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());
@@ -96,16 +98,16 @@ public final class OAuthServer extends NanoHTTPD implements OAuth.Session {
            idToken = query.get("id_token");
            future.complete(query.get("code"));
        } else {
-            LOG.warning("Error: " + parameters);
+            Logging.LOG.warning("Error: " + parameters);
            future.completeExceptionally(new AuthenticationException("failed to authenticate"));
        }

        String html;
        try {
-            html = IOUtils.readFullyAsString(OAuthServer.class.getResourceAsStream("/assets/microsoft_auth.html"))
+            html = IOUtils.readFullyAsString(OAuthServer.class.getResourceAsStream("/assets/microsoft_auth.html"), StandardCharsets.UTF_8)
                    .replace("%close-page%", i18n("account.methods.microsoft.close_page"));
        } catch (IOException e) {
-            LOG.error("Failed to load html", e);
+            Logging.LOG.log(Level.SEVERE, "Failed to load html");
            return newFixedLengthResponse(Response.Status.INTERNAL_ERROR, MIME_HTML, "");
        }
        thread(() -> {
@@ -113,7 +115,7 @@ public final class OAuthServer extends NanoHTTPD implements OAuth.Session {
                Thread.sleep(1000);
                stop();
            } catch (InterruptedException e) {
-                LOG.error("Failed to sleep for 1 second");
+                Logging.LOG.log(Level.SEVERE, "Failed to sleep for 1 second");
            }
        });
        return newFixedLengthResponse(Response.Status.OK, "text/html; charset=UTF-8", html);
@@ -158,19 +160,15 @@ public final class OAuthServer extends NanoHTTPD implements OAuth.Session {
        @Override
        public String getClientId() {
            return System.getProperty("hmcl.microsoft.auth.id",
-                    JarUtils.getManifestAttribute("Microsoft-Auth-Id", ""));
+                    JarUtils.thisJar().flatMap(JarUtils::getManifest).map(manifest -> manifest.getMainAttributes().getValue("Microsoft-Auth-Id")).orElse(""));
        }

        @Override
        public String getClientSecret() {
            return System.getProperty("hmcl.microsoft.auth.secret",
-                    JarUtils.getManifestAttribute("Microsoft-Auth-Secret", ""));
+                    JarUtils.thisJar().flatMap(JarUtils::getManifest).map(manifest -> manifest.getMainAttributes().getValue("Microsoft-Auth-Secret")).orElse(""));
        }

-        @Override
-        public boolean isPublicClient() {
-            return true; // We have turned on the device auth flow.
-        }
    }

    public static class GrantDeviceCodeEvent extends Event {
@@ -17,47 +17,42 @@
 */
 package org.jackhuang.hmcl.game;

-import javafx.beans.InvalidationListener;
-import javafx.beans.WeakInvalidationListener;
+import javafx.beans.binding.Bindings;
 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;
-import javafx.scene.canvas.GraphicsContext;
 import javafx.scene.image.Image;
-import javafx.scene.image.PixelReader;
-import javafx.scene.image.PixelWriter;
 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.task.Schedulers;
 import org.jackhuang.hmcl.ui.FXUtils;
-import org.jackhuang.hmcl.util.Holder;
+import org.jackhuang.hmcl.util.ResourceNotFoundError;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.javafx.BindingMapping;

+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.ref.WeakReference;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.*;
+import java.util.EnumMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
 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.Logger.LOG;
+import static org.jackhuang.hmcl.util.Logging.LOG;

 /**
 * @author yushijinhun
@@ -69,15 +64,15 @@ public final class TexturesLoader {

    // ==== Texture Loading ====
    public static class LoadedTexture {
-        private final Image image;
+        private final BufferedImage image;
        private final Map<String, String> metadata;

-        public LoadedTexture(Image image, Map<String, String> metadata) {
+        public LoadedTexture(BufferedImage image, Map<String, String> metadata) {
            this.image = requireNonNull(image);
            this.metadata = requireNonNull(metadata);
        }

-        public Image getImage() {
+        public BufferedImage getImage() {
            return image;
        }

@@ -101,7 +96,7 @@ public final class TexturesLoader {
        return TEXTURES_DIR.resolve(prefix).resolve(hash);
    }

-    public static LoadedTexture loadTexture(Texture texture) throws Throwable {
+    public static LoadedTexture loadTexture(Texture texture) throws IOException {
        if (StringUtils.isBlank(texture.getUrl())) {
            throw new IOException("Texture url is empty");
        }
@@ -115,20 +110,19 @@ public final class TexturesLoader {
            } catch (Exception e) {
                if (Files.isRegularFile(file)) {
                    // concurrency conflict?
-                    LOG.warning("Failed to download texture " + texture.getUrl() + ", but the file is available", e);
+                    LOG.log(Level.WARNING, "Failed to download texture " + texture.getUrl() + ", but the file is available", e);
                } else {
                    throw new IOException("Failed to download texture " + texture.getUrl());
                }
            }
        }

-        Image img;
+        BufferedImage img;
        try (InputStream in = Files.newInputStream(file)) {
-            img = new Image(in);
+            img = ImageIO.read(in);
        }
-
-        if (img.isError())
-            throw img.getException();
+        if (img == null)
+            throw new IOException("Texture is malformed");

        Map<String, String> metadata = texture.getMetadata();
        if (metadata == null) {
@@ -139,42 +133,34 @@ public final class TexturesLoader {
    // ====

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

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

-    public static LoadedTexture getDefaultSkin(UUID uuid) {
-        int idx = Math.floorMod(uuid.hashCode(), DEFAULT_SKINS.length * 2);
-        TextureModel model;
-        Image skin;
-        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");
+    private static void loadDefaultSkin(String path, TextureModel model) {
+        try (InputStream in = ResourceNotFoundError.getResourceAsStream(path)) {
+            DEFAULT_SKINS.put(model, new LoadedTexture(ImageIO.read(in), singletonMap("model", model.modelName)));
+        } catch (Throwable e) {
+            throw new ResourceNotFoundError("Cannoot load default skin from " + path, e);
        }
-
-        return new LoadedTexture(skin, singletonMap("model", model.modelName));
    }

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

    public static ObjectBinding<LoadedTexture> skinBinding(YggdrasilService service, UUID uuid) {
-        LoadedTexture uuidFallback = getDefaultSkin(uuid);
+        LoadedTexture uuidFallback = getDefaultSkin(TextureModel.detectUUID(uuid));
        return BindingMapping.of(service.getProfileRepository().binding(uuid))
                .map(profile -> profile
                        .flatMap(it -> {
                            try {
                                return YggdrasilService.getTextures(it);
                            } catch (ServerResponseMalformedException e) {
-                                LOG.warning("Failed to parse texture payload", e);
+                                LOG.log(Level.WARNING, "Failed to parse texture payload", e);
                                return Optional.empty();
                            }
                        })
@@ -186,8 +172,8 @@ public final class TexturesLoader {
                        return CompletableFuture.supplyAsync(() -> {
                            try {
                                return loadTexture(texture);
-                            } catch (Throwable e) {
-                                LOG.warning("Failed to load texture " + texture.getUrl() + ", using fallback texture", e);
+                            } catch (IOException e) {
+                                LOG.log(Level.WARNING, "Failed to load texture " + texture.getUrl() + ", using fallback texture", e);
                                return uuidFallback;
                            }
                        }, POOL);
@@ -197,177 +183,64 @@ public final class TexturesLoader {
                }, 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();
+    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 (IOException e) {
+                                LOG.log(Level.WARNING, "Failed to load texture " + texture.getUrl() + ", using fallback texture", e);
+                                return uuidFallback;
                            }
-
-                            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);
-                            }
-                        }
-
+                        }, POOL);
+                    } else {
                        return CompletableFuture.completedFuture(uuidFallback);
-                    }, uuidFallback);
-        }
+                    }
+                }, uuidFallback);
    }

    // ====

    // ==== Avatar ====
-    public static void drawAvatar(Canvas canvas, Image skin) {
-        GraphicsContext g = canvas.getGraphicsContext2D();
-        g.clearRect(0, 0, canvas.getWidth(), canvas.getHeight());
+    public static BufferedImage toAvatar(BufferedImage skin, int size) {
+        BufferedImage avatar = new BufferedImage(size, size, BufferedImage.TYPE_INT_ARGB);
+        Graphics2D g = avatar.createGraphics();

-        int size = (int) canvas.getWidth();
-        int scale = (int) skin.getWidth() / 64;
+        int scale = skin.getWidth() / 64;
        int faceOffset = (int) Math.round(size / 18.0);
-
-        try {
-            g.setImageSmoothing(false);
-            drawAvatar(g, skin, size, scale, faceOffset);
-        } catch (NoSuchMethodError ignored) {
-            // Earlier JavaFX did not support GraphicsContext::setImageSmoothing
-            // In order to prevent the blurring caused by bilinear interpolation,
-            // we use the self-implemented nearest neighbor interpolation to scale
-            drawAvatarSlow(g, skin, size, scale, faceOffset);
-        }
-    }
-
-    private static void drawAvatar(GraphicsContext g, Image skin, int size, int scale, int faceOffset) {
        g.drawImage(skin,
-                8 * scale, 8 * scale, 8 * scale, 8 * scale,
-                faceOffset, faceOffset, size - 2 * faceOffset, size - 2 * faceOffset);
+                faceOffset, faceOffset, size - faceOffset, size - faceOffset,
+                8 * scale, 8 * scale, 16 * scale, 16 * scale,
+                null);
        g.drawImage(skin,
-                40 * scale, 8 * scale, 8 * scale, 8 * scale,
-                0, 0, size, size);
+                0, 0, size, size,
+                40 * scale, 8 * scale, 48 * scale, 16 * scale, null);
+
+        g.dispose();
+        return avatar;
    }

-    private static void drawAvatarSlow(GraphicsContext g, Image skin, int size, int scale, int faceOffset) {
-        PixelReader reader = skin.getPixelReader();
-        PixelWriter writer = g.getPixelWriter();
-        drawImage(writer, reader,
-                8 * scale, 8 * scale, 8 * scale, 8 * scale,
-                faceOffset, faceOffset, size - 2 * faceOffset, size - 2 * faceOffset);
-        drawImage(writer, reader,
-                40 * scale, 8 * scale, 8 * scale, 8 * scale,
-                0, 0, size, size);
+    public static ObjectBinding<Image> fxAvatarBinding(YggdrasilService service, UUID uuid, int size) {
+        return BindingMapping.of(skinBinding(service, uuid))
+                .map(it -> toAvatar(it.image, size))
+                .map(FXUtils::toFXImage);
    }

-    /*
-     * Scale and draw image using nearest-neighbor interpolation
-     */
-    private static void drawImage(PixelWriter writer, PixelReader reader,
-                                  int sx, int sy, int sw, int sh,
-                                  int dx, int dy, int dw, int dh) {
-        double xScale = ((double) sw) / dw;
-        double yScale = ((double) sh) / dh;
-
-        for (int xOffset = 0; xOffset < dw; xOffset++) {
-            for (int yOffset = 0; yOffset < dh; yOffset++) {
-                int color = reader.getArgb(sx + (int) (xOffset * xScale), sy + (int) (yOffset * yScale));
-
-                // Draw only non-transparent pixels
-                if ((color >>> 24) != 0)
-                    writer.setArgb(dx + xOffset, dy + yOffset, color);
-            }
-        }
-    }
-
-    private static final class SkinBindingChangeListener implements ChangeListener<LoadedTexture> {
-        static final WeakHashMap<Canvas, SkinBindingChangeListener> hole = new WeakHashMap<>();
-
-        final WeakReference<Canvas> canvasRef;
-        final ObservableValue<LoadedTexture> binding;
-
-        SkinBindingChangeListener(Canvas canvas, ObservableValue<LoadedTexture> binding) {
-            this.canvasRef = new WeakReference<>(canvas);
-            this.binding = binding;
-        }
-
-        @Override
-        public void changed(ObservableValue<? extends LoadedTexture> observable,
-                            LoadedTexture oldValue, LoadedTexture loadedTexture) {
-            Canvas canvas = canvasRef.get();
-            if (canvas != null)
-                drawAvatar(canvas, loadedTexture.image);
-        }
-    }
-
-    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.getValue());
-            skinBinding.addListener(listener);
-
-            SkinBindingChangeListener.hole.put(canvas, listener);
-        }
-    }
-
-    public static void bindAvatar(Canvas canvas, YggdrasilService service, UUID uuid) {
-        fxAvatarBinding(canvas, skinBinding(service, uuid));
-    }
-
-    public static void bindAvatar(Canvas canvas, Account account) {
-        if (account instanceof YggdrasilAccount || account instanceof MicrosoftAccount || account instanceof OfflineAccount)
-            fxAvatarBinding(canvas, skinBinding(account));
-        else {
-            unbindAvatar(canvas);
-            drawAvatar(canvas, getDefaultSkin(account.getUUID()).image);
-        }
-    }
-
-    public static void unbindAvatar(Canvas canvas) {
-        synchronized (SkinBindingChangeListener.hole) {
-            SkinBindingChangeListener oldListener = SkinBindingChangeListener.hole.remove(canvas);
-            if (oldListener != null)
-                oldListener.binding.removeListener(oldListener);
+    public static ObjectBinding<Image> fxAvatarBinding(Account account, int size) {
+        if (account instanceof YggdrasilAccount || account instanceof MicrosoftAccount) {
+            return BindingMapping.of(skinBinding(account))
+                    .map(it -> toAvatar(it.image, size))
+                    .map(FXUtils::toFXImage);
+        } else {
+            return Bindings.createObjectBinding(
+                    () -> FXUtils.toFXImage(toAvatar(getDefaultSkin(TextureModel.detectUUID(account.getUUID())).image, size)));
        }
    }
    // ====
@@ -1,221 +0,0 @@
-/*
- * 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());
-            }
-        });
-    }
-}
@@ -1,116 +0,0 @@
-/*
- * 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);
-        }
-    }
-}
@@ -1,128 +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.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());
-            }
-        }
-    }
-}
@@ -1,698 +0,0 @@
-/*
- * 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;
-    }
-}
@@ -1,112 +0,0 @@
-/*
- * 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,11 +17,11 @@
 */
 package org.jackhuang.hmcl.setting;

-import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
 import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyListProperty;
+import javafx.beans.property.ReadOnlyListWrapper;
 import javafx.beans.property.SimpleObjectProperty;
-import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.auth.*;
@@ -32,20 +32,19 @@ 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;
-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.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.logging.Level;

 import static java.util.stream.Collectors.toList;
 import static javafx.collections.FXCollections.observableArrayList;
@@ -53,28 +52,24 @@ 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.warning("Failed to check update for authlib-injector", e);
+                    LOG.log(Level.WARNING, "Failed to check update for authlib-injector", e);
                }
            });
        }
@@ -83,16 +78,17 @@ 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_MICROSOFT, FACTORY_AUTHLIB_INJECTOR);
+    public static final List<AccountFactory<?>> FACTORIES = immutableListOf(FACTORY_OFFLINE, FACTORY_MOJANG, 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);

@@ -100,24 +96,14 @@ public final class Accounts {
    }

    public static String getLoginType(AccountFactory<?> factory) {
-        String type = factory2type.get(factory);
-        if (type != null) return type;
-
-        if (factory instanceof BoundAuthlibInjectorAccountFactory) {
-            return factory2type.get(FACTORY_AUTHLIB_INJECTOR);
-        }
-
-        throw new IllegalArgumentException("Unrecognized account factory");
+        return Optional.ofNullable(factory2type.get(factory))
+                .orElseThrow(() -> new IllegalArgumentException("Unrecognized account factory"));
    }

    public static AccountFactory<?> getAccountFactory(String loginType) {
        return Optional.ofNullable(type2factory.get(loginType))
                .orElseThrow(() -> new IllegalArgumentException("Unrecognized login type"));
    }
-
-    public static BoundAuthlibInjectorAccountFactory getAccountFactoryByAuthlibInjectorServer(AuthlibInjectorServer server) {
-        return new BoundAuthlibInjectorAccountFactory(AUTHLIB_INJECTOR_DOWNLOADER, server);
-    }
    // ====

    public static AccountFactory<?> getAccountFactory(Account account) {
@@ -125,26 +111,67 @@ 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
            throw new IllegalArgumentException("Failed to determine account type: " + account);
    }

-    private static final String GLOBAL_PREFIX = "$GLOBAL:";
-    private static final ObservableList<Map<Object, Object>> globalAccountStorages = FXCollections.observableArrayList();
+    private static ObservableList<Account> accounts = observableArrayList(account -> new Observable[] { account });
+    private static ReadOnlyListWrapper<Account> accountsWrapper = new ReadOnlyListWrapper<>(Accounts.class, "accounts", accounts);

-    private static final ObservableList<Account> accounts = observableArrayList(account -> new Observable[]{account});
-    private static final ObjectProperty<Account> selectedAccount = new SimpleObjectProperty<>(Accounts.class, "selectedAccount");
+    private static ObjectProperty<Account> selectedAccount = new SimpleObjectProperty<Account>(Accounts.class, "selectedAccount") {
+        {
+            accounts.addListener(onInvalidating(this::invalidated));
+        }
+
+        @Override
+        protected void invalidated() {
+            // this methods first checks whether the current selection is valid
+            // if it's valid, the underlying storage will be updated
+            // otherwise, the first account will be selected as an alternative(or null if accounts is empty)
+            Account selected = get();
+            if (accounts.isEmpty()) {
+                if (selected == null) {
+                    // valid
+                } else {
+                    // the previously selected account is gone, we can only set it to null here
+                    set(null);
+                    return;
+                }
+            } else {
+                if (accounts.contains(selected)) {
+                    // valid
+                } else {
+                    // the previously selected account is gone
+                    set(accounts.get(0));
+                    return;
+                }
+            }
+            // selection is valid, store it
+            if (!initialized)
+                return;
+            updateAccountStorages();
+        }
+    };

    /**
     * True if {@link #init()} hasn't been called.
     */
    private static boolean initialized = false;

+    static {
+        accounts.addListener(onInvalidating(Accounts::updateAccountStorages));
+    }
+
    private static Map<Object, Object> getAccountStorage(Account account) {
        Map<Object, Object> storage = account.toStorage();
        storage.put("type", getLoginType(getAccountFactory(account)));
+        if (account == selectedAccount.get()) {
+            storage.put("selected", true);
+        }
        return storage;
    }

@@ -154,64 +181,7 @@ public final class Accounts {
        if (!initialized)
            return;
        // update storage
-
-        ArrayList<Map<Object, Object>> global = new ArrayList<>();
-        ArrayList<Map<Object, Object>> portable = new ArrayList<>();
-
-        for (Account account : accounts) {
-            Map<Object, Object> storage = getAccountStorage(account);
-            if (account.isPortable())
-                portable.add(storage);
-            else
-                global.add(storage);
-        }
-
-        if (!global.equals(globalAccountStorages))
-            globalAccountStorages.setAll(global);
-        if (!portable.equals(config().getAccountStorages()))
-            config().getAccountStorages().setAll(portable);
-    }
-
-    private static void loadGlobalAccountStorages() {
-        Path globalAccountsFile = Metadata.HMCL_DIRECTORY.resolve("accounts.json");
-        if (Files.exists(globalAccountsFile)) {
-            try (Reader reader = Files.newBufferedReader(globalAccountsFile)) {
-                globalAccountStorages.setAll(Config.CONFIG_GSON.fromJson(reader, listTypeOf(mapTypeOf(Object.class, Object.class))));
-            } catch (Throwable e) {
-                LOG.warning("Failed to load global accounts", e);
-            }
-        }
-
-        InvocationDispatcher<String> dispatcher = InvocationDispatcher.runOn(Lang::thread, json -> {
-            LOG.info("Saving global accounts");
-            synchronized (globalAccountsFile) {
-                try {
-                    synchronized (globalAccountsFile) {
-                        FileUtils.saveSafely(globalAccountsFile, json);
-                    }
-                } catch (IOException e) {
-                    LOG.error("Failed to save global accounts", e);
-                }
-            }
-        });
-
-        globalAccountStorages.addListener(onInvalidating(() ->
-                dispatcher.accept(Config.CONFIG_GSON.toJson(globalAccountStorages))));
-    }
-
-    private static Account parseAccount(Map<Object, Object> storage) {
-        AccountFactory<?> factory = type2factory.get(storage.get("type"));
-        if (factory == null) {
-            LOG.warning("Unrecognized account type: " + storage);
-            return null;
-        }
-
-        try {
-            return factory.fromStorage(storage);
-        } catch (Exception e) {
-            LOG.warning("Failed to load account: " + storage, e);
-            return null;
-        }
+        config().getAccountStorages().setAll(accounts.stream().map(Accounts::getAccountStorage).collect(toList()));
    }

    /**
@@ -221,112 +191,45 @@ public final class Accounts {
        if (initialized)
            throw new IllegalStateException("Already initialized");

-        if (!config().isAddedLittleSkin()) {
-            AuthlibInjectorServer littleSkin = new AuthlibInjectorServer("https://littleskin.cn/api/yggdrasil/");
-
-            if (config().getAuthlibInjectorServers().stream().noneMatch(it -> littleSkin.getUrl().equals(it.getUrl()))) {
-                config().getAuthlibInjectorServers().add(0, littleSkin);
-            }
-
-            config().setAddedLittleSkin(true);
-        }
-
-        loadGlobalAccountStorages();
-
        // load accounts
-        Account selected = null;
-        for (Map<Object, Object> storage : config().getAccountStorages()) {
-            Account account = parseAccount(storage);
-            if (account != null) {
-                account.setPortable(true);
-                accounts.add(account);
-                if (Boolean.TRUE.equals(storage.get("selected"))) {
-                    selected = account;
-                }
+        config().getAccountStorages().forEach(storage -> {
+            AccountFactory<?> factory = type2factory.get(storage.get("type"));
+            if (factory == null) {
+                LOG.warning("Unrecognized account type: " + storage);
+                return;
            }
-        }
-
-        for (Map<Object, Object> storage : globalAccountStorages) {
-            Account account = parseAccount(storage);
-            if (account != null) {
-                accounts.add(account);
+            Account account;
+            try {
+                account = factory.fromStorage(storage);
+            } catch (Exception e) {
+                LOG.log(Level.WARNING, "Failed to load account: " + storage, e);
+                return;
            }
-        }
+            accounts.add(account);

-        String selectedAccountIdentifier = config().getSelectedAccount();
-        if (selected == null && selectedAccountIdentifier != null) {
-            boolean portable = true;
-            if (selectedAccountIdentifier.startsWith(GLOBAL_PREFIX)) {
-                portable = false;
-                selectedAccountIdentifier = selectedAccountIdentifier.substring(GLOBAL_PREFIX.length());
+            if (Boolean.TRUE.equals(storage.get("selected"))) {
+                selectedAccount.set(account);
            }
-
-            for (Account account : accounts) {
-                if (selectedAccountIdentifier.equals(account.getIdentifier())) {
-                    if (portable == account.isPortable()) {
-                        selected = account;
-                        break;
-                    } else if (selected == null) {
-                        selected = account;
-                    }
-                }
-            }
-        }
-
-        if (selected == null && !accounts.isEmpty()) {
-            selected = accounts.get(0);
-        }
-
-        selectedAccount.set(selected);
-
-        InvalidationListener listener = o -> {
-            // this method first checks whether the current selection is valid
-            // if it's valid, the underlying storage will be updated
-            // otherwise, the first account will be selected as an alternative(or null if accounts is empty)
-            Account account = selectedAccount.get();
-            if (accounts.isEmpty()) {
-                if (account == null) {
-                    // valid
-                } else {
-                    // the previously selected account is gone, we can only set it to null here
-                    selectedAccount.set(null);
-                }
-            } else {
-                if (accounts.contains(account)) {
-                    // valid
-                } else {
-                    // the previously selected account is gone
-                    selectedAccount.set(accounts.get(0));
-                }
-            }
-        };
-        selectedAccount.addListener(listener);
-        selectedAccount.addListener(onInvalidating(() -> {
-            Account account = selectedAccount.get();
-            if (account != null)
-                config().setSelectedAccount(account.isPortable() ? account.getIdentifier() : GLOBAL_PREFIX + account.getIdentifier());
-            else
-                config().setSelectedAccount(null);
-        }));
-        accounts.addListener(listener);
-        accounts.addListener(onInvalidating(Accounts::updateAccountStorages));
+        });

        initialized = true;

        config().getAuthlibInjectorServers().addListener(onInvalidating(Accounts::removeDanglingAuthlibInjectorAccounts));

+        Account selected = selectedAccount.get();
        if (selected != null) {
-            Account finalSelected = selected;
            Schedulers.io().execute(() -> {
                try {
-                    finalSelected.logIn();
-                } catch (Throwable e) {
-                    LOG.warning("Failed to log " + finalSelected + " in", e);
+                    selected.logIn();
+                } catch (AuthenticationException e) {
+                    LOG.log(Level.WARNING, "Failed to log " + selected + " in", e);
                }
            });
        }

-        triggerAuthlibInjectorUpdateCheck();
+        if (!config().getAuthlibInjectorServers().isEmpty()) {
+            triggerAuthlibInjectorUpdateCheck();
+        }

        for (AuthlibInjectorServer server : config().getAuthlibInjectorServers()) {
            if (selected instanceof AuthlibInjectorAccount && ((AuthlibInjectorAccount) selected).getServer() == server)
@@ -335,7 +238,7 @@ public final class Accounts {
                try {
                    server.fetchMetadataResponse();
                } catch (IOException e) {
-                    LOG.warning("Failed to fetch authlib-injector server metdata: " + server, e);
+                    LOG.log(Level.WARNING, "Failed to fetch authlib-injector server metdata: " + server, e);
                }
            });
        }
@@ -345,6 +248,10 @@ public final class Accounts {
        return accounts;
    }

+    public static ReadOnlyListProperty<Account> accountsProperty() {
+        return accountsWrapper.getReadOnlyProperty();
+    }
+
    public static Account getSelectedAccount() {
        return selectedAccount.get();
    }
@@ -406,8 +313,9 @@ public final class Accounts {
    // ====

    // ==== Login type name i18n ===
-    private static final Map<AccountFactory<?>, String> unlocalizedLoginTypeNames = mapOf(
+    private static 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"));

@@ -421,11 +329,7 @@ public final class Accounts {
        if (exception instanceof NoCharacterException) {
            return i18n("account.failed.no_character");
        } else if (exception instanceof ServerDisconnectException) {
-            if (exception.getCause() instanceof SSLException) {
-                return i18n("account.failed.ssl");
-            } else {
-                return i18n("account.failed.connect_authentication_server");
-            }
+            return i18n("account.failed.connect_authentication_server");
        } else if (exception instanceof ServerResponseMalformedException) {
            return i18n("account.failed.server_response_malformed");
        } else if (exception instanceof RemoteAuthenticationException) {
@@ -466,8 +370,6 @@ 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,75 +22,70 @@ 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.Set;
-import java.util.concurrent.CopyOnWriteArraySet;
+import java.util.logging.Level;

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

-public final class AuthlibInjectorServers implements Validation {
+public 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;

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

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

-    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);
+    @Override
+    public void validate() throws JsonParseException {
+        if (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");
        }

-        if (ConfigHolder.isNewlyCreated() && Files.exists(configLocation)) {
-            AuthlibInjectorServers configInstance;
+        configInstance = new AuthlibInjectorServers(Collections.emptyList());
+
+        if (Files.exists(configLocation)) {
            try {
                String content = FileUtils.readText(configLocation);
                configInstance = JsonUtils.GSON.fromJson(content, AuthlibInjectorServers.class);
            } catch (IOException | JsonParseException e) {
-                LOG.warning("Malformed authlib-injectors.json", e);
-                return;
+                LOG.log(Level.WARNING, "Malformed authlib-injectors.json", e);
            }
+        }

-            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;
+    }
 }
@@ -51,7 +51,7 @@ public final class Config implements Cloneable, Observable {

    public static final int CURRENT_UI_VERSION = 0;

-    public static final Gson CONFIG_GSON = new GsonBuilder()
+    private static final Gson CONFIG_GSON = new GsonBuilder()
            .registerTypeAdapter(File.class, FileTypeAdapter.INSTANCE)
            .registerTypeAdapter(ObservableList.class, new ObservableListCreator())
            .registerTypeAdapter(ObservableSet.class, new ObservableSetCreator())
@@ -112,12 +112,6 @@ 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,19 +119,19 @@ public final class Config implements Cloneable, Observable {
    private DoubleProperty height = new SimpleDoubleProperty();

    @SerializedName("theme")
-    private ObjectProperty<Theme> theme = new SimpleObjectProperty<>();
+    private ObjectProperty<Theme> theme = new SimpleObjectProperty<>(Theme.BLUE);

    @SerializedName("localization")
    private ObjectProperty<SupportedLocale> localization = new SimpleObjectProperty<>(Locales.DEFAULT);

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

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

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

    @SerializedName("autoChooseDownloadType")
    private BooleanProperty autoChooseDownloadType = new SimpleBooleanProperty(true);
@@ -146,16 +140,13 @@ public final class Config implements Cloneable, Observable {
    private StringProperty versionListSource = new SimpleStringProperty("balanced");

    @SerializedName("configurations")
-    private SimpleMapProperty<String, Profile> configurations = new SimpleMapProperty<>(FXCollections.observableMap(new TreeMap<>()));
-
-    @SerializedName("selectedAccount")
-    private StringProperty selectedAccount = new SimpleStringProperty();
+    private ObservableMap<String, Profile> configurations = FXCollections.observableMap(new TreeMap<>());

    @SerializedName("accounts")
    private ObservableList<Map<Object, Object>> accountStorages = FXCollections.observableArrayList();

    @SerializedName("fontFamily")
-    private StringProperty fontFamily = new SimpleStringProperty();
+    private StringProperty fontFamily = new SimpleStringProperty("Consolas");

    @SerializedName("fontSize")
    private DoubleProperty fontSize = new SimpleDoubleProperty(12);
@@ -164,7 +155,7 @@ public final class Config implements Cloneable, Observable {
    private StringProperty launcherFontFamily = new SimpleStringProperty();

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

    @SerializedName("titleTransparent")
    private BooleanProperty titleTransparent = new SimpleBooleanProperty(false);
@@ -172,12 +163,6 @@ public final class Config implements Cloneable, Observable {
    @SerializedName("authlibInjectorServers")
    private ObservableList<AuthlibInjectorServer> authlibInjectorServers = FXCollections.observableArrayList(server -> new Observable[] { server });

-    @SerializedName("addedLittleSkin")
-    private BooleanProperty addedLittleSkin = new SimpleBooleanProperty(false);
-
-    @SerializedName("promptedVersion")
-    private StringProperty promptedVersion = new SimpleStringProperty();
-
    @SerializedName("_version")
    private IntegerProperty configVersion = new SimpleIntegerProperty(0);

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

-    @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() {
@@ -385,30 +364,6 @@ 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();
    }
@@ -517,22 +472,10 @@ public final class Config implements Cloneable, Observable {
        return versionListSource;
    }

-    public MapProperty<String, Profile> getConfigurations() {
+    public ObservableMap<String, Profile> getConfigurations() {
        return configurations;
    }

-    public String getSelectedAccount() {
-        return selectedAccount.get();
-    }
-
-    public void setSelectedAccount(String selectedAccount) {
-        this.selectedAccount.set(selectedAccount);
-    }
-
-    public StringProperty selectedAccountProperty() {
-        return selectedAccount;
-    }
-
    public ObservableList<Map<Object, Object>> getAccountStorages() {
        return accountStorages;
    }
@@ -573,15 +516,15 @@ public final class Config implements Cloneable, Observable {
        this.launcherFontFamily.set(launcherFontFamily);
    }

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

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

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

@@ -589,18 +532,6 @@ public final class Config implements Cloneable, Observable {
        return authlibInjectorServers;
    }

-    public boolean isAddedLittleSkin() {
-        return addedLittleSkin.get();
-    }
-
-    public BooleanProperty addedLittleSkinProperty() {
-        return addedLittleSkin;
-    }
-
-    public void setAddedLittleSkin(boolean addedLittleSkin) {
-        this.addedLittleSkin.set(addedLittleSkin);
-    }
-
    public int getConfigVersion() {
        return configVersion.get();
    }
@@ -637,18 +568,6 @@ public final class Config implements Cloneable, Observable {
        return preferredLoginType;
    }

-    public boolean isAnimationDisabled() {
-        return animationDisabled.get();
-    }
-
-    public BooleanProperty animationDisabledProperty() {
-        return animationDisabled;
-    }
-
-    public void setAnimationDisabled(boolean animationDisabled) {
-        this.animationDisabled.set(animationDisabled);
-    }
-
    public boolean isTitleTransparent() {
        return titleTransparent.get();
    }
@@ -660,20 +579,4 @@ public final class Config implements Cloneable, Observable {
    public void setTitleTransparent(boolean titleTransparent) {
        this.titleTransparent.set(titleTransparent);
    }
-
-    public String getPromptedVersion() {
-        return promptedVersion.get();
-    }
-
-    public StringProperty promptedVersionProperty() {
-        return promptedVersion;
-    }
-
-    public void setPromptedVersion(String promptedVersion) {
-        this.promptedVersion.set(promptedVersion);
-    }
-
-    public ObservableMap<String, Object> getShownTips() {
-        return shownTips;
-    }
 }
@@ -17,20 +17,21 @@
 */
 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.Locale;
+import java.util.Map;
+import java.util.logging.Level;

-import static org.jackhuang.hmcl.util.logging.Logger.LOG;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.jackhuang.hmcl.util.Logging.LOG;

 public final class ConfigHolder {

@@ -45,7 +46,6 @@ public final class ConfigHolder {
    private static Config configInstance;
    private static GlobalConfig globalConfigInstance;
    private static boolean newlyCreated;
-    private static boolean ownerChanged = false;

    public static Config config() {
        if (configInstance == null) {
@@ -61,26 +61,18 @@ public final class ConfigHolder {
        return globalConfigInstance;
    }

-    public static Path configLocation() {
-        return configLocation;
-    }
-
    public static boolean isNewlyCreated() {
        return newlyCreated;
    }

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

        configLocation = locateConfig();

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

        configInstance = loadConfig();
        configInstance.addListener(source -> markConfigDirty());
@@ -88,9 +80,6 @@ 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) {
@@ -101,7 +90,7 @@ public final class ConfigHolder {
                try {
                    Files.setAttribute(configLocation, "dos:hidden", true);
                } catch (IOException e) {
-                    LOG.warning("Failed to set hidden attribute of " + configLocation, e);
+                    LOG.log(Level.WARNING, "Failed to set hidden attribute of " + configLocation, e);
                }
            }
        }
@@ -121,10 +110,11 @@ public final class ConfigHolder {
    }

    private static Path locateConfig() {
-        Path exePath = Paths.get("").toAbsolutePath();
+        Path exePath = Paths.get("");
        try {
-            Path jarPath = JarUtils.thisJarPath();
-            if (jarPath != null && Files.isRegularFile(jarPath) && Files.isWritable(jarPath)) {
+            Path jarPath = Paths.get(ConfigHolder.class.getProtectionDomain().getCodeSource().getLocation()
+                    .toURI()).toAbsolutePath();
+            if (Files.isRegularFile(jarPath) && Files.isWritable(jarPath)) {
                jarPath = jarPath.getParent();
                exePath = jarPath;

@@ -154,26 +144,18 @@ public final class ConfigHolder {

    private static Config loadConfig() throws IOException {
        if (Files.exists(configLocation)) {
-            try {
-                if (OperatingSystem.CURRENT_OS != OperatingSystem.WINDOWS
-                        && "root".equals(System.getProperty("user.name"))
-                        && !"root".equals(Files.getOwner(configLocation).getName())) {
-                    ownerChanged = true;
-                }
-            } catch (IOException e1) {
-                LOG.warning("Failed to get owner");
-            }
            try {
                String content = FileUtils.readText(configLocation);
                Config deserialized = Config.fromJson(content);
                if (deserialized == null) {
                    LOG.info("Config is empty");
                } else {
-                    ConfigUpgrader.upgradeConfig(deserialized, content);
+                    Map<?, ?> raw = new Gson().fromJson(content, Map.class);
+                    ConfigUpgrader.upgradeConfig(deserialized, raw);
                    return deserialized;
                }
            } catch (JsonParseException e) {
-                LOG.warning("Malformed config.", e);
+                LOG.log(Level.WARNING, "Malformed config.", e);
            }
        }

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

    private static void writeToConfig(String content) throws IOException {
        LOG.info("Saving config");
        synchronized (configLocation) {
-            FileUtils.saveSafely(configLocation, content);
+            Files.write(configLocation, content.getBytes(UTF_8));
        }
    }

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

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

    private static void writeToGlobalConfig(String content) throws IOException {
        LOG.info("Saving global config");
        synchronized (GLOBAL_CONFIG_PATH) {
-            FileUtils.saveSafely(GLOBAL_CONFIG_PATH, content);
+            Files.write(GLOBAL_CONFIG_PATH, content.getBytes(UTF_8));
        }
    }

@@ -17,89 +17,113 @@
 */
 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 versions.
+     * This method is for the compatibility with old HMCL 3.x as well as HMCL 2.x.
     *
     * @param deserialized deserialized config settings
-     * @param rawContent   raw json content of the config settings without modification
+     * @param rawJson      raw json structure of the config settings without modification
+     * @return true if config version is upgraded
     */
-    static void upgradeConfig(Config deserialized, String rawContent) {
-        int configVersion = deserialized.getConfigVersion();
-
-        if (configVersion == CURRENT_VERSION) {
-            return;
+    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;
        }

-        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;
-        }
+        upgradeV2(deserialized, rawJson);
+        upgradeV3(deserialized, rawJson);

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

-        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);
+    /**
+     * 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);

-                    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
-            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
+     *
+     * @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()));

-            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);
+        tryCast(rawJson.get("selectedAccount"), String.class)
+                .ifPresent(selected -> {
+                    deserialized.getAccountStorages().stream()
+                            .filter(storage -> {
+                                Object type = storage.get("type");
+                                if ("offline".equals(type)) {
+                                    return selected.equals(storage.get("username") + ":" + storage.get("username"));
+                                } else if ("yggdrasil".equals(type) || "authlibInjector".equals(type)) {
+                                    return selected.equals(storage.get("username") + ":" + storage.get("displayName"));
+                                } else {
+                                    return false;
+                                }
+                            })
+                            .findFirst()
+                            .ifPresent(storage -> storage.put("selected", true));
+                });
    }
 }
@@ -26,7 +26,6 @@ import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.i18n.I18n;
 import org.jackhuang.hmcl.util.io.ResponseCodeException;

-import javax.net.ssl.SSLHandshakeException;
 import java.io.FileNotFoundException;
 import java.net.SocketTimeoutException;
 import java.net.URL;
@@ -55,9 +54,10 @@ 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 = "bmclapi";
+    public static final String DEFAULT_RAW_PROVIDER_ID = "mcbbs";

    private static final InvalidationListener observer;

@@ -68,19 +68,21 @@ 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("bmclapi", BMCLAPI),
+                pair("mcbbs", MCBBS)
        );

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

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

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

-        if (!rawProviders.containsKey(config().getDownloadType())) {
-            config().setDownloadType(DEFAULT_RAW_PROVIDER_ID);
-        }
-
        FXUtils.onChangeAndOperate(config().downloadTypeProperty(), downloadType -> {
+            if (!rawProviders.containsKey(downloadType)) {
+                config().setDownloadType(DEFAULT_RAW_PROVIDER_ID);
+                return;
+            }
+
            DownloadProvider primary = Optional.ofNullable(rawProviders.get(downloadType))
                    .orElse(rawProviders.get(DEFAULT_RAW_PROVIDER_ID));
            fileDownloadProvider.setDownloadProviderCandidates(
@@ -153,8 +156,6 @@ public final class DownloadProviders {
                return i18n("install.failed.downloading.detail", url) + "\n" + i18n("exception.access_denied", ((AccessDeniedException) exception.getCause()).getFile());
            } else if (exception.getCause() instanceof ArtifactMalformedException) {
                return i18n("install.failed.downloading.detail", url) + "\n" + i18n("exception.artifact_malformed");
-            } else if (exception.getCause() instanceof SSLHandshakeException) {
-                return i18n("install.failed.downloading.detail", url) + "\n" + i18n("exception.ssl_handshake");
            } else {
                return i18n("install.failed.downloading.detail", url) + "\n" + StringUtils.getStackTrace(exception.getCause());
            }
@@ -21,23 +21,42 @@ import com.google.gson.*;
 import com.google.gson.annotations.JsonAdapter;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
-import javafx.beans.property.IntegerProperty;
-import javafx.beans.property.SimpleIntegerProperty;
-import javafx.collections.FXCollections;
+import javafx.beans.property.*;
+import javafx.collections.ObservableList;
+import javafx.collections.ObservableMap;
 import javafx.collections.ObservableSet;
+import org.hildan.fxgson.creators.ObservableListCreator;
+import org.hildan.fxgson.creators.ObservableMapCreator;
+import org.hildan.fxgson.creators.ObservableSetCreator;
+import org.hildan.fxgson.factories.JavaFxPropertyTypeAdapterFactory;
+import org.jackhuang.hmcl.util.gson.EnumOrdinalDeserializer;
+import org.jackhuang.hmcl.util.gson.FileTypeAdapter;
 import org.jackhuang.hmcl.util.javafx.ObservableHelper;
 import org.jackhuang.hmcl.util.javafx.PropertyUtils;
 import org.jetbrains.annotations.Nullable;

+import java.io.File;
 import java.lang.reflect.Type;
+import java.net.Proxy;
 import java.util.*;

@JsonAdapter(GlobalConfig.Serializer.class)
-public final class GlobalConfig implements Cloneable, Observable {
+public class GlobalConfig implements Cloneable, Observable {
+
+    private static final Gson CONFIG_GSON = new GsonBuilder()
+            .registerTypeAdapter(File.class, FileTypeAdapter.INSTANCE)
+            .registerTypeAdapter(ObservableList.class, new ObservableListCreator())
+            .registerTypeAdapter(ObservableSet.class, new ObservableSetCreator())
+            .registerTypeAdapter(ObservableMap.class, new ObservableMapCreator())
+            .registerTypeAdapterFactory(new JavaFxPropertyTypeAdapterFactory(true, true))
+            .registerTypeAdapter(EnumBackgroundImage.class, new EnumOrdinalDeserializer<>(EnumBackgroundImage.class)) // backward compatibility for backgroundType
+            .registerTypeAdapter(Proxy.Type.class, new EnumOrdinalDeserializer<>(Proxy.Type.class)) // backward compatibility for hasProxy
+            .setPrettyPrinting()
+            .create();

    @Nullable
    public static GlobalConfig fromJson(String json) throws JsonParseException {
-        GlobalConfig loaded = Config.CONFIG_GSON.fromJson(json, GlobalConfig.class);
+        GlobalConfig loaded = CONFIG_GSON.fromJson(json, GlobalConfig.class);
        if (loaded == null) {
            return null;
        }
@@ -47,19 +66,17 @@ public final class GlobalConfig implements Cloneable, Observable {
        return instance;
    }

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

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

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

-    private final ObservableSet<String> userJava = FXCollections.observableSet(new LinkedHashSet<>());
-
-    private final ObservableSet<String> disabledJava = FXCollections.observableSet(new LinkedHashSet<>());
+    private IntegerProperty multiplayerAgreementVersion = new SimpleIntegerProperty(0);

    private final Map<String, Object> unknownFields = new HashMap<>();

-    private final transient ObservableHelper helper = new ObservableHelper(this);
+    private transient ObservableHelper helper = new ObservableHelper(this);

    public GlobalConfig() {
        PropertyUtils.attachListener(this, helper);
@@ -76,7 +93,7 @@ public final class GlobalConfig implements Cloneable, Observable {
    }

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

    @Override
@@ -96,45 +113,47 @@ public final class GlobalConfig implements Cloneable, Observable {
        this.agreementVersion.set(agreementVersion);
    }

-    public int getPlatformPromptVersion() {
-        return platformPromptVersion.get();
+    public boolean isMultiplayerRelay() {
+        return multiplayerRelay.get();
    }

-    public IntegerProperty platformPromptVersionProperty() {
-        return platformPromptVersion;
+    public BooleanProperty multiplayerRelayProperty() {
+        return multiplayerRelay;
    }

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

-    public int getLogRetention() {
-        return logRetention.get();
+    public int getMultiplayerAgreementVersion() {
+        return multiplayerAgreementVersion.get();
    }

-    public IntegerProperty logRetentionProperty() {
-        return logRetention;
+    public IntegerProperty multiplayerAgreementVersionProperty() {
+        return multiplayerAgreementVersion;
    }

-    public void setLogRetention(int logRetention) {
-        this.logRetention.set(logRetention);
+    public void setMultiplayerAgreementVersion(int multiplayerAgreementVersion) {
+        this.multiplayerAgreementVersion.set(multiplayerAgreementVersion);
    }

-    public ObservableSet<String> getUserJava() {
-        return userJava;
+    public String getMultiplayerToken() {
+        return multiplayerToken.get();
    }

-    public ObservableSet<String> getDisabledJava() {
-        return disabledJava;
+    public StringProperty multiplayerTokenProperty() {
+        return multiplayerToken;
    }

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

        @Override
@@ -145,14 +164,9 @@ public final 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("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()));
-
+            jsonObject.add("multiplayerToken", context.serialize(src.getMultiplayerToken()));
+            jsonObject.add("multiplayerRelay", context.serialize(src.isMultiplayerRelay()));
+            jsonObject.add("multiplayerAgreementVersion", context.serialize(src.getMultiplayerAgreementVersion()));
            for (Map.Entry<String, Object> entry : src.unknownFields.entrySet()) {
                jsonObject.add(entry.getKey(), context.serialize(entry.getValue()));
            }
@@ -168,22 +182,9 @@ public final 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.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());
-                }
-            }
+            config.setMultiplayerToken(Optional.ofNullable(obj.get("multiplayerToken")).map(JsonElement::getAsString).orElse(null));
+            config.setMultiplayerRelay(Optional.ofNullable(obj.get("multiplayerRelay")).map(JsonElement::getAsBoolean).orElse(false));
+            config.setMultiplayerAgreementVersion(Optional.ofNullable(obj.get("multiplayerAgreementVersion")).map(JsonElement::getAsInt).orElse(0));

            for (Map.Entry<String, JsonElement> entry : obj.entrySet()) {
                if (!knownFields.contains(entry.getKey())) {
@@ -0,0 +1,164 @@
+/*
+ * 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,25 +0,0 @@
-/*
- * 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.setting;
-
-/**
- * @author Glavo
- */
-public enum JavaVersionType {
-    DEFAULT, AUTO, VERSION, DETECTED, CUSTOM
-}
@@ -43,9 +43,5 @@ public enum LauncherVisibility {
    /**
     * Hide the launcher and reopen it when game closes.
     */
-    HIDE_AND_REOPEN;
-
-    public boolean isDaemon() {
-        return this != CLOSE;
-    }
+    HIDE_AND_REOPEN
 }
@@ -20,18 +20,17 @@ package org.jackhuang.hmcl.setting;
 import javafx.application.Platform;
 import javafx.beans.Observable;
 import javafx.beans.property.*;
-import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.event.EventBus;
 import org.jackhuang.hmcl.event.RefreshedVersionsEvent;

 import java.io.File;
-import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.TreeMap;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;

 import static javafx.collections.FXCollections.observableArrayList;
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
@@ -131,11 +130,8 @@ public final class Profiles {
        if (!initialized)
            return;
        // update storage
-        TreeMap<String, Profile> newConfigurations = new TreeMap<>();
-        for (Profile profile : profiles) {
-            newConfigurations.put(profile.getName(), profile);
-        }
-        config().getConfigurations().setValue(FXCollections.observableMap(newConfigurations));
+        config().getConfigurations().clear();
+        config().getConfigurations().putAll(profiles.stream().collect(Collectors.toMap(Profile::getName, it -> it)));
    }

    /**
@@ -208,7 +204,7 @@ public final class Profiles {
        return selectedVersion.get();
    }

-    private static final List<Consumer<Profile>> versionsListeners = new ArrayList<>(4);
+    private static final List<Consumer<Profile>> versionsListeners = new LinkedList<>();

    public static void registerVersionsListener(Consumer<Profile> listener) {
        Profile profile = getSelectedProfile();
@@ -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.Logger.LOG;
+import static org.jackhuang.hmcl.util.Logging.LOG;

 public final class ProxyManager {
    private ProxyManager() {
@@ -20,10 +20,11 @@ package org.jackhuang.hmcl.setting;
 import javafx.beans.binding.Bindings;
 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.game.HMCLCacheRepository;
-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 {
@@ -45,12 +46,14 @@ public final class Settings {
    }

    private Settings() {
+        config().localizationProperty().addListener(unused -> updateSystemLocale());
+        updateSystemLocale();
+
        DownloadProviders.init();
        ProxyManager.init();
        Accounts.init();
        Profiles.init();
        AuthlibInjectorServers.init();
-        AnimationUtils.init();

        CacheRepository.setInstance(HMCLCacheRepository.REPOSITORY);
        HMCLCacheRepository.REPOSITORY.directoryProperty().bind(Bindings.createStringBinding(() -> {
@@ -76,4 +79,8 @@ public final class Settings {
                return null;
        }
    }
+
+    private static void updateSystemLocale() {
+        Locale.setDefault(config().getLocalization().getLocale());
+    }
 }
@@ -23,25 +23,19 @@ import com.google.gson.stream.JsonWriter;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.ObjectBinding;
 import javafx.scene.paint.Color;
-import javafx.scene.text.Font;
-import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.util.Logging;
+import org.jackhuang.hmcl.util.ResourceNotFoundError;
 import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.util.io.IOUtils;
+import org.jackhuang.hmcl.util.javafx.BindingMapping;

 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 static org.jackhuang.hmcl.setting.ConfigHolder.config;
-import static org.jackhuang.hmcl.util.logging.Logger.LOG;

@JsonAdapter(Theme.TypeAdapter.class)
 public class Theme {
@@ -56,35 +50,6 @@ public class Theme {
            Color.web("#B71C1C")  // red
    };

-    @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
-    private static Optional<Font> font;
-
-    private static Optional<Font> tryLoadFont() {
-        //noinspection OptionalAssignedToNull
-        if (font != null) {
-            return font;
-        }
-
-        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) {
-            }
-        }
-
-        return font = Optional.empty();
-    }
-
-    public static Theme getTheme() {
-        Theme theme = config().getTheme();
-        return theme == null ? BLUE : theme;
-    }
-
    private final Color paint;
    private final String color;
    private final String name;
@@ -108,80 +73,47 @@ public class Theme {
    }

    public boolean isLight() {
-        return paint.grayscale().getRed() >= 0.5;
+        return Color.web(color).grayscale().getRed() >= 0.5;
    }

    public Color getForegroundColor() {
        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";
+        Color textFill = getForegroundColor();

-        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();
-            }
+        String fontFamily;
+        if (System.getProperty("hmcl.font.override") != null) {
+            fontFamily = System.getProperty("hmcl.font.override");
+        } else if (overrideFontFamily != null) {
+            fontFamily = overrideFontFamily;
+        } else {
+            fontFamily = null;
        }

-        if (fontFamily != null || !this.color.equalsIgnoreCase(BLUE.color)) {
-            Color textFill = getForegroundColor();
-
-            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);
-                }
+        String css;
+        try {
+            File temp = File.createTempFile("hmcl", ".css");
+            FileUtils.writeText(temp, IOUtils.readFullyAsString(ResourceNotFoundError.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("")));
+            css = temp.toURI().toString();
+        } catch (IOException | NullPointerException e) {
+            Logging.LOG.log(Level.SEVERE, "Unable to create theme stylesheet. Fallback to blue theme.", e);
+            css = "/assets/css/blue.css";
        }

-        return new String[]{css, "/assets/css/root.css"};
+        return new String[]{
+                css,
+                "/assets/css/root.css"
+        };
    }

    public static Theme custom(String color) {
@@ -193,67 +125,50 @@ public class Theme {
    public static Optional<Theme> getTheme(String name) {
        if (name == null)
            return Optional.empty();
-        else if (name.startsWith("#"))
+        else if (name.equalsIgnoreCase("blue"))
+            return Optional.of(custom("#5C6BC0"));
+        else if (name.equalsIgnoreCase("darker_blue"))
+            return Optional.of(custom("#283593"));
+        else if (name.equalsIgnoreCase("green"))
+            return Optional.of(custom("#43A047"));
+        else if (name.equalsIgnoreCase("orange"))
+            return Optional.of(custom("#E67E22"));
+        else if (name.equalsIgnoreCase("purple"))
+            return Optional.of(custom("#9C27B0"));
+        else if (name.equalsIgnoreCase("red"))
+            return Optional.of(custom("#F44336"));
+
+        if (name.startsWith("#"))
            try {
                Color.web(name);
                return Optional.of(custom(name));
            } catch (IllegalArgumentException ignore) {
            }
-        else {
-            String color = null;
-            switch (name.toLowerCase(Locale.ROOT)) {
-                case "blue":
-                    return Optional.of(BLUE);
-                case "darker_blue":
-                    color = "#283593";
-                    break;
-                case "green":
-                    color = "#43A047";
-                    break;
-                case "orange":
-                    color = "#E67E22";
-                    break;
-                case "purple":
-                    color = "#9C27B0";
-                    break;
-                case "red":
-                    color = "#F44336";
-            }
-            if (color != null)
-                return Optional.of(new Theme(name, color));
-        }

        return Optional.empty();
    }

    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)) : 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)).toUpperCase() : null;
    }

-    private static ObjectBinding<Color> FOREGROUND_FILL;
-
    public static ObjectBinding<Color> foregroundFillBinding() {
-        if (FOREGROUND_FILL == null)
-            FOREGROUND_FILL = Bindings.createObjectBinding(
-                    () -> Theme.getTheme().getForegroundColor(),
-                    config().themeProperty()
-            );
-
-        return FOREGROUND_FILL;
+        return BindingMapping.of(config().themeProperty())
+                .map(Theme::getForegroundColor);
    }

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

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

    public static class TypeAdapter extends com.google.gson.TypeAdapter<Theme> {
        @Override
        public void write(JsonWriter out, Theme value) throws IOException {
-            out.value(value.getName().toLowerCase(Locale.ROOT));
+            out.value(value.getName().toLowerCase());
        }

        @Override
@@ -1,49 +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 javafx.scene.image.Image;
-import org.jackhuang.hmcl.ui.FXUtils;
-
-public enum VersionIconType {
-    DEFAULT("/assets/img/grass.png"),
-
-    GRASS("/assets/img/grass.png"),
-    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");
-
-    // Please append new items at last
-
-    private final String resourceUrl;
-
-    VersionIconType(String resourceUrl) {
-        this.resourceUrl = resourceUrl;
-    }
-
-    public Image getIcon() {
-        return FXUtils.newBuiltinImage(resourceUrl);
-    }
-}
@@ -1,6 +1,6 @@
 /*
 * Hello Minecraft! Launcher
- * Copyright (C) 2021  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
@@ -22,23 +22,29 @@ import com.google.gson.annotations.JsonAdapter;
 import javafx.beans.InvalidationListener;
 import javafx.beans.property.*;
 import org.jackhuang.hmcl.game.*;
-import org.jackhuang.hmcl.java.JavaManager;
+import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.StringUtils;
-import org.jackhuang.hmcl.java.JavaRuntime;
+import org.jackhuang.hmcl.util.platform.Architecture;
+import org.jackhuang.hmcl.util.platform.JavaVersion;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
-import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
+import org.jackhuang.hmcl.util.platform.Platform;
+import org.jackhuang.hmcl.util.versioning.VersionNumber;

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

-import static org.jackhuang.hmcl.util.logging.Logger.LOG;
+import static com.jfoenix.concurrency.JFXUtilities.runInFX;

 /**
+ *
 * @author huangyuhui
 */
@JsonAdapter(VersionSetting.Serializer.class)
@@ -54,7 +60,7 @@ public final class VersionSetting implements Cloneable {
        this.global = global;
    }

-    private final BooleanProperty usesGlobalProperty = new SimpleBooleanProperty(this, "usesGlobal", true);
+    private final BooleanProperty usesGlobalProperty = new SimpleBooleanProperty(this, "usesGlobal", false);

    public BooleanProperty usesGlobalProperty() {
        return usesGlobalProperty;
@@ -78,43 +84,38 @@ public final class VersionSetting implements Cloneable {

    // java

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

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

-    public JavaVersionType getJavaVersionType() {
-        return javaVersionTypeProperty.get();
+    /**
+     * 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 void setJavaVersionType(JavaVersionType javaVersionType) {
-        javaVersionTypeProperty.set(javaVersionType);
+    public void setJava(String java) {
+        javaProperty.set(java);
    }

-    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 boolean isUsesCustomJavaDir() {
+        return "Custom".equals(getJava());
    }

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

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

@@ -340,20 +341,6 @@ public final class VersionSetting implements Cloneable {
        minecraftArgsProperty.set(minecraftArgs);
    }

-    private final StringProperty environmentVariablesProperty = new SimpleStringProperty(this, "environmentVariables", "");
-
-    public StringProperty environmentVariablesProperty() {
-        return environmentVariablesProperty;
-    }
-
-    public String getEnvironmentVariables() {
-        return environmentVariablesProperty.get();
-    }
-
-    public void setEnvironmentVariables(String env) {
-        environmentVariablesProperty.set(env);
-    }
-
    private final BooleanProperty noJVMArgsProperty = new SimpleBooleanProperty(this, "noJVMArgs", false);

    public BooleanProperty noJVMArgsProperty() {
@@ -405,20 +392,6 @@ public final class VersionSetting implements Cloneable {
        notCheckGameProperty.set(notCheckGame);
    }

-    private final BooleanProperty notPatchNativesProperty = new SimpleBooleanProperty(this, "notPatchNatives", false);
-
-    public BooleanProperty notPatchNativesProperty() {
-        return notPatchNativesProperty;
-    }
-
-    public boolean isNotPatchNatives() {
-        return notPatchNativesProperty.get();
-    }
-
-    public void setNotPatchNatives(boolean notPatchNatives) {
-        notPatchNativesProperty.set(notPatchNatives);
-    }
-
    private final BooleanProperty showLogsProperty = new SimpleBooleanProperty(this, "showLogs", false);

    public BooleanProperty showLogsProperty() {
@@ -496,6 +469,7 @@ public final class VersionSetting implements Cloneable {
        widthProperty.set(width);
    }

+
    private final IntegerProperty heightProperty = new SimpleIntegerProperty(this, "height", 480);

    public IntegerProperty heightProperty() {
@@ -566,20 +540,6 @@ public final class VersionSetting implements Cloneable {
        processPriorityProperty.set(processPriority);
    }

-    private final ObjectProperty<Renderer> rendererProperty = new SimpleObjectProperty<>(this, "renderer", Renderer.DEFAULT);
-
-    public Renderer getRenderer() {
-        return rendererProperty.get();
-    }
-
-    public ObjectProperty<Renderer> rendererProperty() {
-        return rendererProperty;
-    }
-
-    public void setRenderer(Renderer renderer) {
-        this.rendererProperty.set(renderer);
-    }
-
    private final BooleanProperty useNativeGLFW = new SimpleBooleanProperty(this, "nativeGLFW", false);

    public boolean isUseNativeGLFW() {
@@ -608,20 +568,6 @@ public final class VersionSetting implements Cloneable {
        this.useNativeOpenAL.set(useNativeOpenAL);
    }

-    private final ObjectProperty<VersionIconType> versionIcon = new SimpleObjectProperty<>(this, "versionIcon", VersionIconType.DEFAULT);
-
-    public VersionIconType getVersionIcon() {
-        return versionIcon.get();
-    }
-
-    public ObjectProperty<VersionIconType> versionIconProperty() {
-        return versionIcon;
-    }
-
-    public void setVersionIcon(VersionIconType versionIcon) {
-        this.versionIcon.set(versionIcon);
-    }
-
    // launcher settings

    /**
@@ -643,74 +589,60 @@ public final class VersionSetting implements Cloneable {
        launcherVisibilityProperty.set(launcherVisibility);
    }

-    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) {
+        return getJavaVersion(gameVersion, version, true);
+    }

-                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);
+    public Task<JavaVersion> getJavaVersion(VersionNumber gameVersion, Version version, boolean checkJava) {
+        return Task.runAsync(Schedulers.javafx(), () -> {
+            if (StringUtils.isBlank(getJava())) {
+                setJava(StringUtils.isBlank(getJavaDir()) ? "Default" : "Custom");
            }
-            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;
-                        }
+        }).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,
                    }
-                } catch (IOException | InvalidPathException ignored) {
-                }
-
-                for (JavaRuntime java : JavaManager.getAllJava()) {
-                    if (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()) {
+                        runInFX(() -> {
+                            setJava("Default");
+                        });
+                        return JavaVersion.fromCurrentEnvironment();
+                    } else {
+                        return matchedJava.stream()
+                                .filter(java -> java.getBinary().toString().equals(getDefaultJavaPath()))
+                                .findFirst()
+                                .orElse(matchedJava.get(0));
                    }
-                }
-
-                return null;
+                } else throw new Error();
+            } catch (InterruptedException e) {
+                throw new CancellationException();
            }
-            default:
-                throw new AssertionError("JavaVersionType: " + getJavaVersionType());
-        }
+        });
+    }
+
+    public void setJavaVersion(JavaVersion java) {
+        setJava(java.getVersion());
+        setDefaultJavaPath(java.getBinary().toString());
    }

    public void addPropertyChangedListener(InvalidationListener listener) {
        usesGlobalProperty.addListener(listener);
-        javaVersionProperty.addListener(listener);
+        javaProperty.addListener(listener);
        javaDirProperty.addListener(listener);
        wrapperProperty.addListener(listener);
        permSizeProperty.addListener(listener);
@@ -721,11 +653,9 @@ public final class VersionSetting implements Cloneable {
        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);
@@ -734,22 +664,19 @@ public final class VersionSetting implements Cloneable {
        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 VersionSetting clone() {
        VersionSetting versionSetting = new VersionSetting();
        versionSetting.setUsesGlobal(isUsesGlobal());
-        versionSetting.setJavaVersionType(getJavaVersionType());
-        versionSetting.setJavaVersion(getJavaVersion());
+        versionSetting.setJava(getJava());
        versionSetting.setDefaultJavaPath(getDefaultJavaPath());
        versionSetting.setJavaDir(getJavaDir());
        versionSetting.setWrapper(getWrapper());
@@ -761,11 +688,9 @@ public final class VersionSetting implements Cloneable {
        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());
@@ -774,12 +699,10 @@ public final class VersionSetting implements Cloneable {
        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;
    }

@@ -792,7 +715,6 @@ public final class VersionSetting implements Cloneable {
            obj.addProperty("usesGlobal", src.isUsesGlobal());
            obj.addProperty("javaArgs", src.getJavaArgs());
            obj.addProperty("minecraftArgs", src.getMinecraftArgs());
-            obj.addProperty("environmentVariables", src.getEnvironmentVariables());
            obj.addProperty("maxMemory", src.getMaxMemory() <= 0 ? OperatingSystem.SUGGESTED_MEMORY : src.getMaxMemory());
            obj.addProperty("minMemory", src.getMinMemory());
            obj.addProperty("autoMemory", src.isAutoMemory());
@@ -803,12 +725,12 @@ 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());
            obj.addProperty("notCheckGame", src.isNotCheckGame());
            obj.addProperty("notCheckJVM", src.isNotCheckJVM());
-            obj.addProperty("notPatchNatives", src.isNotPatchNatives());
            obj.addProperty("showLogs", src.isShowLogs());
            obj.addProperty("gameDir", src.getGameDir());
            obj.addProperty("launcherVisibility", src.getLauncherVisibility().ordinal());
@@ -819,44 +741,13 @@ public final class VersionSetting implements Cloneable {
            obj.addProperty("defaultJavaPath", src.getDefaultJavaPath());
            obj.addProperty("nativesDir", src.getNativesDir());
            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);

            return obj;
        }

-        private static <T> T getOrDefault(T[] values, JsonElement index, T defaultValue) {
-            if (index == null)
-                return defaultValue;
-
-            int idx = index.getAsInt();
-            return idx >= 0 && idx < values.length ? values[idx] : defaultValue;
-        }
-
        @Override
        public VersionSetting deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-            if (!(json instanceof JsonObject))
+            if (json == JsonNull.INSTANCE || !(json instanceof JsonObject))
                return null;
            JsonObject obj = (JsonObject) json;

@@ -868,7 +759,6 @@ public final class VersionSetting implements Cloneable {
            vs.setUsesGlobal(Optional.ofNullable(obj.get("usesGlobal")).map(JsonElement::getAsBoolean).orElse(false));
            vs.setJavaArgs(Optional.ofNullable(obj.get("javaArgs")).map(JsonElement::getAsString).orElse(""));
            vs.setMinecraftArgs(Optional.ofNullable(obj.get("minecraftArgs")).map(JsonElement::getAsString).orElse(""));
-            vs.setEnvironmentVariables(Optional.ofNullable(obj.get("environmentVariables")).map(JsonElement::getAsString).orElse(""));
            vs.setMaxMemory(maxMemoryN);
            vs.setMinMemory(Optional.ofNullable(obj.get("minMemory")).map(JsonElement::getAsInt).orElse(null));
            vs.setAutoMemory(Optional.ofNullable(obj.get("autoMemory")).map(JsonElement::getAsBoolean).orElse(true));
@@ -877,8 +767,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(""));
@@ -886,49 +776,14 @@ public final class VersionSetting implements Cloneable {
            vs.setNoJVMArgs(Optional.ofNullable(obj.get("noJVMArgs")).map(JsonElement::getAsBoolean).orElse(false));
            vs.setNotCheckGame(Optional.ofNullable(obj.get("notCheckGame")).map(JsonElement::getAsBoolean).orElse(false));
            vs.setNotCheckJVM(Optional.ofNullable(obj.get("notCheckJVM")).map(JsonElement::getAsBoolean).orElse(false));
-            vs.setNotPatchNatives(Optional.ofNullable(obj.get("notPatchNatives")).map(JsonElement::getAsBoolean).orElse(false));
            vs.setShowLogs(Optional.ofNullable(obj.get("showLogs")).map(JsonElement::getAsBoolean).orElse(false));
-            vs.setLauncherVisibility(getOrDefault(LauncherVisibility.values(), obj.get("launcherVisibility"), LauncherVisibility.HIDE));
-            vs.setProcessPriority(getOrDefault(ProcessPriority.values(), obj.get("processPriority"), ProcessPriority.NORMAL));
+            vs.setLauncherVisibility(LauncherVisibility.values()[Optional.ofNullable(obj.get("launcherVisibility")).map(JsonElement::getAsInt).orElse(LauncherVisibility.HIDE.ordinal())]);
+            vs.setProcessPriority(ProcessPriority.values()[Optional.ofNullable(obj.get("processPriority")).map(JsonElement::getAsInt).orElse(ProcessPriority.NORMAL.ordinal())]);
            vs.setUseNativeGLFW(Optional.ofNullable(obj.get("useNativeGLFW")).map(JsonElement::getAsBoolean).orElse(false));
            vs.setUseNativeOpenAL(Optional.ofNullable(obj.get("useNativeOpenAL")).map(JsonElement::getAsBoolean).orElse(false));
-            vs.setGameDirType(getOrDefault(GameDirectoryType.values(), obj.get("gameDirType"), GameDirectoryType.ROOT_FOLDER));
+            vs.setGameDirType(GameDirectoryType.values()[Optional.ofNullable(obj.get("gameDirType")).map(JsonElement::getAsInt).orElse(GameDirectoryType.ROOT_FOLDER.ordinal())]);
            vs.setDefaultJavaPath(Optional.ofNullable(obj.get("defaultJavaPath")).map(JsonElement::getAsString).orElse(null));
-            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 {
-                            return Optional.of(Renderer.valueOf(name.toUpperCase(Locale.ROOT)));
-                        } catch (IllegalArgumentException ignored) {
-                            return Optional.empty();
-                        }
-                    }).orElseGet(() -> {
-                        boolean useSoftwareRenderer = Optional.ofNullable(obj.get("useSoftwareRenderer")).map(JsonElement::getAsBoolean).orElse(false);
-                        return useSoftwareRenderer ? Renderer.LLVMPIPE : Renderer.DEFAULT;
-                    }));
+            vs.setNativesDirType(NativesDirectoryType.values()[Optional.ofNullable(obj.get("nativesDirType")).map(JsonElement::getAsInt).orElse(0)]);

            return vs;
        }
@@ -945,25 +800,5 @@ 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;
-                }
-            }
-        }
    }
 }
@@ -9,8 +9,8 @@ public final class AwtUtils {

    public static void setAppleIcon(Image image) {
        try {
-            Class<?> taskbarClass = Class.forName("java.awt.Taskbar");
-            Method getTaskBarMethod = taskbarClass.getDeclaredMethod("getTaskbar");
+            Class<?> taskbarClass = Class.forName("java.awt.TaskBar");
+            Method getTaskBarMethod = taskbarClass.getDeclaredMethod("getTaskBar");
            Object taskBar = getTaskBarMethod.invoke(null);
            Method setIconImageMethod = taskbarClass.getDeclaredMethod("setIconImage", Image.class);
            setIconImageMethod.invoke(taskBar, image);
@@ -19,26 +19,22 @@ package org.jackhuang.hmcl.ui;

 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXDialogLayout;
-import javafx.beans.InvalidationListener;
-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.java.JavaManager;
-import org.jackhuang.hmcl.setting.*;
+import org.jackhuang.hmcl.download.java.JavaRepository;
+import org.jackhuang.hmcl.setting.Accounts;
+import org.jackhuang.hmcl.setting.EnumCommonDirectory;
+import org.jackhuang.hmcl.setting.Profiles;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskExecutor;
 import org.jackhuang.hmcl.ui.account.AccountListPage;
@@ -49,28 +45,26 @@ import org.jackhuang.hmcl.ui.download.DownloadPage;
 import org.jackhuang.hmcl.ui.download.ModpackInstallWizardProvider;
 import org.jackhuang.hmcl.ui.main.LauncherSettingsPage;
 import org.jackhuang.hmcl.ui.main.RootPage;
+import org.jackhuang.hmcl.ui.multiplayer.MultiplayerPage;
 import org.jackhuang.hmcl.ui.versions.GameListPage;
 import org.jackhuang.hmcl.ui.versions.VersionPage;
-import org.jackhuang.hmcl.util.*;
+import org.jackhuang.hmcl.util.FutureCallback;
+import org.jackhuang.hmcl.util.Lazy;
+import org.jackhuang.hmcl.util.Logging;
 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.JavaVersion;

 import java.io.File;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
+import java.util.function.Consumer;

-import static org.jackhuang.hmcl.setting.ConfigHolder.*;
-import static org.jackhuang.hmcl.util.logging.Logger.LOG;
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.setting.ConfigHolder.globalConfig;
+import static org.jackhuang.hmcl.ui.FXUtils.newImage;
 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();

@@ -81,7 +75,7 @@ public final class Controllers {
        GameListPage gameListPage = new GameListPage();
        gameListPage.selectedProfileProperty().bindBidirectional(Profiles.selectedProfileProperty());
        gameListPage.profilesProperty().bindContent(Profiles.profilesProperty());
-        FXUtils.applyDragListener(gameListPage, ModpackHelper::isFileModpackByExtension, modpacks -> {
+        FXUtils.applyDragListener(gameListPage, it -> "zip".equals(FileUtils.getExtension(it)), modpacks -> {
            File modpack = modpacks.get(0);
            Controllers.getDecorator().startWizard(new ModpackInstallWizardProvider(Profiles.getSelectedProfile(), modpack), i18n("install.modpack"));
        });
@@ -93,10 +87,11 @@ public final class Controllers {
    private static Lazy<AccountListPage> accountListPage = new Lazy<>(() -> {
        AccountListPage accountListPage = new AccountListPage();
        accountListPage.selectedAccountProperty().bindBidirectional(Accounts.selectedAccountProperty());
-        accountListPage.accountsProperty().bindContent(Accounts.getAccounts());
+        accountListPage.accountsProperty().bindContent(Accounts.accountsProperty());
        accountListPage.authServersProperty().bindContentBidirectional(config().getAuthlibInjectorServers());
        return accountListPage;
    });
+    private static Lazy<MultiplayerPage> multiplayerPage = new Lazy<>(MultiplayerPage::new);
    private static Lazy<LauncherSettingsPage> settingsPage = new Lazy<>(LauncherSettingsPage::new);

    private Controllers() {
@@ -125,6 +120,11 @@ public final class Controllers {
        return rootPage.get();
    }

+    // FXThread
+    public static MultiplayerPage getMultiplayerPage() {
+        return multiplayerPage.get();
+    }
+
    // FXThread
    public static LauncherSettingsPage getSettingsPage() {
        return settingsPage.get();
@@ -146,101 +146,21 @@ 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;
-        }
-        if (stageWidth != null) {
-            config().setWidth(stageWidth.get());
-            stageWidth = null;
-        }
+        config().setHeight(stageHeight.get());
+        config().setWidth(stageWidth.get());
+        stageHeight = null;
+        stageWidth = null;
    }

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

        Controllers.stage = stage;

-        stageSizeChangeListener = o -> {
-            ReadOnlyDoubleProperty sourceProperty = (ReadOnlyDoubleProperty) o;
-            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
-                    && !Controllers.stage.isIconified()) {
-                targetProperty.set(sourceProperty.get());
-            }
-        };
-
-        WeakInvalidationListener weakListener = new WeakInvalidationListener(stageSizeChangeListener);
-
-        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);
+        stage.setHeight(config().getHeight());
+        stageHeight.bind(stage.heightProperty());
+        stage.setWidth(config().getWidth());
+        stageWidth.bind(stage.widthProperty());

        stage.setOnCloseRequest(e -> Launcher.stopApplication());

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

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

        scene = new Scene(decorator.getDecorator());
        scene.setFill(Color.TRANSPARENT);
-        stage.setMinWidth(MIN_WIDTH);
-        stage.setMinHeight(MIN_HEIGHT);
+        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
        decorator.getDecorator().prefWidthProperty().bind(scene.widthProperty());
        decorator.getDecorator().prefHeightProperty().bind(scene.heightProperty());
-        scene.getStylesheets().setAll(Theme.getTheme().getStylesheets(config().getLauncherFontFamily()));
+        scene.getStylesheets().setAll(config().getTheme().getStylesheets(config().getLauncherFontFamily()));

-        FXUtils.setIcon(stage);
+        stage.getIcons().add(newImage("/assets/img/icon.png"));
        stage.setTitle(Metadata.FULL_TITLE);
        stage.initStyle(StageStyle.TRANSPARENT);
        stage.setScene(scene);

-        if (!Architecture.SYSTEM_ARCH.isX86() && globalConfig().getPlatformPromptVersion() < 1) {
-            Runnable continueAction = () -> globalConfig().setPlatformPromptVersion(1);
-
-            if (OperatingSystem.CURRENT_OS == OperatingSystem.OSX && Architecture.SYSTEM_ARCH == Architecture.ARM64) {
-                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);
-            }
-        }
-
-
        if (globalConfig().getAgreementVersion() < 1) {
            JFXDialogLayout agreementPane = new JFXDialogLayout();
            agreementPane.setHeading(new Label(i18n("launcher.agreement")));
            agreementPane.setBody(new Label(i18n("launcher.agreement.hint")));
            JFXHyperlink agreementLink = new JFXHyperlink(i18n("launcher.agreement"));
-            agreementLink.setExternalLink(Metadata.EULA_URL);
+            agreementLink.setOnAction(e -> FXUtils.openLink(Metadata.EULA_URL));
            JFXButton yesButton = new JFXButton(i18n("launcher.agreement.accept"));
            yesButton.getStyleClass().add("dialog-accept");
            yesButton.setOnAction(e -> {
@@ -299,7 +201,9 @@ public final class Controllers {
            });
            JFXButton noButton = new JFXButton(i18n("launcher.agreement.decline"));
            noButton.getStyleClass().add("dialog-cancel");
-            noButton.setOnAction(e -> javafx.application.Platform.exit());
+            noButton.setOnAction(e -> {
+                System.exit(1);
+            });
            agreementPane.setActions(agreementLink, yesButton, noButton);
            Controllers.dialog(agreementPane);
        }
@@ -358,7 +262,11 @@ public final class Controllers {
        return pane.getCompletableFuture();
    }

-    public static TaskExecutorDialogPane taskDialog(TaskExecutor executor, String title, TaskCancellationAction onCancel) {
+    public static TaskExecutorDialogPane taskDialog(TaskExecutor executor, String title) {
+        return taskDialog(executor, title, null);
+    }
+
+    public static TaskExecutorDialogPane taskDialog(TaskExecutor executor, String title, Consumer<Region> onCancel) {
        TaskExecutorDialogPane pane = new TaskExecutorDialogPane(onCancel);
        pane.setTitle(title);
        pane.setExecutor(executor);
@@ -366,7 +274,7 @@ public final class Controllers {
        return pane;
    }

-    public static TaskExecutorDialogPane taskDialog(Task<?> task, String title, TaskCancellationAction onCancel) {
+    public static TaskExecutorDialogPane taskDialog(Task<?> task, String title, Consumer<Region> onCancel) {
        TaskExecutor executor = task.executor();
        TaskExecutorDialogPane pane = new TaskExecutorDialogPane(onCancel);
        pane.setTitle(title);
@@ -386,11 +294,9 @@ public final class Controllers {

    public static void onHyperlinkAction(String href) {
        if (href.startsWith("hmcl://")) {
-            switch (href) {
-                case "hmcl://settings/feedback":
-                    Controllers.getSettingsPage().showFeedback();
-                    Controllers.navigate(Controllers.getSettingsPage());
-                    break;
+            if ("hmcl://settings/feedback".equals(href)) {
+                Controllers.getSettingsPage().showFeedback();
+                Controllers.navigate(Controllers.getSettingsPage());
            }
        } else {
            FXUtils.openLink(href);
@@ -405,14 +311,9 @@ public final class Controllers {
        rootPage = null;
        versionPage = null;
        gameListPage = null;
-        downloadPage = null;
-        accountListPage = null;
        settingsPage = null;
        decorator = null;
        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,23 +37,21 @@ import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 */
 public class CrashWindow extends Stage {

-    public CrashWindow(CrashReport report) {
+    public CrashWindow(String text) {
        Label lblCrash = new Label();
-        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"));
+        if (UpdateChecker.isOutdated())
+            lblCrash.setText(i18n("launcher.crash_out_dated"));
        else
            lblCrash.setText(i18n("launcher.crash"));
        lblCrash.setWrapText(true);

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

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

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

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

 }
@@ -23,112 +23,78 @@ 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.*;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.beans.value.WeakChangeListener;
+import javafx.beans.value.WritableValue;
+import javafx.fxml.FXMLLoader;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
-import javafx.scene.Cursor;
 import javafx.scene.Node;
-import javafx.scene.control.Label;
-import javafx.scene.control.ScrollPane;
 import javafx.scene.control.*;
+import javafx.scene.control.ScrollPane;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
+import javafx.scene.image.PixelWriter;
+import javafx.scene.image.WritableImage;
 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.Stage;
 import javafx.util.Callback;
 import javafx.util.Duration;
 import javafx.util.StringConverter;
-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.util.Holder;
-import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.ui.construct.JFXHyperlink;
+import org.jackhuang.hmcl.util.Logging;
 import org.jackhuang.hmcl.util.ResourceNotFoundError;
-import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.i18n.I18n;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.javafx.ExtendedProperties;
 import org.jackhuang.hmcl.util.javafx.SafeStringConverter;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
-import org.jackhuang.hmcl.util.platform.SystemUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 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.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+import java.awt.*;
+import java.awt.image.BufferedImage;
 import java.io.*;
-import java.lang.ref.WeakReference;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
 import java.net.URI;
-import java.net.URISyntaxException;
-import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.Objects;
 import java.util.function.BooleanSupplier;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import java.util.logging.Level;
 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.Logger.LOG;
+import static org.jackhuang.hmcl.util.Logging.LOG;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 public final class FXUtils {
    private FXUtils() {
    }

-    public static final int JAVAFX_MAJOR_VERSION;
-
-    static {
-        String jfxVersion = System.getProperty("javafx.version");
-        int majorVersion = -1;
-        if (jfxVersion != null) {
-            Matcher matcher = Pattern.compile("^(?<version>[0-9]+)").matcher(jfxVersion);
-            if (matcher.find()) {
-                majorVersion = Lang.parseInt(matcher.group(), -1);
-            }
-        }
-        JAVAFX_MAJOR_VERSION = majorVersion;
-    }
-
-    public static final String DEFAULT_MONOSPACE_FONT = OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS ? "Consolas" : "Monospace";
-
-    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()) {
            runnable.run();
@@ -309,16 +275,22 @@ public final class FXUtils {
    }

    public static void smoothScrolling(ScrollPane scrollPane) {
-        if (AnimationUtils.isAnimationEnabled())
-            ScrollUtils.addSmoothScrolling(scrollPane);
+        JFXScrollPane.smoothScrolling(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 loadFXML(Node node, String absolutePath) {
+        FXMLLoader loader = new FXMLLoader(node.getClass().getResource(absolutePath), I18n.getResourceBundle());
+        loader.setRoot(node);
+        loader.setController(node);
+        try {
+            loader.load();
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }

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

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

    public static void installSlowTooltip(Node node, Tooltip tooltip) {
-        runInFX(() -> TooltipInstaller.INSTALLER.installTooltip(node, TOOLTIP_SLOW_SHOW_DELAY, TOOLTIP_SHOW_DURATION, Duration.ZERO, tooltip));
+        installTooltip(node, 500, 5000, 0, 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);
@@ -359,103 +357,45 @@ public final class FXUtils {

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

        String path = file.getAbsolutePath();

-        String openCommand;
-        if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS)
-            openCommand = "explorer.exe";
-        else if (OperatingSystem.CURRENT_OS == OperatingSystem.OSX)
-            openCommand = "/usr/bin/open";
-        else if (OperatingSystem.CURRENT_OS.isLinuxOrBSD() && new File("/usr/bin/xdg-open").exists())
-            openCommand = "/usr/bin/xdg-open";
-        else
-            openCommand = null;
-
-        thread(() -> {
-            if (openCommand != null) {
+        switch (OperatingSystem.CURRENT_OS) {
+            case OSX:
                try {
-                    int exitCode = SystemUtils.callExternalProcess(openCommand, path);
-
-                    // explorer.exe always return 1
-                    if (exitCode == 0 || (exitCode == 1 && OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS))
-                        return;
-                    else
-                        LOG.warning("Open " + path + " failed with code " + exitCode);
-                } catch (Throwable e) {
-                    LOG.warning("Unable to open " + path + " by executing " + openCommand, e);
+                    Runtime.getRuntime().exec(new String[]{"/usr/bin/open", path});
+                } catch (IOException e) {
+                    Logging.LOG.log(Level.SEVERE, "Unable to open " + path + " by executing /usr/bin/open", e);
                }
-            }
-
-            // Fallback to java.awt.Desktop::open
-            try {
-                java.awt.Desktop.getDesktop().open(file);
-            } catch (Throwable 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) {
-            }
+                break;
+            default:
+                thread(() -> {
+                    if (java.awt.Desktop.isDesktopSupported()) {
+                        try {
+                            java.awt.Desktop.getDesktop().open(file);
+                        } catch (Throwable e) {
+                            Logging.LOG.log(Level.SEVERE, "Unable to open " + path + " by java.awt.Desktop.getDesktop()::open", e);
+                        }
+                    }
+                });
        }
-        return null;
    }

    public static void showFileInExplorer(Path file) {
-        String path = file.toAbsolutePath().toString();
-
-        String[] openCommands;
-        if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS)
-            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;
-
-        if (openCommands != null) {
-            thread(() -> {
+        switch (OperatingSystem.CURRENT_OS) {
+            case WINDOWS:
                try {
-                    int exitCode = SystemUtils.callExternalProcess(openCommands);
-
-                    // explorer.exe always return 1
-                    if (exitCode == 0 || (exitCode == 1 && OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS))
-                        return;
-                    else
-                        LOG.warning("Show " + path + " in explorer failed with code " + exitCode);
-                } catch (Throwable e) {
-                    LOG.warning("Unable to show " + path + " in explorer", e);
+                    Runtime.getRuntime().exec(new String[]{"explorer.exe", "/select,", file.toAbsolutePath().toString()});
+                } catch (IOException e) {
+                    Logging.LOG.log(Level.SEVERE, "Unable to open " + file + " by executing explorer /select", e);
                }
-
-                // Fallback to open folder
-                openFolder(file.getParent().toFile());
-            });
-        } else {
-            // We do not have a universal method to show file in file manager.
-            openFolder(file.getParent().toFile());
+                break;
+            default:
+                // Currently unsupported.
+                break;
        }
    }

@@ -478,121 +418,96 @@ public final class FXUtils {
        if (link == null)
            return;

-        thread(() -> {
-            if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
-                try {
-                    Runtime.getRuntime().exec(new String[]{"rundll32.exe", "url.dll,FileProtocolHandler", link});
-                    return;
-                } catch (Throwable e) {
-                    LOG.warning("An exception occurred while calling rundll32", e);
-                }
-            }
-            if (OperatingSystem.CURRENT_OS.isLinuxOrBSD()) {
-                for (String browser : linuxBrowsers) {
-                    String path = which(browser);
-                    if (path != null) {
-                        try {
-                            Runtime.getRuntime().exec(new String[]{browser, link});
-                            return;
+        if (java.awt.Desktop.isDesktopSupported()) {
+            thread(() -> {
+                if (OperatingSystem.CURRENT_OS == OperatingSystem.LINUX) {
+                    for (String browser : linuxBrowsers) {
+                        try (final InputStream is = Runtime.getRuntime().exec(new String[]{"which", browser}).getInputStream()) {
+                            if (is.read() != -1) {
+                                Runtime.getRuntime().exec(new String[]{browser, link});
+                                return;
+                            }
                        } catch (Throwable ignored) {
                        }
+                        Logging.LOG.log(Level.WARNING, "No known browser found");
                    }
-                    LOG.warning("No known browser found");
                }
-            }
-            try {
-                java.awt.Desktop.getDesktop().browse(new URI(link));
-            } catch (Throwable e) {
-                if (OperatingSystem.CURRENT_OS == OperatingSystem.OSX)
-                    try {
-                        Runtime.getRuntime().exec(new String[]{"/usr/bin/open", link});
-                    } catch (IOException ex) {
-                        LOG.warning("Unable to open link: " + link, ex);
-                    }
-                LOG.warning("Failed to open link: " + link, e);
-            }
-        });
+                try {
+                    java.awt.Desktop.getDesktop().browse(new URI(link));
+                } catch (Throwable e) {
+                    if (OperatingSystem.CURRENT_OS == OperatingSystem.OSX)
+                        try {
+                            Runtime.getRuntime().exec(new String[]{"/usr/bin/open", link});
+                        } catch (IOException ex) {
+                            Logging.LOG.log(Level.WARNING, "Unable to open link: " + link, ex);
+                        }
+                    Logging.LOG.log(Level.WARNING, "Failed to open link: " + link, e);
+                }
+            });
+
+        }
    }

-    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);
+    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);
+
+            SwingUtilities.invokeLater(() -> {
+                final JFrame frame = new JFrame(title);
+                frame.setSize(width, height);
+                frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+                frame.setLocationByPlatform(true);
+                //noinspection ConstantConditions
+                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 void bindInt(JFXTextField textField, Property<Number> property) {
-        bind(textField, property, SafeStringConverter.fromInteger());
+        textField.textProperty().bindBidirectional(property, SafeStringConverter.fromInteger());
+    }
+
+    public static void unbindInt(JFXTextField textField, Property<Number> property) {
+        textField.textProperty().unbindBidirectional(property);
    }

    public static void bindString(JFXTextField textField, Property<String> property) {
-        bind(textField, property, null);
+        textField.textProperty().bindBidirectional(property);
    }

-    public static void unbind(JFXTextField textField, Property<?> property) {
-        TextFieldBindingListener<?> listener = new TextFieldBindingListener<>(textField, property, null);
-        textField.focusedProperty().removeListener((ChangeListener<Boolean>) listener);
-        property.removeListener(listener);
-    }
-
-    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 final StringConverter<T> converter;
-
-        TextFieldBindingListener(JFXTextField textField, Property<T> property, StringConverter<T> converter) {
-            this.textFieldRef = new WeakReference<>(textField);
-            this.propertyRef = new WeakReference<>(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);
-                }
-            }
-        }
-
-        @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 static void unbindString(JFXTextField textField, Property<String> property) {
+        textField.textProperty().unbindBidirectional(property);
    }

    public static void bindBoolean(JFXToggleButton toggleButton, Property<Boolean> property) {
@@ -618,17 +533,16 @@ public final class FXUtils {
     * @param comboBox the combo box being bound with {@code property}.
     * @param property the property being bound with {@code combo box}.
     * @see #unbindEnum(JFXComboBox)
-     * @see ExtendedProperties#selectedItemPropertyFor(ComboBox)
+     * @deprecated Use {@link ExtendedProperties#selectedItemPropertyFor(ComboBox)}
     */
-    public static <T extends Enum<T>> void bindEnum(JFXComboBox<T> comboBox, Property<T> property) {
+    @SuppressWarnings("unchecked")
+    @Deprecated
+    public static void bindEnum(JFXComboBox<?> comboBox, Property<? extends Enum<?>> property) {
        unbindEnum(comboBox);
-
-        T currentValue = property.getValue();
-        @SuppressWarnings("unchecked")
-        T[] enumConstants = (T[]) currentValue.getClass().getEnumConstants();
-        ChangeListener<Number> listener = (a, b, newValue) -> property.setValue(enumConstants[newValue.intValue()]);
-
-        comboBox.getSelectionModel().select(currentValue.ordinal());
+        @SuppressWarnings("rawtypes")
+        ChangeListener<Number> listener = (a, b, newValue) ->
+                ((Property) property).setValue(property.getValue().getClass().getEnumConstants()[newValue.intValue()]);
+        comboBox.getSelectionModel().select(property.getValue().ordinal());
        comboBox.getProperties().put("FXUtils.bindEnum.listener", listener);
        comboBox.getSelectionModel().selectedIndexProperty().addListener(listener);
    }
@@ -639,78 +553,15 @@ public final class FXUtils {
     *
     * @param comboBox the combo box being bound with the property which can be inferred by {@code bindEnum}.
     * @see #bindEnum(JFXComboBox, Property)
-     * @see ExtendedProperties#selectedItemPropertyFor(ComboBox)
+     * @deprecated Use {@link ExtendedProperties#selectedItemPropertyFor(ComboBox)}
     */
-    public static void unbindEnum(JFXComboBox<? extends Enum<?>> comboBox) {
-        @SuppressWarnings("unchecked")
-        ChangeListener<Number> listener = (ChangeListener<Number>) comboBox.getProperties().remove("FXUtils.bindEnum.listener");
-        if (listener != null)
-            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));
+    @SuppressWarnings("unchecked")
+    @Deprecated
+    public static void unbindEnum(JFXComboBox<?> comboBox) {
+        @SuppressWarnings("rawtypes")
+        ChangeListener listener = tryCast(comboBox.getProperties().get("FXUtils.bindEnum.listener"), ChangeListener.class).orElse(null);
+        if (listener == null) return;
+        comboBox.getSelectionModel().selectedIndexProperty().removeListener(listener);
    }

    /**
@@ -721,138 +572,14 @@ public final class FXUtils {
     * @see org.jackhuang.hmcl.util.CrashReporter
     * @see ResourceNotFoundError
     */
-    public static Image newBuiltinImage(String url) {
+    public static Image newImage(String url) {
        try {
-            return builtinImageCache.computeIfAbsent(url, Image::new);
+            return new Image(url);
        } 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");
-        button.setButtonType(JFXButton.ButtonType.RAISED);
-        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);
    }
@@ -897,17 +624,10 @@ public final class FXUtils {
    }

    public static <T> Callback<ListView<T>, ListCell<T>> jfxListCellFactory(Function<T, Node> graphicBuilder) {
-        Holder<Object> lastCell = new Holder<>();
        return view -> new JFXListCell<T>() {
            @Override
            public void updateItem(T item, boolean empty) {
                super.updateItem(item, empty);
-
-                // https://mail.openjdk.org/pipermail/openjfx-dev/2022-July/034764.html
-                if (this == lastCell.value && !isVisible())
-                    return;
-                lastCell.value = this;
-
                if (!empty) {
                    setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
                    setGraphic(graphicBuilder.apply(item));
@@ -941,6 +661,13 @@ 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) {
@@ -950,13 +677,20 @@ 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();
+    // Based on https://stackoverflow.com/a/57552025
+    // Fix #874: Use it instead of SwingFXUtils.toFXImage
+    public static WritableImage toFXImage(BufferedImage image) {
+        WritableImage wr = new WritableImage(image.getWidth(), image.getHeight());
+        PixelWriter pw = wr.getPixelWriter();
+
+        final int iw = image.getWidth();
+        final int ih = image.getHeight();
+        for (int x = 0; x < iw; x++) {
+            for (int y = 0; y < ih; y++) {
+                pw.setArgb(x, y, image.getRGB(x, y));
            }
-        });
+        }
+        return wr;
    }

    public static void copyText(String text) {
@@ -964,15 +698,10 @@ public final class FXUtils {
        content.putString(text);
        Clipboard.getSystemClipboard().setContent(content);

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

    public static List<Node> parseSegment(String segment, Consumer<String> hyperlinkAction) {
-        if (segment.indexOf('<') < 0)
-            return Collections.singletonList(new Text(segment));
-
        try {
            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
            DocumentBuilder builder = factory.newDocumentBuilder();
@@ -980,7 +709,7 @@ public final class FXUtils {
            Element r = doc.getDocumentElement();

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

@@ -988,19 +717,9 @@ public final class FXUtils {
                    Element element = (Element) node;
                    if ("a".equals(element.getTagName())) {
                        String href = element.getAttribute("href");
-                        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);
+                        JFXHyperlink hyperlink = new JFXHyperlink(element.getTextContent());
+                        hyperlink.setOnAction(e -> hyperlinkAction.accept(href));
+                        texts.add(hyperlink);
                    } else if ("b".equals(element.getTagName())) {
                        Text text = new Text(element.getTextContent());
                        text.getStyleClass().add("bold");
@@ -1016,7 +735,7 @@ public final class FXUtils {
            }
            return texts;
        } catch (SAXException | ParserConfigurationException | IOException e) {
-            LOG.warning("Failed to parse xml", e);
+            LOG.log(Level.WARNING, "Failed to parse xml", e);
            return Collections.singletonList(new Text(segment));
        }
    }
@@ -1027,11 +746,4 @@ 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);
-    }
 }
@@ -1,6 +1,6 @@
 /*
 * Hello Minecraft! Launcher
- * Copyright (C) 2023  huangyuhui <huanghongxun2008@126.com> and contributors
+ * 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
@@ -20,64 +20,60 @@ 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;
 import javafx.scene.Scene;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Label;
-import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.VBox;
-import javafx.scene.text.Text;
-import javafx.scene.text.TextFlow;
 import javafx.stage.Stage;
-import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.download.LibraryAnalyzer;
 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.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.awt.*;
 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.util.logging.Logger.LOG;
+import static org.jackhuang.hmcl.ui.FXUtils.newImage;
+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;

 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 TextFlow reasonTextFlow = new TextFlow(new Text(i18n("game.crash.reason.unknown")));
+    private final StringProperty os = new SimpleStringProperty(OperatingSystem.SYSTEM_NAME);
+    private final StringProperty arch = new SimpleStringProperty(Architecture.SYSTEM_ARCH.getDisplayName());
+    private final StringProperty reason = new SimpleStringProperty(i18n("game.crash.reason.unknown"));
    private final BooleanProperty loading = new SimpleBooleanProperty();
-    private final TextFlow feedbackTextFlow = new TextFlow();
+    private final Label feedbackLabel = new Label(i18n("game.crash.feedback"));

    private final ManagedProcess managedProcess;
    private final DefaultGameRepository repository;
@@ -85,147 +81,107 @@ public class GameCrashWindow extends Stage {
    private final LaunchOptions launchOptions;
    private final View view;

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

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

        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() + ")";

        this.view = new View();

-        this.feedbackTextFlow.getChildren().addAll(FXUtils.parseSegment(i18n("game.crash.feedback"), Controllers::onHyperlinkAction));
-
        setScene(new Scene(view, 800, 480));
-        getScene().getStylesheets().addAll(Theme.getTheme().getStylesheets(config().getLauncherFontFamily()));
+        getScene().getStylesheets().addAll(config().getTheme().getStylesheets(config().getLauncherFontFamily()));
        setTitle(i18n("game.crash.title"));
-        FXUtils.setIcon(this);
+        getIcons().add(newImage("/assets/img/icon.png"));

        analyzeCrashReport();
    }

-    @SuppressWarnings("unchecked")
    private void analyzeCrashReport() {
        loading.set(true);
-        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.
+        CompletableFuture.supplyAsync(() -> {
+            String rawLog = logs.stream().map(Pair::getKey).collect(Collectors.joining("\n"));
+            Set<String> keywords = Collections.emptySet();
            String crashReport = null;
            try {
                crashReport = CrashReportAnalyzer.findCrashReport(rawLog);
            } catch (IOException e) {
-                LOG.warning("Failed to read crash report", e);
+                LOG.log(Level.WARNING, "Failed to read crash report", e);
            }
            if (crashReport == null) {
                crashReport = CrashReportAnalyzer.extractCrashReport(rawLog);
            }
-
-            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>());
+            if (crashReport != null) {
+                keywords = CrashReportAnalyzer.findKeywordsFromCrashReport(crashReport);
            }
-
-            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) -> {
+            return pair(
+                    CrashReportAnalyzer.anaylze(rawLog),
+                    keywords);
+        }).whenCompleteAsync((pair, exception) -> {
            loading.set(false);

            if (exception != null) {
-                LOG.warning("Failed to analyze crash report", exception);
-                reasonTextFlow.getChildren().setAll(FXUtils.parseSegment(i18n("game.crash.reason.unknown"), Controllers::onHyperlinkAction));
+                LOG.log(Level.WARNING, "Failed to analyze crash report", exception);
+                reason.set(i18n("game.crash.reason.unknown"));
            } else {
-                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<>(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;
+                List<CrashReportAnalyzer.Result> results = pair.getKey();
+                Set<String> keywords = pair.getValue();
+                StringBuilder reasonText = new StringBuilder();
+                for (CrashReportAnalyzer.Result result : results) {
                    switch (result.getRule()) {
                        case TOO_OLD_JAVA:
-                            message = i18n("game.crash.reason.too_old_java", CrashReportAnalyzer.getJavaVersionFromMajorVersion(Integer.parseInt(result.getMatcher().group("expected"))));
+                            reasonText.append(i18n("game.crash.reason.too_old_java",
+                                    CrashReportAnalyzer.getJavaVersionFromMajorVersion(Integer.parseInt(result.getMatcher().group("expected")))))
+                                    .append("\n");
                            break;
                        case MOD_RESOLUTION_CONFLICT:
                        case MOD_RESOLUTION_MISSING:
                        case MOD_RESOLUTION_COLLECTION:
-                            message = i18n("game.crash.reason." + result.getRule().name().toLowerCase(Locale.ROOT),
+                            reasonText.append(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")));
+                                    parseFabricModId(result.getMatcher().group("destmod"))));
                            break;
                        case MOD_RESOLUTION_MISSING_MINECRAFT:
-                            message = i18n("game.crash.reason." + result.getRule().name().toLowerCase(Locale.ROOT),
+                            reasonText.append(i18n("game.crash.reason." + result.getRule().name().toLowerCase(Locale.ROOT),
                                    translateFabricModId(result.getMatcher().group("mod")),
-                                    result.getMatcher().group("version"));
+                                    result.getMatcher().group("version")));
                            break;
-                        case MOD_FOREST_OPTIFINE:
                        case TWILIGHT_FOREST_OPTIFINE:
-                        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"));
+                            reasonText.append(i18n("game.crash.reason.mod", "OptiFine"));
                            break;
                        default:
-                            message = i18n("game.crash.reason." + result.getRule().name().toLowerCase(Locale.ROOT),
+                            reasonText.append(i18n("game.crash.reason." + result.getRule().name().toLowerCase(Locale.ROOT),
                                    Arrays.stream(result.getRule().getGroupNames()).map(groupName -> result.getMatcher().group(groupName))
-                                            .toArray());
+                                            .toArray()))
+                                    .append("\n");
                            break;
                    }
-                    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));
+                        reason.set(i18n("game.crash.reason.stacktrace", String.join(", ", keywords)));
                    } else {
-                        reasonTextFlow.getChildren().setAll(FXUtils.parseSegment(i18n("game.crash.reason.unknown"), Controllers::onHyperlinkAction));
-                        LOG.info("Crash reason unknown");
+                        reason.set(i18n("game.crash.reason.unknown"));
                    }
+
+                    feedbackLabel.setVisible(true);
                } else {
-                    feedbackTextFlow.setVisible(false);
-                    reasonTextFlow.getChildren().setAll(segments);
+                    reason.set(reasonText.toString());
                }
            }
-        }).start();
+        }, Schedulers.javafx()).exceptionally(Lang::handleUncaughtException);
    }

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

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

-        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();
+        logWindow.logLine("Command: " + new CommandBuilder().addAll(managedProcess.getCommands()).toString(), Log4jLevel.INFO);
+        logWindow.logLine("ClassPath: " + managedProcess.getClasspath(), Log4jLevel.INFO);
+        for (Map.Entry<String, Log4jLevel> entry : logs)
+            logWindow.logLine(entry.getKey(), entry.getValue());
+
+        logWindow.showNormal();
    }

    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(Log::getLog).collect(Collectors.joining(OperatingSystem.LINE_SEPARATOR)))
+                        logs.stream().map(Pair::getKey).collect(Collectors.joining(OperatingSystem.LINE_SEPARATOR)))
                .thenComposeAsync(logs ->
                        LogExporter.exportLogs(logFile, repository, launchOptions.getVersionName(), logs, new CommandBuilder().addAll(managedProcess.getCommands()).toString()))
-                .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));
-                    }
-
+                .thenRunAsync(() -> {
+                    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();
-
+                    if (Desktop.isDesktopSupported()) {
+                        try {
+                            Desktop.getDesktop().open(logFile.toFile());
+                        } catch (IOException | IllegalArgumentException ignored) {
+                        }
+                    }
+                }, Schedulers.javafx())
+                .exceptionally(e -> {
+                    LOG.log(Level.WARNING, "Failed to export game crash info", e);
                    return null;
                });
    }
@@ -309,9 +265,6 @@ 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);
@@ -324,21 +277,11 @@ public class GameCrashWindow extends Stage {
                infoPane.setPadding(new Insets(8));
                infoPane.setAlignment(Pos.CENTER_LEFT);

-                TwoLineListItem launcher = new TwoLineListItem();
-                launcher.getStyleClass().setAll("two-line-item-second-large");
-                launcher.setTitle(i18n("launcher"));
-                launcher.setSubtitle(Metadata.VERSION);
-
                TwoLineListItem version = new TwoLineListItem();
                version.getStyleClass().setAll("two-line-item-second-large");
-                version.setTitle(i18n("game.version"));
+                version.setTitle(i18n("archive.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"));
@@ -352,14 +295,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.setSubtitle(Lang.requireNonNullElse(OperatingSystem.OS_RELEASE_NAME, OperatingSystem.SYSTEM_NAME));
+                os.subtitleProperty().bind(GameCrashWindow.this.os);

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

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

            HBox moddedPane = new HBox(8);
@@ -368,15 +311,13 @@ public class GameCrashWindow extends Stage {
                moddedPane.setAlignment(Pos.CENTER_LEFT);

                for (LibraryAnalyzer.LibraryType type : LibraryAnalyzer.LibraryType.values()) {
-                    if (!type.getPatchId().isEmpty()) {
-                        analyzer.getVersion(type).ifPresent(ver -> {
-                            TwoLineListItem item = new TwoLineListItem();
-                            item.getStyleClass().setAll("two-line-item-second-large");
-                            item.setTitle(i18n("install.installer." + type.getPatchId()));
-                            item.setSubtitle(ver);
-                            moddedPane.getChildren().add(item);
-                        });
-                    }
+                    analyzer.getVersion(type).ifPresent(ver -> {
+                        TwoLineListItem item = new TwoLineListItem();
+                        item.getStyleClass().setAll("two-line-item-second-large");
+                        item.setTitle(i18n("install.installer." + type.getPatchId()));
+                        item.setSubtitle(ver);
+                        moddedPane.getChildren().add(item);
+                    });
                }
            }

@@ -386,50 +327,38 @@ 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");
-
-                ScrollPane reasonPane = new ScrollPane(reasonTextFlow);
-                reasonPane.setFitToWidth(true);
-                reasonPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
-                reasonPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
+                TwoLineListItem reason = new TwoLineListItem();
+                reason.getStyleClass().setAll("two-line-item-second-large", "wrap-text");
+                reason.setTitle(i18n("game.crash.reason"));
+                reason.subtitleProperty().bind(GameCrashWindow.this.reason);

                gameDirPane.setPadding(new Insets(8));
                VBox.setVgrow(gameDirPane, Priority.ALWAYS);
-                FXUtils.onChangeAndOperate(feedbackTextFlow.visibleProperty(), visible -> {
-                    if (visible) {
-                        gameDirPane.getChildren().setAll(gameDir, javaDir, new VBox(reasonTitle, reasonPane, feedbackTextFlow));
-                    } else {
-                        gameDirPane.getChildren().setAll(gameDir, javaDir, new VBox(reasonTitle, reasonPane));
-                    }
-                });
+                gameDirPane.getChildren().setAll(gameDir, javaDir, reason);
            }

            HBox toolBar = new HBox();
            {
-                JFXButton exportGameCrashInfoButton = FXUtils.newRaisedButton(i18n("logwindow.export_game_crash_logs"));
-                exportGameCrashInfoButton.setOnAction(e -> exportGameCrashInfo());
-
-                JFXButton logButton = FXUtils.newRaisedButton(i18n("logwindow.title"));
-                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"));
+                JFXButton exportGameCrashInfoButton = new JFXButton(i18n("logwindow.export_game_crash_logs"));
+                exportGameCrashInfoButton.setButtonType(JFXButton.ButtonType.RAISED);
+                exportGameCrashInfoButton.getStyleClass().add("jfx-button-raised");
+                exportGameCrashInfoButton.setOnMouseClicked(e -> exportGameCrashInfo());

+                JFXButton logButton = new JFXButton(i18n("logwindow.title"));
+                logButton.setButtonType(JFXButton.ButtonType.RAISED);
+                logButton.getStyleClass().add("jfx-button-raised");
+                logButton.setOnMouseClicked(e -> showLogWindow());

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

            getChildren().setAll(titlePane, infoPane, moddedPane, gameDirPane, toolBar);
@@ -1,266 +0,0 @@
-/*
- * 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,11 +18,9 @@
 package org.jackhuang.hmcl.ui;

 import com.jfoenix.controls.JFXButton;
-import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.css.PseudoClass;
+import javafx.beans.property.*;
+import javafx.event.EventHandler;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Cursor;
@@ -31,20 +29,16 @@ 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.MouseButton;
-import javafx.scene.layout.*;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
 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;
@@ -54,389 +48,183 @@ import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 */
 public class InstallerItem extends Control {
    private final String id;
-    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 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 ObjectProperty<Runnable> onInstall = new SimpleObjectProperty<>(this, "onInstall");
-    private final ObjectProperty<Runnable> onRemove = new SimpleObjectProperty<>(this, "onRemove");
-
-    public interface State {
+    public InstallerItem(LibraryAnalyzer.LibraryType id) {
+        this(id.getPatchId());
    }

-    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, Style style) {
-        this(id.getPatchId(), style);
-    }
-
-    public InstallerItem(String id, Style style) {
+    public InstallerItem(String id) {
        this.id = id;
-        this.style = style;

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

+    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 final static class InstallerItemGroup {
-        private final InstallerItem game;
+    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);

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

-        private Set<InstallerItem> getIncompatibles(Map<InstallerItem, Set<InstallerItem>> incompatibleMap, InstallerItem item) {
-            return incompatibleMap.computeIfAbsent(item, it -> new HashSet<>());
-        }
+            liteLoader.incompatibleLibraryName.bind(Bindings.createStringBinding(() -> {
+                if (fabric.libraryVersion.get() != null) return FABRIC.getPatchId();
+                return null;
+            }, fabric.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);
-            }
-        }
+            optiFine.incompatibleLibraryName.bind(Bindings.createStringBinding(() -> {
+                if (fabric.libraryVersion.get() != null) return FABRIC.getPatchId();
+                return null;
+            }, fabric.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));
+            for (InstallerItem fabric : new InstallerItem[]{fabric, fabricApi}) {
+                fabric.incompatibleLibraryName.bind(Bindings.createStringBinding(() -> {
+                    if (liteLoader.libraryVersion.get() != null) return LITELOADER.getPatchId();
+                    if (optiFine.libraryVersion.get() != null) return OPTIFINE.getPatchId();
+                    if (forge.libraryVersion.get() != null) return FORGE.getPatchId();
+                    return null;
+                }, optiFine.libraryVersion, forge.libraryVersion));
            }

-            if (gameVersion != null) {
-                game.versionProperty.set(new InstalledState(gameVersion, false, false));
-            }
-
-            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;
+            fabricApi.dependencyName.bind(Bindings.createStringBinding(() -> {
+                if (fabric.libraryVersion.get() == null) return FABRIC.getPatchId();
+                else return null;
+            }, fabric.libraryVersion));
        }

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

-    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();
+    public static class InstallerItemSkin extends SkinBase<InstallerItem> {

        InstallerItemSkin(InstallerItem control) {
            super(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();
-            }
-            pane.getStyleClass().add("installer-item");
-            RipplerContainer container = new RipplerContainer(pane);
+            HBox hbox = new HBox();
+            hbox.getStyleClass().add("md-list-cell");
+            hbox.setPadding(new Insets(8));
+            RipplerContainer container = new RipplerContainer(hbox);
            getChildren().setAll(container);

-            pane.pseudoClassStateChanged(LIST_ITEM, control.style == Style.LIST_ITEM);
-            pane.pseudoClassStateChanged(CARD, control.style == Style.CARD);
+            hbox.setAlignment(Pos.CENTER_LEFT);

-            if (control.iconType != null) {
-                ImageView view = new ImageView(control.iconType.getIcon());
+            if (control.imageUrl != null) {
+                ImageView view = new ImageView(new Image(control.imageUrl, 32, 32, true, true));
                Node node = FXUtils.limitingSize(view, 32, 32);
                node.setMouseTransparent(true);
-                node.getStyleClass().add("installer-item-image");
-                pane.getChildren().add(node);
-
-                if (control.style == Style.CARD) {
-                    VBox.setMargin(node, new Insets(8, 0, 16, 0));
-                }
+                hbox.getChildren().add(node);
            }

            Label nameLabel = new Label();
-            nameLabel.getStyleClass().add("installer-item-name");
            nameLabel.setMouseTransparent(true);
-            pane.getChildren().add(nameLabel);
+            hbox.getChildren().add(nameLabel);
+            nameLabel.setPrefWidth(80);
            nameLabel.textProperty().set(I18n.hasKey("install.installer." + control.id) ? i18n("install.installer." + control.id) : control.id);
            HBox.setMargin(nameLabel, new Insets(0, 4, 0, 4));

-            Label statusLabel = new Label();
-            statusLabel.getStyleClass().add("installer-item-status");
-            statusLabel.setMouseTransparent(true);
-            pane.getChildren().add(statusLabel);
-            HBox.setHgrow(statusLabel, Priority.ALWAYS);
-            statusLabel.textProperty().bind(Bindings.createStringBinding(() -> {
-                State state = control.resolvedStateProperty.get();
-
-                if (state instanceof InstalledState) {
-                    InstalledState s = (InstalledState) state;
-                    if (s.incompatibleWithGame) {
-                        return i18n("install.installer.change_version", s.version);
-                    }
-                    if (s.external) {
-                        return i18n("install.installer.external_version", s.version);
-                    }
-                    return i18n("install.installer.version", s.version);
-                } else if (state instanceof InstallableState) {
+            Label label = new Label();
+            label.setMouseTransparent(true);
+            hbox.getChildren().add(label);
+            label.setMaxWidth(Double.MAX_VALUE);
+            HBox.setHgrow(label, Priority.ALWAYS);
+            label.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) {
                    return i18n("install.installer.not_installed");
-                } else if (state instanceof IncompatibleState) {
-                    return i18n("install.installer.incompatible", i18n("install.installer." + ((IncompatibleState) state).incompatibleItemName));
                } else {
-                    throw new AssertionError("Unknown state type: " + state.getClass());
+                    return i18n("install.installer.version", version);
                }
-            }, control.resolvedStateProperty));
-            BorderPane.setMargin(statusLabel, new Insets(0, 0, 0, 8));
-            BorderPane.setAlignment(statusLabel, Pos.CENTER_LEFT);
+            }, control.incompatibleLibraryName, control.incompatibleWithGame, control.libraryVersion));
+            BorderPane.setMargin(label, new Insets(0, 0, 0, 8));
+            BorderPane.setAlignment(label, Pos.CENTER_LEFT);

-            HBox buttonsContainer = new HBox();
-            buttonsContainer.setSpacing(8);
-            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);
+            hbox.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);
+            hbox.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;
-                }
-
-                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 -> {
+            FXUtils.onChangeAndOperate(arrowButton.visibleProperty(), clickable -> {
                if (clickable) {
-                    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);
+                    container.onMouseClickedProperty().bind(control.action);
+                    hbox.setCursor(Cursor.HAND);
                } else {
-                    container.setOnMouseClicked(null);
-                    pane.setCursor(Cursor.DEFAULT);
+                    container.onMouseClickedProperty().unbind();
+                    container.onMouseClickedProperty().set(null);
+                    hbox.setCursor(Cursor.DEFAULT);
                }
            });
        }
@@ -18,6 +18,7 @@
 package org.jackhuang.hmcl.ui;

 import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXScrollPane;
 import javafx.beans.binding.Bindings;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
@@ -55,7 +56,7 @@ public class ListPageSkin extends SkinBase<ListPage<?>> {
                Bindings.bindContent(list.getChildren(), skinnable.itemsProperty());

                scrollPane.setContent(content);
-                FXUtils.smoothScrolling(scrollPane);
+                JFXScrollPane.smoothScrolling(scrollPane);
            }
            
            VBox vBox = new VBox();
@@ -69,16 +70,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.createIcon(Theme.whiteFill(), -1, -1));
-                btnAdd.setOnAction(e -> skinnable.add());
+                btnAdd.setGraphic(SVG.plus(Theme.whiteFillBinding(), -1, -1));
+                btnAdd.setOnMouseClicked(e -> skinnable.add());

                JFXButton btnRefresh = new JFXButton();
                FXUtils.setLimitWidth(btnRefresh, 40);
                FXUtils.setLimitHeight(btnRefresh, 40);
                btnRefresh.getStyleClass().add("jfx-button-raised-round");
                btnRefresh.setButtonType(JFXButton.ButtonType.RAISED);
-                btnRefresh.setGraphic(SVG.REFRESH.createIcon(Theme.whiteFill(), -1, -1));
-                btnRefresh.setOnAction(e -> skinnable.refresh());
+                btnRefresh.setGraphic(SVG.refresh(Theme.whiteFillBinding(), -1, -1));
+                btnRefresh.setOnMouseClicked(e -> skinnable.refresh());

                vBox.getChildren().setAll(btnAdd);

@@ -25,163 +25,165 @@ import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.*;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
+import javafx.beans.value.ChangeListener;
 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.ManagedProcess;
-import org.jackhuang.hmcl.util.platform.SystemUtils;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;

+import javax.swing.*;
+import java.awt.*;
 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.*;
+import java.util.ArrayDeque;
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Map;
+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.Logger.LOG;
+import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.StringUtils.parseEscapeSequence;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

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

-    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 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 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 final LogWindowImpl impl;
-    private final ManagedProcess gameProcess;
+    private Consumer<String> exportGameCrashInfoCallback;

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

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

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

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

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

-    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);
+    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;
+            }
        }
-        checkLogCount();
-        autoScroll();
+        show();
+    }
+
+    public void showNormal() {
+        this.impl.showCrashReport.set(false);
+        show();
    }

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

    private void checkLogCount() {
-        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++) {
+        while (logs.size() > config().getLogLines()) {
            Log removedLog = logs.removeFirst();
-            if (itemsSize > count && items.get(count) == removedLog)
-                count++;
+            if (!impl.listView.getItems().isEmpty() && impl.listView.getItems().get(0) == removedLog) {
+                // TODO: fix O(n)
+                impl.listView.getItems().remove(0);
+            }
        }
-
-        items.remove(0, count);
    }

-    private void autoScroll() {
-        if (!impl.listView.getItems().isEmpty() && impl.autoScroll.get())
-            impl.listView.scrollTo(impl.listView.getItems().size() - 1);
+    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 final class LogWindowImpl extends Control {
+    public class LogWindowImpl extends Control {

-        private final ListView<Log> listView = new JFXListView<>();
-        private final BooleanProperty autoScroll = 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<>();
+        private ListView<Log> listView = new JFXListView<>();
+        private BooleanProperty autoScroll = new SimpleBooleanProperty();
+        private List<StringProperty> buttonText = IntStream.range(0, 5).mapToObj(x -> new SimpleStringProperty()).collect(Collectors.toList());
+        private List<BooleanProperty> showLevel = IntStream.range(0, 5).mapToObj(x -> new SimpleBooleanProperty(true)).collect(Collectors.toList());
+        private JFXComboBox<String> cboLines = new JFXComboBox<>();
+        private BooleanProperty showCrashReport = new SimpleBooleanProperty();

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

-            listView.setItems(FXCollections.observableList(new CircularArrayList<>(logs.size())));
+            boolean flag = false;
+            cboLines.getItems().setAll("500", "2000", "5000");
+            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);
-            }
+            cboLines.getSelectionModel().selectedItemProperty().addListener((a, b, newValue) -> {
+                config().setLogLines(newValue == null ? 100 : Integer.parseInt(newValue));
+            });

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

-            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]);
+            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));
            }
        }

@@ -198,47 +200,25 @@ 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(Log::getLog).collect(Collectors.toList()));
+                    Files.write(logFile, logs.stream().map(x -> x.log).collect(Collectors.toList()));
                } catch (IOException e) {
-                    LOG.warning("Failed to export logs", e);
+                    LOG.log(Level.WARNING, "Failed to export logs", e);
                    return;
                }

-                Platform.runLater(() -> {
-                    Alert alert = new Alert(Alert.AlertType.INFORMATION, i18n("settings.launcher.launcher_log.export.success", logFile));
-                    alert.setTitle(i18n("settings.launcher.launcher_log.export"));
-                    alert.showAndWait();
-                });
-
-                FXUtils.showFileInExplorer(logFile);
+                JOptionPane.showMessageDialog(null, i18n("settings.launcher.launcher_log.export.success", logFile), i18n("settings.launcher.launcher_log.export"), JOptionPane.INFORMATION_MESSAGE);
+                if (Desktop.isDesktopSupported()) {
+                    try {
+                        Desktop.getDesktop().open(logFile.toFile());
+                    } catch (IOException | IllegalArgumentException ignored) {
+                    }
+                }
            });
        }

-        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));
-            });
+        private void onExportGameCrashInfo() {
+            if (exportGameCrashInfoCallback == null) return;
+            exportGameCrashInfoCallback.accept(logs.stream().map(x -> x.log).collect(Collectors.joining(OperatingSystem.LINE_SEPARATOR)));
        }

        @Override
@@ -247,19 +227,26 @@ public final class LogWindow extends Stage {
        }
    }

-    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");
-        private static final PseudoClass WARN = PseudoClass.getPseudoClass("warn");
-        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 class LogWindowSkin extends SkinBase<LogWindowImpl> {
+        private static PseudoClass EMPTY = PseudoClass.getPseudoClass("empty");
+        private static PseudoClass FATAL = PseudoClass.getPseudoClass("fatal");
+        private static PseudoClass ERROR = PseudoClass.getPseudoClass("error");
+        private static PseudoClass WARN = PseudoClass.getPseudoClass("warn");
+        private static PseudoClass INFO = PseudoClass.getPseudoClass("info");
+        private static PseudoClass DEBUG = PseudoClass.getPseudoClass("debug");
+        private static PseudoClass TRACE = PseudoClass.getPseudoClass("trace");

-        private final Set<ListCell<Log>> selected = new HashSet<>();
+        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;
+        }

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

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

                {
                    HBox hBox = new HBox(3);
-                    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);
-                    }
-
+                    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))
+                    );
                    borderPane.setRight(hBox);
                }

@@ -306,14 +290,11 @@ public final class LogWindow extends Stage {
                    if (!listView.getItems().isEmpty() && control.autoScroll.get())
                        listView.scrollTo(listView.getItems().size() - 1);
                });
-
-                listView.setStyle("-fx-font-family: " + Lang.requireNonNullElse(config().getFontFamily(), FXUtils.DEFAULT_MONOSPACE_FONT)
-                        + "; -fx-font-size: " + config().getFontSize() + "px;");
-                Holder<Object> lastCell = new Holder<>();
+                listView.setStyle("-fx-font-family: " + config().getFontFamily() + "; -fx-font-size: " + config().getFontSize() + "px;");
                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());
@@ -321,76 +302,26 @@ public final class LogWindow extends Stage {
                        setPadding(new Insets(2));
                        setWrapText(true);
                        setGraphic(null);
-
-                        setOnMouseClicked(event -> {
-                            if (event.getButton() != MouseButton.PRIMARY)
-                                return;
-
-                            if (!event.isControlDown()) {
-                                for (ListCell<Log> logListCell : selected) {
-                                    if (logListCell != this) {
-                                        logListCell.pseudoClassStateChanged(SELECTED, false);
-                                        if (logListCell.getItem() != null) {
-                                            logListCell.getItem().setSelected(false);
-                                        }
-                                    }
-                                }
-
-                                selected.clear();
-                            }
-
-                            selected.add(this);
-                            pseudoClassStateChanged(SELECTED, true);
-                            if (getItem() != null) {
-                                getItem().setSelected(true);
-                            }
-
-                            event.consume();
-                        });
                    }

                    @Override
                    protected void updateItem(Log item, boolean empty) {
                        super.updateItem(item, empty);
-
-                        // https://mail.openjdk.org/pipermail/openjfx-dev/2022-July/034764.html
-                        if (this == lastCell.value && !isVisible())
-                            return;
-                        lastCell.value = this;
-
                        pseudoClassStateChanged(EMPTY, empty);
-                        pseudoClassStateChanged(FATAL, !empty && item.getLevel() == Log4jLevel.FATAL);
-                        pseudoClassStateChanged(ERROR, !empty && item.getLevel() == Log4jLevel.ERROR);
-                        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());
-
+                        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);
                        if (empty) {
                            setText(null);
                        } else {
-                            setText(item.getLog());
+                            setText(item.log);
                        }
                    }
                });

-                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);
            }
@@ -398,6 +329,11 @@ 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);
@@ -407,25 +343,15 @@ public final class LogWindow extends Stage {
                autoScrollCheckBox.setSelected(true);
                control.autoScroll.bind(autoScrollCheckBox.selectedProperty());

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

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

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

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

-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"),
-    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 final class SVG {
+    private SVG() {
    }

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

-    private static Node createIcon(SVGPath path, double width, double height) {
+    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);
+
        if (width < 0 || height < 0) {
            StackPane pane = new StackPane(path);
            pane.setAlignment(Pos.CENTER);
@@ -138,24 +54,488 @@ public enum SVG {
        return svg;
    }

-    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

-        return createIcon(p, width, height);
+    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 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);
-
-        return createIcon(p, 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);
+    }
+
+    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("M4,11V13H16L10.5,18.5L11.92,19.92L19.84,12L11.92,4.08L10.5,5.5L16,11H4Z", 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 static Node upload(ObjectBinding<? extends Paint> fill, double width, double height) {
+        return createSVGPath("M9,16V10H5L12,3L19,10H15V16H9M5,20V18H19V20H5Z", fill, 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);
+    }
 }
@@ -1,215 +0,0 @@
-// Copy from https://github.com/palexdev/MaterialFX/blob/c8038ce2090f5cddf923a19d79cc601db86a4d17/materialfx/src/main/java/io/github/palexdev/materialfx/utils/ScrollUtils.java
-
-/*
- * Copyright (C) 2022 Parisi Alessandro
- * This file is part of MaterialFX (https://github.com/palexdev/MaterialFX).
- *
- * MaterialFX is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MaterialFX 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with MaterialFX.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.jackhuang.hmcl.ui;
-
-import javafx.animation.Animation;
-import javafx.animation.Animation.Status;
-import javafx.animation.KeyFrame;
-import javafx.animation.Timeline;
-import javafx.event.EventHandler;
-import javafx.geometry.Bounds;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.input.ScrollEvent;
-import javafx.util.Duration;
-
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Function;
-
-/**
- * Utility class for ScrollPanes.
- */
-final class ScrollUtils {
-
-    public enum ScrollDirection {
-        UP(-1), RIGHT(-1), DOWN(1), LEFT(1);
-
-        final int intDirection;
-
-        ScrollDirection(int intDirection) {
-            this.intDirection = intDirection;
-        }
-
-        public int intDirection() {
-            return intDirection;
-        }
-    }
-
-    private ScrollUtils() {
-    }
-
-    /**
-     * Determines if the given ScrollEvent comes from a trackpad.
-     * <p></p>
-     * Although this method works in most cases, it is not very accurate.
-     * Since in JavaFX there's no way to tell if a ScrollEvent comes from a trackpad or a mouse
-     * we use this trick: I noticed that a mouse scroll has a delta of 32 (don't know if it changes depending on the device or OS)
-     * and trackpad scrolls have a way smaller delta. So depending on the scroll direction we check if the delta is lesser than 10
-     * (trackpad event) or greater(mouse event).
-     *
-     * @see ScrollEvent#getDeltaX()
-     * @see ScrollEvent#getDeltaY()
-     */
-    public static boolean isTrackPad(ScrollEvent event, ScrollDirection scrollDirection) {
-        switch (scrollDirection) {
-            case UP:
-            case DOWN:
-                return Math.abs(event.getDeltaY()) < 10;
-            case LEFT:
-            case RIGHT:
-                return Math.abs(event.getDeltaX()) < 10;
-            default:
-                return false;
-        }
-    }
-
-    /**
-     * Determines the scroll direction of the given ScrollEvent.
-     * <p></p>
-     * Although this method works fine, it is not very accurate.
-     * In JavaFX there's no concept of scroll direction, if you try to scroll with a trackpad
-     * you'll notice that you can scroll in both directions at the same time, both deltaX and deltaY won't be 0.
-     * <p></p>
-     * For this method to work we assume that this behavior is not possible.
-     * <p></p>
-     * If deltaY is 0 we return LEFT or RIGHT depending on deltaX (respectively if lesser or greater than 0).
-     * <p>
-     * Else we return DOWN or UP depending on deltaY (respectively if lesser or greater than 0).
-     *
-     * @see ScrollEvent#getDeltaX()
-     * @see ScrollEvent#getDeltaY()
-     */
-    public static ScrollDirection determineScrollDirection(ScrollEvent event) {
-        double deltaX = event.getDeltaX();
-        double deltaY = event.getDeltaY();
-
-        if (deltaY == 0.0) {
-            return deltaX < 0 ? ScrollDirection.LEFT : ScrollDirection.RIGHT;
-        } else {
-            return deltaY < 0 ? ScrollDirection.DOWN : ScrollDirection.UP;
-        }
-    }
-
-    //================================================================================
-    // ScrollPanes
-    //================================================================================
-
-    /**
-     * Adds a smooth scrolling effect to the given scroll pane,
-     * calls {@link #addSmoothScrolling(ScrollPane, double)} with a
-     * default speed value of 1.
-     */
-    public static void addSmoothScrolling(ScrollPane scrollPane) {
-        addSmoothScrolling(scrollPane, 1);
-    }
-
-    /**
-     * Adds a smooth scrolling effect to the given scroll pane with the given scroll speed.
-     * Calls {@link #addSmoothScrolling(ScrollPane, double, double)}
-     * with a default trackPadAdjustment of 7.
-     */
-    public static void addSmoothScrolling(ScrollPane scrollPane, double speed) {
-        addSmoothScrolling(scrollPane, speed, 7);
-    }
-
-    /**
-     * Adds a smooth scrolling effect to the given scroll pane with the given
-     * scroll speed and the given trackPadAdjustment.
-     * <p></p>
-     * The trackPadAdjustment is a value used to slow down the scrolling if a trackpad is used.
-     * This is kind of a workaround and it's not perfect, but at least it's way better than before.
-     * The default value is 7, tested up to 10, further values can cause scrolling misbehavior.
-     */
-    public static void addSmoothScrolling(ScrollPane scrollPane, double speed, double trackPadAdjustment) {
-        smoothScroll(scrollPane, speed, trackPadAdjustment);
-    }
-
-    private static void smoothScroll(ScrollPane scrollPane, double speed, double trackPadAdjustment) {
-        final double[] frictions = {0.99, 0.1, 0.05, 0.04, 0.03, 0.02, 0.01, 0.04, 0.01, 0.008, 0.008, 0.008, 0.008, 0.0006, 0.0005, 0.00003, 0.00001};
-        final double[] derivatives = new double[frictions.length];
-        AtomicReference<Double> atomicSpeed = new AtomicReference<>(speed);
-
-        Timeline timeline = new Timeline();
-        AtomicReference<ScrollDirection> scrollDirection = new AtomicReference<>();
-        final EventHandler<MouseEvent> mouseHandler = event -> timeline.stop();
-        final EventHandler<ScrollEvent> scrollHandler = event -> {
-            if (event.getEventType() == ScrollEvent.SCROLL) {
-                scrollDirection.set(determineScrollDirection(event));
-                if (isTrackPad(event, scrollDirection.get())) {
-                    atomicSpeed.set(speed / trackPadAdjustment);
-                } else {
-                    atomicSpeed.set(speed);
-                }
-                derivatives[0] += scrollDirection.get().intDirection * atomicSpeed.get();
-                if (timeline.getStatus() == Status.STOPPED) {
-                    timeline.play();
-                }
-                event.consume();
-            }
-        };
-        if (scrollPane.getContent().getParent() != null) {
-            scrollPane.getContent().getParent().addEventHandler(MouseEvent.MOUSE_PRESSED, mouseHandler);
-            scrollPane.getContent().getParent().addEventHandler(ScrollEvent.ANY, scrollHandler);
-        }
-        scrollPane.getContent().parentProperty().addListener((observable, oldValue, newValue) -> {
-            if (oldValue != null) {
-                oldValue.removeEventHandler(MouseEvent.MOUSE_PRESSED, mouseHandler);
-                oldValue.removeEventHandler(ScrollEvent.ANY, scrollHandler);
-            }
-            if (newValue != null) {
-                newValue.addEventHandler(MouseEvent.MOUSE_PRESSED, mouseHandler);
-                newValue.addEventHandler(ScrollEvent.ANY, scrollHandler);
-            }
-        });
-
-        timeline.getKeyFrames().add(new KeyFrame(Duration.millis(3), event -> {
-            for (int i = 0; i < derivatives.length; i++) {
-                derivatives[i] *= frictions[i];
-            }
-            for (int i = 1; i < derivatives.length; i++) {
-                derivatives[i] += derivatives[i - 1];
-            }
-
-            double dy = derivatives[derivatives.length - 1];
-            Function<Bounds, Double> sizeFunction = (scrollDirection.get() == ScrollDirection.UP || scrollDirection.get() == ScrollDirection.DOWN) ? Bounds::getHeight : Bounds::getWidth;
-            double size = sizeFunction.apply(scrollPane.getContent().getLayoutBounds());
-            double value;
-            switch (scrollDirection.get()) {
-                case LEFT:
-                case RIGHT:
-                    value = Math.min(Math.max(scrollPane.hvalueProperty().get() + dy / size, 0), 1);
-                    scrollPane.hvalueProperty().set(value);
-                    break;
-                case UP:
-                case DOWN:
-                    value = Math.min(Math.max(scrollPane.vvalueProperty().get() + dy / size, 0), 1);
-                    scrollPane.vvalueProperty().set(value);
-                    break;
-            }
-
-            if (Math.abs(dy) < 0.001) {
-                timeline.stop();
-            }
-        }));
-        timeline.setCycleCount(Animation.INDEFINITE);
-    }
-
-}
@@ -1,33 +0,0 @@
-package org.jackhuang.hmcl.ui;
-
-import javax.swing.*;
-
-public final class SwingUtils {
-    static {
-        if (System.getProperty("swing.defaultlaf") == null) {
-            try {
-                UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-            } catch (Throwable ignored) {
-            }
-        }
-    }
-
-    private SwingUtils() {
-    }
-
-    public static void initLookAndFeel() {
-        // Make sure the static constructor is called
-    }
-
-    public static void showInfoDialog(Object message) {
-        JOptionPane.showMessageDialog(null, message, "Info", JOptionPane.INFORMATION_MESSAGE);
-    }
-
-    public static void showWarningDialog(Object message) {
-        JOptionPane.showMessageDialog(null, message, "Warning", JOptionPane.WARNING_MESSAGE);
-    }
-
-    public static void showErrorDialog(Object message) {
-        JOptionPane.showMessageDialog(null, message, "Error", JOptionPane.ERROR_MESSAGE);
-    }
-}
@@ -18,6 +18,7 @@
 package org.jackhuang.hmcl.ui;

 import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXScrollPane;
 import javafx.beans.binding.Bindings;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
@@ -68,7 +69,7 @@ public abstract class ToolbarListPageSkin<T extends ListPageBase<? extends Node>
            Bindings.bindContent(content.getChildren(), skinnable.itemsProperty());

            scrollPane.setContent(content);
-            FXUtils.smoothScrolling(scrollPane);
+            JFXScrollPane.smoothScrolling(scrollPane);

            root.getContent().add(scrollPane);
        }
@@ -85,32 +86,32 @@ public abstract class ToolbarListPageSkin<T extends ListPageBase<? extends Node>
        return stackPane;
    }

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

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

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

@@ -1,123 +0,0 @@
-/*
- * 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);
-        }
-    }
-}
@@ -20,72 +20,57 @@ package org.jackhuang.hmcl.ui;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXDialogLayout;
 import javafx.scene.control.Label;
-import javafx.scene.control.ProgressIndicator;
-import javafx.scene.control.ScrollPane;
-import org.jackhuang.hmcl.task.Schedulers;
-import org.jackhuang.hmcl.task.Task;
+import javafx.scene.web.WebEngine;
+import javafx.scene.web.WebView;
+import org.jackhuang.hmcl.Metadata;
 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.io.IOException;
-import java.net.URL;
+import java.util.logging.Level;

 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 final class UpgradeDialog extends JFXDialogLayout {
+public class UpgradeDialog extends JFXDialogLayout {
    public UpgradeDialog(RemoteVersion remoteVersion, Runnable updateRunnable) {
-        setHeading(new Label(i18n("update.changelog")));
-        setBody(new ProgressIndicator());
+        {
+            setHeading(new Label(i18n("update.changelog")));
+        }

-        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");
+        {
+            String url = CHANGELOG_URL + remoteVersion.getChannel().channelName + ".html";
+            WebView webView = new WebView();
+            webView.getEngine().setUserDataDirectory(Metadata.HMCL_DIRECTORY.toFile());
+            try {
+                WebEngine engine = webView.getEngine();
+                engine.load(CHANGELOG_URL + remoteVersion.getChannel().channelName);
+                engine.getLoadWorker().stateProperty().addListener((observable, oldValue, newValue) -> {
+                    String viewURL = engine.getLoadWorker().getMessage().trim();
+                    if (!viewURL.startsWith(CHANGELOG_URL)) {
+                        engine.getLoadWorker().cancel();
+                        FXUtils.openLink(viewURL);
+                    }
+                });
+            } catch (NoClassDefFoundError | UnsatisfiedLinkError e) {
+                LOG.log(Level.WARNING, "WebView is missing or initialization failed", e);
                FXUtils.openLink(url);
-                setBody();
            }
-        }).start();
+            setBody(webView);
+        }

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

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

-        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);
+            setActions(updateButton, cancelButton);
+            onEscPressed(this, cancelButton::fire);
+        }
    }
 }
@@ -24,11 +24,11 @@ import javafx.beans.value.WeakChangeListener;
 import javafx.collections.ListChangeListener;
 import javafx.collections.WeakListChangeListener;

-import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;

 public class WeakListenerHolder {
-    private final List<Object> refs = new ArrayList<>(0);
+    private List<Object> refs = new LinkedList<>();

    public WeakListenerHolder() {
    }
				`@@ -1 +0,0 @@`
				<svg viewBox="0 -0.5 52 56" shape-rendering="crispEdges" xmlns="http://www.w3.org/2000/svg"><path stroke="#38342a" d="M28 0h4m-4 1h4m-4 1h4m-4 1h4m-8 1h4m4 0h4M24 5h4m4 0h4M24 6h4m4 0h4M24 7h4m4 0h4M24 8h4m8 0h4M24 9h4m8 0h4m-16 1h4m8 0h4m-16 1h4m8 0h4m-20 1h4m4 0h4m8 0h4m-24 1h4m4 0h4m8 0h4m-24 1h4m4 0h4m8 0h4m-24 1h4m4 0h4m8 0h4m-28 1h4m12 0h4m8 0h4m-32 1h4m12 0h4m8 0h4m-32 1h4m12 0h4m8 0h4m-32 1h4m12 0h4m8 0h4m-36 1h4m20 0h4m4 0h8m-40 1h4m20 0h4m4 0h8m-40 1h4m20 0h4m4 0h8m-40 1h4m20 0h4m4 0h8M8 24h4m28 0h4m4 0h4M8 25h4m28 0h4m4 0h4M8 26h4m28 0h4m4 0h4M8 27h4m28 0h4m4 0h4M4 28h4m32 0h8M4 29h4m32 0h8M4 30h4m32 0h8M4 31h4m32 0h8M0 32h4m32 0h4M0 33h4m32 0h4M0 34h4m32 0h4M0 35h4m32 0h4M0 36h4m28 0h4M0 37h4m28 0h4M0 38h4m28 0h4M0 39h4m28 0h4M4 40h4m20 0h4M4 41h4m20 0h4M4 42h4m20 0h4M4 43h4m20 0h4M8 44h4m12 0h4M8 45h4m12 0h4M8 46h4m12 0h4M8 47h4m12 0h4m-16 1h4m4 0h8m-16 1h4m4 0h8m-16 1h4m4 0h8m-16 1h4m4 0h8m-12 1h8m-8 1h8m-8 1h8m-8 1h8"/><path stroke="#dbd0b4" d="M28 4h4m-4 1h4m-4 1h4m-4 1h4m0 1h4m-4 1h4m-4 1h4m-4 1h4m-12 1h4m8 0h4m-16 1h4m8 0h4m-16 1h4m8 0h4m-16 1h4m8 0h4m-16 1h8m8 0h4m-20 1h8m8 0h4m-20 1h8m8 0h4m-20 1h8m8 0h4m-28 1h8m4 0h8m-20 1h8m4 0h8m-20 1h8m4 0h8m-20 1h8m4 0h8m-24 1h16m-16 1h16m-16 1h16m-16 1h16M8 28h8m4 0h12M8 29h8m4 0h12M8 30h8m4 0h12M8 31h8m4 0h12M8 32h12m8 0h4M8 33h12m8 0h4M8 34h12m8 0h4M8 35h12m8 0h4m-20 1h12m-12 1h12m-12 1h12m-12 1h12m-8 1h8m-8 1h8m-8 1h8m-8 1h8"/><path stroke="#c6bca5" d="M28 8h4m-4 1h4m-4 1h4m-4 1h4m-12 5h4m-4 1h4m-4 1h4m-4 1h4m0 1h4m-4 1h4m-4 1h4m-4 1h4m0 1h8m-8 1h8m-8 1h8m-8 1h8m-20 1h4m-4 1h4m-4 1h4m-4 1h4m0 1h8m-8 1h8m-8 1h8m-8 1h8"/><path stroke="#bcb29c" d="M32 12h4m-4 1h4m-4 1h4m-4 1h4m0 1h4m-4 1h4m-4 1h4m-4 1h4m0 1h4m-4 1h4m-4 1h4m-4 1h4m-8 1h4m-4 1h4m-4 1h4m-4 1h4m-8 1h8m-8 1h8m-8 1h8m-8 1h8m-8 1h4m-4 1h4m-4 1h4m-4 1h4m-12 1h8m-8 1h8m-8 1h8m-8 1h8m-8 1h4m-4 1h4m-4 1h4m-4 1h4m-8 1h4m-4 1h4m-4 1h4m-4 1h4"/><path stroke="#807a6d" d="M44 24h4m-4 1h4m-4 1h4m-4 1h4"/><path stroke="#aea694" d="M4 32h4m-4 1h4m-4 1h4m-4 1h4m0 1h4m-4 1h4m-4 1h4m-4 1h4m0 1h4m-4 1h4m-4 1h4m-4 1h4m0 1h4m-4 1h4m-4 1h4m-4 1h4"/><path stroke="#9a927e" d="M4 36h4m-4 1h4m-4 1h4m-4 1h4m0 1h4m-4 1h4m-4 1h4m-4 1h4m0 1h4m-4 1h4m-4 1h4m-4 1h4m0 1h4m-4 1h4m-4 1h4m-4 1h4"/></svg>