feat: custom zipfilesystem.

* fix: The implementation of 'Files.isWritable' is incorrect

* Report Samba problems to users

* Rollback FileUtils

.github/ISSUE_TEMPLATE.md

@@ -6,9 +6,10 @@
 
 
 
-我们发现，对于不经常检查邮箱的人来说，GitHub issues 的反馈效率太低，时隔几个小时甚至一天的情况很多。为了改善反馈效率，并将积极为 HMCL 提供问题反馈和建议的人聚集起来，我们希望在这里反馈的人可以在 HMCL 3 用户 QQ 群：219177735 中反馈信息，**而不在 GitHub Issues 中反馈问题**。
+我们发现，对于不经常检查邮箱的人来说，GitHub Issues 的反馈效率太低，时隔几个小时甚至一天的情况很多。
+为了改善反馈效率，并将积极为 HMCL 提供问题反馈和建议的人聚集起来，我们希望在这里反馈的人可以在 [Discord频道](https://discord.gg/jVvC7HfM6U)  [开黑啦频道](https://kaihei.co/Kx7n3t) 中反馈信息，**而不在 GitHub Issues 中反馈问题**。
 
-如果你希望在 QQ 群中反馈问题，也请将下面的信息表填好直接发在群中，加快我们的沟通速度。
+如果你希望在 QQ 群中反馈问题，请[赞助 HMCL](https://afdian.net/@huanghongxun) 后申请加入群聊，也请将下面的信息表填好直接发在群中，加快我们的沟通速度。
 
 
 
@@ -24,5 +25,5 @@
 * 对游戏做的修改（是否自行通过安装器安装 Rift 等 API，以及 mod）：
 * 游戏崩溃报告（如果有）：
 * 启动器崩溃报告（如果有）：
-* 启动器日志文件（在启动器设置中打开日志文件夹并将文件夹内所有文件打包发在这里）：
-* 问题描述（如何触发问题）：
+* 启动器日志文件（出现问题后点击启动器设置中的【导出启动器日志】按钮）：
+* 问题描述（如何触发问题）：

.github/workflows/check-style.yml

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

.github/workflows/check-translations.yml

@@ -0,0 +1,21 @@
+name: Check Translations
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Checkout submodules
+        run: git submodule update --init --recursive
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          distribution: 'zulu'
+          java-version: '11'
+          java-package: jdk+fx
+      - name: Check style test
+        run: ./gradlew checkTranslations

.github/workflows/check-update.yml

@@ -0,0 +1,67 @@
+name: Check Update
+
+on:
+  push:
+    branches:
+      - javafx
+
+jobs:
+  check-update:
+    if: ${{ github.repository_owner == 'huanghongxun' }}
+    runs-on: ubuntu-latest
+    env:
+      HMCL_BASE_VERSION: '3.4'
+    steps:
+      - uses: actions/checkout@v2
+      - 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/lastSuccessfulBuild/api/json
+
+          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
+      - name: Check for existing tags
+        run: if [ -z "$(git tag -l "$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.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
+        if: ${{ env.continue == 'true' }}
+        run: |
+          echo "HMCL v$HMCL_VERSION" >> RELEASE_NOTE
+          echo "" >> RELEASE_NOTE
+          echo "The full changelogs can be found on the website: https://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
+        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
+          target_commitish: ${{ env.HMCL_COMMIT_SHA }}
+          name: ${{ env.HMCL_TAG_NAME }}
+          tag_name: ${{ env.HMCL_TAG_NAME }}
+
+

.github/workflows/gradle.yml

@@ -0,0 +1,28 @@
+name: Java CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - 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: '11'
+        java-package: jdk+fx
+    - name: Build with Gradle
+      run: ./gradlew build
+    - name: Get short SHA
+      run: echo "SHORT_SHA=${GITHUB_SHA::7}" >> $GITHUB_ENV
+    - name: Upload Artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: HMCL-${{ env.SHORT_SHA }}
+        path: HMCL/build/libs

.github/workflows/release.yml

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

.gitignore

@@ -10,27 +10,40 @@ hs_err_pid*
 *.2
 *.log
 .mine*
+/externalgames
 NVIDIA
-*.json
 
 # gradle build
 /build/
 /HMCL/build/
 /HMCLCore/build/
+/HMCLTransformerDiscoveryService/build/
 
 # idea
 .idea
 /out/
 /HMCL/out/
 /HMCLCore/out/
+/HMCLTransformerDiscoveryService/out/
 
 # eclipse
 /bin/
 /HMCL/bin/
 /HMCLCore/bin/
+/HMCLTransformerDiscoveryService/bin/
 .classpath
 .project
 .settings
 
 # netbeans
 .nb-gradle
+
+*.exe
+!/HMCL/src/main/resources/assets/HMCLauncher.exe
+
+# macos
+.DS_Store
+
+# test
+/hmcl.json
+/.hmcl.json

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "JSTUN"]
+	path = JSTUN
+	url = https://github.com/huanghongxun/JSTUN

HMCL/.gitignore

@@ -0,0 +1,2 @@
+/data.csv
+/data.json

HMCL/build.gradle

@@ -1,6 +1,19 @@
+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 'com.github.johnrengelman.shadow' version '4.0.0'
     id 'application'
+    id 'com.github.johnrengelman.shadow' version '7.0.0'
 }
 
 import java.nio.file.FileSystems
@@ -10,25 +23,33 @@ import java.security.Signature
 import java.security.spec.PKCS8EncodedKeySpec
 import java.util.jar.JarFile
 import java.util.jar.JarOutputStream
-import java.util.jar.Pack200
 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 buildnumber = System.getenv("BUILD_NUMBER") ?: "SNAPSHOT"
+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.2"
+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 {
-    compile project(":HMCLCore")
-    compile rootProject.files("lib/JFoenix.jar")
+    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) {
@@ -69,40 +90,164 @@ 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) }
 }
 
-jar {
-    manifest {
-        attributes 'Created-By': 'Copyright(c) 2013-2018 huangyuhui.',
-                'Main-Class': mainClassName,
-                'Multi-Release': 'true',
-                'Implementation-Version': version
+sourceSets {
+    java11 {
+        java {
+            srcDirs = ['src/main/java11']
+        }
     }
-    finalizedBy shadowJar
+}
+
+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 = null
+    classifier = "shadow"
 
-    exclude 'META-INF/maven/**'
-    exclude 'META-INF/NOTICE.txt'
-    exclude 'META-INF/LICENSE.txt'
+    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(" ")
+    }
+}
 
-    dependencies {
-        exclude(dependency('org.jetbrains:annotations'))
+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)
+        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
@@ -112,13 +257,15 @@ def createExecutable(String suffix, String header) {
 
 processResources {
     ext.convertToBSS = { String resource ->
-        exclude 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()
-            exec {
-                commandLine 'javapackager', '-createbss', '-outdir', bssFile.parent, '-srcfiles', cssFile.path
+            javaexec {
+                classpath = sourceSets.main.compileClasspath
+                mainClass = "com.sun.javafx.css.parser.Css2Bin"
+                args = [cssFile, bssFile]
             }
         }
     }
@@ -126,6 +273,11 @@ processResources {
 
     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) {
@@ -140,7 +292,8 @@ task makePack(dependsOn: jar) {
 
 task makePackXz(dependsOn: makePack) doLast {
     def packXz = new File(makePack.outputPath.parentFile, makePack.outputPath.name + ".xz")
-    new XZOutputStream(packXz.newOutputStream(), new LZMA2Options(6)).withCloseable { it << makePack.outputPath.bytes }
+    // 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)
 }
 

HMCL/parse_mcmod_data.py

@@ -0,0 +1,138 @@
+#
+# 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/>.
+#
+
+import json
+import codecs
+import re
+from urllib.parse import urlparse, parse_qs
+
+S = ';'
+
+MOD_SEPARATOR = ','
+
+CURSEFORGE_PATTERN1 = re.compile(
+    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-]+)(/(.*?))?$')
+
+
+def parseCurseforge(url):
+    res = urlparse(url)
+    if res.scheme not in ['http', 'https']:
+        return ''
+    for pattern in [CURSEFORGE_PATTERN1, CURSEFORGE_PATTERN2, CURSEFORGE_PATTERN3]:
+        match = pattern.match(res.path)
+        if match:
+            return match.group('modid')
+    return ''
+
+
+MCMOD_PATTERN = re.compile(
+    r'^http(s)?://www\.mcmod\.cn/class/(?P<modid>\d+)\.html$')
+
+
+def parseMcmod(url):
+    match = MCMOD_PATTERN.match(url)
+    if match:
+        return match.group('modid')
+    return ''
+
+
+MCBBS_HTML_PATTERN = re.compile(r'/thread-(?P<modid>\d+)-(\d+)-(\d+).html')
+MCBBS_PHP_PATTERN = re.compile(r'')
+
+
+def parseMcbbs(url):
+    res = urlparse(url)
+    if res.scheme not in ['http', 'https']:
+        return ''
+    if res.netloc != 'www.mcbbs.net':
+        return ''
+    match = MCBBS_HTML_PATTERN.match(res.path)
+    if match:
+        return match.group('modid')
+
+    query = parse_qs(res.query)
+
+    if res.path == '/forum.php':
+        if 'mod' in query and 'tid' in query and query['mod'] == ['viewthread']:
+            return query['tid']
+
+    return ''
+
+
+if __name__ == '__main__':
+    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:
+            chinese_name = mod['name']['main']
+            sub_name = mod['name']['sub']
+            abbr = mod['name']['abbr']
+
+            if S in chinese_name:
+                print('Error! ' + chinese_name)
+                exit(1)
+
+            if S in sub_name:
+                print('Error! ' + chinese_name)
+                exit(1)
+
+            black_lists = [
+                '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']:
+                    curseforge_id = parseCurseforge(link['url'])
+                    if curseforge_id != '':
+                        break
+                if curseforge_id == '':
+                    print('Error curseforge ' + chinese_name)
+                    exit(1)
+            if 'mcmod' in links and links['mcmod']:
+                mcmod_id = parseMcmod(links['mcmod'][0]['url'])
+                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 'list' in mod['modid']:
+                for id in mod['modid']['list']:
+                    if MOD_SEPARATOR in id:
+                        print('Error mod id!' + id)
+                        exit(1)
+
+                    mod_id.append(id)
+            mod_ids = MOD_SEPARATOR.join([str(id) for id in mod_id])
+
+            outfile.write(
+                f'{curseforge_id}{S}{mcmod_id}{S}{mcbbs_id}{S}{mod_ids}{S}{chinese_name}{S}{sub_name}{S}{abbr}\n')
+
+    print('Success!')

HMCL/settings.gradle

@@ -1,2 +0,0 @@
-rootProject.name = 'HMCL'
-

HMCL/src/main/java/moe/mickey/minecraft/skin/fx/FunctionHelper.java

@@ -0,0 +1,68 @@
+package moe.mickey.minecraft.skin.fx;
+
+import javafx.event.Event;
+import javafx.event.EventHandler;
+
+import java.util.Arrays;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+public final class FunctionHelper {
+
+    private FunctionHelper() {
+    }
+
+    @SafeVarargs
+    public static <T> void always(Consumer<T> consumer, T... ts) {
+        Arrays.asList(ts).forEach(consumer);
+    }
+
+    @SafeVarargs
+    public static <A, B> void alwaysA(BiConsumer<A, B> consumer, A a, B... bs) {
+        Arrays.asList(bs).forEach(b -> consumer.accept(a, b));
+    }
+
+    @SafeVarargs
+    public static <A, B> void alwaysB(BiConsumer<A, B> consumer, B b, A... as) {
+        Arrays.asList(as).forEach(a -> consumer.accept(a, b));
+    }
+
+    public static <A, B> BiConsumer<B, A> exchange(BiConsumer<A, B> consumer) {
+        return (b, a) -> consumer.accept(a, b);
+    }
+
+    @SafeVarargs
+    public static <T> Consumer<T> link(Consumer<T>... consumers) {
+        return t -> {
+            for (Consumer<T> consumer : consumers)
+                consumer.accept(t);
+        };
+    }
+
+    @SafeVarargs
+    public static <T extends Event> EventHandler<T> link(EventHandler<T>... handlers) {
+        return t -> {
+            for (EventHandler<T> handler : handlers)
+                handler.handle(t);
+        };
+    }
+
+    public static <A, B> Consumer<A> link1(Function<A, B> function, Consumer<B> consumer) {
+        return a -> consumer.accept(function.apply(a));
+    }
+
+    public static <A, B, C> BiConsumer<A, C> link2(Function<A, B> function, BiConsumer<B, C> consumer) {
+        return (a, c) -> consumer.accept(function.apply(a), c);
+    }
+
+    public static <A, B> Consumer<B> link2(Supplier<A> supplier, BiConsumer<A, B> consumer) {
+        return b -> consumer.accept(supplier.get(), b);
+    }
+
+    public static <A, B> Supplier<B> link1(Supplier<A> supplier, Function<A, B> function) {
+        return () -> function.apply(supplier.get());
+    }
+
+}

HMCL/src/main/java/moe/mickey/minecraft/skin/fx/SkinAnimation.java

@@ -0,0 +1,58 @@
+package moe.mickey.minecraft.skin.fx;
+
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
+
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+
+public class SkinAnimation {
+
+    protected int weight, left;
+    protected List<SkinTransition> transitions;
+
+    @Deprecated
+    public SkinAnimation() {
+        this.transitions = new LinkedList<>();
+    }
+
+    public SkinAnimation(int weight, SkinTransition... transitions) {
+        this.weight = weight;
+        this.transitions = Arrays.asList(transitions);
+        init();
+    }
+
+    protected void init() {
+        transitions.forEach(t -> {
+            EventHandler<ActionEvent> oldHandler = t.getOnFinished();
+            EventHandler<ActionEvent> newHandler = e -> left--;
+            newHandler = oldHandler == null ? newHandler : FunctionHelper.link(oldHandler, newHandler);
+            t.setOnFinished(newHandler);
+        });
+    }
+
+    public int getWeight() {
+        return weight;
+    }
+
+    public boolean isPlaying() {
+        return left > 0;
+    }
+
+    public void play() {
+        transitions.forEach(SkinTransition::play);
+        left = transitions.size();
+    }
+
+    public void playFromStart() {
+        transitions.forEach(SkinTransition::playFromStart);
+        left = transitions.size();
+    }
+
+    public void stop() {
+        transitions.forEach(SkinTransition::stop);
+        left = 0;
+    }
+
+}

HMCL/src/main/java/moe/mickey/minecraft/skin/fx/SkinAnimationPlayer.java

@@ -0,0 +1,93 @@
+package moe.mickey.minecraft.skin.fx;
+
+import javafx.animation.AnimationTimer;
+
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.Random;
+
+public class SkinAnimationPlayer {
+
+    protected final Random random = new Random();
+    protected LinkedList<SkinAnimation> animations = new LinkedList<>();
+    protected SkinAnimation playing;
+    protected boolean running;
+    protected int weightedSum = 0;
+    protected long lastPlayTime = -1L, interval = 10_000_000_000L;
+    protected AnimationTimer animationTimer = new AnimationTimer() {
+        @Override
+        public void handle(long now) {
+            if (playing == null || !playing.isPlaying() && now - lastPlayTime > interval) {
+                int nextAni = random.nextInt(weightedSum);
+                SkinAnimation tmp = null;
+                for (SkinAnimation animation : animations) {
+                    nextAni -= animation.getWeight();
+                    tmp = animation;
+                    if (nextAni <= 0)
+                        break;
+                }
+                playing = tmp;
+                if (playing == null && animations.size() > 0)
+                    playing = animations.getLast();
+                if (playing != null) {
+                    playing.playFromStart();
+                    lastPlayTime = now;
+                }
+            }
+        }
+    };
+
+    public int getWeightedSum() {
+        return weightedSum;
+    }
+
+    public void setInterval(long interval) {
+        this.interval = interval;
+        if (interval < 1)
+            animationTimer.stop();
+        else
+            start();
+    }
+
+    public long getInterval() {
+        return interval;
+    }
+
+    public long getLastPlayTime() {
+        return lastPlayTime;
+    }
+
+    public boolean isRunning() {
+        return running;
+    }
+
+    public boolean isPlaying() {
+        return playing != null;
+    }
+
+    public SkinAnimation getPlaying() {
+        return playing;
+    }
+
+    public void addSkinAnimation(SkinAnimation... animations) {
+        this.animations.addAll(Arrays.asList(animations));
+        this.weightedSum = this.animations.stream().mapToInt(SkinAnimation::getWeight).sum();
+        start();
+    }
+
+    public void start() {
+        if (!running && weightedSum > 0 && interval > 0) {
+            animationTimer.start();
+            running = true;
+        }
+    }
+
+    public void stop() {
+        if (running)
+            animationTimer.stop();
+        if (playing != null)
+            playing.stop();
+        running = false;
+    }
+
+}

HMCL/src/main/java/moe/mickey/minecraft/skin/fx/SkinCanvas.java

@@ -0,0 +1,255 @@
+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.Material;
+import javafx.scene.paint.PhongMaterial;
+import javafx.scene.shape.Shape3D;
+import javafx.scene.transform.Rotate;
+import javafx.scene.transform.Scale;
+import javafx.scene.transform.Translate;
+
+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;
+    protected boolean isSlim;
+
+    protected double preW, preH;
+    protected boolean msaa;
+
+    protected SubScene subScene;
+    protected Group root = new Group();
+
+    public final SkinMultipleCubes headOuter = new SkinMultipleCubes(8, 8, 8, 32F / 64F, 0F, 1.125, 0.2);
+    public final SkinMultipleCubes bodyOuter = new SkinMultipleCubes(8, 12, 4, 16F / 64F, 32F / 64F, 1, 0.2);
+    public final SkinMultipleCubes larmOuter = new SkinMultipleCubes(4, 12, 4, 48F / 64F, 48F / 64F, 1.0625, 0.2);
+    public final SkinMultipleCubes rarmOuter = new SkinMultipleCubes(4, 12, 4, 40F / 64F, 32F / 64F, 1.0625, 0.2);
+    public final SkinMultipleCubes llegOuter = new SkinMultipleCubes(4, 12, 4, 0F / 64F, 48F / 64F, 1.0625, 0.2);
+    public final SkinMultipleCubes rlegOuter = new SkinMultipleCubes(4, 12, 4, 0F / 64F, 32F / 64F, 1.0625, 0.2);
+
+    public final SkinCube headInside = new SkinCube(8, 8, 8, 32F / 64F, 16F / 64F, 0F, 0F, 0F, false);
+    public final SkinCube bodyInside = new SkinCube(8, 12, 4, 24F / 64F, 16F / 64F, 16F / 64F, 16F / 64F, 0.03F, false);
+    public final SkinCube larmInside = new SkinCube(4, 12, 4, 16F / 64F, 16F / 64F, 32F / 64F, 48F / 64F, 0F, false);
+    public final SkinCube rarmInside = new SkinCube(4, 12, 4, 16F / 64F, 16F / 64F, 40F / 64F, 16F / 64F, 0F, false);
+    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 SkinGroup head = new SkinGroup(
+            new Rotate(0, 0, headInside.getHeight() / 2, 0, Rotate.X_AXIS),
+            new Rotate(0, Rotate.Y_AXIS),
+            new Rotate(0, 0, headInside.getHeight() / 2, 0, Rotate.Z_AXIS),
+            headOuter, headInside
+    );
+    public final SkinGroup body = new SkinGroup(
+            new Rotate(0, Rotate.X_AXIS),
+            new Rotate(0, Rotate.Y_AXIS),
+            new Rotate(0, Rotate.Z_AXIS),
+            bodyOuter, bodyInside
+    );
+    public final SkinGroup larm = new SkinGroup(
+            new Rotate(0, 0, -larmInside.getHeight() / 2, 0, Rotate.X_AXIS),
+            new Rotate(0, Rotate.Y_AXIS),
+            new Rotate(0, +larmInside.getWidth() / 2, -larmInside.getHeight() / 2, 0, Rotate.Z_AXIS),
+            larmOuter, larmInside
+    );
+    public final SkinGroup rarm = new SkinGroup(
+            new Rotate(0, 0, -rarmInside.getHeight() / 2, 0, Rotate.X_AXIS),
+            new Rotate(0, Rotate.Y_AXIS),
+            new Rotate(0, -rarmInside.getWidth() / 2, -rarmInside.getHeight() / 2, 0, Rotate.Z_AXIS),
+            rarmOuter, rarmInside
+    );
+    public final SkinGroup lleg = new SkinGroup(
+            new Rotate(0, 0, -llegInside.getHeight() / 2, 0, Rotate.X_AXIS),
+            new Rotate(0, Rotate.Y_AXIS),
+            new Rotate(0, 0, -llegInside.getHeight() / 2, 0, Rotate.Z_AXIS),
+            llegOuter, llegInside
+    );
+    public final SkinGroup rleg = new SkinGroup(
+            new Rotate(0, 0, -rlegInside.getHeight() / 2, 0, Rotate.X_AXIS),
+            new Rotate(0, Rotate.Y_AXIS),
+            new Rotate(0, 0, -rlegInside.getHeight() / 2, 0, Rotate.Z_AXIS),
+            rlegOuter, rlegInside
+    );
+
+    protected PerspectiveCamera camera = new PerspectiveCamera(true);
+
+    protected Rotate xRotate = new Rotate(0, Rotate.X_AXIS);
+    protected Rotate yRotate = new Rotate(180, Rotate.Y_AXIS);
+    protected Rotate zRotate = new Rotate(0, Rotate.Z_AXIS);
+    protected Translate translate = new Translate(0, 0, -80);
+    protected Scale scale = new Scale(1, 1);
+
+    protected SkinAnimationPlayer animationplayer = new SkinAnimationPlayer();
+
+    public SkinAnimationPlayer getAnimationplayer() {
+        return animationplayer;
+    }
+
+    public Image getSrcSkin() {
+        return srcSkin;
+    }
+
+    public Image getSkin() {
+        return skin;
+    }
+
+    public void updateSkin(Image skin, boolean isSlim) {
+        if (SkinHelper.isNoRequest(skin) && SkinHelper.isSkin(skin)) {
+            this.srcSkin = skin;
+            this.skin = SkinHelper.x32Tox64(skin);
+            int multiple = Math.max((int) (1024 / skin.getWidth()), 1);
+            if (multiple > 1)
+                this.skin = SkinHelper.enlarge(this.skin, multiple);
+            if (this.isSlim != isSlim)
+                updateSkinModel(isSlim);
+            bindMaterial(root);
+        }
+    }
+
+    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);
+
+        FunctionHelper.alwaysB(Node::setTranslateX, -(bodyInside.getWidth() + larmInside.getWidth()) / 2, larm);
+        FunctionHelper.alwaysB(Node::setTranslateX, +(bodyInside.getWidth() + rarmInside.getWidth()) / 2, rarm);
+        if (isSlim) {
+            larmInside.setModel(ALEX_LARM.getModel());
+            rarmInside.setModel(ALEX_RARM.getModel());
+        } else {
+            larmInside.setModel(STEVEN_LARM.getModel());
+            rarmInside.setModel(STEVEN_RARM.getModel());
+        }
+
+        larm.getZRotate().setPivotX(-larmInside.getWidth() / 2);
+        rarm.getZRotate().setPivotX(+rarmInside.getWidth() / 2);
+    }
+
+    public SkinCanvas(double preW, double preH) {
+        this(STEVE, preW, preH, true);
+    }
+
+    public SkinCanvas(Image skin, double preW, double preH, boolean msaa) {
+        this.skin = skin;
+        this.preW = preW;
+        this.preH = preH;
+        this.msaa = msaa;
+
+        init();
+    }
+
+    protected Material createMaterial() {
+        PhongMaterial material = new PhongMaterial();
+        material.setDiffuseMap(skin);
+        return material;
+    }
+
+    protected void bindMaterial(Group group) {
+        Material material = createMaterial();
+        for (Node node : group.getChildren())
+            if (node instanceof Shape3D)
+                ((Shape3D) node).setMaterial(material);
+            else if (node instanceof SkinMultipleCubes)
+                ((SkinMultipleCubes) node).updateSkin(skin);
+            else if (node instanceof Group)
+                bindMaterial((Group) node);
+    }
+
+    protected Group createPlayerModel() {
+        head.setTranslateY(-(bodyInside.getHeight() + headInside.getHeight()) / 2);
+
+        larm.setTranslateX(-(bodyInside.getWidth() + larmInside.getWidth()) / 2);
+        rarm.setTranslateX(+(bodyInside.getWidth() + rarmInside.getWidth()) / 2);
+
+        lleg.setTranslateX(-(bodyInside.getWidth() - llegInside.getWidth()) / 2);
+        rleg.setTranslateX(+(bodyInside.getWidth() - rlegInside.getWidth()) / 2);
+
+        lleg.setTranslateY(+(bodyInside.getHeight() + llegInside.getHeight()) / 2);
+        rleg.setTranslateY(+(bodyInside.getHeight() + rlegInside.getHeight()) / 2);
+
+        root.getTransforms().addAll(xRotate);
+
+        root.getChildren().addAll(
+                head,
+                body,
+                larm,
+                rarm,
+                lleg,
+                rleg
+        );
+        updateSkin(skin, false);
+
+        return root;
+    }
+
+    protected SubScene createSubScene() {
+        Group group = new Group();
+        group.getChildren().add(createPlayerModel());
+        group.getTransforms().add(zRotate);
+
+        camera.getTransforms().addAll(yRotate, translate, scale);
+
+        subScene = new SubScene(group, preW, preH, true,
+                msaa ? SceneAntialiasing.BALANCED : SceneAntialiasing.DISABLED);
+        subScene.setCamera(camera);
+
+        return subScene;
+    }
+
+    protected void init() {
+        getChildren().add(createSubScene());
+    }
+
+    private double lastX, lastY;
+
+    public void enableRotation(double sensitivity) {
+        addEventHandler(MouseEvent.MOUSE_PRESSED, e -> {
+            lastX = -1;
+            lastY = -1;
+        });
+        addEventHandler(MouseEvent.MOUSE_DRAGGED, e -> {
+            if (!(lastX == -1 || lastY == -1)) {
+                if (e.isAltDown() || e.isControlDown() || e.isShiftDown()) {
+                    if (e.isShiftDown())
+                        zRotate.setAngle(zRotate.getAngle() - (e.getSceneY() - lastY) * sensitivity);
+                    if (e.isAltDown())
+                        yRotate.setAngle(yRotate.getAngle() + (e.getSceneX() - lastX) * sensitivity);
+                    if (e.isControlDown())
+                        xRotate.setAngle(xRotate.getAngle() + (e.getSceneY() - lastY) * sensitivity);
+                } else {
+                    double yaw = yRotate.getAngle() + (e.getSceneX() - lastX) * sensitivity;
+                    yaw %= 360;
+                    if (yaw < 0)
+                        yaw += 360;
+
+                    int flagX = yaw < 90 || yaw > 270 ? 1 : -1;
+                    int flagZ = yaw < 180 ? -1 : 1;
+                    double kx = Math.abs(90 - yaw % 180) / 90 * flagX, kz = Math.abs(90 - (yaw + 90) % 180) / 90 * flagZ;
+
+                    xRotate.setAngle(xRotate.getAngle() + (e.getSceneY() - lastY) * sensitivity * kx);
+                    yRotate.setAngle(yaw);
+                    zRotate.setAngle(zRotate.getAngle() + (e.getSceneY() - lastY) * sensitivity * kz);
+                }
+            }
+            lastX = e.getSceneX();
+            lastY = e.getSceneY();
+        });
+        addEventHandler(ScrollEvent.SCROLL, e -> {
+            double delta = (e.getDeltaY() > 0 ? 1 : e.getDeltaY() == 0 ? 0 : -1) / 10D * sensitivity;
+            scale.setX(Math.min(Math.max(scale.getX() - delta, 0.1), 10));
+            scale.setY(Math.min(Math.max(scale.getY() - delta, 0.1), 10));
+        });
+    }
+
+}

HMCL/src/main/java/moe/mickey/minecraft/skin/fx/SkinCube.java

@@ -0,0 +1,142 @@
+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 {
+
+    public static class Model extends TriangleMesh {
+
+        public Model(float width, float height, float depth, float scaleX, float scaleY, float startX, float startY, boolean isSlim) {
+            getPoints().addAll(createPoints(width, height, depth));
+            getTexCoords().addAll(createTexCoords(width, height, depth, scaleX, scaleY, startX, startY, isSlim));
+            getFaces().addAll(createFaces());
+        }
+
+        public static float[] createPoints(float width, float height, float depth) {
+            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
+            };
+        }
+
+        public static float[] createTexCoords(float width, float height, float depth, float scaleX, float scaleY,
+                                              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   |
+                    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 + half_depth + half_width, bottom_y,    // T10  |
+                    bottom_x + scaleX - arm4, bottom_y,                // T11  |
+                    bottom_x + scaleX, bottom_y                        // T12 ---
+            };
+        }
+
+        public static int[] createFaces() {
+            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
+                    // 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
+                    // 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
+                    // 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
+            };
+
+            int[] copy = faces.clone();
+            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;
+            }
+            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) {
+        this.width = width;
+        this.height = height;
+        this.depth = depth;
+        this.isSlim = isSlim;
+        setMesh(model = new Model(width + enlarge, height + enlarge, depth + enlarge, scaleX, scaleY, startX, startY, isSlim));
+    }
+
+    public void setWidth(double width) {
+        this.width = width;
+    }
+
+    public double getWidth() {
+        return width;
+    }
+
+    public void setHeight(double height) {
+        this.height = height;
+    }
+
+    public double getHeight() {
+        return height;
+    }
+
+    public void setDepth(double depth) {
+        this.depth = depth;
+    }
+
+    public double getDepth() {
+        return depth;
+    }
+
+    public boolean isSlim() {
+        return isSlim;
+    }
+
+    public Mesh getModel() {
+        return model;
+    }
+
+    public void setModel(Mesh model) {
+        this.model = model;
+        setMesh(model);
+    }
+
+}

HMCL/src/main/java/moe/mickey/minecraft/skin/fx/SkinGroup.java

@@ -0,0 +1,45 @@
+package moe.mickey.minecraft.skin.fx;
+
+import javafx.scene.Group;
+import javafx.scene.Node;
+import javafx.scene.transform.Rotate;
+
+public class SkinGroup extends Group {
+
+    protected Rotate xRotate, yRotate, zRotate;
+
+    public SkinGroup(Rotate xRotate, Rotate yRotate, Rotate zRotate, Node... nodes) {
+        this.xRotate = xRotate;
+        this.yRotate = yRotate;
+        this.zRotate = zRotate;
+        Group group = new Group();
+        group.getChildren().addAll(nodes);
+        getChildren().add(addRotate(group, xRotate, yRotate, zRotate));
+    }
+
+    protected Group addRotate(Group group, Rotate... rotates) {
+        for (Rotate rotate : rotates)
+            group = addRotate(group, rotate);
+        return group;
+    }
+
+    protected Group addRotate(Group group, Rotate rotate) {
+        Group newGroup = new Group();
+        group.getTransforms().add(rotate);
+        newGroup.getChildren().add(group);
+        return newGroup;
+    }
+
+    public Rotate getXRotate() {
+        return xRotate;
+    }
+
+    public Rotate getYRotate() {
+        return yRotate;
+    }
+
+    public Rotate getZRotate() {
+        return zRotate;
+    }
+
+}

HMCL/src/main/java/moe/mickey/minecraft/skin/fx/SkinHelper.java

@@ -0,0 +1,125 @@
+package moe.mickey.minecraft.skin.fx;
+
+import javafx.scene.image.Image;
+import javafx.scene.image.PixelReader;
+import javafx.scene.image.PixelWriter;
+import javafx.scene.image.WritableImage;
+
+public final class SkinHelper {
+
+    private SkinHelper() {
+    }
+
+    public static class PixelCopyer {
+
+        protected Image srcImage;
+        protected WritableImage newImage;
+
+        public PixelCopyer(Image srcImage, WritableImage newImage) {
+            this.srcImage = srcImage;
+            this.newImage = newImage;
+        }
+
+        public void copy(int srcX, int srcY, int width, int height) {
+            copy(srcX, srcY, srcX, srcY, width, height);
+        }
+
+        public void copy(int srcX, int srcY, int toX, int toY, int width, int height) {
+            copy(srcX, srcY, toX, toY, width, height, false, false);
+        }
+
+        public void copy(int srcX, int srcY, int toX, int toY, int width, int height, boolean reversalX, boolean reversalY) {
+            PixelReader reader = srcImage.getPixelReader();
+            PixelWriter writer = newImage.getPixelWriter();
+            for (int x = 0; x < width; x++)
+                for (int y = 0; y < height; y++)
+                    writer.setArgb(toX + x, toY + y,
+                            reader.getArgb(srcX + (reversalX ? width - x - 1 : x), srcY + (reversalY ? height - y - 1 : y)));
+        }
+
+        public void copy(float srcX, float srcY, float toX, float toY, float width, float height) {
+            copy(srcX, srcY, toX, toY, width, height, false, false);
+        }
+
+        public void copy(float srcX, float srcY, float toX, float toY, float width, float height, boolean reversalX, boolean reversalY) {
+            PixelReader reader = srcImage.getPixelReader();
+            PixelWriter writer = newImage.getPixelWriter();
+            int srcScaleX = (int) srcImage.getWidth();
+            int srcScaleY = (int) srcImage.getHeight();
+            int newScaleX = (int) newImage.getWidth();
+            int newScaleY = (int) newImage.getHeight();
+            int srcWidth = (int) (width * srcScaleX);
+            int srcHeight = (int) (height * srcScaleY);
+
+            for (int x = 0; x < srcWidth; x++)
+                for (int y = 0; y < srcHeight; y++)
+                    writer.setArgb((int) (toX * newScaleX + x), (int) (toY * newScaleY + y),
+                            reader.getArgb((int) (srcX * srcScaleX + (reversalX ? srcWidth - x - 1 : x)),
+                                    (int) (srcY * srcScaleY + (reversalY ? srcHeight - y - 1 : y))));
+        }
+
+    }
+
+    public static boolean isNoRequest(Image image) {
+        return image.getRequestedWidth() == 0 && image.getRequestedHeight() == 0;
+    }
+
+    public static boolean isSkin(Image image) {
+        return image.getWidth() % 64 == 0 && image.getWidth() / 64 > 0 &&
+                (image.getHeight() == image.getWidth() / 2 || image.getHeight() == image.getWidth());
+    }
+
+    public static Image x32Tox64(Image srcSkin) {
+        if (srcSkin.getHeight() == 64)
+            return srcSkin;
+
+        WritableImage newSkin = new WritableImage((int) srcSkin.getWidth(), (int) srcSkin.getHeight() * 2);
+        PixelCopyer copyer = new PixelCopyer(srcSkin, newSkin);
+        // HEAD & HAT
+        copyer.copy(0 / 64F, 0 / 32F, 0 / 64F, 0 / 64F, 64 / 64F, 16 / 32F);
+        // LEFT-LEG
+        x32Tox64(copyer, 0 / 64F, 16 / 32F, 16 / 64F, 48 / 64F, 4 / 64F, 12 / 32F, 4 / 64F);
+        // RIGHT-LEG
+        copyer.copy(0 / 64F, 16 / 32F, 0 / 64F, 16 / 64F, 16 / 64F, 16 / 32F);
+        // BODY
+        copyer.copy(16 / 64F, 16 / 32F, 16 / 64F, 16 / 64F, 24 / 64F, 16 / 32F);
+        // LEFT-ARM
+        x32Tox64(copyer, 40 / 64F, 16 / 32F, 32 / 64F, 48 / 64F, 4 / 64F, 12 / 32F, 4 / 64F);
+        // RIGHT-ARM
+        copyer.copy(40 / 64F, 16 / 32F, 40 / 64F, 16 / 64F, 16 / 64F, 16 / 32F);
+
+        return newSkin;
+    }
+
+    static void x32Tox64(PixelCopyer copyer, float srcX, float srcY, float toX, float toY, float width, float height, float depth) {
+        // TOP
+        copyer.copy(srcX + depth, srcY, toX + depth, toY, width, depth * 2, true, false);
+        // BOTTOM
+        copyer.copy(srcX + depth + width, srcY, toX + depth + width, toY, width, depth * 2, true, false);
+        // INS
+        copyer.copy(srcX, srcY + depth * 2, toX + width + depth, toY + depth, depth, height, true, false);
+        // OUTS
+        copyer.copy(srcX + width + depth, srcY + depth * 2, toX, toY + depth, depth, height, true, false);
+        // FRONT
+        copyer.copy(srcX + depth, srcY + depth * 2, toX + depth, toY + depth, width, height, true, false);
+        // BACK
+        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 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 < multiple; mx++)
+                    for (int my = 0; my < multiple; my++) {
+                        int argb = reader.getArgb(x, y);
+                        writer.setArgb(x * multiple + mx, y * multiple + my, argb);
+                    }
+
+        return newSkin;
+    }
+
+}

HMCL/src/main/java/moe/mickey/minecraft/skin/fx/SkinMultipleCubes.java

@@ -0,0 +1,161 @@
+package moe.mickey.minecraft.skin.fx;
+
+import javafx.geometry.Point2D;
+import javafx.scene.Group;
+import javafx.scene.image.Image;
+import javafx.scene.image.PixelReader;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.Material;
+import javafx.scene.paint.PhongMaterial;
+import javafx.scene.shape.Box;
+
+import java.util.function.BiConsumer;
+import java.util.function.Supplier;
+
+public class SkinMultipleCubes extends Group {
+
+    public static class Face extends Group {
+
+        public Face(Image image, int startX, int startY, int width, int height, int interval, boolean reverseX, boolean reverseY,
+                    Supplier<Box> supplier, BiConsumer<Box, Point2D> consumer) {
+            PixelReader reader = image.getPixelReader();
+            for (int x = 0; x < width; x++)
+                for (int y = 0; y < height; y++) {
+                    int argb;
+                    if ((argb = reader.getArgb(startX + (reverseX ? width - x - 1 : x) * interval,
+                            startY + (reverseY ? height - y - 1 : y) * interval)) != 0) {
+                        Box pixel = supplier.get();
+                        consumer.accept(pixel, new Point2D(x, y));
+                        pixel.setMaterial(createMaterial(Color.rgb(
+                                (argb >> 16) & 0xFF, (argb >> 8) & 0xFF, (argb >> 0) & 0xFF)));
+                        getChildren().add(pixel);
+                    }
+                }
+        }
+
+        protected Material createMaterial(Color color) {
+            return new PhongMaterial(color);
+        }
+
+    }
+
+    protected int width, height, depth;
+    protected float startX, startY;
+    protected double length, thick;
+
+    public SkinMultipleCubes(int width, int height, int depth, float startX, float startY, double length, double thick) {
+        this.width = width;
+        this.height = height;
+        this.depth = depth;
+        this.startX = startX;
+        this.startY = startY;
+        this.length = length;
+        this.thick = thick;
+    }
+
+    public void setWidth(int width) {
+        this.width = width;
+    }
+
+    public int getWidth() {
+        return width;
+    }
+
+    public void setHeight(int height) {
+        this.height = height;
+    }
+
+    public int getHeight() {
+        return height;
+    }
+
+    public void setDepth(int depth) {
+        this.depth = depth;
+    }
+
+    public int getDepth() {
+        return depth;
+    }
+
+    public void setStartX(float startX) {
+        this.startX = startX;
+    }
+
+    public float getStartX() {
+        return startX;
+    }
+
+    public void setStartY(float startY) {
+        this.startY = startY;
+    }
+
+    public float getStartY() {
+        return startY;
+    }
+
+    public void setLength(double length) {
+        this.length = length;
+    }
+
+    public double getLength() {
+        return length;
+    }
+
+    public void setThick(double thick) {
+        this.thick = thick;
+    }
+
+    public double getThick() {
+        return thick;
+    }
+
+    public void updateSkin(Image skin) {
+        getChildren().clear();
+        int start_x = (int) (startX * skin.getWidth()), start_y = (int) (startY * skin.getHeight()),
+                interval = (int) Math.max(skin.getWidth() / 64, 1),
+                width_interval = width * interval, height_interval = height * interval, depth_interval = depth * interval;
+        // FRONT
+        getChildren().add(new Face(skin, start_x + depth_interval, start_y + depth_interval, width, height, interval, false, false,
+                () -> new Box(length, length, thick), (b, p) -> {
+            b.setTranslateX(((width - 1) / 2.0 - p.getX()) * b.getWidth());
+            b.setTranslateY(-((height - 1) / 2.0 - p.getY()) * b.getHeight());
+            b.setTranslateZ((depth * length + thick) / 2.0);
+        }));
+        // BACK
+        getChildren().add(new Face(skin, start_x + width_interval + depth_interval * 2, start_y + depth_interval, width, height, interval, true, false,
+                () -> new Box(length, length, thick), (b, p) -> {
+            b.setTranslateX(((width - 1) / 2.0 - p.getX()) * b.getWidth());
+            b.setTranslateY(-((height - 1) / 2.0 - p.getY()) * b.getHeight());
+            b.setTranslateZ(-(depth * length + thick) / 2.0);
+        }));
+        // LEFT
+        getChildren().add(new Face(skin, start_x + width_interval + depth_interval, start_y + depth_interval, depth, height, interval, false, false,
+                () -> new Box(thick, length, length), (b, p) -> {
+            b.setTranslateX((width * length + thick) / 2.0);
+            b.setTranslateY(-((height - 1) / 2.0 - p.getY()) * b.getHeight());
+            b.setTranslateZ(((depth - 1) / 2.0 - p.getX()) * b.getDepth());
+        }));
+        // RIGHT
+        getChildren().add(new Face(skin, start_x, start_y + depth_interval, depth, height, interval, true, false,
+                () -> new Box(thick, length, length), (b, p) -> {
+            b.setTranslateX(-(width * length + thick) / 2.0);
+            b.setTranslateY(-((height - 1) / 2.0 - p.getY()) * b.getHeight());
+            b.setTranslateZ(((depth - 1) / 2.0 - p.getX()) * b.getDepth());
+        }));
+        // TOP
+        getChildren().add(new Face(skin, start_x + depth_interval, start_y, width, depth, interval, false, false,
+                () -> new Box(length, thick, length), (b, p) -> {
+            b.setTranslateX(((width - 1) / 2.0 - p.getX()) * b.getWidth());
+            b.setTranslateY(-(height * length + thick) / 2.0);
+            b.setTranslateZ(-((depth - 1) / 2.0 - p.getY()) * b.getDepth());
+        }));
+        // BOTTOM
+        getChildren().add(new Face(skin, start_x + width_interval + depth_interval, start_y, width, depth, interval, false, false,
+                () -> new Box(length, thick, length), (b, p) -> {
+            b.setTranslateX(((width - 1) / 2.0 - p.getX()) * b.getWidth());
+            b.setTranslateY((height * length + thick) / 2.0);
+            b.setTranslateZ(-((depth - 1) / 2.0 - p.getY()) * b.getDepth());
+        }));
+    }
+
+}

HMCL/src/main/java/moe/mickey/minecraft/skin/fx/SkinTransition.java

@@ -0,0 +1,42 @@
+package moe.mickey.minecraft.skin.fx;
+
+import javafx.animation.Transition;
+import javafx.beans.value.WritableValue;
+import javafx.util.Duration;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Function;
+
+public class SkinTransition extends Transition {
+
+    protected Function<Double, Double> expression;
+    protected List<WritableValue<Number>> observables;
+    protected boolean fix;
+    protected int count;
+
+    public int getCount() {
+        return count;
+    }
+
+    public SkinTransition(Duration duration, Function<Double, Double> expression, WritableValue<Number>... observables) {
+        setCycleDuration(duration);
+        this.expression = expression;
+        this.observables = Arrays.asList(observables);
+    }
+
+    @Override
+    protected void interpolate(double frac) {
+        if (frac == 0 || frac == 1)
+            count++;
+        double val = expression.apply(frac);
+        observables.forEach(w -> w.setValue(val));
+    }
+
+    @Override
+    public void play() {
+        count = 0;
+        super.play();
+    }
+
+}

HMCL/src/main/java/moe/mickey/minecraft/skin/fx/animation/SkinAniRunning.java

@@ -0,0 +1,29 @@
+package moe.mickey.minecraft.skin.fx.animation;
+
+import javafx.util.Duration;
+import moe.mickey.minecraft.skin.fx.FunctionHelper;
+import moe.mickey.minecraft.skin.fx.SkinAnimation;
+import moe.mickey.minecraft.skin.fx.SkinCanvas;
+import moe.mickey.minecraft.skin.fx.SkinTransition;
+
+public final class SkinAniRunning extends SkinAnimation {
+
+    private SkinTransition larmTransition, rarmTransition;
+
+    public SkinAniRunning(int weight, int time, double angle, SkinCanvas canvas) {
+        larmTransition = new SkinTransition(Duration.millis(time),
+                v -> v * (larmTransition.getCount() % 4 < 2 ? 1 : -1) * angle,
+                canvas.larm.getXRotate().angleProperty(), canvas.rleg.getXRotate().angleProperty());
+
+        rarmTransition = new SkinTransition(Duration.millis(time),
+                v -> v * (rarmTransition.getCount() % 4 < 2 ? 1 : -1) * -angle,
+                canvas.rarm.getXRotate().angleProperty(), canvas.lleg.getXRotate().angleProperty());
+
+        FunctionHelper.alwaysB(SkinTransition::setAutoReverse, true, larmTransition, rarmTransition);
+        FunctionHelper.alwaysB(SkinTransition::setCycleCount, 16, larmTransition, rarmTransition);
+        FunctionHelper.always(transitions::add, larmTransition, rarmTransition);
+        this.weight = weight;
+        init();
+    }
+
+}

HMCL/src/main/java/moe/mickey/minecraft/skin/fx/animation/SkinAniWavingArms.java

@@ -0,0 +1,25 @@
+package moe.mickey.minecraft.skin.fx.animation;
+
+import javafx.util.Duration;
+import moe.mickey.minecraft.skin.fx.FunctionHelper;
+import moe.mickey.minecraft.skin.fx.SkinAnimation;
+import moe.mickey.minecraft.skin.fx.SkinCanvas;
+import moe.mickey.minecraft.skin.fx.SkinTransition;
+
+public final class SkinAniWavingArms extends SkinAnimation {
+
+    public SkinAniWavingArms(int weight, int time, double angle, SkinCanvas canvas) {
+        SkinTransition larmTransition = new SkinTransition(Duration.millis(time), v -> v * angle,
+                canvas.larm.getZRotate().angleProperty());
+
+        SkinTransition rarmTransition = new SkinTransition(Duration.millis(time), v -> v * -angle,
+                canvas.rarm.getZRotate().angleProperty());
+
+        FunctionHelper.alwaysB(SkinTransition::setAutoReverse, true, larmTransition, rarmTransition);
+        FunctionHelper.alwaysB(SkinTransition::setCycleCount, 2, larmTransition, rarmTransition);
+        FunctionHelper.always(transitions::add, larmTransition, rarmTransition);
+        this.weight = weight;
+        init();
+    }
+
+}

HMCL/src/main/java/org/jackhuang/hmcl/Launcher.java

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -17,41 +17,56 @@
  */
 package org.jackhuang.hmcl;
 
-import com.jfoenix.utils.JFXUtilities;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.stage.Stage;
 import org.jackhuang.hmcl.setting.ConfigHolder;
+import org.jackhuang.hmcl.setting.SambaException;
 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.util.*;
+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.FileUtils;
+import org.jackhuang.hmcl.util.platform.Architecture;
 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.URISyntaxException;
-import java.net.URL;
-import java.net.URLClassLoader;
+import java.net.*;
 import java.nio.file.Paths;
 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.LOG;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class Launcher extends Application {
+    public static final CookieManager COOKIE_MANAGER = new CookieManager();
 
     @Override
     public void start(Stage primaryStage) {
         Thread.currentThread().setUncaughtExceptionHandler(CRASH_REPORTER);
 
+        CookieHandler.setDefault(COOKIE_MANAGER);
+
         try {
             try {
                 ConfigHolder.init();
+            } catch (SambaException ignored) {
+                Main.showWarningAndContinue(i18n("fatal.samba"));
             } catch (IOException e) {
+                LOG.log(Level.SEVERE, "Failed to load config", e);
                 Main.showErrorAndExit(i18n("fatal.config_loading_failure", Paths.get("").toAbsolutePath().normalize()));
             }
 
@@ -61,8 +76,8 @@ public final class Launcher extends Application {
                 // Stage.show() cannot work again because JavaFX Toolkit have already shut down.
                 Platform.setImplicitExit(false);
                 Controllers.initialize(primaryStage);
-                primaryStage.setResizable(false);
-                primaryStage.setScene(Controllers.getScene());
+
+                initIcon();
 
                 UpdateChecker.init();
 
@@ -73,12 +88,31 @@ public final class Launcher extends Application {
         }
     }
 
+    @Override
+    public void stop() throws Exception {
+        super.stop();
+        Controllers.onApplicationStop();
+    }
+
+    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)) {
+            return;
+        }
+
         Thread.setDefaultUncaughtExceptionHandler(CRASH_REPORTER);
+        AsyncTaskExecutor.setUncaughtExceptionHandler(new CrashReporter(false));
 
         try {
             LOG.info("*** " + Metadata.TITLE + " ***");
-            LOG.info("Operating System: " + System.getProperty("os.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"));
@@ -88,7 +122,7 @@ public final class Launcher extends Application {
             ManagementFactory.getMemoryPoolMXBeans().stream().filter(bean -> bean.getName().equals("Metaspace")).findAny()
                     .ifPresent(bean -> LOG.info("Metaspace: " + bean.getUsage().getUsed() / 1024 / 1024 + "MB"));
 
-            launch(args);
+            launch(Launcher.class, args);
         } catch (Throwable e) { // Fucking JavaFX will suppress the exception and will break our crash reporter.
             CRASH_REPORTER.uncaughtException(Thread.currentThread(), e);
         }
@@ -97,21 +131,20 @@ public final class Launcher extends Application {
     public static void stopApplication() {
         LOG.info("Stopping application.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));
 
-        JFXUtilities.runInFX(() -> {
+        runInFX(() -> {
             if (Controllers.getStage() == null)
                 return;
             Controllers.getStage().close();
             Schedulers.shutdown();
             Controllers.shutdown();
             Platform.exit();
-            Lang.executeDelayed(OperatingSystem::forceGC, TimeUnit.SECONDS, 5, true);
         });
     }
 
     public static void stopWithoutPlatform() {
         LOG.info("Stopping application without JavaFX Toolkit.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));
 
-        JFXUtilities.runInFX(() -> {
+        runInFX(() -> {
             if (Controllers.getStage() == null)
                 return;
             Controllers.getStage().close();
@@ -133,6 +166,16 @@ public final class Launcher extends Application {
                 } 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;
@@ -140,5 +183,5 @@ public final class Launcher extends Application {
             return result;
     }
 
-    public static final CrashReporter CRASH_REPORTER = new CrashReporter();
+    public static final CrashReporter CRASH_REPORTER = new CrashReporter(true);
 }

HMCL/src/main/java/org/jackhuang/hmcl/Main.java

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -17,18 +17,26 @@
  */
 package org.jackhuang.hmcl;
 
-import org.jackhuang.hmcl.upgrade.UpdateHandler;
 import org.jackhuang.hmcl.util.Logging;
+import org.jackhuang.hmcl.util.SelfDependencyPatcher;
 
-import javax.net.ssl.TrustManager;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManagerFactory;
-import javax.net.ssl.X509TrustManager;
 import javax.swing.*;
 import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.security.KeyManagementException;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
-import java.security.cert.X509Certificate;
+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;
@@ -37,26 +45,41 @@ import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class Main {
 
+    private Main() {
+    }
+
     public static void main(String[] args) {
         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");
+
+        // Use System look and feel
+        initLookAndFeel();
 
-        checkJavaFX();
         checkDirectoryPath();
 
         // This environment check will take ~300ms
-        thread(() -> checkDSTRootCAX3(), "CA Certificate Check", true);
+        thread(Main::fixLetsEncrypt, "CA Certificate Check", true);
 
         Logging.start(Metadata.HMCL_DIRECTORY.resolve("logs"));
 
-        if (UpdateHandler.processArguments(args)) {
-            return;
-        }
+        checkJavaFX();
+
 
         Launcher.main(args);
     }
 
+    private static void initLookAndFeel() {
+        if (System.getProperty("swing.defaultlaf") == null) {
+            try {
+                UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+            } catch (Throwable ignored) {
+            }
+        }
+    }
+
     private static void checkDirectoryPath() {
         String currentDirectory = new File("").getAbsolutePath();
         if (currentDirectory.contains("!")) {
@@ -68,34 +91,19 @@ public final class Main {
 
     private static void checkJavaFX() {
         try {
-            Class.forName("javafx.application.Application");
-        } catch (ClassNotFoundException e) {
-            showErrorAndExit(i18n("fatal.missing_javafx"));
+            SelfDependencyPatcher.patch();
+        } catch (SelfDependencyPatcher.PatchException e) {
+            LOG.log(Level.SEVERE, "unable to patch JVM", e);
+            showErrorAndExit(i18n("fatal.javafx.missing"));
+        } catch (SelfDependencyPatcher.IncompatibleVersionException e) {
+            LOG.log(Level.SEVERE, "unable to patch JVM", e);
+            showErrorAndExit(i18n("fatal.javafx.incompatible"));
+        } catch (CancellationException e) {
+            LOG.log(Level.SEVERE, "User cancels downloading JavaFX", e);
+            System.exit(0);
         }
     }
 
-    private static void checkDSTRootCAX3() {
-        TrustManagerFactory tmf;
-        try {
-            tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-            tmf.init((KeyStore) null);
-        } catch (NoSuchAlgorithmException | KeyStoreException e) {
-            LOG.log(Level.WARNING, "Failed to init TrustManagerFactory", e);
-            // don't know what to do here
-            return;
-        }
-        for (TrustManager tm : tmf.getTrustManagers()) {
-            if (tm instanceof X509TrustManager) {
-                for (X509Certificate cert : ((X509TrustManager) tm).getAcceptedIssuers()) {
-                    if ("CN=DST Root CA X3, O=Digital Signature Trust Co.".equals((cert.getSubjectDN().getName()))) {
-                        return;
-                    }
-                }
-            }
-        }
-        showWarningAndContinue(i18n("fatal.missing_dst_root_ca_x3"));
-    }
-
     /**
      * Indicates that a fatal error has occurred, and that the application cannot start.
      */
@@ -115,4 +123,35 @@ public final class Main {
         JOptionPane.showMessageDialog(null, message, "Warning", JOptionPane.WARNING_MESSAGE);
     }
 
+    static void fixLetsEncrypt() {
+        try {
+            KeyStore defaultKeyStore = KeyStore.getInstance(KeyStore.getDefaultType());
+            Path ksPath = Paths.get(System.getProperty("java.home"), "lib", "security", "cacerts");
+
+            try (InputStream ksStream = Files.newInputStream(ksPath)) {
+                defaultKeyStore.load(ksStream, "changeit".toCharArray());
+            }
+
+            KeyStore letsEncryptKeyStore = KeyStore.getInstance(KeyStore.getDefaultType());
+            try (InputStream letsEncryptFile = Main.class.getResourceAsStream("/assets/lekeystore.jks")) {
+                letsEncryptKeyStore.load(letsEncryptFile, "supersecretpassword".toCharArray());
+            }
+
+            KeyStore merged = KeyStore.getInstance(KeyStore.getDefaultType());
+            merged.load(null, new char[0]);
+            for (String alias : Collections.list(letsEncryptKeyStore.aliases()))
+                merged.setCertificateEntry(alias, letsEncryptKeyStore.getCertificate(alias));
+            for (String alias : Collections.list(defaultKeyStore.aliases()))
+                merged.setCertificateEntry(alias, defaultKeyStore.getCertificate(alias));
+
+            TrustManagerFactory instance = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+            instance.init(merged);
+            SSLContext tls = SSLContext.getInstance("TLS");
+            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.log(Level.SEVERE, "Failed to load lets encrypt certificate. Expect problems", e);
+        }
+    }
 }

HMCL/src/main/java/org/jackhuang/hmcl/Metadata.java

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -17,26 +17,60 @@
  */
 package org.jackhuang.hmcl;
 
-import java.nio.file.Path;
-
 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;
+import java.nio.file.Paths;
+
 /**
  * Stores metadata about this application.
  */
 public final class Metadata {
     private Metadata() {}
 
-    public static final String VERSION = System.getProperty("hmcl.version.override", JarUtils.thisJar().flatMap(JarUtils::getImplementationVersion).orElse("@develop@"));
     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.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 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.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 = OperatingSystem.getWorkingDirectory("hmcl");
+    public static final Path HMCL_DIRECTORY = getHMCLDirectory();
+
+    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");
+            }
+            return Paths.get(home, ".cache", "hmcl");
+        }
+        return OperatingSystem.getWorkingDirectory("hmcl");
+    }
+
+    public static boolean isStable() {
+        return "stable".equals(BUILD_CHANNEL);
+    }
+
+    public static boolean isDev() {
+        return "dev".equals(BUILD_CHANNEL);
+    }
+
+    public static boolean isNightly() {
+        return !isStable() && !isDev();
+    }
 }

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -21,24 +21,32 @@ 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 java.io.File;
+import java.io.IOException;
+import java.util.Locale;
 import java.util.Map;
+import java.util.logging.Level;
 
 /**
  * @author huangyuhui
  */
 public final class HMCLGameLauncher extends DefaultLauncher {
 
-    public HMCLGameLauncher(GameRepository repository, String versionId, AuthInfo authInfo, LaunchOptions options) {
-        this(repository, versionId, authInfo, options, null);
+    public HMCLGameLauncher(GameRepository repository, Version version, AuthInfo authInfo, LaunchOptions options) {
+        this(repository, version, authInfo, options, null);
     }
 
-    public HMCLGameLauncher(GameRepository repository, String versionId, AuthInfo authInfo, LaunchOptions options, ProcessListener listener) {
-        this(repository, versionId, authInfo, options, listener, true);
+    public HMCLGameLauncher(GameRepository repository, Version version, AuthInfo authInfo, LaunchOptions options, ProcessListener listener) {
+        this(repository, version, authInfo, options, listener, true);
     }
 
-    public HMCLGameLauncher(GameRepository repository, String versionId, AuthInfo authInfo, LaunchOptions options, ProcessListener listener, boolean daemon) {
-        super(repository, versionId, authInfo, options, listener, daemon);
+    public HMCLGameLauncher(GameRepository repository, Version version, AuthInfo authInfo, LaunchOptions options, ProcessListener listener, boolean daemon) {
+        super(repository, version, authInfo, options, listener, daemon);
     }
 
     @Override
@@ -48,4 +56,29 @@ public final class HMCLGameLauncher extends DefaultLauncher {
         res.put("${launcher_version}", Metadata.VERSION);
         return res;
     }
+
+    private void generateOptionsTxt() {
+        File optionsFile = new File(repository.getRunDirectory(version.getId()), "options.txt");
+        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);
+        }
+    }
+
+    @Override
+    public ManagedProcess launch() throws IOException, InterruptedException {
+        generateOptionsTxt();
+        return super.launch();
+    }
+
+    @Override
+    public void makeLaunchScript(File scriptFile) throws IOException {
+        generateOptionsTxt();
+        super.makeLaunchScript(scriptFile);
+    }
 }

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -19,27 +19,44 @@ 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.event.EventBus;
-import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
-import org.jackhuang.hmcl.event.RefreshingVersionsEvent;
-import org.jackhuang.hmcl.setting.EnumGameDirectory;
+import org.jackhuang.hmcl.Metadata;
+import org.jackhuang.hmcl.download.LibraryAnalyzer;
+import org.jackhuang.hmcl.mod.Modpack;
+import org.jackhuang.hmcl.mod.ModpackConfiguration;
+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.VersionSetting;
-import org.jackhuang.hmcl.util.Logging;
+import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.util.platform.JavaVersion;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;
+import org.jackhuang.hmcl.util.versioning.VersionNumber;
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.*;
 import java.util.logging.Level;
+import java.util.stream.Stream;
+
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.ui.FXUtils.newImage;
+import static org.jackhuang.hmcl.util.Logging.LOG;
 
 public class HMCLGameRepository extends DefaultGameRepository {
     private final Profile profile;
-    private final Map<String, VersionSetting> versionSettings = new HashMap<>();
-    private final Set<String> beingModpackVersions = new HashSet<>();
 
-    public boolean checkedModpack = false, checkingModpack = false;
+    // local version settings
+    private final Map<String, VersionSetting> localVersionSettings = new HashMap<>();
+    private final Set<String> beingModpackVersions = new HashSet<>();
 
     public HMCLGameRepository(Profile profile, File baseDirectory) {
         super(baseDirectory);
@@ -51,33 +68,58 @@ public class HMCLGameRepository extends DefaultGameRepository {
     }
 
     @Override
-    public File getRunDirectory(String id) {
-        if (beingModpackVersions.contains(id) || isModpack(id))
-            return getVersionRoot(id);
-        else {
-            VersionSetting vs = profile.getVersionSetting(id);
-            switch (vs.getGameDirType()) {
-                case VERSION_FOLDER: return getVersionRoot(id);
-                case ROOT_FOLDER: return super.getRunDirectory(id);
-                case CUSTOM: return new File(vs.getGameDir());
-                default: throw new Error();
-            }
+    public GameDirectoryType getGameDirectoryType(String id) {
+        if (beingModpackVersions.contains(id) || isModpack(id)) {
+            return GameDirectoryType.VERSION_FOLDER;
+        } else {
+            return getVersionSetting(id).getGameDirType();
         }
     }
 
+    @Override
+    public File getRunDirectory(String id) {
+        switch (getGameDirectoryType(id)) {
+            case VERSION_FOLDER:
+                return getVersionRoot(id);
+            case ROOT_FOLDER:
+                return super.getRunDirectory(id);
+            case CUSTOM:
+                File dir = new File(getVersionSetting(id).getGameDir());
+                if (!FileUtils.isValidPath(dir)) return getVersionRoot(id);
+                return dir;
+            default:
+                throw new Error();
+        }
+    }
+
+    public Stream<Version> getDisplayVersions() {
+        return getVersions().stream()
+                .filter(v -> !v.isHidden())
+                .sorted(Comparator.comparing((Version v) -> v.getReleaseTime() == null ? new Date(0L) : v.getReleaseTime())
+                        .thenComparing(v -> VersionNumber.asVersion(v.getId())));
+    }
+
     @Override
     protected void refreshVersionsImpl() {
-        versionSettings.clear();
+        localVersionSettings.clear();
         super.refreshVersionsImpl();
-        versions.keySet().forEach(this::loadVersionSetting);
+        versions.keySet().forEach(this::loadLocalVersionSetting);
+        versions.keySet().forEach(version -> {
+            if (isModpack(version)) {
+                specializeVersionSetting(version);
+            }
+        });
 
         try {
             File file = new File(getBaseDirectory(), "launcher_profiles.json");
             if (!file.exists() && !versions.isEmpty())
                 FileUtils.writeText(file, PROFILE);
         } catch (IOException ex) {
-            Logging.LOG.log(Level.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/huanghongxun/HMCL/issues/938
+        System.gc();
     }
 
     public void changeDirectory(File newDirectory) {
@@ -95,19 +137,70 @@ public class HMCLGameRepository extends DefaultGameRepository {
         clean(getRunDirectory(id));
     }
 
-    private File getVersionSettingFile(String id) {
+    public void duplicateVersion(String srcId, String dstId, boolean copySaves) throws IOException {
+        Path srcDir = getVersionRoot(srcId).toPath();
+        Path dstDir = getVersionRoot(dstId).toPath();
+
+        Version fromVersion = getVersion(srcId);
+
+        if (Files.exists(dstDir)) throw new IOException("Version exists");
+        FileUtils.copyDirectory(srcDir, dstDir);
+
+        Path fromJson = dstDir.resolve(srcId + ".json");
+        Path fromJar = dstDir.resolve(srcId + ".jar");
+        Path toJson = dstDir.resolve(dstId + ".json");
+        Path toJar = dstDir.resolve(dstId + ".jar");
+
+        if (Files.exists(fromJar)) {
+            Files.move(fromJar, toJar);
+        }
+        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);
+        oldVersionSetting.setGameDirType(GameDirectoryType.VERSION_FOLDER);
+        VersionSetting newVersionSetting = initLocalVersionSetting(dstId, oldVersionSetting);
+        saveVersionSetting(dstId);
+
+        File srcGameDir = getRunDirectory(srcId);
+        File dstGameDir = getRunDirectory(dstId);
+
+        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)
+            blackList.add("saves");
+
+        if (originalGameDirType != GameDirectoryType.VERSION_FOLDER)
+            FileUtils.copyDirectory(srcGameDir.toPath(), dstGameDir.toPath(), path -> Modpack.acceptFile(path, blackList, null));
+    }
+
+    private File getLocalVersionSettingFile(String id) {
         return new File(getVersionRoot(id), "hmclversion.cfg");
     }
 
-    private void loadVersionSetting(String id) {
-        File file = getVersionSettingFile(id);
+    private void loadLocalVersionSetting(String id) {
+        File file = getLocalVersionSettingFile(id);
         if (file.exists())
             try {
                 VersionSetting versionSetting = GSON.fromJson(FileUtils.readText(file), VersionSetting.class);
-                initVersionSetting(id, versionSetting);
+                initLocalVersionSetting(id, versionSetting);
             } catch (Exception ex) {
                 // If [JsonParseException], [IOException] or [NullPointerException] happens, the json file is malformed and needed to be recreated.
-                initVersionSetting(id, new VersionSetting());
+                initLocalVersionSetting(id, new VersionSetting());
             }
     }
 
@@ -116,18 +209,18 @@ public class HMCLGameRepository extends DefaultGameRepository {
      * @param id the version id.
      * @return new version setting, null if given version does not exist.
      */
-    public VersionSetting createVersionSetting(String id) {
+    public VersionSetting createLocalVersionSetting(String id) {
         if (!hasVersion(id))
             return null;
-        if (versionSettings.containsKey(id))
-            return getVersionSetting(id);
+        if (localVersionSettings.containsKey(id))
+            return getLocalVersionSetting(id);
         else
-            return initVersionSetting(id, new VersionSetting());
+            return initLocalVersionSetting(id, new VersionSetting());
     }
 
-    private VersionSetting initVersionSetting(String id, VersionSetting vs) {
+    private VersionSetting initLocalVersionSetting(String id, VersionSetting vs) {
+        localVersionSettings.put(id, vs);
         vs.addPropertyChangedListener(a -> saveVersionSetting(id));
-        versionSettings.put(id, vs);
         return vs;
     }
 
@@ -136,49 +229,57 @@ public class HMCLGameRepository extends DefaultGameRepository {
      *
      * @param id version id
      *
-     * @return may return null if the id not exists
+     * @return corresponding version setting, null if the version has no its own version setting.
      */
-    public VersionSetting getVersionSetting(String id) {
-        if (!versionSettings.containsKey(id))
-            loadVersionSetting(id);
-        VersionSetting setting = versionSettings.get(id);
+    public VersionSetting getLocalVersionSetting(String id) {
+        if (!localVersionSettings.containsKey(id))
+            loadLocalVersionSetting(id);
+        VersionSetting setting = localVersionSettings.get(id);
         if (setting != null && isModpack(id))
-            setting.setGameDirType(EnumGameDirectory.VERSION_FOLDER);
+            setting.setGameDirType(GameDirectoryType.VERSION_FOLDER);
         return setting;
     }
 
+    public VersionSetting getVersionSetting(String id) {
+        VersionSetting vs = getLocalVersionSetting(id);
+        if (vs == null || vs.isUsesGlobal()) {
+            profile.getGlobal().setGlobal(true); // always keep global.isGlobal = true
+            profile.getGlobal().setUsesGlobal(true);
+            return profile.getGlobal();
+        } else
+            return vs;
+    }
+
     public File getVersionIconFile(String id) {
         return new File(getVersionRoot(id), "icon.png");
     }
 
     public Image getVersionIconImage(String id) {
         if (id == null || !isLoaded())
-            return new Image("/assets/img/grass.png");
+            return newImage("/assets/img/grass.png");
 
-        Version version = getVersion(id);
+        Version version = getVersion(id).resolve(this);
         File iconFile = getVersionIconFile(id);
         if (iconFile.exists())
             return new Image("file:" + iconFile.getAbsolutePath());
-        else if ("net.minecraft.launchwrapper.Launch".equals(version.getMainClass()))
-            return new Image("/assets/img/furnace.png");
-        else if ("cpw.mods.modlauncher.Launcher".equals(version.getMainClass()))
-            return new Image("/assets/img/furnace.png");
+        else if (LibraryAnalyzer.isModded(this, version))
+            return newImage("/assets/img/furnace.png");
         else
-            return new Image("/assets/img/grass.png");
+            return newImage("/assets/img/grass.png");
     }
 
     public boolean saveVersionSetting(String id) {
-        if (!versionSettings.containsKey(id))
+        if (!localVersionSettings.containsKey(id))
             return false;
-        File file = getVersionSettingFile(id);
+        File file = getLocalVersionSettingFile(id);
         if (!FileUtils.makeDirectory(file.getAbsoluteFile().getParentFile()))
             return false;
 
         try {
-            FileUtils.writeText(file, GSON.toJson(versionSettings.get(id)));
+            FileUtils.writeText(file, GSON.toJson(localVersionSettings.get(id)));
             return true;
         } catch (IOException e) {
-            Logging.LOG.log(Level.SEVERE, "Unable to save version setting of " + id, e);
+            LOG.log(Level.SEVERE, "Unable to save version setting of " + id, e);
             return false;
         }
     }
@@ -189,9 +290,9 @@ public class HMCLGameRepository extends DefaultGameRepository {
      * @return specialized version setting, null if given version does not exist.
      */
     public VersionSetting specializeVersionSetting(String id) {
-        VersionSetting vs = getVersionSetting(id);
+        VersionSetting vs = getLocalVersionSetting(id);
         if (vs == null)
-            vs = createVersionSetting(id);
+            vs = createLocalVersionSetting(id);
         if (vs == null)
             return null;
         vs.setUsesGlobal(false);
@@ -199,13 +300,66 @@ public class HMCLGameRepository extends DefaultGameRepository {
     }
 
     public void globalizeVersionSetting(String id) {
-        VersionSetting vs = getVersionSetting(id);
+        VersionSetting vs = getLocalVersionSetting(id);
         if (vs != null)
             vs.setUsesGlobal(true);
     }
 
-    public boolean forbidsVersion(String id) {
-        return FORBIDDEN.contains(id);
+    public LaunchOptions getLaunchOptions(String version, JavaVersion javaVersion, File gameDir) {
+        VersionSetting vs = getVersionSetting(version);
+
+        LaunchOptions.Builder builder = new LaunchOptions.Builder()
+                .setGameDir(gameDir)
+                .setJava(javaVersion)
+                .setVersionType(Metadata.TITLE)
+                .setVersionName(version)
+                .setProfileName(Metadata.TITLE)
+                .setGameArguments(StringUtils.tokenize(vs.getMinecraftArgs()))
+                .setJavaArguments(StringUtils.tokenize(vs.getJavaArgs()))
+                .setMaxMemory((int)(getAllocatedMemory(
+                        vs.getMaxMemory() * 1024L * 1024L,
+                        OperatingSystem.getPhysicalMemoryStatus().orElse(OperatingSystem.PhysicalMemoryStatus.INVALID).getAvailable(),
+                        vs.isAutoMemory()
+                ) / 1024 / 1024))
+                .setMinMemory(vs.getMinMemory())
+                .setMetaspace(Lang.toIntOrNull(vs.getPermSize()))
+                .setWidth(vs.getWidth())
+                .setHeight(vs.getHeight())
+                .setFullscreen(vs.isFullscreen())
+                .setServerIp(vs.getServerIp())
+                .setWrapper(vs.getWrapper())
+                .setPreLaunchCommand(vs.getPreLaunchCommand())
+                .setPostExitCommand(vs.getPostExitCommand())
+                .setNoGeneratedJVMArgs(vs.isNoJVMArgs())
+                .setNativesDirType(vs.getNativesDirType())
+                .setNativesDir(vs.getNativesDir())
+                .setProcessPriority(vs.getProcessPriority())
+                .setUseNativeGLFW(vs.isUseNativeGLFW())
+                .setUseNativeOpenAL(vs.isUseNativeOpenAL());
+        if (config().hasProxy()) {
+            builder.setProxy(ProxyManager.getProxy());
+            if (config().hasProxyAuth()) {
+                builder.setProxyUser(config().getProxyUser());
+                builder.setProxyPass(config().getProxyPass());
+            }
+        }
+
+        File json = getModpackConfiguration(version);
+        if (json.exists()) {
+            try {
+                String jsonText = FileUtils.readText(json);
+                ModpackConfiguration<?> modpackConfiguration = JsonUtils.GSON.fromJson(jsonText, ModpackConfiguration.class);
+                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();
+            }
+        }
+
+        return builder.create();
     }
 
     @Override
@@ -221,11 +375,60 @@ public class HMCLGameRepository extends DefaultGameRepository {
         beingModpackVersions.remove(id);
     }
 
+    public void markVersionLaunchedAbnormally(String id) {
+        try {
+            Files.createFile(getVersionRoot(id).toPath().resolve(".abnormal"));
+        } catch (IOException ignored) {
+        }
+    }
+
+    public boolean unmarkVersionLaunchedAbnormally(String id) {
+        File file = new File(getVersionRoot(id), ".abnormal");
+        boolean result = file.isFile();
+        file.delete();
+        return result;
+    }
+
     private static final Gson GSON = new GsonBuilder()
             .setPrettyPrinting()
             .create();
 
-    private static final HashSet<String> FORBIDDEN = new HashSet<>(Arrays.asList("modpack", "minecraftinstance", "manifest"));
-
     private static final String PROFILE = "{\"selectedProfile\": \"(Default)\",\"profiles\": {\"(Default)\": {\"name\": \"(Default)\"}},\"clientToken\": \"88888888-8888-8888-8888-888888888888\"}";
+
+
+    // These version ids are forbidden because they may conflict with modpack configuration filenames
+    private static final Set<String> FORBIDDEN_VERSION_IDS = new HashSet<>(Arrays.asList(
+            "modpack", "minecraftinstance", "manifest"));
+
+    public static boolean isValidVersionId(String id) {
+        if (FORBIDDEN_VERSION_IDS.contains(id))
+            return false;
+
+        if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS &&
+                FORBIDDEN_VERSION_IDS.contains(id.toLowerCase()))
+            return false;
+
+        return OperatingSystem.isNameValid(id);
+    }
+
+    /**
+     * Returns true if the given version id conflicts with an existing version.
+     */
+    public boolean versionIdConflicts(String id) {
+        if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
+            // on Windows, filenames are case-insensitive
+            for (String existingId : versions.keySet()) {
+                if (existingId.equalsIgnoreCase(id)) {
+                    return true;
+                }
+            }
+            return false;
+        } else {
+            return versions.containsKey(id);
+        }
+    }
+
+    public static long getAllocatedMemory(long minimum, long available, boolean auto) {
+        return auto ? Math.max(minimum, (long) (available * 0.8)) : minimum;
+    }
 }

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

@@ -1,82 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  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.Modpack;
-import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.util.Logging;
-import org.jackhuang.hmcl.util.gson.JsonUtils;
-import org.jackhuang.hmcl.util.io.Zipper;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Export the game to a mod pack file.
- */
-public class HMCLModpackExportTask extends Task {
-    private final DefaultGameRepository repository;
-    private final String version;
-    private final List<String> whitelist;
-    private final Modpack modpack;
-    private final File output;
-
-    /**
-     * @param output  mod pack file.
-     * @param version to locate version.json
-     */
-    public HMCLModpackExportTask(DefaultGameRepository repository, String version, List<String> whitelist, Modpack modpack, File output) {
-        this.repository = repository;
-        this.version = version;
-        this.whitelist = whitelist;
-        this.modpack = modpack;
-        this.output = output;
-
-        onDone().register(event -> {
-            if (event.isFailed()) output.delete();
-        });
-    }
-
-    @Override
-    public void execute() throws Exception {
-        ArrayList<String> blackList = new ArrayList<>(HMCLModpackManager.MODPACK_BLACK_LIST);
-        blackList.add(version + ".jar");
-        blackList.add(version + ".json");
-        Logging.LOG.info("Compressing game files without some files in blacklist, including files or directories: usernamecache.json, asm, logs, backups, versions, assets, usercache.json, libraries, crash-reports, launcher_profiles.json, NVIDIA, TCNodeTracker");
-        try (Zipper zip = new Zipper(output.toPath())) {
-            zip.putDirectory(repository.getRunDirectory(version).toPath(), "minecraft", path -> {
-                if (path.isEmpty())
-                    return true;
-                for (String s : blackList)
-                    if (path.equals(s))
-                        return false;
-                for (String s : whitelist)
-                    if (path.equals(s))
-                        return true;
-                return false;
-            });
-
-            Version mv = repository.getResolvedVersion(version);
-            String gameVersion = GameVersion.minecraftVersion(repository.getVersionJar(version))
-                    .orElseThrow(() ->  new IllegalStateException("Cannot parse the version of " + version));
-            zip.putTextFile(JsonUtils.GSON.toJson(mv.setJar(gameVersion)), "minecraft/pack.json"); // Making "jar" to gameVersion is to be compatible with old HMCL.
-            zip.putTextFile(JsonUtils.GSON.toJson(modpack.setGameVersion(gameVersion)), "modpack.json"); // Newer HMCL only reads 'gameVersion' field.
-        }
-    }
-}

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -19,8 +19,8 @@ package org.jackhuang.hmcl.game;
 
 import com.google.gson.JsonParseException;
 import com.google.gson.reflect.TypeToken;
-import org.jackhuang.hmcl.download.DependencyManager;
-import org.jackhuang.hmcl.download.game.VersionJsonSaveTask;
+import org.jackhuang.hmcl.download.DefaultDependencyManager;
+import org.jackhuang.hmcl.download.LibraryAnalyzer;
 import org.jackhuang.hmcl.mod.MinecraftInstanceTask;
 import org.jackhuang.hmcl.mod.Modpack;
 import org.jackhuang.hmcl.mod.ModpackConfiguration;
@@ -36,16 +36,17 @@ import java.io.IOException;
 import java.util.LinkedList;
 import java.util.List;
 
-public final class HMCLModpackInstallTask extends Task {
+public final class HMCLModpackInstallTask extends Task<Void> {
     private final File zipFile;
     private final String name;
     private final HMCLGameRepository repository;
+    private final DefaultDependencyManager dependency;
     private final Modpack modpack;
-    private final List<Task> dependencies = new LinkedList<>();
-    private final List<Task> dependents = new LinkedList<>();
+    private final List<Task<?>> dependencies = new LinkedList<>();
+    private final List<Task<?>> dependents = new LinkedList<>();
 
     public HMCLModpackInstallTask(Profile profile, File zipFile, Modpack modpack, String name) {
-        DependencyManager dependency = profile.getDependency();
+        dependency = profile.getDependency();
         repository = profile.getRepository();
         this.zipFile = zipFile;
         this.name = name;
@@ -74,24 +75,34 @@ public final class HMCLModpackInstallTask extends Task {
         } catch (JsonParseException | IOException ignore) {
         }
         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
-    public List<Task> getDependencies() {
+    public List<Task<?>> getDependencies() {
         return dependencies;
     }
 
     @Override
-    public List<Task> getDependents() {
+    public List<Task<?>> getDependents() {
         return dependents;
     }
 
     @Override
     public void execute() throws Exception {
         String json = CompressingUtils.readTextZipEntry(zipFile, "minecraft/pack.json");
-        Version version = JsonUtils.GSON.fromJson(json, Version.class).setId(name).setJar(null);
-        dependencies.add(new VersionJsonSaveTask(repository, version));
-        dependencies.add(new MinecraftInstanceTask<>(zipFile, modpack.getEncoding(), "/minecraft", modpack, MODPACK_TYPE, repository.getModpackConfiguration(name)));
+        Version originalVersion = JsonUtils.GSON.fromJson(json, Version.class).setId(name).setJar(null);
+        LibraryAnalyzer analyzer = LibraryAnalyzer.analyze(originalVersion);
+        Task<Version> libraryTask = Task.supplyAsync(() -> originalVersion);
+        // reinstall libraries
+        // libraries of Forge and OptiFine should be obtained by installation.
+        for (LibraryAnalyzer.LibraryMark mark : analyzer) {
+            if (LibraryAnalyzer.LibraryType.MINECRAFT.getPatchId().equals(mark.getLibraryId()))
+                continue;
+            libraryTask = libraryTask.thenComposeAsync(version -> dependency.installLibraryAsync(modpack.getGameVersion(), version, mark.getLibraryId(), mark.getLibraryVersion()));
+        }
+
+        dependencies.add(libraryTask.thenComposeAsync(repository::saveAsync));
     }
 
     public static final String MODPACK_TYPE = "HMCL";

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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,80 +18,53 @@
 package org.jackhuang.hmcl.game;
 
 import com.google.gson.JsonParseException;
+import org.jackhuang.hmcl.download.DefaultDependencyManager;
 import org.jackhuang.hmcl.mod.Modpack;
-import org.jackhuang.hmcl.util.Lang;
+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.util.List;
+import java.nio.file.FileSystem;
 
 /**
  * @author huangyuhui
  */
 public final class HMCLModpackManager {
-
-    public static final List<String> MODPACK_BLACK_LIST = Lang.immutableListOf(
-            "usernamecache.json", "usercache.json", // Minecraft
-            "launcher_profiles.json", "launcher.pack.lzma", // Minecraft Launcher
-            "pack.json", "launcher.jar", "hmclmc.log", "cache", // HMCL
-            "manifest.json", "minecraftinstance.json", ".curseclient", // Curse
-            "minetweaker.log", // Mods
-            "jars", "logs", "versions", "assets", "libraries", "crash-reports", "NVIDIA", "AMD", "screenshots", "natives", "native", "$native", "server-resource-packs", // Minecraft
-            "downloads", // Curse
-            "asm", "backups", "TCNodeTracker", "CustomDISkins", "data" // Mods
-    );
-    public static final List<String> MODPACK_SUGGESTED_BLACK_LIST = Lang.immutableListOf(
-            "fonts", // BetterFonts
-            "saves", "servers.dat", "options.txt", // Minecraft
-            "blueprints" /* BuildCraft */,
-            "optionsof.txt" /* OptiFine */,
-            "journeymap" /* JourneyMap */,
-            "optionsshaders.txt",
-            "mods/VoxelMods");
-
-    public static ModAdviser.ModSuggestion suggestMod(String fileName, boolean isDirectory) {
-        if (match(MODPACK_BLACK_LIST, fileName, isDirectory))
-            return ModAdviser.ModSuggestion.HIDDEN;
-        if (match(MODPACK_SUGGESTED_BLACK_LIST, fileName, isDirectory))
-            return ModAdviser.ModSuggestion.NORMAL;
-        else
-            return ModAdviser.ModSuggestion.SUGGESTED;
-    }
-
-    private static boolean match(List<String> l, String fileName, boolean isDirectory) {
-        for (String s : l)
-            if (isDirectory) {
-                if (fileName.startsWith(s + "/"))
-                    return true;
-            } else if (fileName.equals(s))
-                return true;
-        return false;
+    private HMCLModpackManager() {
     }
 
     /**
      * Read the manifest in a HMCL modpack.
      *
-     * @param file a HMCL modpack file.
+     * @param fs     a HMCL modpack file.
      * @param encoding encoding of modpack zip file.
-     * @throws IOException if the file is not a valid zip file.
-     * @throws JsonParseException if the manifest.json is missing or malformed.
      * @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(Path file, Charset encoding) throws IOException, JsonParseException {
-        String manifestJson = CompressingUtils.readTextZipEntry(file, "modpack.json", encoding);
-        Modpack manifest = JsonUtils.fromNonNullJson(manifestJson, Modpack.class).setEncoding(encoding);
-        String gameJson = CompressingUtils.readTextZipEntry(file, "minecraft/pack.json", encoding);
+    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 = 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
-                return manifest.setManifest(HMCLModpackManifest.INSTANCE);
+                manifest.setManifest(HMCLModpackManifest.INSTANCE);
         else
-            return manifest.setManifest(HMCLModpackManifest.INSTANCE).setGameVersion(game.getJar());
+            manifest.setManifest(HMCLModpackManifest.INSTANCE).setGameVersion(game.getJar());
+        return manifest;
+    }
+
+    private static class HMCLModpack extends Modpack {
+        @Override
+        public Task<?> getInstallTask(DefaultDependencyManager dependencyManager, File zipFile, String name) {
+            return new HMCLModpackInstallTask(((HMCLGameRepository) dependencyManager.getGameRepository()).getProfile(), zipFile, this, name);
+        }
     }
 }

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -18,50 +18,54 @@
 package org.jackhuang.hmcl.game;
 
 import javafx.application.Platform;
+import javafx.stage.Stage;
 import org.jackhuang.hmcl.Launcher;
-import org.jackhuang.hmcl.auth.Account;
-import org.jackhuang.hmcl.auth.AuthInfo;
-import org.jackhuang.hmcl.auth.AuthenticationException;
-import org.jackhuang.hmcl.auth.CredentialExpiredException;
+import org.jackhuang.hmcl.auth.*;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorDownloadException;
 import org.jackhuang.hmcl.download.DefaultDependencyManager;
+import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.download.MaintainTask;
+import org.jackhuang.hmcl.download.game.GameAssetIndexDownloadTask;
+import org.jackhuang.hmcl.download.game.GameVerificationFixTask;
 import org.jackhuang.hmcl.download.game.LibraryDownloadException;
+import org.jackhuang.hmcl.download.java.JavaRepository;
 import org.jackhuang.hmcl.launch.*;
-import org.jackhuang.hmcl.mod.CurseCompletionException;
-import org.jackhuang.hmcl.mod.CurseCompletionTask;
 import org.jackhuang.hmcl.mod.ModpackConfiguration;
+import org.jackhuang.hmcl.mod.curse.CurseCompletionException;
+import org.jackhuang.hmcl.mod.curse.CurseCompletionTask;
+import org.jackhuang.hmcl.mod.curse.CurseInstallTask;
+import org.jackhuang.hmcl.mod.mcbbs.McbbsModpackCompletionTask;
+import org.jackhuang.hmcl.mod.mcbbs.McbbsModpackLocalInstallTask;
+import org.jackhuang.hmcl.mod.server.ServerModpackCompletionTask;
+import org.jackhuang.hmcl.mod.server.ServerModpackLocalInstallTask;
+import org.jackhuang.hmcl.setting.DownloadProviders;
 import org.jackhuang.hmcl.setting.LauncherVisibility;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.VersionSetting;
 import org.jackhuang.hmcl.task.*;
-import org.jackhuang.hmcl.ui.Controllers;
-import org.jackhuang.hmcl.ui.DialogController;
-import org.jackhuang.hmcl.ui.LogWindow;
-import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
-import org.jackhuang.hmcl.ui.construct.MessageBox;
-import org.jackhuang.hmcl.ui.construct.TaskExecutorDialogPane;
-import org.jackhuang.hmcl.util.Log4jLevel;
-import org.jackhuang.hmcl.util.Logging;
-import org.jackhuang.hmcl.util.Pair;
-import org.jackhuang.hmcl.util.StringUtils;
-import org.jackhuang.hmcl.util.function.ExceptionalSupplier;
-import org.jackhuang.hmcl.util.gson.UUIDTypeAdapter;
-import org.jackhuang.hmcl.util.platform.CommandBuilder;
-import org.jackhuang.hmcl.util.platform.JavaVersion;
-import org.jackhuang.hmcl.util.platform.ManagedProcess;
-import org.jackhuang.hmcl.util.platform.OperatingSystem;
+import org.jackhuang.hmcl.ui.*;
+import org.jackhuang.hmcl.ui.construct.*;
+import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
+import org.jackhuang.hmcl.util.*;
+import org.jackhuang.hmcl.util.i18n.I18n;
+import org.jackhuang.hmcl.util.io.ResponseCodeException;
+import org.jackhuang.hmcl.util.platform.*;
 import org.jackhuang.hmcl.util.versioning.VersionNumber;
 
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.net.SocketTimeoutException;
+import java.net.URL;
+import java.nio.file.AccessDeniedException;
 import java.util.*;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.logging.Level;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 import static org.jackhuang.hmcl.util.Lang.mapOf;
+import static org.jackhuang.hmcl.util.Lang.resolveException;
 import static org.jackhuang.hmcl.util.Logging.LOG;
 import static org.jackhuang.hmcl.util.Pair.pair;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
@@ -83,30 +87,28 @@ public final class LauncherHelper {
         this.setting = profile.getVersionSetting(selectedVersion);
         this.launcherVisibility = setting.getLauncherVisibility();
         this.showLogs = setting.isShowLogs();
+        this.launchingStepsPane.setTitle(i18n("version.launch"));
     }
 
-    private final TaskExecutorDialogPane launchingStepsPane = new TaskExecutorDialogPane(it -> {});
+    private final TaskExecutorDialogPane launchingStepsPane = new TaskExecutorDialogPane(it -> {
+    });
 
     public void setTestMode() {
         launcherVisibility = LauncherVisibility.KEEP;
         showLogs = true;
     }
 
+    public void setKeep() {
+        launcherVisibility = LauncherVisibility.KEEP;
+    }
+
     public void launch() {
+        FXUtils.checkFxUserThread();
+
         Logging.LOG.info("Launching game version: " + selectedVersion);
 
-        GameRepository repository = profile.getRepository();
-        Version version = repository.getResolvedVersion(selectedVersion);
-
-        Platform.runLater(() -> {
-            try {
-                checkGameState(profile, setting, version, () -> {
-                    Controllers.dialog(launchingStepsPane);
-                    Schedulers.newThread().schedule(this::launch0);
-                });
-            } catch (InterruptedException ignore) {
-            }
-        });
+        Controllers.dialog(launchingStepsPane);
+        launch0();
     }
 
     public void makeLaunchScript(File scriptFile) {
@@ -118,67 +120,79 @@ public final class LauncherHelper {
     private void launch0() {
         HMCLGameRepository repository = profile.getRepository();
         DefaultDependencyManager dependencyManager = profile.getDependency();
-        Version version = MaintainTask.maintain(repository.getResolvedVersion(selectedVersion));
-        Optional<String> gameVersion = GameVersion.minecraftVersion(repository.getVersionJar(version));
+        Version version = MaintainTask.maintain(repository, repository.getResolvedVersion(selectedVersion));
+        Optional<String> gameVersion = repository.getGameVersion(version);
+        boolean integrityCheck = repository.unmarkVersionLaunchedAbnormally(selectedVersion);
+        CountDownLatch launchingLatch = new CountDownLatch(1);
 
-        TaskExecutor executor = Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.DEPENDENCIES))
-                .then(variables -> {
-                    if (setting.isNotCheckGame())
-                        return null;
-                    else
-                        return dependencyManager.checkGameCompletionAsync(version);
+        AtomicReference<JavaVersion> javaVersionRef = new AtomicReference<>();
+
+        TaskExecutor executor = checkGameState(profile, setting, version)
+                .thenComposeAsync(javaVersion -> {
+                    javaVersionRef.set(Objects.requireNonNull(javaVersion));
+                    return dependencyManager.checkPatchCompletionAsync(repository.getVersion(selectedVersion), integrityCheck);
                 })
-                .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.MODS)))
-                .then(var -> {
-                    try {
-                        ModpackConfiguration<?> configuration = ModpackHelper.readModpackConfiguration(repository.getModpackConfiguration(selectedVersion));
-                        if ("Curse".equals(configuration.getType()))
-                            return new CurseCompletionTask(dependencyManager, selectedVersion);
-                        else
-                            return null;
-                    } catch (IOException e) {
-                        return null;
-                    }
+                .thenComposeAsync(Task.allOf(
+                        Task.composeAsync(() -> {
+                            if (setting.isNotCheckGame())
+                                return null;
+                            else
+                                return dependencyManager.checkGameCompletionAsync(version, integrityCheck);
+                        }), Task.composeAsync(() -> {
+                            if (setting.isNotCheckGame()) {
+                                return null;
+                            } else {
+                                try {
+                                    ModpackConfiguration<?> configuration = ModpackHelper.readModpackConfiguration(repository.getModpackConfiguration(selectedVersion));
+                                    if (CurseInstallTask.MODPACK_TYPE.equals(configuration.getType()))
+                                        return new CurseCompletionTask(dependencyManager, selectedVersion);
+                                    else if (ServerModpackLocalInstallTask.MODPACK_TYPE.equals(configuration.getType()))
+                                        return new ServerModpackCompletionTask(dependencyManager, selectedVersion);
+                                    else if (McbbsModpackLocalInstallTask.MODPACK_TYPE.equals(configuration.getType()))
+                                        return new McbbsModpackCompletionTask(dependencyManager, selectedVersion);
+                                    else
+                                        return null;
+                                } catch (IOException e) {
+                                    return null;
+                                }
+                            }
+                        }))).withStage("launch.state.dependencies")
+                .thenComposeAsync(() -> {
+                    return gameVersion.map(s -> new GameVerificationFixTask(dependencyManager, s, version)).orElse(null);
                 })
-                .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.LOGGING_IN)))
-                .then(Task.of(i18n("account.methods"), variables -> {
+                .thenComposeAsync(Task.supplyAsync(() -> {
                     try {
-                        variables.set("account", account.logIn());
+                        return account.logIn();
                     } catch (CredentialExpiredException e) {
                         LOG.info("Credential has expired: " + e);
-                        variables.set("account", DialogController.logIn(account));
+                        return DialogController.logIn(account);
                     } catch (AuthenticationException e) {
                         LOG.warning("Authentication failed, try playing offline: " + e);
-                        variables.set("account",
-                                account.playOffline().orElseThrow(() -> e));
+                        return account.playOffline().orElseThrow(() -> e);
                     }
-                }))
-                .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.LAUNCHING)))
-                .then(Task.of(variables -> {
-                    variables.set("launcher", new HMCLGameLauncher(
+                }).withStage("launch.state.logging_in"))
+                .thenComposeAsync(authInfo -> Task.supplyAsync(() -> {
+                    LaunchOptions launchOptions = repository.getLaunchOptions(selectedVersion, javaVersionRef.get(), profile.getGameDir());
+                    return new HMCLGameLauncher(
                             repository,
-                            selectedVersion,
-                            variables.get("account"),
-                            setting.toLaunchOptions(profile.getGameDir()),
+                            version,
+                            authInfo,
+                            launchOptions,
                             launcherVisibility == LauncherVisibility.CLOSE
                                     ? null // Unnecessary to start listening to game process output when close launcher immediately after game launched.
-                                    : new HMCLProcessListener(variables.get("account"), setting, gameVersion.isPresent())
-                    ));
-                }))
-                .then(variables -> {
-                    DefaultLauncher launcher = variables.get("launcher");
+                                    : new HMCLProcessListener(repository, version, authInfo, launchOptions, launchingLatch, gameVersion.isPresent())
+                    );
+                }).thenComposeAsync(launcher -> { // launcher is prev task's result
                     if (scriptFile == null) {
-                        return new LaunchTask<>(launcher::launch).setName(i18n("version.launch"));
+                        return Task.supplyAsync(launcher::launch);
                     } else {
-                        return new LaunchTask<>(() -> {
+                        return Task.supplyAsync(() -> {
                             launcher.makeLaunchScript(scriptFile);
                             return null;
-                        }).setName(i18n("version.launch_script"));
+                        });
                     }
-                })
-                .then(Task.of(variables -> {
+                }).thenAcceptAsync(process -> { // process is LaunchTask's result
                     if (scriptFile == null) {
-                        ManagedProcess process = variables.get(LaunchTask.LAUNCH_ID);
                         PROCESSES.add(process);
                         if (launcherVisibility == LauncherVisibility.CLOSE)
                             Launcher.stopApplication();
@@ -187,36 +201,34 @@ public final class LauncherHelper {
                                 process.stop();
                                 it.fireEvent(new DialogCloseEvent());
                             });
-                    } else
+                    } else {
                         Platform.runLater(() -> {
                             launchingStepsPane.fireEvent(new DialogCloseEvent());
                             Controllers.dialog(i18n("version.launch_script.success", scriptFile.getAbsolutePath()));
                         });
-
-                }))
+                    }
+                }).thenRunAsync(() -> {
+                    launchingLatch.await();
+                }).withStage("launch.state.waiting_launching"))
+                .withStagesHint(Lang.immutableListOf(
+                        "launch.state.java",
+                        "launch.state.dependencies",
+                        "launch.state.logging_in",
+                        "launch.state.waiting_launching"))
                 .executor();
-
         launchingStepsPane.setExecutor(executor, false);
         executor.addTaskListener(new TaskListener() {
-            final AtomicInteger finished = new AtomicInteger(0);
-
-            @Override
-            public void onFinished(Task task) {
-                finished.incrementAndGet();
-                int runningTasks = executor.getRunningTasks();
-                Platform.runLater(() -> launchingStepsPane.setProgress(1.0 * finished.get() / runningTasks));
-            }
 
             @Override
             public void onStop(boolean success, TaskExecutor executor) {
-                if (!success && !Controllers.isStopped()) {
-                    Platform.runLater(() -> {
-                        // Check if the application has stopped
-                        // because onStop will be invoked if tasks fail when the executor service shut down.
-                        if (!Controllers.isStopped()) {
-                            launchingStepsPane.fireEvent(new DialogCloseEvent());
-                            Exception ex = executor.getLastException();
-                            if (ex != null) {
+                Platform.runLater(() -> {
+                    // Check if the application has stopped
+                    // because onStop will be invoked if tasks fail when the executor service shut down.
+                    if (!Controllers.isStopped()) {
+                        launchingStepsPane.fireEvent(new DialogCloseEvent());
+                        if (!success) {
+                            Exception ex = executor.getException();
+                            if (!(ex instanceof CancellationException)) {
                                 String message;
                                 if (ex instanceof CurseCompletionException) {
                                     if (ex.getCause() instanceof FileNotFoundException)
@@ -230,177 +242,364 @@ public final class LauncherHelper {
                                 } else if (ex instanceof NotDecompressingNativesException) {
                                     message = i18n("launch.failed.decompressing_natives") + ex.getLocalizedMessage();
                                 } else if (ex instanceof LibraryDownloadException) {
-                                    message = i18n("launch.failed.download_library", ((LibraryDownloadException) ex).getLibrary().getName()) + "\n" + StringUtils.getStackTrace(ex.getCause());
+                                    message = i18n("launch.failed.download_library", ((LibraryDownloadException) ex).getLibrary().getName()) + "\n";
+                                    if (ex.getCause() instanceof ResponseCodeException) {
+                                        ResponseCodeException rce = (ResponseCodeException) ex.getCause();
+                                        int responseCode = rce.getResponseCode();
+                                        URL url = rce.getUrl();
+                                        if (responseCode == 404)
+                                            message += i18n("download.code.404", url);
+                                        else
+                                            message += i18n("download.failed", url, responseCode);
+                                    } else {
+                                        message += StringUtils.getStackTrace(ex.getCause());
+                                    }
+                                } else if (ex instanceof DownloadException) {
+                                    URL url = ((DownloadException) ex).getUrl();
+                                    if (ex.getCause() instanceof SocketTimeoutException) {
+                                        message = i18n("install.failed.downloading.timeout", url);
+                                    } else if (ex.getCause() instanceof ResponseCodeException) {
+                                        ResponseCodeException responseCodeException = (ResponseCodeException) ex.getCause();
+                                        if (I18n.hasKey("download.code." + responseCodeException.getResponseCode())) {
+                                            message = i18n("download.code." + responseCodeException.getResponseCode(), url);
+                                        } else {
+                                            message = i18n("install.failed.downloading.detail", url) + "\n" + StringUtils.getStackTrace(ex.getCause());
+                                        }
+                                    } else {
+                                        message = i18n("install.failed.downloading.detail", url) + "\n" + StringUtils.getStackTrace(ex.getCause());
+                                    }
+                                } else if (ex instanceof GameAssetIndexDownloadTask.GameAssetIndexMalformedException) {
+                                    message = i18n("assets.index.malformed");
+                                } else if (ex instanceof AuthlibInjectorDownloadException) {
+                                    message = i18n("account.failed.injector_download_failure");
+                                } else if (ex instanceof CharacterDeletedException) {
+                                    message = i18n("account.failed.character_deleted");
+                                } else if (ex instanceof ResponseCodeException) {
+                                    ResponseCodeException rce = (ResponseCodeException) ex;
+                                    int responseCode = rce.getResponseCode();
+                                    URL url = rce.getUrl();
+                                    if (responseCode == 404)
+                                        message = i18n("download.code.404", url);
+                                    else
+                                        message = i18n("download.failed", url, responseCode);
+                                } else if (ex instanceof CommandTooLongException) {
+                                    message = i18n("launch.failed.command_too_long");
+                                } else if (ex instanceof ExecutionPolicyLimitException) {
+                                    Controllers.prompt(new PromptDialogPane.Builder(i18n("launch.failed.execution_policy"),
+                                            (result, resolve, reject) -> {
+                                                if (CommandBuilder.setExecutionPolicy()) {
+                                                    LOG.info("Set the ExecutionPolicy for the scope 'CurrentUser' to 'RemoteSigned'");
+                                                    resolve.run();
+                                                } else {
+                                                    LOG.warning("Failed to set ExecutionPolicy");
+                                                    reject.accept(i18n("launch.failed.execution_policy.failed_to_set"));
+                                                }
+                                            })
+                                            .addQuestion(new PromptDialogPane.Builder.HintQuestion(i18n("launch.failed.execution_policy.hint")))
+                                    );
+
+                                    return;
+                                } else if (ex instanceof AccessDeniedException) {
+                                    message = i18n("exception.access_denied", ((AccessDeniedException) ex).getFile());
                                 } else {
                                     message = StringUtils.getStackTrace(ex);
                                 }
                                 Controllers.dialog(message,
                                         scriptFile == null ? i18n("launch.failed") : i18n("version.launch_script.failed"),
-                                        MessageBox.ERROR_MESSAGE);
+                                        MessageType.ERROR);
                             }
                         }
-                    });
-                }
-                launchingStepsPane.setExecutor(null);
+                    }
+                    launchingStepsPane.setExecutor(null);
+                });
             }
         });
 
         executor.start();
     }
 
-    private static void checkGameState(Profile profile, VersionSetting setting, Version version, Runnable onAccept) throws InterruptedException {
+    private static Task<JavaVersion> checkGameState(Profile profile, VersionSetting setting, Version version) {
+        VersionNumber gameVersion = VersionNumber.asVersion(profile.getRepository().getGameVersion(version).orElse("Unknown"));
+
         if (setting.isNotCheckJVM()) {
-            onAccept.run();
-            return;
+            return Task.composeAsync(() -> setting.getJavaVersion(gameVersion, version))
+                    .thenApplyAsync(javaVersion -> Optional.ofNullable(javaVersion).orElseGet(JavaVersion::fromCurrentEnvironment))
+                    .withStage("launch.state.java");
         }
 
-        boolean flag = false;
-        boolean java8required = false;
-        boolean newJavaRequired = false;
+        return Task.composeAsync(() -> {
+            return setting.getJavaVersion(gameVersion, version);
+        }).thenComposeAsync(Schedulers.javafx(), javaVersion -> {
+            // Reset invalid java version
+            if (javaVersion == null) {
+                CompletableFuture<JavaVersion> future = new CompletableFuture<>();
+                Runnable continueAction = () -> future.complete(JavaVersion.fromCurrentEnvironment());
 
-        // Without onAccept called, the launching operation will be terminated.
+                if (setting.isJavaAutoSelected()) {
+                    JavaVersionConstraint.VersionRanges range = JavaVersionConstraint.findSuitableJavaVersionRange(gameVersion, version);
+                    GameJavaVersion targetJavaVersion;
 
-        VersionNumber gameVersion = VersionNumber.asVersion(GameVersion.minecraftVersion(profile.getRepository().getVersionJar(version)).orElse("Unknown"));
-        JavaVersion java = setting.getJavaVersion();
-        if (java == null) {
-            Controllers.dialog(i18n("launch.wrong_javadir"), i18n("message.warning"), MessageBox.WARNING_MESSAGE, onAccept);
-            setting.setJava(null);
-            setting.setDefaultJavaPath(null);
-            java = JavaVersion.fromCurrentEnvironment();
-            flag = true;
-        }
+                    if (range.getMandatory().contains(VersionNumber.asVersion("16"))) {
+                        targetJavaVersion = GameJavaVersion.JAVA_16;
+                    } else if (range.getMandatory().contains(VersionNumber.asVersion("1.8.0_51"))) {
+                        targetJavaVersion = GameJavaVersion.JAVA_8;
+                    } else {
+                        targetJavaVersion = null;
+                    }
 
-        // Game later than 1.7.2 accepts Java 8.
-        if (!flag && java.getParsedVersion() < JavaVersion.JAVA_8 && gameVersion.compareTo(VersionNumber.asVersion("1.7.2")) > 0) {
-            Optional<JavaVersion> java8 = JavaVersion.getJavas().stream()
-                    .filter(javaVersion -> javaVersion.getParsedVersion() >= JavaVersion.JAVA_8)
-                    .max(Comparator.comparing(JavaVersion::getVersionNumber));
-            if (java8.isPresent()) {
-                newJavaRequired = true;
-                setting.setJavaVersion(java8.get());
-            } else {
-                if (gameVersion.compareTo(VersionNumber.asVersion("1.13")) >= 0) {
-                    // Minecraft 1.13 and later versions only support Java 8 or later.
-                    // Terminate launching operation.
-                    Controllers.dialog(i18n("launch.advice.java8_1_13"), i18n("message.error"), MessageBox.ERROR_MESSAGE, null);
+                    if (targetJavaVersion != null) {
+                        downloadJava(gameVersion.toString(), targetJavaVersion, profile)
+                                .thenAcceptAsync(downloadedJavaVersion -> {
+                                    future.complete(downloadedJavaVersion);
+                                })
+                                .exceptionally(throwable -> {
+                                    LOG.log(Level.WARNING, "Failed to download java", throwable);
+                                    Controllers.dialog(i18n("launch.failed.no_accepted_java"), i18n("message.warning"), MessageType.WARNING, continueAction);
+                                    return null;
+                                });
+                    }
                 } else {
-                    // Most mods require Java 8 or later version.
-                    Controllers.dialog(i18n("launch.advice.newer_java"), i18n("message.warning"), MessageBox.WARNING_MESSAGE, onAccept);
+                    Controllers.dialog(i18n("launch.wrong_javadir"), i18n("message.warning"), MessageType.WARNING, continueAction);
+
+                    setting.setJava(null);
+                    setting.setDefaultJavaPath(null);
+                    setting.setJavaVersion(JavaVersion.fromCurrentEnvironment());
                 }
-                flag = true;
-            }
-        }
 
-        // LaunchWrapper 1.12 will crash because of assuming the system class loader is an instance of URLClassLoader.
-        if (!flag && java.getParsedVersion() >= JavaVersion.JAVA_9
-                && version.getMainClass().contains("launchwrapper")
-                && version.getLibraries().stream()
-                .filter(library -> "launchwrapper".equals(library.getArtifactId()))
-                .anyMatch(library -> VersionNumber.asVersion(library.getVersion()).compareTo(VersionNumber.asVersion("1.13")) < 0)) {
-            Optional<JavaVersion> java8 = JavaVersion.getJavas().stream().filter(javaVersion -> javaVersion.getParsedVersion() == JavaVersion.JAVA_8).findAny();
-            if (java8.isPresent()) {
-                java8required = true;
-                setting.setJavaVersion(java8.get());
-                Controllers.dialog(i18n("launch.advice.java9") + "\n" + i18n("launch.advice.corrected"), i18n("message.info"), MessageBox.INFORMATION_MESSAGE, onAccept);
-                flag = true;
+                return Task.fromCompletableFuture(future);
             } else {
-                Controllers.dialog(i18n("launch.advice.java9") + "\n" + i18n("launch.advice.uncorrected"), i18n("message.error"), MessageBox.ERROR_MESSAGE, null);
-                flag = true;
+                return Task.completed(javaVersion);
             }
-        }
+        }).thenComposeAsync(javaVersion -> {
+            return Task.allOf(Task.completed(javaVersion), Task.supplyAsync(() -> JavaVersionConstraint.findSuitableJavaVersion(gameVersion, version)));
+        }).thenComposeAsync(Schedulers.javafx(), javaVersions -> {
+            JavaVersion javaVersion = (JavaVersion) javaVersions.get(0);
+            JavaVersion suggestedJavaVersion = (JavaVersion) javaVersions.get(1);
+            if (setting.isJavaAutoSelected()) return Task.completed(javaVersion);
 
-        // Minecraft 1.13 may crash when generating world on Java 8 earlier than 1.8.0_51
-        VersionNumber JAVA_8 = VersionNumber.asVersion("1.8.0_51");
-        if (!flag && gameVersion.compareTo(VersionNumber.asVersion("1.13")) >= 0 && java.getParsedVersion() == JavaVersion.JAVA_8 && java.getVersionNumber().compareTo(JAVA_8) < 0) {
-            Optional<JavaVersion> java8 = JavaVersion.getJavas().stream()
-                    .filter(javaVersion -> javaVersion.getVersionNumber().compareTo(JAVA_8) >= 0)
-                    .max(Comparator.comparing(JavaVersion::getVersionNumber));
-            if (java8.isPresent()) {
-                newJavaRequired = true;
-                setting.setJavaVersion(java8.get());
-            } else {
-                Controllers.dialog(i18n("launch.advice.java8_51_1_13"), i18n("message.warning"), MessageBox.WARNING_MESSAGE, onAccept);
-                flag = true;
-            }
-        }
+            JavaVersionConstraint violatedMandatoryConstraint = null;
+            JavaVersionConstraint violatedSuggestedConstraint = null;
+            for (JavaVersionConstraint constraint : JavaVersionConstraint.ALL) {
+                if (constraint.appliesToVersion(gameVersion, version, javaVersion)) {
+                    if (!constraint.checkJava(gameVersion, version, javaVersion)) {
+                        if (constraint.getType() == JavaVersionConstraint.RULE_MANDATORY) {
+                            violatedMandatoryConstraint = constraint;
+                        } else if (constraint.getType() == JavaVersionConstraint.RULE_SUGGESTED) {
+                            violatedSuggestedConstraint = constraint;
+                        }
+                    }
 
-        if (!flag && java.getPlatform() == org.jackhuang.hmcl.util.platform.Platform.BIT_32 &&
-                org.jackhuang.hmcl.util.platform.Platform.IS_64_BIT) {
-            final JavaVersion java32 = java;
-
-            // First find if same java version but whose platform is 64-bit installed.
-            Optional<JavaVersion> java64 = JavaVersion.getJavas().stream()
-                    .filter(javaVersion -> javaVersion.getPlatform() == org.jackhuang.hmcl.util.platform.Platform.PLATFORM)
-                    .filter(javaVersion -> javaVersion.getParsedVersion() == java32.getParsedVersion())
-                    .max(Comparator.comparing(JavaVersion::getVersionNumber));
-
-            if (!java64.isPresent()) {
-                final boolean java8requiredFinal = java8required, newJavaRequiredFinal = newJavaRequired;
-
-                // Then find if other java version which satisfies requirements installed.
-                java64 = JavaVersion.getJavas().stream()
-                        .filter(javaVersion -> javaVersion.getPlatform() == org.jackhuang.hmcl.util.platform.Platform.PLATFORM)
-                        .filter(javaVersion -> {
-                            if (java8requiredFinal) return javaVersion.getParsedVersion() == JavaVersion.JAVA_8;
-                            if (newJavaRequiredFinal) return javaVersion.getParsedVersion() >= JavaVersion.JAVA_8;
-                            return true;
-                        })
-                        .max(Comparator.comparing(JavaVersion::getVersionNumber));
+                }
             }
 
-            if (java64.isPresent()) {
-                setting.setJavaVersion(java64.get());
-            } else {
-                Controllers.dialog(i18n("launch.advice.different_platform"), i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
-                flag = true;
+            boolean suggested = false;
+            CompletableFuture<JavaVersion> future = new CompletableFuture<>();
+            Runnable continueAction = () -> future.complete(javaVersion);
+            Runnable breakAction = () -> {
+                future.completeExceptionally(new CancellationException("Launch operation was cancelled by user"));
+            };
+
+            if (violatedMandatoryConstraint != null) {
+                if (suggestedJavaVersion != null) {
+                    Controllers.confirm(i18n("launch.advice.java.auto"), i18n("message.warning"), () -> {
+                        setting.setJavaAutoSelected();
+                        future.complete(suggestedJavaVersion);
+                    }, breakAction);
+                    return Task.fromCompletableFuture(future);
+                } else {
+                    switch (violatedMandatoryConstraint) {
+                        case GAME_JSON:
+                            downloadJava(gameVersion.toString(), version.getJavaVersion(), profile)
+                                    .thenAcceptAsync(downloadedJavaVersion -> {
+                                        setting.setJavaVersion(downloadedJavaVersion);
+                                        future.complete(downloadedJavaVersion);
+                                    })
+                                    .exceptionally(throwable -> {
+                                        LOG.log(Level.WARNING, "Failed to download java", throwable);
+                                        breakAction.run();
+                                        return null;
+                                    });
+                            return Task.fromCompletableFuture(future);
+                        case VANILLA_JAVA_16:
+                            Controllers.confirm(i18n("launch.advice.require_newer_java_version", gameVersion.toString(), 16), i18n("message.warning"), () -> {
+                                FXUtils.openLink("https://adoptium.net/?variant=openjdk17");
+                            }, breakAction);
+                            return null;
+                        case VANILLA_JAVA_8:
+                            Controllers.dialog(i18n("launch.advice.java8_1_13"), i18n("message.error"), MessageType.ERROR, breakAction);
+                            return null;
+                        case VANILLA_LINUX_JAVA_8:
+                            if (setting.getNativesDirType() == NativesDirectoryType.VERSION_FOLDER) {
+                                Controllers.dialog(i18n("launch.advice.vanilla_linux_java_8"), i18n("message.error"), MessageType.ERROR, breakAction);
+                                return null;
+                            } else {
+                                break;
+                            }
+                        case VANILLA_X86:
+                            if (setting.getNativesDirType() == NativesDirectoryType.VERSION_FOLDER) {
+                                if (Architecture.SYSTEM_ARCH == Architecture.ARM64) {
+                                    if (OperatingSystem.CURRENT_OS == OperatingSystem.OSX
+                                            // Windows on ARM introduced translation support for x86-64 after 10.0.21277.
+                                            || (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS && OperatingSystem.SYSTEM_BUILD_NUMBER >= 21277)) {
+                                        Controllers.dialog(i18n("launch.advice.vanilla_x86.translation"), i18n("message.error"), MessageType.ERROR, breakAction);
+                                        return null;
+                                    }
+                                }
+                                Controllers.dialog(i18n("launch.advice.vanilla_x86"), i18n("message.error"), MessageType.ERROR, breakAction);
+                                return null;
+                            } else {
+                                break;
+                            }
+                        case LAUNCH_WRAPPER:
+                            Controllers.dialog(i18n("launch.advice.java9") + "\n" + i18n("launch.advice.uncorrected"), i18n("message.error"), MessageType.ERROR, breakAction);
+                            return null;
+                    }
+                }
             }
-        }
 
-        // 32-bit JVM cannot make use of too much memory.
-        if (!flag && java.getPlatform() == org.jackhuang.hmcl.util.platform.Platform.BIT_32 &&
-                setting.getMaxMemory() > 1.5 * 1024) {
-            // 1.5 * 1024 is an inaccurate number.
-            // Actual memory limit depends on operating system and memory.
-            Controllers.dialog(i18n("launch.advice.too_large_memory_for_32bit"), i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
-            flag = true;
-        }
-
-        // Cannot allocate too much memory exceeding free space.
-        if (!flag && OperatingSystem.TOTAL_MEMORY > 0 && OperatingSystem.TOTAL_MEMORY < setting.getMaxMemory()) {
-            Controllers.dialog(i18n("launch.advice.not_enough_space", OperatingSystem.TOTAL_MEMORY), i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
-            flag = true;
-        }
-
-        // Forge 2760~2773 will crash game with LiteLoader.
-        if (!flag) {
-            boolean hasForge2760 = version.getLibraries().stream().filter(it -> it.is("net.minecraftforge", "forge"))
-                    .anyMatch(it ->
-                            VersionNumber.VERSION_COMPARATOR.compare("1.12.2-14.23.5.2760", it.getVersion()) <= 0 &&
-                                    VersionNumber.VERSION_COMPARATOR.compare(it.getVersion(), "1.12.2-14.23.5.2773") < 0);
-            boolean hasLiteLoader = version.getLibraries().stream().anyMatch(it -> it.is("com.mumfrey", "liteloader"));
-            if (hasForge2760 && hasLiteLoader && gameVersion.compareTo(VersionNumber.asVersion("1.12.2")) == 0) {
-                Controllers.dialog(i18n("launch.advice.forge2760_liteloader"), i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
-                flag = true;
+            if (Architecture.SYSTEM_ARCH == Architecture.X86_64
+                    && javaVersion.getPlatform().getArchitecture() == Architecture.X86) {
+                Controllers.dialog(i18n("launch.advice.different_platform"), i18n("message.warning"), MessageType.ERROR, continueAction);
+                suggested = true;
             }
-        }
 
-        if (!flag)
-            onAccept.run();
+            // 32-bit JVM cannot make use of too much memory.
+            if (javaVersion.getBits() == Bits.BIT_32 &&
+                    setting.getMaxMemory() > 1.5 * 1024) {
+                // 1.5 * 1024 is an inaccurate number.
+                // Actual memory limit depends on operating system and memory.
+                Controllers.confirm(i18n("launch.advice.too_large_memory_for_32bit"), i18n("message.error"), continueAction, breakAction);
+                suggested = true;
+            }
+
+            if (!suggested && violatedSuggestedConstraint != null) {
+                suggested = true;
+                switch (violatedSuggestedConstraint) {
+                    case MODDED_JAVA_7:
+                        Controllers.dialog(i18n("launch.advice.java.modded_java_7"), i18n("message.warning"), MessageType.WARNING, continueAction);
+                        return null;
+                    case MODDED_JAVA_8:
+                        Controllers.dialog(i18n("launch.advice.newer_java"), i18n("message.warning"), MessageType.WARNING, continueAction);
+                        break;
+                    case VANILLA_JAVA_8_51:
+                        Controllers.dialog(i18n("launch.advice.java8_51_1_13"), i18n("message.warning"), MessageType.WARNING, continueAction);
+                        break;
+                }
+            }
+
+            // Cannot allocate too much memory exceeding free space.
+            if (!suggested && OperatingSystem.TOTAL_MEMORY > 0 && OperatingSystem.TOTAL_MEMORY < setting.getMaxMemory()) {
+                Controllers.confirm(i18n("launch.advice.not_enough_space", OperatingSystem.TOTAL_MEMORY), i18n("message.error"), continueAction, null);
+                suggested = true;
+            }
+
+            // Forge 2760~2773 will crash game with LiteLoader.
+            if (!suggested) {
+                boolean hasForge2760 = version.getLibraries().stream().filter(it -> it.is("net.minecraftforge", "forge"))
+                        .anyMatch(it ->
+                                VersionNumber.VERSION_COMPARATOR.compare("1.12.2-14.23.5.2760", it.getVersion()) <= 0 &&
+                                        VersionNumber.VERSION_COMPARATOR.compare(it.getVersion(), "1.12.2-14.23.5.2773") < 0);
+                boolean hasLiteLoader = version.getLibraries().stream().anyMatch(it -> it.is("com.mumfrey", "liteloader"));
+                if (hasForge2760 && hasLiteLoader && gameVersion.compareTo(VersionNumber.asVersion("1.12.2")) == 0) {
+                    Controllers.confirm(i18n("launch.advice.forge2760_liteloader"), i18n("message.error"), continueAction, null);
+                    suggested = true;
+                }
+            }
+
+            // OptiFine 1.14.4 is not compatible with Forge 28.2.2 and later versions.
+            if (!suggested) {
+                boolean hasForge28_2_2 = version.getLibraries().stream().filter(it -> it.is("net.minecraftforge", "forge"))
+                        .anyMatch(it ->
+                                VersionNumber.VERSION_COMPARATOR.compare("1.14.4-28.2.2", it.getVersion()) <= 0);
+                boolean hasOptiFine = version.getLibraries().stream().anyMatch(it -> it.is("optifine", "OptiFine"));
+                if (hasForge28_2_2 && hasOptiFine && gameVersion.compareTo(VersionNumber.asVersion("1.14.4")) == 0) {
+                    Controllers.confirm(i18n("launch.advice.forge28_2_2_optifine"), i18n("message.error"), continueAction, null);
+                    suggested = true;
+                }
+            }
+
+            if (!suggested) {
+                future.complete(javaVersion);
+            }
+
+            return Task.fromCompletableFuture(future);
+        }).withStage("launch.state.java");
     }
 
-    public void emitStatus(LoadingState state) {
-        if (state == LoadingState.DONE) {
-            launchingStepsPane.fireEvent(new DialogCloseEvent());
-        }
+    private static CompletableFuture<JavaVersion> downloadJava(String gameVersion, GameJavaVersion javaVersion, Profile profile) {
+        CompletableFuture<JavaVersion> future = new CompletableFuture<>();
 
-        launchingStepsPane.setTitle(state.getLocalizedMessage());
-        launchingStepsPane.setSubtitle((state.ordinal() + 1) + " / " + LoadingState.values().length);
+        JFXHyperlink link = new JFXHyperlink(i18n("download.external_link"));
+        link.setOnAction(e -> {
+            FXUtils.openLink("https://docs.microsoft.com/zh-cn/java/openjdk/download");
+            future.completeExceptionally(new CancellationException());
+        });
+
+        Controllers.dialog(new MessageDialogPane.Builder(
+                i18n("launch.advice.require_newer_java_version",
+                        gameVersion,
+                        javaVersion.getMajorVersion()),
+                i18n("message.warning"),
+                MessageType.QUESTION)
+                .addAction(link)
+                .yesOrNo(() -> {
+                    downloadJavaImpl(javaVersion, profile.getDependency().getDownloadProvider())
+                            .thenAcceptAsync(downloadedJava -> {
+                                future.complete(downloadedJava);
+                            })
+                            .exceptionally(throwable -> {
+                                Throwable resolvedException = resolveException(throwable);
+                                LOG.log(Level.WARNING, "Failed to download java", throwable);
+                                if (!(resolvedException instanceof CancellationException)) {
+                                    Controllers.dialog(DownloadProviders.localizeErrorMessage(resolvedException), i18n("install.failed"));
+                                }
+                                future.completeExceptionally(new CancellationException());
+                                return null;
+                            });
+                }, () -> {
+                    future.completeExceptionally(new CancellationException());
+                }).build());
+
+        return future;
+    }
+
+    /**
+     * Directly start java downloading.
+     *
+     * @param javaVersion target Java version
+     * @param downloadProvider download provider
+     * @return JavaVersion, null if we failed to download java, failed if an error occurred when downloading.
+     */
+    private static CompletableFuture<JavaVersion> downloadJavaImpl(GameJavaVersion javaVersion, DownloadProvider downloadProvider) {
+        CompletableFuture<JavaVersion> future = new CompletableFuture<>();
+
+        TaskExecutorDialogPane javaDownloadingPane = new TaskExecutorDialogPane(it -> {
+        });
+
+        TaskExecutor executor = JavaRepository.downloadJava(javaVersion, downloadProvider)
+                .whenComplete(Schedulers.javafx(), (downloadedJava, exception) -> {
+                    if (exception != null) {
+                        future.completeExceptionally(exception);
+                    } else {
+                        future.complete(downloadedJava);
+                    }
+                })
+                .executor(false);
+
+        javaDownloadingPane.setExecutor(executor, true);
+        Controllers.dialog(javaDownloadingPane);
+        executor.start();
+
+        return future;
     }
 
     private void checkExit() {
         switch (launcherVisibility) {
             case HIDE_AND_REOPEN:
-                Platform.runLater(Controllers.getStage()::show);
+                Platform.runLater(() -> {
+                    Optional.ofNullable(Controllers.getStage())
+                            .ifPresent(Stage::show);
+                });
                 break;
             case KEEP:
                 // No operations here
@@ -418,26 +617,6 @@ public final class LauncherHelper {
         }
     }
 
-    private static class LaunchTask<T> extends TaskResult<T> {
-        private final ExceptionalSupplier<T, Exception> supplier;
-
-        public LaunchTask(ExceptionalSupplier<T, Exception> supplier) {
-            this.supplier = supplier;
-        }
-
-        @Override
-        public void execute() throws Exception {
-            setResult(supplier.get());
-        }
-
-        @Override
-        public String getId() {
-            return LAUNCH_ID;
-        }
-
-        static final String LAUNCH_ID = "launch";
-    }
-
     /**
      * The managed process listener.
      * Guarantee that one [JavaProcess], one [HMCLProcessListener].
@@ -445,26 +624,30 @@ public final class LauncherHelper {
      */
     class HMCLProcessListener implements ProcessListener {
 
-        private final VersionSetting setting;
+        private final HMCLGameRepository repository;
+        private final Version version;
         private final Map<String, String> forbiddenTokens;
+        private final LaunchOptions launchOptions;
         private ManagedProcess process;
         private boolean lwjgl;
         private LogWindow logWindow;
         private final boolean detectWindow;
         private final LinkedList<Pair<String, Log4jLevel>> logs;
-        private final CountDownLatch latch = new CountDownLatch(1);
+        private final CountDownLatch logWindowLatch = new CountDownLatch(1);
+        private final CountDownLatch launchingLatch;
 
-        public HMCLProcessListener(AuthInfo authInfo, VersionSetting setting, boolean detectWindow) {
-            this.setting = setting;
+        public HMCLProcessListener(HMCLGameRepository repository, Version version, AuthInfo authInfo, LaunchOptions launchOptions, CountDownLatch launchingLatch, boolean detectWindow) {
+            this.repository = repository;
+            this.version = version;
+            this.launchOptions = launchOptions;
+            this.launchingLatch = launchingLatch;
             this.detectWindow = detectWindow;
 
             if (authInfo == null)
                 forbiddenTokens = Collections.emptyMap();
             else
                 forbiddenTokens = mapOf(
-                        pair(authInfo.getAccessToken(), "<access token>"),
-                        pair(UUIDTypeAdapter.fromUUID(authInfo.getUUID()), "<uuid>"),
-                        pair(authInfo.getUsername(), "<player>")
+                        pair(authInfo.getAccessToken(), "<access token>")
                 );
 
             logs = new LinkedList<>();
@@ -474,11 +657,22 @@ public final class LauncherHelper {
         public void setProcess(ManagedProcess process) {
             this.process = process;
 
+            String command = new CommandBuilder().addAll(process.getCommands()).toString();
+            for (Map.Entry<String, String> entry : forbiddenTokens.entrySet())
+                command = command.replace(entry.getKey(), entry.getValue());
+
+            LOG.info("Launched process: " + command);
+
+            String classpath = process.getClasspath();
+            if (classpath != null) {
+                LOG.info("Process ClassPath: " + classpath);
+            }
+
             if (showLogs)
                 Platform.runLater(() -> {
                     logWindow = new LogWindow();
-                    logWindow.show();
-                    latch.countDown();
+                    logWindow.showNormal();
+                    logWindowLatch.countDown();
                 });
         }
 
@@ -490,7 +684,7 @@ public final class LauncherHelper {
                         // these codes will be executed.
                         if (Controllers.getStage() != null) {
                             Controllers.getStage().hide();
-                            emitStatus(LoadingState.DONE);
+                            launchingLatch.countDown();
                         }
                     });
                     break;
@@ -498,17 +692,17 @@ public final class LauncherHelper {
                     // Never come to here.
                     break;
                 case KEEP:
-                    Platform.runLater(() -> {
-                        emitStatus(LoadingState.DONE);
-                    });
+                    Platform.runLater(launchingLatch::countDown);
                     break;
                 case HIDE:
+                    launchingLatch.countDown();
                     Platform.runLater(() -> {
                         // If application was stopped and execution services did not finish termination,
                         // these codes will be executed.
                         if (Controllers.getStage() != null) {
                             Controllers.getStage().close();
-                            emitStatus(LoadingState.DONE);
+                            Controllers.shutdown();
+                            Schedulers.shutdown();
                         }
                     });
                     break;
@@ -520,29 +714,29 @@ public final class LauncherHelper {
             String newLog = log;
             for (Map.Entry<String, String> entry : forbiddenTokens.entrySet())
                 newLog = newLog.replace(entry.getKey(), entry.getValue());
+            String filteredLog = newLog;
 
             if (level.lessOrEqual(Log4jLevel.ERROR))
-                System.err.print(log);
+                System.err.println(filteredLog);
             else
-                System.out.print(log);
+                System.out.println(filteredLog);
 
-            logs.add(pair(log, level));
+            logs.add(pair(filteredLog, level));
             if (logs.size() > config().getLogLines())
                 logs.removeFirst();
 
             if (showLogs) {
                 try {
-                    latch.await();
-                    logWindow.waitForLoaded();
+                    logWindowLatch.await();
                 } catch (InterruptedException e) {
                     Thread.currentThread().interrupt();
                     return;
                 }
 
-                Platform.runLater(() -> logWindow.logLine(log, level));
+                Platform.runLater(() -> logWindow.logLine(filteredLog, level));
             }
 
-            if (!lwjgl && (log.contains("LWJGL Version: ") || !detectWindow)) {
+            if (!lwjgl && (filteredLog.toLowerCase().contains("lwjgl version") || filteredLog.toLowerCase().contains("lwjgl openal") || !detectWindow)) {
                 lwjgl = true;
                 finishLaunch();
             }
@@ -550,32 +744,18 @@ public final class LauncherHelper {
 
         @Override
         public void onExit(int exitCode, ExitType exitType) {
+            launchingLatch.countDown();
+
             if (exitType == ExitType.INTERRUPTED)
                 return;
 
             // Game crashed before opening the game window.
             if (!lwjgl) finishLaunch();
 
-            if (exitType != ExitType.NORMAL && logWindow == null)
-                Platform.runLater(() -> {
-                    logWindow = new LogWindow();
-
-                    switch (exitType) {
-                        case JVM_ERROR:
-                            logWindow.setTitle(i18n("launch.failed.cannot_create_jvm"));
-                            break;
-                        case APPLICATION_ERROR:
-                            logWindow.setTitle(i18n("launch.failed.exited_abnormally"));
-                            break;
-                    }
-
-                    logWindow.show();
-                    logWindow.onDone.register(() -> {
-                        logWindow.logLine("Command: " + new CommandBuilder().addAll(process.getCommands()).toString(), Log4jLevel.INFO);
-                        for (Map.Entry<String, Log4jLevel> entry : logs)
-                            logWindow.logLine(entry.getKey(), entry.getValue());
-                    });
-                });
+            if (exitType != ExitType.NORMAL) {
+                repository.markVersionLaunchedAbnormally(version.getId());
+                Platform.runLater(() -> new GameCrashWindow(process, exitType, repository, version, launchOptions, logs).show());
+            }
 
             checkExit();
         }
@@ -583,6 +763,7 @@ public final class LauncherHelper {
     }
 
     public static final Queue<ManagedProcess> PROCESSES = new ConcurrentLinkedQueue<>();
+
     public static void stopManagedProcesses() {
         while (!PROCESSES.isEmpty())
             Optional.ofNullable(PROCESSES.poll()).ifPresent(ManagedProcess::stop);

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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

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

@@ -0,0 +1,82 @@
+/*
+ * 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.game;
+
+import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.util.Logging;
+import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.io.Zipper;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+public final class LogExporter {
+    private LogExporter() {
+    }
+
+    public static CompletableFuture<Void> exportLogs(Path zipFile, DefaultGameRepository gameRepository, String versionId, String logs, String launchScript) {
+        Path runDirectory = gameRepository.getRunDirectory(versionId).toPath();
+        Path baseDirectory = gameRepository.getBaseDirectory().toPath();
+        List<String> versions = new ArrayList<>();
+
+        String currentVersionId = versionId;
+        HashSet<String> resolvedSoFar = new HashSet<>();
+        while (true) {
+            if (resolvedSoFar.contains(currentVersionId)) break;
+            resolvedSoFar.add(currentVersionId);
+            Version currentVersion = gameRepository.getVersion(currentVersionId);
+            versions.add(currentVersionId);
+
+            if (StringUtils.isNotBlank(currentVersion.getInheritsFrom())) {
+                currentVersionId = currentVersion.getInheritsFrom();
+            } else {
+                break;
+            }
+        }
+
+        return CompletableFuture.runAsync(() -> {
+            try (Zipper zipper = new Zipper(zipFile)) {
+                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(launchScript, OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS ? "launch.bat" : "launch.sh");
+
+                for (String id : versions) {
+                    Path versionJson = baseDirectory.resolve("versions").resolve(id).resolve(id + ".json");
+                    if (Files.exists(versionJson)) {
+                        zipper.putFile(versionJson, id + ".json");
+                    }
+                }
+            } catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
+        }, Schedulers.io());
+    }
+}

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -15,17 +15,18 @@
  * 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.wizard;
+package org.jackhuang.hmcl.game;
 
-import javafx.scene.Node;
+import java.nio.file.Path;
 
-public final class Wizard {
+public class ManuallyCreatedModpackException extends Exception {
+    private final Path path;
 
-    public static Node createWizard(WizardProvider provider) {
-        return createWizard("", provider);
+    public ManuallyCreatedModpackException(Path path) {
+        this.path = path;
     }
 
-    public static Node createWizard(String namespace, WizardProvider provider) {
-        return new DefaultWizardDisplayer(namespace, provider);
+    public Path getPath() {
+        return path;
     }
 }

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

@@ -0,0 +1,61 @@
+/*
+ * 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.game;
+
+import org.jackhuang.hmcl.setting.Profile;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.util.io.CompressingUtils;
+import org.jackhuang.hmcl.util.io.Unzipper;
+
+import java.nio.charset.Charset;
+import java.nio.file.FileSystem;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+public class ManuallyCreatedModpackInstallTask extends Task<Path> {
+
+    private final Profile profile;
+    private final Path zipFile;
+    private final Charset charset;
+    private final String name;
+
+    public ManuallyCreatedModpackInstallTask(Profile profile, Path zipFile, Charset charset, String name) {
+        this.profile = profile;
+        this.zipFile = zipFile;
+        this.charset = charset;
+        this.name = name;
+    }
+
+    @Override
+    public void execute() throws Exception {
+        Path subdirectory;
+        try (FileSystem fs = CompressingUtils.readonly(zipFile).setEncoding(charset).build()) {
+            subdirectory = ModpackHelper.findMinecraftDirectoryInManuallyCreatedModpack(zipFile.toString(), fs);
+        }
+
+        Path dest = Paths.get("externalgames").resolve(name);
+
+        setResult(dest);
+
+        new Unzipper(zipFile, dest)
+                .setSubDirectory(subdirectory.toString())
+                .setTerminateIfSubDirectoryNotExists()
+                .setEncoding(charset)
+                .unzip();
+    }
+}

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -20,8 +20,18 @@ package org.jackhuang.hmcl.game;
 import com.google.gson.JsonParseException;
 import com.google.gson.reflect.TypeToken;
 import org.jackhuang.hmcl.mod.*;
-import org.jackhuang.hmcl.setting.EnumGameDirectory;
+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.multimc.MultiMCInstanceConfiguration;
+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.ServerModpackRemoteInstallTask;
 import org.jackhuang.hmcl.setting.Profile;
+import org.jackhuang.hmcl.setting.Profiles;
 import org.jackhuang.hmcl.setting.VersionSetting;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
@@ -29,40 +39,97 @@ import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.function.ExceptionalConsumer;
 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.jackhuang.hmcl.util.io.ZipFileSystem;
 
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.nio.charset.Charset;
+import java.nio.file.FileSystem;
+import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.Objects;
 import java.util.Optional;
+import java.util.stream.Stream;
+
+import static org.jackhuang.hmcl.util.Lang.toIterable;
 
 public final class ModpackHelper {
     private ModpackHelper() {}
 
-    public static Modpack readModpackManifest(Path file, Charset charset) throws UnsupportedModpackException {
-        try {
-            return CurseManifest.readCurseForgeModpackManifest(file, charset);
-        } catch (Exception e) {
-            // ignore it, not a valid CurseForge modpack.
+    public static Modpack readModpackManifest(Path file, Charset charset) throws UnsupportedModpackException, ManuallyCreatedModpackException {
+        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) {
         }
 
-        try {
-            return HMCLModpackManager.readHMCLModpackManifest(file, charset);
-        } catch (Exception e) {
-            // ignore it, not a valid HMCL modpack.
-        }
-
-        try {
-            return MultiMCInstanceConfiguration.readMultiMCModpackManifest(file, charset);
-        } catch (Exception e) {
-            // ignore it, not a valid MultiMC modpack.
+        try (FileSystem fs = CompressingUtils.createReadOnlyZipFileSystem(file, charset)) {
+            findMinecraftDirectoryInManuallyCreatedModpack(file.toString(), fs);
+            throw new ManuallyCreatedModpackException(file);
+        } catch (IOException e) {
+            // ignore it
         }
 
         throw new UnsupportedModpackException(file.toString());
     }
 
+    public static Path findMinecraftDirectoryInManuallyCreatedModpack(String modpackName, FileSystem fs) throws IOException, UnsupportedModpackException {
+        Path root = fs.getPath("/");
+        if (isMinecraftDirectory(root)) return root;
+        try (Stream<Path> firstLayer = Files.list(root)) {
+            for (Path dir : toIterable(firstLayer)) {
+                if (isMinecraftDirectory(dir)) return dir;
+
+                try (Stream<Path> secondLayer = Files.list(dir)) {
+                    for (Path subdir : toIterable(secondLayer)) {
+                        if (isMinecraftDirectory(subdir)) return subdir;
+                    }
+                } catch (IOException ignored) {
+                }
+            }
+        } catch (IOException ignored) {
+        }
+        throw new UnsupportedModpackException(modpackName);
+    }
+
+    private static boolean isMinecraftDirectory(Path path) {
+        return Files.isDirectory(path.resolve("versions")) &&
+                (path.getFileName() == null || ".minecraft".equals(FileUtils.getName(path)));
+    }
+
     public static ModpackConfiguration<?> readModpackConfiguration(File file) throws IOException {
         if (!file.exists())
             throw new FileNotFoundException(file.getPath());
@@ -86,7 +153,7 @@ public final class ModpackHelper {
             throw new UnsupportedModpackException();
     }
 
-    public static Task getInstallTask(Profile profile, File zipFile, String name, Modpack modpack) {
+    public static Task<?> getInstallTask(Profile profile, ServerModpackManifest manifest, String name, Modpack modpack) {
         profile.getRepository().markVersionAsModpack(name);
 
         ExceptionalRunnable<?> success = () -> {
@@ -95,33 +162,82 @@ public final class ModpackHelper {
             VersionSetting vs = repository.specializeVersionSetting(name);
             repository.undoMark(name);
             if (vs != null)
-                vs.setGameDirType(EnumGameDirectory.VERSION_FOLDER);
+                vs.setGameDirType(GameDirectoryType.VERSION_FOLDER);
         };
 
         ExceptionalConsumer<Exception, ?> failure = ex -> {
             if (ex instanceof CurseCompletionException && !(ex.getCause() instanceof FileNotFoundException)) {
                 success.run();
                 // This is tolerable and we will not delete the game
-            } else {
-                HMCLGameRepository repository = profile.getRepository();
-                repository.removeVersionFromDisk(name);
             }
         };
 
-        if (modpack.getManifest() instanceof CurseManifest)
-            return new CurseInstallTask(profile.getDependency(), zipFile, modpack, ((CurseManifest) modpack.getManifest()), name)
-                    .finalized(Schedulers.defaultScheduler(), ExceptionalConsumer.fromRunnable(success), failure);
-        else if (modpack.getManifest() instanceof HMCLModpackManifest)
-            return new HMCLModpackInstallTask(profile, zipFile, modpack, name)
-                    .finalized(Schedulers.defaultScheduler(), ExceptionalConsumer.fromRunnable(success), failure);
-        else if (modpack.getManifest() instanceof MultiMCInstanceConfiguration)
-            return new MultiMCModpackInstallTask(profile.getDependency(), zipFile, modpack, ((MultiMCInstanceConfiguration) modpack.getManifest()), name)
-                    .finalized(Schedulers.defaultScheduler(), ExceptionalConsumer.fromRunnable(success), failure)
-                    .then(new MultiMCInstallVersionSettingTask(profile, ((MultiMCInstanceConfiguration) modpack.getManifest()), name));
-        else throw new IllegalStateException("Unrecognized modpack: " + modpack);
+        return new ServerModpackRemoteInstallTask(profile.getDependency(), manifest, name)
+                .whenComplete(Schedulers.defaultScheduler(), success, failure)
+                .withStagesHint(Arrays.asList("hmcl.modpack", "hmcl.modpack.download"));
     }
 
-    public static Task getUpdateTask(Profile profile, File zipFile, Charset charset, String name, ModpackConfiguration<?> configuration) throws UnsupportedModpackException, MismatchedModpackTypeException {
+    public static boolean isExternalGameNameConflicts(String name) {
+        return Files.exists(Paths.get("externalgames").resolve(name));
+    }
+
+    public static Task<?> getInstallManuallyCreatedModpackTask(Profile profile, File zipFile, String name, Charset charset) {
+        if (isExternalGameNameConflicts(name)) {
+            throw new IllegalArgumentException("name existing");
+        }
+
+        return new ManuallyCreatedModpackInstallTask(profile, zipFile.toPath(), charset, name)
+                .thenAcceptAsync(Schedulers.javafx(), location -> {
+                    Profile newProfile = new Profile(name, location.toFile());
+                    newProfile.setUseRelativePath(true);
+                    Profiles.getProfiles().add(newProfile);
+                    Profiles.setSelectedProfile(newProfile);
+                });
+    }
+
+    public static Task<?> getInstallTask(Profile profile, File zipFile, String name, Modpack modpack) {
+        profile.getRepository().markVersionAsModpack(name);
+
+        ExceptionalRunnable<?> success = () -> {
+            HMCLGameRepository repository = profile.getRepository();
+            repository.refreshVersions();
+            VersionSetting vs = repository.specializeVersionSetting(name);
+            repository.undoMark(name);
+            if (vs != null)
+                vs.setGameDirType(GameDirectoryType.VERSION_FOLDER);
+        };
+
+        ExceptionalConsumer<Exception, ?> failure = ex -> {
+            if (ex instanceof CurseCompletionException && !(ex.getCause() instanceof FileNotFoundException)) {
+                success.run();
+                // This is tolerable and we will not delete the game
+            }
+        };
+
+        if (modpack.getManifest() instanceof MultiMCInstanceConfiguration)
+            return modpack.getInstallTask(profile.getDependency(), zipFile, name)
+                    .whenComplete(Schedulers.defaultScheduler(), success, failure)
+                    .thenComposeAsync(createMultiMCPostInstallTask(profile, (MultiMCInstanceConfiguration) modpack.getManifest(), name));
+        else if (modpack.getManifest() instanceof McbbsModpackManifest)
+            return modpack.getInstallTask(profile.getDependency(), zipFile, name)
+                    .whenComplete(Schedulers.defaultScheduler(), success, failure)
+                    .thenComposeAsync(createMcbbsPostInstallTask(profile, (McbbsModpackManifest) modpack.getManifest(), name));
+        else
+            return modpack.getInstallTask(profile.getDependency(), zipFile, name)
+                    .whenComplete(Schedulers.javafx(), success, failure);
+    }
+
+    public static Task<Void> getUpdateTask(Profile profile, ServerModpackManifest manifest, Charset charset, String name, ModpackConfiguration<?> configuration) throws UnsupportedModpackException {
+        switch (configuration.getType()) {
+            case ServerModpackRemoteInstallTask.MODPACK_TYPE:
+                return new ModpackUpdateTask(profile.getRepository(), name, new ServerModpackRemoteInstallTask(profile.getDependency(), manifest, name))
+                        .withStagesHint(Arrays.asList("hmcl.modpack", "hmcl.modpack.download"));
+            default:
+                throw new UnsupportedModpackException();
+        }
+    }
+
+    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);
 
         switch (configuration.getType()) {
@@ -140,6 +256,16 @@ public final class ModpackHelper {
                     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();
         }
@@ -147,7 +273,7 @@ public final class ModpackHelper {
 
     public static void toVersionSetting(MultiMCInstanceConfiguration c, VersionSetting vs) {
         vs.setUsesGlobal(false);
-        vs.setGameDirType(EnumGameDirectory.VERSION_FOLDER);
+        vs.setGameDirType(GameDirectoryType.VERSION_FOLDER);
 
         if (c.isOverrideJavaLocation()) {
             vs.setJavaDir(Lang.nonNull(c.getJavaPath(), ""));
@@ -182,5 +308,18 @@ public final class ModpackHelper {
         }
     }
 
+    private static Task<Void> createMultiMCPostInstallTask(Profile profile, MultiMCInstanceConfiguration manifest, String version) {
+        return Task.runAsync(Schedulers.javafx(), () -> {
+            VersionSetting vs = Objects.requireNonNull(profile.getRepository().specializeVersionSetting(version));
+            ModpackHelper.toVersionSetting(manifest, vs);
+        });
+    }
 
+    private static Task<Void> createMcbbsPostInstallTask(Profile profile, McbbsModpackManifest manifest, String version) {
+        return Task.runAsync(Schedulers.javafx(), () -> {
+            VersionSetting vs = Objects.requireNonNull(profile.getRepository().specializeVersionSetting(version));
+            if (manifest.getLaunchInfo().getMinMemory() > vs.getMaxMemory())
+                vs.setMaxMemory(manifest.getLaunchInfo().getMinMemory());
+        });
+    }
 }

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

@@ -1,50 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  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.MultiMCInstanceConfiguration;
-import org.jackhuang.hmcl.setting.Profile;
-import org.jackhuang.hmcl.setting.VersionSetting;
-import org.jackhuang.hmcl.task.Scheduler;
-import org.jackhuang.hmcl.task.Schedulers;
-import org.jackhuang.hmcl.task.Task;
-
-import java.util.Objects;
-
-public final class MultiMCInstallVersionSettingTask extends Task {
-    private final Profile profile;
-    private final MultiMCInstanceConfiguration manifest;
-    private final String version;
-
-    public MultiMCInstallVersionSettingTask(Profile profile, MultiMCInstanceConfiguration manifest, String version) {
-        this.profile = profile;
-        this.manifest = manifest;
-        this.version = version;
-    }
-
-    @Override
-    public Scheduler getScheduler() {
-        return Schedulers.javafx();
-    }
-
-    @Override
-    public void execute() {
-        VersionSetting vs = Objects.requireNonNull(profile.getRepository().specializeVersionSetting(version));
-        ModpackHelper.toVersionSetting(manifest, vs);
-    }
-}

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

@@ -0,0 +1,208 @@
+/*
+ * 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.game;
+
+import fi.iki.elonen.NanoHTTPD;
+import org.jackhuang.hmcl.auth.AuthenticationException;
+import org.jackhuang.hmcl.auth.OAuth;
+import org.jackhuang.hmcl.event.Event;
+import org.jackhuang.hmcl.event.EventManager;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.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.i18n.I18n.i18n;
+
+public final class OAuthServer extends NanoHTTPD implements OAuth.Session {
+    private final int port;
+    private final CompletableFuture<String> future = new CompletableFuture<>();
+
+    public static String lastlyOpenedURL;
+
+    private String idToken;
+
+    private OAuthServer(int port) {
+        super(port);
+
+        this.port = port;
+    }
+
+    @Override
+    public String getRedirectURI() {
+        return String.format("http://localhost:%d/auth-response", port);
+    }
+
+    @Override
+    public String waitFor() throws InterruptedException, ExecutionException {
+        return future.get();
+    }
+
+    @Override
+    public String getIdToken() {
+        return idToken;
+    }
+
+    @Override
+    public Response serve(IHTTPSession session) {
+        if (!"/auth-response".equals(session.getUri())) {
+            return newFixedLengthResponse(Response.Status.NOT_FOUND, MIME_HTML, "");
+        }
+
+        if (session.getMethod() == Method.POST) {
+            Map<String, String> files = new HashMap<>();
+            try {
+                session.parseBody(files);
+            } catch (IOException 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());
+            }
+        } else if (session.getMethod() == Method.GET) {
+            // do nothing
+        } else {
+            return newFixedLengthResponse(Response.Status.NOT_FOUND, MIME_HTML, "");
+        }
+        String parameters = session.getQueryParameterString();
+
+        Map<String, String> query = mapOf(NetworkUtils.parseQuery(parameters));
+        if (query.containsKey("code")) {
+            idToken = query.get("id_token");
+            future.complete(query.get("code"));
+        } else {
+            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"), StandardCharsets.UTF_8)
+                    .replace("%close-page%", i18n("account.methods.microsoft.close_page"));
+        } catch (IOException e) {
+            Logging.LOG.log(Level.SEVERE, "Failed to load html");
+            return newFixedLengthResponse(Response.Status.INTERNAL_ERROR, MIME_HTML, "");
+        }
+        thread(() -> {
+            try {
+                Thread.sleep(1000);
+                stop();
+            } catch (InterruptedException e) {
+                Logging.LOG.log(Level.SEVERE, "Failed to sleep for 1 second");
+            }
+        });
+        return newFixedLengthResponse(Response.Status.OK, "text/html; charset=UTF-8", html);
+    }
+
+    public static class Factory implements OAuth.Callback {
+        public final EventManager<GrantDeviceCodeEvent> onGrantDeviceCode = new EventManager<>();
+        public final EventManager<OpenBrowserEvent> onOpenBrowser = new EventManager<>();
+
+        @Override
+        public OAuth.Session startServer() throws IOException, AuthenticationException {
+            if (StringUtils.isBlank(getClientId())) {
+                throw new MicrosoftAuthenticationNotSupportedException();
+            }
+
+            IOException exception = null;
+            for (int port : new int[]{29111, 29112, 29113, 29114, 29115}) {
+                try {
+                    OAuthServer server = new OAuthServer(port);
+                    server.start(NanoHTTPD.SOCKET_READ_TIMEOUT, true);
+                    return server;
+                } catch (IOException e) {
+                    exception = e;
+                }
+            }
+            throw exception;
+        }
+
+        @Override
+        public void grantDeviceCode(String userCode, String verificationURI) {
+            onGrantDeviceCode.fireEvent(new GrantDeviceCodeEvent(this, userCode, verificationURI));
+        }
+
+        @Override
+        public void openBrowser(String url) throws IOException {
+            lastlyOpenedURL = url;
+            FXUtils.openLink(url);
+
+            onOpenBrowser.fireEvent(new OpenBrowserEvent(this, url));
+        }
+
+        @Override
+        public String getClientId() {
+            return System.getProperty("hmcl.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.thisJar().flatMap(JarUtils::getManifest).map(manifest -> manifest.getMainAttributes().getValue("Microsoft-Auth-Secret")).orElse(""));
+        }
+
+    }
+
+    public static class GrantDeviceCodeEvent extends Event {
+        private final String userCode;
+        private final String verificationUri;
+
+        public GrantDeviceCodeEvent(Object source, String userCode, String verificationUri) {
+            super(source);
+            this.userCode = userCode;
+            this.verificationUri = verificationUri;
+        }
+
+        public String getUserCode() {
+            return userCode;
+        }
+
+        public String getVerificationUri() {
+            return verificationUri;
+        }
+    }
+
+    public static class OpenBrowserEvent extends Event {
+        private final String url;
+
+        public OpenBrowserEvent(Object source, String url) {
+            super(source);
+            this.url = url;
+        }
+
+        public String getUrl() {
+            return url;
+        }
+    }
+
+    public static class MicrosoftAuthenticationNotSupportedException extends AuthenticationException {
+    }
+}

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -17,15 +17,25 @@
  */
 package org.jackhuang.hmcl.game;
 
-import static java.util.Collections.singletonMap;
-import static org.jackhuang.hmcl.util.Lang.threadPool;
-import static org.jackhuang.hmcl.util.Logging.LOG;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.ObjectBinding;
+import javafx.scene.image.Image;
+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.yggdrasil.*;
+import org.jackhuang.hmcl.task.FileDownloadTask;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.util.ResourceNotFoundError;
+import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.javafx.BindingMapping;
 
-import java.awt.Graphics2D;
+import javax.imageio.ImageIO;
+import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.UncheckedIOException;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -33,27 +43,16 @@ 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 javax.imageio.ImageIO;
-
-import org.jackhuang.hmcl.Metadata;
-import org.jackhuang.hmcl.auth.Account;
-import org.jackhuang.hmcl.auth.ServerResponseMalformedException;
-import org.jackhuang.hmcl.auth.yggdrasil.Texture;
-import org.jackhuang.hmcl.auth.yggdrasil.TextureModel;
-import org.jackhuang.hmcl.auth.yggdrasil.TextureType;
-import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
-import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilService;
-import org.jackhuang.hmcl.task.FileDownloadTask;
-import org.jackhuang.hmcl.util.javafx.MultiStepBinding;
-
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.ObjectBinding;
-import javafx.embed.swing.SwingFXUtils;
-import javafx.scene.image.Image;
+import static java.util.Collections.emptyMap;
+import static java.util.Collections.singletonMap;
+import static java.util.Objects.requireNonNull;
+import static org.jackhuang.hmcl.util.Lang.threadPool;
+import static org.jackhuang.hmcl.util.Logging.LOG;
 
 /**
  * @author yushijinhun
@@ -69,8 +68,8 @@ public final class TexturesLoader {
         private final Map<String, String> metadata;
 
         public LoadedTexture(BufferedImage image, Map<String, String> metadata) {
-            this.image = image;
-            this.metadata = metadata;
+            this.image = requireNonNull(image);
+            this.metadata = requireNonNull(metadata);
         }
 
         public BufferedImage getImage() {
@@ -98,6 +97,10 @@ public final class TexturesLoader {
     }
 
     public static LoadedTexture loadTexture(Texture texture) throws IOException {
+        if (StringUtils.isBlank(texture.getUrl())) {
+            throw new IOException("Texture url is empty");
+        }
+
         Path file = getTexturePath(texture);
         if (!Files.isRegularFile(file)) {
             // download it
@@ -118,21 +121,30 @@ public final class TexturesLoader {
         try (InputStream in = Files.newInputStream(file)) {
             img = ImageIO.read(in);
         }
-        return new LoadedTexture(img, texture.getMetadata());
+        if (img == null)
+            throw new IOException("Texture is malformed");
+
+        Map<String, String> metadata = texture.getMetadata();
+        if (metadata == null) {
+            metadata = emptyMap();
+        }
+        return new LoadedTexture(img, metadata);
     }
     // ====
 
     // ==== Skins ====
     private final static Map<TextureModel, LoadedTexture> DEFAULT_SKINS = new EnumMap<>(TextureModel.class);
+
     static {
         loadDefaultSkin("/assets/img/steve.png", TextureModel.STEVE);
         loadDefaultSkin("/assets/img/alex.png", TextureModel.ALEX);
     }
+
     private static void loadDefaultSkin(String path, TextureModel model) {
-        try (InputStream in = TexturesLoader.class.getResourceAsStream(path)) {
+        try (InputStream in = ResourceNotFoundError.getResourceAsStream(path)) {
             DEFAULT_SKINS.put(model, new LoadedTexture(ImageIO.read(in), singletonMap("model", model.modelName)));
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
+        } catch (Throwable e) {
+            throw new ResourceNotFoundError("Cannoot load default skin from " + path, e);
         }
     }
 
@@ -142,7 +154,7 @@ public final class TexturesLoader {
 
     public static ObjectBinding<LoadedTexture> skinBinding(YggdrasilService service, UUID uuid) {
         LoadedTexture uuidFallback = getDefaultSkin(TextureModel.detectUUID(uuid));
-        return MultiStepBinding.of(service.getProfileRepository().binding(uuid))
+        return BindingMapping.of(service.getProfileRepository().binding(uuid))
                 .map(profile -> profile
                         .flatMap(it -> {
                             try {
@@ -152,21 +164,48 @@ public final class TexturesLoader {
                                 return Optional.empty();
                             }
                         })
-                        .flatMap(it -> Optional.ofNullable(it.get(TextureType.SKIN))))
+                        .flatMap(it -> Optional.ofNullable(it.get(TextureType.SKIN)))
+                        .filter(it -> StringUtils.isNotBlank(it.getUrl())))
                 .asyncMap(it -> {
                     if (it.isPresent()) {
                         Texture texture = it.get();
-                        try {
-                            return loadTexture(texture);
-                        } catch (IOException e) {
-                            LOG.log(Level.WARNING, "Failed to load texture " + texture.getUrl() + ", using fallback texture", e);
-                            return getDefaultSkin(TextureModel.detectModelName(texture.getMetadata()));
-                        }
+                        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;
+                            }
+                        }, POOL);
                     } else {
-                        return uuidFallback;
+                        return CompletableFuture.completedFuture(uuidFallback);
                     }
-                }, uuidFallback, POOL);
+                }, uuidFallback);
     }
+
+    public static ObjectBinding<LoadedTexture> skinBinding(Account account) {
+        LoadedTexture uuidFallback = getDefaultSkin(TextureModel.detectUUID(account.getUUID()));
+        return BindingMapping.of(account.getTextures())
+                .map(textures -> textures
+                        .flatMap(it -> Optional.ofNullable(it.get(TextureType.SKIN)))
+                        .filter(it -> StringUtils.isNotBlank(it.getUrl())))
+                .asyncMap(it -> {
+                    if (it.isPresent()) {
+                        Texture texture = it.get();
+                        return CompletableFuture.supplyAsync(() -> {
+                            try {
+                                return loadTexture(texture);
+                            } catch (IOException e) {
+                                LOG.log(Level.WARNING, "Failed to load texture " + texture.getUrl() + ", using fallback texture", e);
+                                return uuidFallback;
+                            }
+                        }, POOL);
+                    } else {
+                        return CompletableFuture.completedFuture(uuidFallback);
+                    }
+                }, uuidFallback);
+    }
+
     // ====
 
     // ==== Avatar ====
@@ -189,17 +228,19 @@ public final class TexturesLoader {
     }
 
     public static ObjectBinding<Image> fxAvatarBinding(YggdrasilService service, UUID uuid, int size) {
-        return MultiStepBinding.of(skinBinding(service, uuid))
+        return BindingMapping.of(skinBinding(service, uuid))
                 .map(it -> toAvatar(it.image, size))
-                .map(img -> SwingFXUtils.toFXImage(img, null));
+                .map(FXUtils::toFXImage);
     }
 
     public static ObjectBinding<Image> fxAvatarBinding(Account account, int size) {
-        if (account instanceof YggdrasilAccount) {
-            return fxAvatarBinding(((YggdrasilAccount) account).getYggdrasilService(), account.getUUID(), 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(
-                    () -> SwingFXUtils.toFXImage(toAvatar(getDefaultSkin(TextureModel.detectUUID(account.getUUID())).image, size), null));
+                    () -> FXUtils.toFXImage(toAvatar(getDefaultSkin(TextureModel.detectUUID(account.getUUID())).image, size)));
         }
     }
     // ====

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -24,24 +24,24 @@ import javafx.beans.property.ReadOnlyListWrapper;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.ObservableList;
 import org.jackhuang.hmcl.Metadata;
-import org.jackhuang.hmcl.auth.Account;
-import org.jackhuang.hmcl.auth.AccountFactory;
-import org.jackhuang.hmcl.auth.AuthenticationException;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccountFactory;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorArtifactProvider;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorDownloader;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
-import org.jackhuang.hmcl.auth.authlibinjector.SimpleAuthlibInjectorArtifactProvider;
+import org.jackhuang.hmcl.auth.*;
+import org.jackhuang.hmcl.auth.authlibinjector.*;
+import org.jackhuang.hmcl.auth.microsoft.MicrosoftAccount;
+import org.jackhuang.hmcl.auth.microsoft.MicrosoftAccountFactory;
+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.skin.InvalidSkinException;
 
 import java.io.IOException;
 import java.nio.file.Paths;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.logging.Level;
@@ -50,6 +50,7 @@ import static java.util.stream.Collectors.toList;
 import static javafx.collections.FXCollections.observableArrayList;
 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;
@@ -61,9 +62,26 @@ import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 public final class Accounts {
     private Accounts() {}
 
-    public static final OfflineAccountFactory FACTORY_OFFLINE = OfflineAccountFactory.INSTANCE;
+    private static final AuthlibInjectorArtifactProvider AUTHLIB_INJECTOR_DOWNLOADER = createAuthlibInjectorArtifactProvider();
+    private static void triggerAuthlibInjectorUpdateCheck() {
+        if (AUTHLIB_INJECTOR_DOWNLOADER instanceof AuthlibInjectorDownloader) {
+            Schedulers.io().execute(() -> {
+                try {
+                    ((AuthlibInjectorDownloader) AUTHLIB_INJECTOR_DOWNLOADER).checkUpdate();
+                } catch (IOException e) {
+                    LOG.log(Level.WARNING, "Failed to check update for authlib-injector", e);
+                }
+            });
+        }
+    }
+
+    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(createAuthlibInjectorArtifactProvider(), Accounts::getOrCreateAuthlibInjectorServer);
+    public static final AuthlibInjectorAccountFactory FACTORY_AUTHLIB_INJECTOR = new AuthlibInjectorAccountFactory(AUTHLIB_INJECTOR_DOWNLOADER, Accounts::getOrCreateAuthlibInjectorServer);
+    public static final MicrosoftAccountFactory FACTORY_MICROSOFT = new MicrosoftAccountFactory(new MicrosoftService(OAUTH_CALLBACK));
+    public static final List<AccountFactory<?>> FACTORIES = immutableListOf(FACTORY_OFFLINE, FACTORY_MOJANG, FACTORY_MICROSOFT, FACTORY_AUTHLIB_INJECTOR);
 
     // ==== login type / account factory mapping ====
     private static final Map<String, AccountFactory<?>> type2factory = new HashMap<>();
@@ -72,6 +90,7 @@ public final class Accounts {
         type2factory.put("offline", FACTORY_OFFLINE);
         type2factory.put("yggdrasil", FACTORY_MOJANG);
         type2factory.put("authlibInjector", FACTORY_AUTHLIB_INJECTOR);
+        type2factory.put("microsoft", FACTORY_MICROSOFT);
 
         type2factory.forEach((type, factory) -> factory2type.put(factory, type));
     }
@@ -94,6 +113,8 @@ public final class Accounts {
             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);
     }
@@ -197,7 +218,7 @@ public final class Accounts {
 
         Account selected = selectedAccount.get();
         if (selected != null) {
-            Schedulers.io().schedule(() -> {
+            Schedulers.io().execute(() -> {
                 try {
                     selected.logIn();
                 } catch (AuthenticationException e) {
@@ -206,10 +227,14 @@ public final class Accounts {
             });
         }
 
+        if (!config().getAuthlibInjectorServers().isEmpty()) {
+            triggerAuthlibInjectorUpdateCheck();
+        }
+
         for (AuthlibInjectorServer server : config().getAuthlibInjectorServers()) {
             if (selected instanceof AuthlibInjectorAccount && ((AuthlibInjectorAccount) selected).getServer() == server)
                 continue;
-            Schedulers.io().schedule(() -> {
+            Schedulers.io().execute(() -> {
                 try {
                     server.fetchMetadataResponse();
                 } catch (IOException e) {
@@ -243,7 +268,19 @@ public final class Accounts {
     private static AuthlibInjectorArtifactProvider createAuthlibInjectorArtifactProvider() {
         String authlibinjectorLocation = System.getProperty("hmcl.authlibinjector.location");
         if (authlibinjectorLocation == null) {
-            return new AuthlibInjectorDownloader(Metadata.HMCL_DIRECTORY, DownloadProviders::getDownloadProvider);
+            return new AuthlibInjectorDownloader(
+                    Metadata.HMCL_DIRECTORY.resolve("authlib-injector.jar"),
+                    DownloadProviders::getDownloadProvider) {
+                @Override
+                public Optional<AuthlibInjectorArtifactInfo> getArtifactInfoImmediately() {
+                    Optional<AuthlibInjectorArtifactInfo> local = super.getArtifactInfoImmediately();
+                    if (local.isPresent()) {
+                        return local;
+                    }
+                    // search authlib-injector.jar in current directory, it's used as a fallback
+                    return parseArtifact(Paths.get("authlib-injector.jar"));
+                }
+            };
         } else {
             LOG.info("Using specified authlib-injector: " + authlibinjectorLocation);
             return new SimpleAuthlibInjectorArtifactProvider(Paths.get(authlibinjectorLocation));
@@ -279,11 +316,72 @@ public final class Accounts {
     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_AUTHLIB_INJECTOR, "account.methods.authlib_injector"),
+            pair(Accounts.FACTORY_MICROSOFT, "account.methods.microsoft"));
 
     public static String getLocalizedLoginTypeName(AccountFactory<?> factory) {
         return i18n(Optional.ofNullable(unlocalizedLoginTypeNames.get(factory))
                 .orElseThrow(() -> new IllegalArgumentException("Unrecognized account factory")));
     }
     // ====
+
+    public static String localizeErrorMessage(Exception exception) {
+        if (exception instanceof NoCharacterException) {
+            return i18n("account.failed.no_character");
+        } else if (exception instanceof ServerDisconnectException) {
+            return i18n("account.failed.connect_authentication_server");
+        } else if (exception instanceof ServerResponseMalformedException) {
+            return i18n("account.failed.server_response_malformed");
+        } else if (exception instanceof RemoteAuthenticationException) {
+            RemoteAuthenticationException remoteException = (RemoteAuthenticationException) exception;
+            String remoteMessage = remoteException.getRemoteMessage();
+            if ("ForbiddenOperationException".equals(remoteException.getRemoteName()) && remoteMessage != null) {
+                if (remoteMessage.contains("Invalid credentials")) {
+                    return i18n("account.failed.invalid_credentials");
+                } else if (remoteMessage.contains("Invalid token")) {
+                    return i18n("account.failed.invalid_token");
+                } else if (remoteMessage.contains("Invalid username or password")) {
+                    return i18n("account.failed.invalid_password");
+                } else {
+                    return remoteMessage;
+                }
+            } else if ("ResourceException".equals(remoteException.getRemoteName()) && remoteMessage != null) {
+                if (remoteMessage.contains("The requested resource is no longer available")) {
+                    return i18n("account.failed.migration");
+                } else {
+                    return remoteMessage;
+                }
+            }
+            return exception.getMessage();
+        } else if (exception instanceof AuthlibInjectorDownloadException) {
+            return i18n("account.failed.injector_download_failure");
+        } else if (exception instanceof CharacterDeletedException) {
+            return i18n("account.failed.character_deleted");
+        } else if (exception instanceof InvalidSkinException) {
+            return i18n("account.skin.invalid_skin");
+        } else if (exception instanceof MicrosoftService.XboxAuthorizationException) {
+            long errorCode = ((MicrosoftService.XboxAuthorizationException) exception).getErrorCode();
+            if (errorCode == MicrosoftService.XboxAuthorizationException.ADD_FAMILY) {
+                return i18n("account.methods.microsoft.error.add_family");
+            } else if (errorCode == MicrosoftService.XboxAuthorizationException.COUNTRY_UNAVAILABLE) {
+                return i18n("account.methods.microsoft.error.country_unavailable");
+            } else if (errorCode == MicrosoftService.XboxAuthorizationException.MISSING_XBOX_ACCOUNT) {
+                return i18n("account.methods.microsoft.error.missing_xbox_account");
+            } else {
+                return i18n("account.methods.microsoft.error.unknown", errorCode);
+            }
+        } else if (exception instanceof MicrosoftService.NoMinecraftJavaEditionProfileException) {
+            return i18n("account.methods.microsoft.error.no_character");
+        } else if (exception instanceof MicrosoftService.NoXuiException) {
+            return i18n("account.methods.microsoft.error.add_family_probably");
+        } else if (exception instanceof OAuthServer.MicrosoftAuthenticationNotSupportedException) {
+            return i18n("account.methods.microsoft.snapshot");
+        } else if (exception instanceof OAuthAccount.WrongAccountException) {
+            return i18n("account.failed.wrong_account");
+        } else if (exception.getClass() == AuthenticationException.class) {
+            return exception.getLocalizedMessage();
+        } else {
+            return exception.getClass().getName() + ": " + exception.getLocalizedMessage();
+        }
+    }
 }

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

@@ -0,0 +1,91 @@
+/*
+ * 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.setting;
+
+import com.google.gson.JsonParseException;
+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.Validation;
+import org.jackhuang.hmcl.util.io.FileUtils;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.List;
+import java.util.logging.Level;
+
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.util.Logging.LOG;
+
+public class AuthlibInjectorServers implements Validation {
+
+    public static final String CONFIG_FILENAME = "authlib-injectors.json";
+
+    private final List<String> urls;
+
+    public AuthlibInjectorServers(List<String> urls) {
+        this.urls = urls;
+    }
+
+    public List<String> getUrls() {
+        return urls;
+    }
+
+    @Override
+    public void validate() throws JsonParseException {
+        if (urls == null)
+            throw new JsonParseException("authlib-injectors.json -> urls cannot be null");
+    }
+
+    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");
+        }
+
+        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.log(Level.WARNING, "Malformed authlib-injectors.json", e);
+            }
+        }
+
+        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;
+    }
+}

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -34,7 +34,6 @@ import org.hildan.fxgson.creators.ObservableSetCreator;
 import org.hildan.fxgson.factories.JavaFxPropertyTypeAdapterFactory;
 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
-import org.jackhuang.hmcl.upgrade.UpdateChannel;
 import org.jackhuang.hmcl.util.gson.EnumOrdinalDeserializer;
 import org.jackhuang.hmcl.util.gson.FileTypeAdapter;
 import org.jackhuang.hmcl.util.i18n.Locales;
@@ -83,6 +82,9 @@ public final class Config implements Cloneable, Observable {
     @SerializedName("bgpath")
     private StringProperty backgroundImage = new SimpleStringProperty();
 
+    @SerializedName("bgurl")
+    private StringProperty backgroundImageUrl = new SimpleStringProperty();
+
     @SerializedName("commonDirType")
     private ObjectProperty<EnumCommonDirectory> commonDirType = new SimpleObjectProperty<>(EnumCommonDirectory.DEFAULT);
 
@@ -110,14 +112,32 @@ public final class Config implements Cloneable, Observable {
     @SerializedName("proxyPassword")
     private StringProperty proxyPass = new SimpleStringProperty();
 
+    @SerializedName("width")
+    private DoubleProperty width = new SimpleDoubleProperty();
+
+    @SerializedName("height")
+    private DoubleProperty height = new SimpleDoubleProperty();
+
     @SerializedName("theme")
     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(false);
+
+    @SerializedName("downloadThreads")
+    private IntegerProperty downloadThreads = new SimpleIntegerProperty(64);
+
     @SerializedName("downloadType")
-    private StringProperty downloadType = new SimpleStringProperty("bmclapi");
+    private StringProperty downloadType = new SimpleStringProperty("mcbbs");
+
+    @SerializedName("autoChooseDownloadType")
+    private BooleanProperty autoChooseDownloadType = new SimpleBooleanProperty(true);
+
+    @SerializedName("versionListSource")
+    private StringProperty versionListSource = new SimpleStringProperty("balanced");
 
     @SerializedName("configurations")
     private ObservableMap<String, Profile> configurations = FXCollections.observableMap(new TreeMap<>());
@@ -131,15 +151,18 @@ public final class Config implements Cloneable, Observable {
     @SerializedName("fontSize")
     private DoubleProperty fontSize = new SimpleDoubleProperty(12);
 
+    @SerializedName("launcherFontFamily")
+    private StringProperty launcherFontFamily = new SimpleStringProperty();
+
     @SerializedName("logLines")
     private IntegerProperty logLines = new SimpleIntegerProperty(100);
 
+    @SerializedName("titleTransparent")
+    private BooleanProperty titleTransparent = new SimpleBooleanProperty(false);
+
     @SerializedName("authlibInjectorServers")
     private ObservableList<AuthlibInjectorServer> authlibInjectorServers = FXCollections.observableArrayList(server -> new Observable[] { server });
 
-    @SerializedName("updateChannel")
-    private ObjectProperty<UpdateChannel> updateChannel = new SimpleObjectProperty<>(UpdateChannel.STABLE);
-
     @SerializedName("_version")
     private IntegerProperty configVersion = new SimpleIntegerProperty(0);
 
@@ -221,6 +244,18 @@ public final class Config implements Cloneable, Observable {
         return backgroundImage;
     }
 
+    public String getBackgroundImageUrl() {
+        return backgroundImageUrl.get();
+    }
+
+    public StringProperty backgroundImageUrlProperty() {
+        return backgroundImageUrl;
+    }
+
+    public void setBackgroundImageUrl(String backgroundImageUrl) {
+        this.backgroundImageUrl.set(backgroundImageUrl);
+    }
+
     public EnumCommonDirectory getCommonDirType() {
         return commonDirType.get();
     }
@@ -329,6 +364,30 @@ public final class Config implements Cloneable, Observable {
         return proxyPass;
     }
 
+    public double getWidth() {
+        return width.get();
+    }
+
+    public DoubleProperty widthProperty() {
+        return width;
+    }
+
+    public void setWidth(double width) {
+        this.width.set(width);
+    }
+
+    public double getHeight() {
+        return height.get();
+    }
+
+    public DoubleProperty heightProperty() {
+        return height;
+    }
+
+    public void setHeight(double height) {
+        this.height.set(height);
+    }
+
     public Theme getTheme() {
         return theme.get();
     }
@@ -353,6 +412,30 @@ public final class Config implements Cloneable, Observable {
         return localization;
     }
 
+    public boolean getAutoDownloadThreads() {
+        return autoDownloadThreads.get();
+    }
+
+    public BooleanProperty autoDownloadThreadsProperty() {
+        return autoDownloadThreads;
+    }
+
+    public void setAutoDownloadThreads(boolean autoDownloadThreads) {
+        this.autoDownloadThreads.set(autoDownloadThreads);
+    }
+
+    public int getDownloadThreads() {
+        return downloadThreads.get();
+    }
+
+    public IntegerProperty downloadThreadsProperty() {
+        return downloadThreads;
+    }
+
+    public void setDownloadThreads(int downloadThreads) {
+        this.downloadThreads.set(downloadThreads);
+    }
+
     public String getDownloadType() {
         return downloadType.get();
     }
@@ -365,6 +448,30 @@ public final class Config implements Cloneable, Observable {
         return downloadType;
     }
 
+    public boolean isAutoChooseDownloadType() {
+        return autoChooseDownloadType.get();
+    }
+
+    public BooleanProperty autoChooseDownloadTypeProperty() {
+        return autoChooseDownloadType;
+    }
+
+    public void setAutoChooseDownloadType(boolean autoChooseDownloadType) {
+        this.autoChooseDownloadType.set(autoChooseDownloadType);
+    }
+
+    public String getVersionListSource() {
+        return versionListSource.get();
+    }
+
+    public void setVersionListSource(String versionListSource) {
+        this.versionListSource.set(versionListSource);
+    }
+
+    public StringProperty versionListSourceProperty() {
+        return versionListSource;
+    }
+
     public ObservableMap<String, Profile> getConfigurations() {
         return configurations;
     }
@@ -397,6 +504,18 @@ public final class Config implements Cloneable, Observable {
         return fontSize;
     }
 
+    public String getLauncherFontFamily() {
+        return launcherFontFamily.get();
+    }
+
+    public StringProperty launcherFontFamilyProperty() {
+        return launcherFontFamily;
+    }
+
+    public void setLauncherFontFamily(String launcherFontFamily) {
+        this.launcherFontFamily.set(launcherFontFamily);
+    }
+
     public int getLogLines() {
         return logLines.get();
     }
@@ -413,18 +532,6 @@ public final class Config implements Cloneable, Observable {
         return authlibInjectorServers;
     }
 
-    public UpdateChannel getUpdateChannel() {
-        return updateChannel.get();
-    }
-
-    public ObjectProperty<UpdateChannel> updateChannelProperty() {
-        return updateChannel;
-    }
-
-    public void setUpdateChannel(UpdateChannel updateChannel) {
-        this.updateChannel.set(updateChannel);
-    }
-
     public int getConfigVersion() {
         return configVersion.get();
     }
@@ -460,4 +567,16 @@ public final class Config implements Cloneable, Observable {
     public StringProperty preferredLoginTypeProperty() {
         return preferredLoginType;
     }
+
+    public boolean isTitleTransparent() {
+        return titleTransparent.get();
+    }
+
+    public BooleanProperty titleTransparentProperty() {
+        return titleTransparent;
+    }
+
+    public void setTitleTransparent(boolean titleTransparent) {
+        this.titleTransparent.set(titleTransparent);
+    }
 }

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -19,15 +19,14 @@ 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.io.FileUtils;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
 
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
+import java.nio.file.*;
 import java.util.Map;
 import java.util.logging.Level;
 
@@ -36,13 +35,16 @@ import static org.jackhuang.hmcl.util.Logging.LOG;
 
 public final class ConfigHolder {
 
-    private ConfigHolder() {}
+    private ConfigHolder() {
+    }
 
     public static final String CONFIG_FILENAME = "hmcl.json";
     public static final String CONFIG_FILENAME_LINUX = ".hmcl.json";
+    public static final Path GLOBAL_CONFIG_PATH = Metadata.HMCL_DIRECTORY.resolve("config.json");
 
     private static Path configLocation;
     private static Config configInstance;
+    private static GlobalConfig globalConfigInstance;
     private static boolean newlyCreated;
 
     public static Config config() {
@@ -52,15 +54,32 @@ public final class ConfigHolder {
         return configInstance;
     }
 
+    public static GlobalConfig globalConfig() {
+        if (globalConfigInstance == null) {
+            throw new IllegalStateException("Configuration hasn't been loaded");
+        }
+        return globalConfigInstance;
+    }
+
+    public static boolean isNewlyCreated() {
+        return newlyCreated;
+    }
+
     public synchronized static void init() throws IOException {
         if (configInstance != null) {
             throw new IllegalStateException("Configuration is already loaded");
         }
 
         configLocation = locateConfig();
+
+        LOG.log(Level.INFO, "Config location: " + configLocation);
+
         configInstance = loadConfig();
         configInstance.addListener(source -> markConfigDirty());
 
+        globalConfigInstance = loadGlobalConfig();
+        globalConfigInstance.addListener(source -> markGlobalConfigDirty());
+
         Settings.init();
 
         if (newlyCreated) {
@@ -77,13 +96,40 @@ public final class ConfigHolder {
         }
 
         if (!Files.isWritable(configLocation)) {
-            // the config cannot be saved
-            // throw up the error now to prevent further data loss
-            throw new IOException("Config at " + configLocation + " is not writable");
+            if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS
+                    && configLocation.getFileSystem() == FileSystems.getDefault()
+                    && configLocation.toFile().canWrite()) {
+                // There are some serious problems with the implementation of Samba or OpenJDK
+                throw new SambaException();
+            } else {
+                // the config cannot be saved
+                // throw up the error now to prevent further data loss
+                throw new IOException("Config at " + configLocation + " is not writable");
+            }
         }
     }
 
     private static Path locateConfig() {
+        Path exePath = Paths.get("");
+        try {
+            Path jarPath = Paths.get(ConfigHolder.class.getProtectionDomain().getCodeSource().getLocation()
+                    .toURI()).toAbsolutePath();
+            if (Files.isRegularFile(jarPath) && Files.isWritable(jarPath)) {
+                jarPath = jarPath.getParent();
+                exePath = jarPath;
+
+                Path config = jarPath.resolve(CONFIG_FILENAME);
+                if (Files.isRegularFile(config))
+                    return config;
+
+                Path dotConfig = jarPath.resolve(CONFIG_FILENAME_LINUX);
+                if (Files.isRegularFile(dotConfig))
+                    return dotConfig;
+            }
+
+        } catch (Throwable ignore) {
+        }
+
         Path config = Paths.get(CONFIG_FILENAME);
         if (Files.isRegularFile(config))
             return config;
@@ -93,7 +139,7 @@ public final class ConfigHolder {
             return dotConfig;
 
         // create new
-        return OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS ? config : dotConfig;
+        return exePath.resolve(OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS ? CONFIG_FILENAME : CONFIG_FILENAME_LINUX);
     }
 
     private static Config loadConfig() throws IOException {
@@ -118,7 +164,7 @@ public final class ConfigHolder {
         return new Config();
     }
 
-    private static InvocationDispatcher<String> configWriter = InvocationDispatcher.runOn(Lang::thread, content -> {
+    private static final InvocationDispatcher<String> configWriter = InvocationDispatcher.runOn(Lang::thread, content -> {
         try {
             writeToConfig(content);
         } catch (IOException e) {
@@ -140,4 +186,48 @@ public final class ConfigHolder {
     private static void saveConfigSync() throws IOException {
         writeToConfig(configInstance.toJson());
     }
+
+    // Global Config
+
+    private static GlobalConfig loadGlobalConfig() throws IOException {
+        if (Files.exists(GLOBAL_CONFIG_PATH)) {
+            try {
+                String content = FileUtils.readText(GLOBAL_CONFIG_PATH);
+                GlobalConfig deserialized = GlobalConfig.fromJson(content);
+                if (deserialized == null) {
+                    LOG.info("Config is empty");
+                } else {
+                    return deserialized;
+                }
+            } catch (JsonParseException e) {
+                LOG.log(Level.WARNING, "Malformed config.", e);
+            }
+        }
+
+        LOG.info("Creating an empty global config");
+        return new GlobalConfig();
+    }
+
+    private static final InvocationDispatcher<String> globalConfigWriter = InvocationDispatcher.runOn(Lang::thread, content -> {
+        try {
+            writeToGlobalConfig(content);
+        } catch (IOException 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) {
+            Files.write(GLOBAL_CONFIG_PATH, content.getBytes(UTF_8));
+        }
+    }
+
+    static void markGlobalConfigDirty() {
+        globalConfigWriter.accept(globalConfigInstance.toJson());
+    }
+
+    private static void saveGlobalConfigSync() throws IOException {
+        writeToConfig(globalConfigInstance.toJson());
+    }
 }

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -17,44 +17,153 @@
  */
 package org.jackhuang.hmcl.setting;
 
-import static org.jackhuang.hmcl.setting.ConfigHolder.config;
-import static org.jackhuang.hmcl.util.Lang.mapOf;
-import static org.jackhuang.hmcl.util.Pair.pair;
+import javafx.beans.InvalidationListener;
+import org.jackhuang.hmcl.download.*;
+import org.jackhuang.hmcl.task.DownloadException;
+import org.jackhuang.hmcl.task.FetchTask;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.i18n.I18n;
+import org.jackhuang.hmcl.util.io.ResponseCodeException;
 
+import java.io.FileNotFoundException;
+import java.net.SocketTimeoutException;
+import java.net.URL;
+import java.nio.file.AccessDeniedException;
+import java.util.Arrays;
 import java.util.Map;
 import java.util.Optional;
+import java.util.concurrent.CancellationException;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
-import org.jackhuang.hmcl.download.BMCLAPIDownloadProvider;
-import org.jackhuang.hmcl.download.DownloadProvider;
-import org.jackhuang.hmcl.download.MojangDownloadProvider;
-
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.ObjectBinding;
-import javafx.beans.value.ObservableObjectValue;
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.task.FetchTask.DEFAULT_CONCURRENCY;
+import static org.jackhuang.hmcl.util.Lang.mapOf;
+import static org.jackhuang.hmcl.util.Pair.pair;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class DownloadProviders {
     private DownloadProviders() {}
 
-    public static final Map<String, DownloadProvider> providersById = mapOf(
-            pair("mojang", new MojangDownloadProvider()),
-            pair("bmclapi", new BMCLAPIDownloadProvider()));
+    private static DownloadProvider currentDownloadProvider;
 
-    public static final String DEFAULT_PROVIDER_ID = "bmclapi";
+    public static final Map<String, DownloadProvider> providersById;
+    public static final Map<String, DownloadProvider> rawProviders;
+    private static final AdaptedDownloadProvider fileDownloadProvider = new AdaptedDownloadProvider();
 
-    private static ObjectBinding<DownloadProvider> downloadProviderProperty;
+    private static final MojangDownloadProvider MOJANG;
+    private static final BMCLAPIDownloadProvider BMCLAPI;
+    private static final BMCLAPIDownloadProvider MCBBS;
+
+    public static final String DEFAULT_PROVIDER_ID = "balanced";
+    public static final String DEFAULT_RAW_PROVIDER_ID = "mcbbs";
+
+    private static final InvalidationListener observer;
+
+    static {
+        String bmclapiRoot = "https://bmclapi2.bangbang93.com";
+        String bmclapiRootOverride = System.getProperty("hmcl.bmclapi.override");
+        if (bmclapiRootOverride != null) bmclapiRoot = bmclapiRootOverride;
+
+        MOJANG = new MojangDownloadProvider();
+        BMCLAPI = new BMCLAPIDownloadProvider(bmclapiRoot);
+        MCBBS = new BMCLAPIDownloadProvider("https://download.mcbbs.net");
+        rawProviders = mapOf(
+                pair("mojang", MOJANG),
+                pair("bmclapi", BMCLAPI),
+                pair("mcbbs", MCBBS)
+        );
+
+        AdaptedDownloadProvider fileProvider = new AdaptedDownloadProvider();
+        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(MCBBS, fileProvider)));
+
+        observer = FXUtils.observeWeak(() -> {
+            FetchTask.setDownloadExecutorConcurrency(
+                    config().getAutoDownloadThreads() ? DEFAULT_CONCURRENCY : config().getDownloadThreads());
+        }, config().autoDownloadThreadsProperty(), config().downloadThreadsProperty());
+    }
 
     static void init() {
-        downloadProviderProperty = Bindings.createObjectBinding(
-                () -> Optional.ofNullable(providersById.get(config().getDownloadType()))
-                        .orElse(providersById.get(DEFAULT_PROVIDER_ID)),
-                config().downloadTypeProperty());
+        FXUtils.onChangeAndOperate(config().versionListSourceProperty(), versionListSource -> {
+            if (!providersById.containsKey(versionListSource)) {
+                config().setVersionListSource(DEFAULT_PROVIDER_ID);
+                return;
+            }
+
+            currentDownloadProvider = Optional.ofNullable(providersById.get(versionListSource))
+                    .orElse(providersById.get(DEFAULT_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(
+                    Stream.concat(
+                            Stream.of(primary),
+                            rawProviders.values().stream().filter(x -> x != primary)
+                    ).collect(Collectors.toList())
+            );
+        });
     }
 
+    public static String getPrimaryDownloadProviderId() {
+        String downloadType = config().getDownloadType();
+        if (providersById.containsKey(downloadType))
+            return downloadType;
+        else
+            return DEFAULT_PROVIDER_ID;
+    }
+
+    public static DownloadProvider getDownloadProviderByPrimaryId(String primaryId) {
+        return Optional.ofNullable(providersById.get(primaryId))
+                .orElse(providersById.get(DEFAULT_PROVIDER_ID));
+    }
+
+    /**
+     * Get current primary preferred download provider
+     */
     public static DownloadProvider getDownloadProvider() {
-        return downloadProviderProperty.get();
+        return config().isAutoChooseDownloadType() ? currentDownloadProvider : fileDownloadProvider;
     }
 
-    public static ObservableObjectValue<DownloadProvider> downloadProviderProperty() {
-        return downloadProviderProperty;
+    public static String localizeErrorMessage(Throwable exception) {
+        if (exception instanceof DownloadException) {
+            URL url = ((DownloadException) exception).getUrl();
+            if (exception.getCause() instanceof SocketTimeoutException) {
+                return i18n("install.failed.downloading.timeout", url);
+            } else if (exception.getCause() instanceof ResponseCodeException) {
+                ResponseCodeException responseCodeException = (ResponseCodeException) exception.getCause();
+                if (I18n.hasKey("download.code." + responseCodeException.getResponseCode())) {
+                    return i18n("download.code." + responseCodeException.getResponseCode(), url);
+                } else {
+                    return i18n("install.failed.downloading.detail", url) + "\n" + StringUtils.getStackTrace(exception.getCause());
+                }
+            } else if (exception.getCause() instanceof FileNotFoundException) {
+                return i18n("download.code.404", url);
+            } else if (exception.getCause() instanceof AccessDeniedException) {
+                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 {
+                return i18n("install.failed.downloading.detail", url) + "\n" + StringUtils.getStackTrace(exception.getCause());
+            }
+        } else if (exception instanceof ArtifactMalformedException) {
+            return i18n("exception.artifact_malformed");
+        } else if (exception instanceof CancellationException) {
+            return i18n("message.cancelled");
+        }
+        return StringUtils.getStackTrace(exception);
     }
 }

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -19,5 +19,8 @@ package org.jackhuang.hmcl.setting;
 
 public enum EnumBackgroundImage {
     DEFAULT,
-    CUSTOM
+    CUSTOM,
+    CLASSIC,
+    NETWORK,
+    TRANSLUCENT
 }

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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

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

@@ -0,0 +1,198 @@
+/*
+ * 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.*;
+import com.google.gson.annotations.JsonAdapter;
+import javafx.beans.InvalidationListener;
+import javafx.beans.Observable;
+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 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_GSON.fromJson(json, GlobalConfig.class);
+        if (loaded == null) {
+            return null;
+        }
+        GlobalConfig instance = new GlobalConfig();
+        PropertyUtils.copyProperties(loaded, instance);
+        instance.unknownFields.putAll(loaded.unknownFields);
+        return instance;
+    }
+
+    private IntegerProperty agreementVersion = new SimpleIntegerProperty();
+
+    private StringProperty multiplayerToken = new SimpleStringProperty();
+
+    private BooleanProperty multiplayerRelay = new SimpleBooleanProperty();
+
+    private IntegerProperty multiplayerAgreementVersion = new SimpleIntegerProperty(0);
+
+    private final Map<String, Object> unknownFields = new HashMap<>();
+
+    private transient ObservableHelper helper = new ObservableHelper(this);
+
+    public GlobalConfig() {
+        PropertyUtils.attachListener(this, helper);
+    }
+
+    @Override
+    public void addListener(InvalidationListener listener) {
+        helper.addListener(listener);
+    }
+
+    @Override
+    public void removeListener(InvalidationListener listener) {
+        helper.removeListener(listener);
+    }
+
+    public String toJson() {
+        return CONFIG_GSON.toJson(this);
+    }
+
+    @Override
+    public GlobalConfig clone() {
+        return fromJson(this.toJson());
+    }
+
+    public int getAgreementVersion() {
+        return agreementVersion.get();
+    }
+
+    public IntegerProperty agreementVersionProperty() {
+        return agreementVersion;
+    }
+
+    public void setAgreementVersion(int agreementVersion) {
+        this.agreementVersion.set(agreementVersion);
+    }
+
+    public boolean isMultiplayerRelay() {
+        return multiplayerRelay.get();
+    }
+
+    public BooleanProperty multiplayerRelayProperty() {
+        return multiplayerRelay;
+    }
+
+    public void setMultiplayerRelay(boolean multiplayerRelay) {
+        this.multiplayerRelay.set(multiplayerRelay);
+    }
+
+    public int getMultiplayerAgreementVersion() {
+        return multiplayerAgreementVersion.get();
+    }
+
+    public IntegerProperty multiplayerAgreementVersionProperty() {
+        return multiplayerAgreementVersion;
+    }
+
+    public void setMultiplayerAgreementVersion(int multiplayerAgreementVersion) {
+        this.multiplayerAgreementVersion.set(multiplayerAgreementVersion);
+    }
+
+    public String getMultiplayerToken() {
+        return multiplayerToken.get();
+    }
+
+    public StringProperty multiplayerTokenProperty() {
+        return multiplayerToken;
+    }
+
+    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",
+                "multiplayerToken",
+                "multiplayerAgreementVersion"
+        ));
+
+        @Override
+        public JsonElement serialize(GlobalConfig src, Type typeOfSrc, JsonSerializationContext context) {
+            if (src == null) {
+                return JsonNull.INSTANCE;
+            }
+
+            JsonObject jsonObject = new JsonObject();
+            jsonObject.add("agreementVersion", context.serialize(src.getAgreementVersion()));
+            jsonObject.add("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()));
+            }
+
+            return jsonObject;
+        }
+
+        @Override
+        public GlobalConfig deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+            if (!(json instanceof JsonObject)) return null;
+
+            JsonObject obj = (JsonObject) json;
+
+            GlobalConfig config = new GlobalConfig();
+            config.setAgreementVersion(Optional.ofNullable(obj.get("agreementVersion")).map(JsonElement::getAsInt).orElse(0));
+            config.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())) {
+                    config.unknownFields.put(entry.getKey(), context.deserialize(entry.getValue(), Object.class));
+                }
+            }
+
+            return config;
+        }
+    }
+}

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

@@ -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;
+    }
+
+}

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -19,12 +19,12 @@ package org.jackhuang.hmcl.setting;
 
 import com.google.gson.*;
 import com.google.gson.annotations.JsonAdapter;
-import com.jfoenix.utils.JFXUtilities;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
 import javafx.beans.property.*;
 import org.jackhuang.hmcl.download.DefaultDependencyManager;
+import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.event.EventBus;
 import org.jackhuang.hmcl.event.EventPriority;
 import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
@@ -32,9 +32,7 @@ import org.jackhuang.hmcl.game.HMCLCacheRepository;
 import org.jackhuang.hmcl.game.HMCLGameRepository;
 import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.ui.WeakListenerHolder;
-import org.jackhuang.hmcl.util.*;
-import org.jackhuang.hmcl.util.javafx.ImmediateObjectProperty;
-import org.jackhuang.hmcl.util.javafx.ImmediateStringProperty;
+import org.jackhuang.hmcl.util.ToStringBuilder;
 import org.jackhuang.hmcl.util.javafx.ObservableHelper;
 
 import java.io.File;
@@ -42,6 +40,7 @@ import java.lang.reflect.Type;
 import java.util.Optional;
 
 import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
+import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 
 /**
  *
@@ -90,9 +89,9 @@ public final class Profile implements Observable {
         return global.get();
     }
 
-    private final ImmediateStringProperty name;
+    private final SimpleStringProperty name;
 
-    public ImmediateStringProperty nameProperty() {
+    public StringProperty nameProperty() {
         return name;
     }
 
@@ -131,8 +130,8 @@ public final class Profile implements Observable {
     }
 
     public Profile(String name, File initialGameDir, VersionSetting global, String selectedVersion, boolean useRelativePath) {
-        this.name = new ImmediateStringProperty(this, "name", name);
-        gameDir = new ImmediateObjectProperty<>(this, "gameDir", initialGameDir);
+        this.name = new SimpleStringProperty(this, "name", name);
+        gameDir = new SimpleObjectProperty<>(this, "gameDir", initialGameDir);
         repository = new HMCLGameRepository(this, initialGameDir);
         this.global.set(global == null ? new VersionSetting() : global);
         this.selectedVersion.set(selectedVersion);
@@ -146,7 +145,7 @@ public final class Profile implements Observable {
     }
 
     private void checkSelectedVersion() {
-        JFXUtilities.runInFX(() -> {
+        runInFX(() -> {
             if (!repository.isLoaded()) return;
             String newValue = selectedVersion.get();
             if (!repository.hasVersion(newValue)) {
@@ -164,17 +163,15 @@ public final class Profile implements Observable {
     }
 
     public DefaultDependencyManager getDependency() {
-        return new DefaultDependencyManager(repository, DownloadProviders.getDownloadProvider(), HMCLCacheRepository.REPOSITORY);
+        return getDependency(DownloadProviders.getDownloadProvider());
+    }
+
+    public DefaultDependencyManager getDependency(DownloadProvider downloadProvider) {
+        return new DefaultDependencyManager(repository, downloadProvider, HMCLCacheRepository.REPOSITORY);
     }
 
     public VersionSetting getVersionSetting(String id) {
-        VersionSetting vs = repository.getVersionSetting(id);
-        if (vs == null || vs.isUsesGlobal()) {
-            getGlobal().setGlobal(true); // always keep global.isGlobal = true
-            getGlobal().setUsesGlobal(true);
-            return getGlobal();
-        } else
-            return vs;
+        return repository.getVersionSetting(id);
     }
 
     @Override
@@ -211,6 +208,24 @@ public final class Profile implements Observable {
         Platform.runLater(observableHelper::invalidate);
     }
 
+    public static class ProfileVersion {
+        private final Profile profile;
+        private final String version;
+
+        public ProfileVersion(Profile profile, String version) {
+            this.profile = profile;
+            this.version = version;
+        }
+
+        public Profile getProfile() {
+            return profile;
+        }
+
+        public String getVersion() {
+            return version;
+        }
+    }
+
     public static final class Serializer implements JsonSerializer<Profile>, JsonDeserializer<Profile> {
         @Override
         public JsonElement serialize(Profile src, Type typeOfSrc, JsonSerializationContext context) {
@@ -228,7 +243,7 @@ public final class Profile implements Observable {
 
         @Override
         public Profile deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-            if (json == null || json == JsonNull.INSTANCE || !(json instanceof JsonObject)) return null;
+            if (json == JsonNull.INSTANCE || !(json instanceof JsonObject)) return null;
             JsonObject obj = (JsonObject) json;
             String gameDir = Optional.ofNullable(obj.get("gameDir")).map(JsonElement::getAsString).orElse("");
 

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -17,7 +17,6 @@
  */
 package org.jackhuang.hmcl.setting;
 
-import com.jfoenix.utils.JFXUtilities;
 import javafx.application.Platform;
 import javafx.beans.Observable;
 import javafx.beans.property.*;
@@ -36,6 +35,7 @@ import java.util.stream.Collectors;
 import static javafx.collections.FXCollections.observableArrayList;
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
+import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class Profiles {
@@ -162,7 +162,7 @@ public final class Profiles {
         });
 
         EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).registerWeak(event -> {
-            JFXUtilities.runInFX(() -> {
+            runInFX(() -> {
                 Profile profile = selectedProfile.get();
                 if (profile != null && profile.getRepository() == event.getSource()) {
                     selectedVersion.bind(profile.selectedVersionProperty());

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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

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

@@ -0,0 +1,18 @@
+package org.jackhuang.hmcl.setting;
+
+public final class SambaException extends RuntimeException {
+    public SambaException() {
+    }
+
+    public SambaException(String message) {
+        super(message);
+    }
+
+    public SambaException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public SambaException(Throwable cause) {
+        super(cause);
+    }
+}

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -23,9 +23,11 @@ import org.jackhuang.hmcl.game.HMCLCacheRepository;
 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 class Settings {
+public final class Settings {
 
     private static Settings instance;
 
@@ -44,10 +46,14 @@ public class Settings {
     }
 
     private Settings() {
+        config().localizationProperty().addListener(unused -> updateSystemLocale());
+        updateSystemLocale();
+
         DownloadProviders.init();
         ProxyManager.init();
         Accounts.init();
         Profiles.init();
+        AuthlibInjectorServers.init();
 
         CacheRepository.setInstance(HMCLCacheRepository.REPOSITORY);
         HMCLCacheRepository.REPOSITORY.directoryProperty().bind(Bindings.createStringBinding(() -> {
@@ -73,4 +79,8 @@ public class Settings {
                 return null;
         }
     }
+
+    private static void updateSystemLocale() {
+        Locale.setDefault(config().getLocalization().getLocale());
+    }
 }

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -23,13 +23,15 @@ import com.google.gson.stream.JsonWriter;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.ObjectBinding;
 import javafx.scene.paint.Color;
-
 import org.jackhuang.hmcl.util.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.util.Objects;
 import java.util.Optional;
 import java.util.logging.Level;
 
@@ -38,9 +40,9 @@ import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 @JsonAdapter(Theme.TypeAdapter.class)
 public class Theme {
     public static final Theme BLUE = new Theme("blue", "#5C6BC0");
-
+    public static final Color BLACK = Color.web("#292929");
     public static final Color[] SUGGESTED_COLORS = new Color[]{
-            Color.web("#5C6BC0"), // blue
+            Color.web("#3D6DA3"), // blue
             Color.web("#283593"), // dark blue
             Color.web("#43A047"), // green
             Color.web("#E67E22"), // orange
@@ -48,12 +50,14 @@ public class Theme {
             Color.web("#B71C1C")  // red
     };
 
+    private final Color paint;
     private final String color;
     private final String name;
 
     Theme(String name, String color) {
         this.name = name;
-        this.color = color;
+        this.color = Objects.requireNonNull(color);
+        this.paint = Color.web(color);
     }
 
     public String getName() {
@@ -76,13 +80,30 @@ public class Theme {
         return isLight() ? Color.BLACK : Color.WHITE;
     }
 
-    public String[] getStylesheets() {
+    public String[] getStylesheets(String overrideFontFamily) {
+        Color textFill = getForegroundColor();
+
+        String fontFamily;
+        if (System.getProperty("hmcl.font.override") != null) {
+            fontFamily = System.getProperty("hmcl.font.override");
+        } else if (overrideFontFamily != null) {
+            fontFamily = overrideFontFamily;
+        } else {
+            fontFamily = null;
+        }
+
         String css;
         try {
             File temp = File.createTempFile("hmcl", ".css");
-            FileUtils.writeText(temp, IOUtils.readFullyAsString(Theme.class.getResourceAsStream("/assets/css/custom.css"))
+            FileUtils.writeText(temp, IOUtils.readFullyAsString(ResourceNotFoundError.getResourceAsStream("/assets/css/custom.css"))
                     .replace("%base-color%", color)
-                    .replace("%font-color%", getColorDisplayName(getForegroundColor())));
+                    .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);
@@ -132,11 +153,12 @@ public class Theme {
     }
 
     public static ObjectBinding<Color> foregroundFillBinding() {
-        return Bindings.createObjectBinding(() -> config().getTheme().getForegroundColor(), config().themeProperty());
+        return BindingMapping.of(config().themeProperty())
+                .map(Theme::getForegroundColor);
     }
 
     public static ObjectBinding<Color> blackFillBinding() {
-        return Bindings.createObjectBinding(() -> Color.BLACK);
+        return Bindings.createObjectBinding(() -> BLACK);
     }
 
     public static ObjectBinding<Color> whiteFillBinding() {

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -19,36 +19,36 @@ package org.jackhuang.hmcl.setting;
 
 import com.google.gson.*;
 import com.google.gson.annotations.JsonAdapter;
-
 import javafx.beans.InvalidationListener;
-import org.jackhuang.hmcl.Metadata;
-import org.jackhuang.hmcl.game.LaunchOptions;
-import org.jackhuang.hmcl.util.*;
-import org.jackhuang.hmcl.util.javafx.ImmediateBooleanProperty;
-import org.jackhuang.hmcl.util.javafx.ImmediateIntegerProperty;
-import org.jackhuang.hmcl.util.javafx.ImmediateObjectProperty;
-import org.jackhuang.hmcl.util.javafx.ImmediateStringProperty;
+import javafx.beans.property.*;
+import org.jackhuang.hmcl.game.*;
+import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.platform.Architecture;
 import org.jackhuang.hmcl.util.platform.JavaVersion;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
+import org.jackhuang.hmcl.util.platform.Platform;
+import org.jackhuang.hmcl.util.versioning.VersionNumber;
 
-import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Type;
+import java.nio.file.InvalidPathException;
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.CancellationException;
 import java.util.stream.Collectors;
 
-import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static com.jfoenix.concurrency.JFXUtilities.runInFX;
 
 /**
  *
  * @author huangyuhui
  */
 @JsonAdapter(VersionSetting.Serializer.class)
-public final class VersionSetting {
-
-    public transient String id;
+public final class VersionSetting implements Cloneable {
 
     private boolean global = false;
 
@@ -60,9 +60,9 @@ public final class VersionSetting {
         this.global = global;
     }
 
-    private final ImmediateBooleanProperty usesGlobalProperty = new ImmediateBooleanProperty(this, "usesGlobal", false);
+    private final BooleanProperty usesGlobalProperty = new SimpleBooleanProperty(this, "usesGlobal", false);
 
-    public ImmediateBooleanProperty usesGlobalProperty() {
+    public BooleanProperty usesGlobalProperty() {
         return usesGlobalProperty;
     }
 
@@ -71,7 +71,7 @@ public final class VersionSetting {
      * 1. Global settings.
      * 2. Version settings.
      * If a version claims that it uses global settings, its version setting will be disabled.
-     *
+     * <p>
      * Defaults false because if one version uses global first, custom version file will not be generated.
      */
     public boolean isUsesGlobal() {
@@ -84,9 +84,9 @@ public final class VersionSetting {
 
     // java
 
-    private final ImmediateStringProperty javaProperty = new ImmediateStringProperty(this, "java", "");
+    private final StringProperty javaProperty = new SimpleStringProperty(this, "java", "");
 
-    public ImmediateStringProperty javaProperty() {
+    public StringProperty javaProperty() {
         return javaProperty;
     }
 
@@ -110,7 +110,16 @@ public final class VersionSetting {
         setDefaultJavaPath(null);
     }
 
-    private final ImmediateStringProperty defaultJavaPathProperty = new ImmediateStringProperty(this, "defaultJavaPath", "");
+    public boolean isJavaAutoSelected() {
+        return "Auto".equals(getJava());
+    }
+
+    public void setJavaAutoSelected() {
+        setJava("Auto");
+        setDefaultJavaPath(null);
+    }
+
+    private final StringProperty defaultJavaPathProperty = new SimpleStringProperty(this, "defaultJavaPath", "");
 
     /**
      * Path to Java executable, or null if user customizes java directory.
@@ -120,13 +129,50 @@ public final class VersionSetting {
         return defaultJavaPathProperty.get();
     }
 
+    public StringProperty defaultJavaPathPropertyProperty() {
+        return defaultJavaPathProperty;
+    }
+
     public void setDefaultJavaPath(String defaultJavaPath) {
         defaultJavaPathProperty.set(defaultJavaPath);
     }
 
-    private final ImmediateStringProperty javaDirProperty = new ImmediateStringProperty(this, "javaDir", "");
+    /**
+     * 0 - .minecraft/versions/&lt;version&gt;/natives/<br/>
+     */
+    private final ObjectProperty<NativesDirectoryType> nativesDirTypeProperty = new SimpleObjectProperty<>(this, "nativesDirType", NativesDirectoryType.VERSION_FOLDER);
 
-    public ImmediateStringProperty javaDirProperty() {
+    public ObjectProperty<NativesDirectoryType> nativesDirTypeProperty() {
+        return nativesDirTypeProperty;
+    }
+
+    public NativesDirectoryType getNativesDirType() {
+        return nativesDirTypeProperty.get();
+    }
+
+    public void setNativesDirType(NativesDirectoryType nativesDirType) {
+        nativesDirTypeProperty.set(nativesDirType);
+    }
+
+    // Path to lwjgl natives directory
+
+    private final StringProperty nativesDirProperty = new SimpleStringProperty(this, "nativesDirProperty", "");
+
+    public StringProperty nativesDirProperty() {
+        return nativesDirProperty;
+    }
+
+    public String getNativesDir() {
+        return nativesDirProperty.get();
+    }
+
+    public void setNativesDir(String nativesDir) {
+        nativesDirProperty.set(nativesDir);
+    }
+
+    private final StringProperty javaDirProperty = new SimpleStringProperty(this, "javaDir", "");
+
+    public StringProperty javaDirProperty() {
         return javaDirProperty;
     }
 
@@ -141,9 +187,9 @@ public final class VersionSetting {
         javaDirProperty.set(javaDir);
     }
 
-    private final ImmediateStringProperty wrapperProperty = new ImmediateStringProperty(this, "wrapper", "");
+    private final StringProperty wrapperProperty = new SimpleStringProperty(this, "wrapper", "");
 
-    public ImmediateStringProperty wrapperProperty() {
+    public StringProperty wrapperProperty() {
         return wrapperProperty;
     }
 
@@ -158,9 +204,9 @@ public final class VersionSetting {
         wrapperProperty.set(wrapper);
     }
 
-    private final ImmediateStringProperty permSizeProperty = new ImmediateStringProperty(this, "permSize", "");
+    private final StringProperty permSizeProperty = new SimpleStringProperty(this, "permSize", "");
 
-    public ImmediateStringProperty permSizeProperty() {
+    public StringProperty permSizeProperty() {
         return permSizeProperty;
     }
 
@@ -175,9 +221,9 @@ public final class VersionSetting {
         permSizeProperty.set(permSize);
     }
 
-    private final ImmediateIntegerProperty maxMemoryProperty = new ImmediateIntegerProperty(this, "maxMemory", OperatingSystem.SUGGESTED_MEMORY);
+    private final IntegerProperty maxMemoryProperty = new SimpleIntegerProperty(this, "maxMemory", OperatingSystem.SUGGESTED_MEMORY);
 
-    public ImmediateIntegerProperty maxMemoryProperty() {
+    public IntegerProperty maxMemoryProperty() {
         return maxMemoryProperty;
     }
 
@@ -195,9 +241,9 @@ public final class VersionSetting {
     /**
      * The minimum memory that JVM can allocate for heap.
      */
-    private final ImmediateObjectProperty<Integer> minMemoryProperty = new ImmediateObjectProperty<>(this, "minMemory", null);
+    private final ObjectProperty<Integer> minMemoryProperty = new SimpleObjectProperty<>(this, "minMemory", null);
 
-    public ImmediateObjectProperty<Integer> minMemoryProperty() {
+    public ObjectProperty<Integer> minMemoryProperty() {
         return minMemoryProperty;
     }
 
@@ -209,9 +255,23 @@ public final class VersionSetting {
         minMemoryProperty.set(minMemory);
     }
 
-    private final ImmediateStringProperty preLaunchCommandProperty = new ImmediateStringProperty(this, "precalledCommand", "");
+    private final BooleanProperty autoMemory = new SimpleBooleanProperty(this, "autoMemory", true);
 
-    public ImmediateStringProperty preLaunchCommandProperty() {
+    public boolean isAutoMemory() {
+        return autoMemory.get();
+    }
+
+    public BooleanProperty autoMemoryProperty() {
+        return autoMemory;
+    }
+
+    public void setAutoMemory(boolean autoMemory) {
+        this.autoMemory.set(autoMemory);
+    }
+
+    private final StringProperty preLaunchCommandProperty = new SimpleStringProperty(this, "precalledCommand", "");
+
+    public StringProperty preLaunchCommandProperty() {
         return preLaunchCommandProperty;
     }
 
@@ -227,11 +287,29 @@ public final class VersionSetting {
         preLaunchCommandProperty.set(preLaunchCommand);
     }
 
+    private final StringProperty postExitCommand = new SimpleStringProperty(this, "postExitCommand", "");
+
+    public StringProperty postExitCommandProperty() {
+        return postExitCommand;
+    }
+
+    /**
+     * The command that will be executed after game exits.
+     * Operating system relevant.
+     */
+    public String getPostExitCommand() {
+        return postExitCommand.get();
+    }
+
+    public void setPostExitCommand(String postExitCommand) {
+        this.postExitCommand.set(postExitCommand);
+    }
+
     // options
 
-    private final ImmediateStringProperty javaArgsProperty = new ImmediateStringProperty(this, "javaArgs", "");
+    private final StringProperty javaArgsProperty = new SimpleStringProperty(this, "javaArgs", "");
 
-    public ImmediateStringProperty javaArgsProperty() {
+    public StringProperty javaArgsProperty() {
         return javaArgsProperty;
     }
 
@@ -246,9 +324,9 @@ public final class VersionSetting {
         javaArgsProperty.set(javaArgs);
     }
 
-    private final ImmediateStringProperty minecraftArgsProperty = new ImmediateStringProperty(this, "minecraftArgs", "");
+    private final StringProperty minecraftArgsProperty = new SimpleStringProperty(this, "minecraftArgs", "");
 
-    public ImmediateStringProperty minecraftArgsProperty() {
+    public StringProperty minecraftArgsProperty() {
         return minecraftArgsProperty;
     }
 
@@ -263,9 +341,9 @@ public final class VersionSetting {
         minecraftArgsProperty.set(minecraftArgs);
     }
 
-    private final ImmediateBooleanProperty noJVMArgsProperty = new ImmediateBooleanProperty(this, "noJVMArgs", false);
+    private final BooleanProperty noJVMArgsProperty = new SimpleBooleanProperty(this, "noJVMArgs", false);
 
-    public ImmediateBooleanProperty noJVMArgsProperty() {
+    public BooleanProperty noJVMArgsProperty() {
         return noJVMArgsProperty;
     }
 
@@ -280,9 +358,9 @@ public final class VersionSetting {
         noJVMArgsProperty.set(noJVMArgs);
     }
 
-    private final ImmediateBooleanProperty notCheckJVMProperty = new ImmediateBooleanProperty(this, "notCheckJVM", false);
+    private final BooleanProperty notCheckJVMProperty = new SimpleBooleanProperty(this, "notCheckJVM", false);
 
-    public ImmediateBooleanProperty notCheckJVMProperty() {
+    public BooleanProperty notCheckJVMProperty() {
         return notCheckJVMProperty;
     }
 
@@ -297,9 +375,9 @@ public final class VersionSetting {
         notCheckJVMProperty.set(notCheckJVM);
     }
 
-    private final ImmediateBooleanProperty notCheckGameProperty = new ImmediateBooleanProperty(this, "notCheckGame", false);
+    private final BooleanProperty notCheckGameProperty = new SimpleBooleanProperty(this, "notCheckGame", false);
 
-    public ImmediateBooleanProperty notCheckGameProperty() {
+    public BooleanProperty notCheckGameProperty() {
         return notCheckGameProperty;
     }
 
@@ -314,9 +392,9 @@ public final class VersionSetting {
         notCheckGameProperty.set(notCheckGame);
     }
 
-    private final ImmediateBooleanProperty showLogsProperty = new ImmediateBooleanProperty(this, "showLogs", false);
+    private final BooleanProperty showLogsProperty = new SimpleBooleanProperty(this, "showLogs", false);
 
-    public ImmediateBooleanProperty showLogsProperty() {
+    public BooleanProperty showLogsProperty() {
         return showLogsProperty;
     }
 
@@ -333,15 +411,15 @@ public final class VersionSetting {
 
     // Minecraft settings.
 
-    private final ImmediateStringProperty serverIpProperty = new ImmediateStringProperty(this, "serverIp", "");
+    private final StringProperty serverIpProperty = new SimpleStringProperty(this, "serverIp", "");
 
-    public ImmediateStringProperty serverIpProperty() {
+    public StringProperty serverIpProperty() {
         return serverIpProperty;
     }
 
     /**
-     * The server ip that will be entered after Minecraft successfully loaded immediately.
-     *
+     * The server ip that will be entered after Minecraft successfully loaded ly.
+     * <p>
      * Format: ip:port or without port.
      */
     public String getServerIp() {
@@ -353,9 +431,9 @@ public final class VersionSetting {
     }
 
 
-    private final ImmediateBooleanProperty fullscreenProperty = new ImmediateBooleanProperty(this, "fullscreen", false);
+    private final BooleanProperty fullscreenProperty = new SimpleBooleanProperty(this, "fullscreen", false);
 
-    public ImmediateBooleanProperty fullscreenProperty() {
+    public BooleanProperty fullscreenProperty() {
         return fullscreenProperty;
     }
 
@@ -370,15 +448,15 @@ public final class VersionSetting {
         fullscreenProperty.set(fullscreen);
     }
 
-    private final ImmediateIntegerProperty widthProperty = new ImmediateIntegerProperty(this, "width", 854);
+    private final IntegerProperty widthProperty = new SimpleIntegerProperty(this, "width", 854);
 
-    public ImmediateIntegerProperty widthProperty() {
+    public IntegerProperty widthProperty() {
         return widthProperty;
     }
 
     /**
      * The width of Minecraft window, defaults 800.
-     *
+     * <p>
      * The field saves int value.
      * String type prevents unexpected value from JsonParseException.
      * We can only reset this field instead of recreating the whole setting file.
@@ -392,15 +470,15 @@ public final class VersionSetting {
     }
 
 
-    private final ImmediateIntegerProperty heightProperty = new ImmediateIntegerProperty(this, "height", 480);
+    private final IntegerProperty heightProperty = new SimpleIntegerProperty(this, "height", 480);
 
-    public ImmediateIntegerProperty heightProperty() {
+    public IntegerProperty heightProperty() {
         return heightProperty;
     }
 
     /**
      * The height of Minecraft window, defaults 480.
-     *
+     * <p>
      * The field saves int value.
      * String type prevents unexpected value from JsonParseException.
      * We can only reset this field instead of recreating the whole setting file.
@@ -417,26 +495,26 @@ public final class VersionSetting {
      * 0 - .minecraft<br/>
      * 1 - .minecraft/versions/&lt;version&gt;/<br/>
      */
-    private final ImmediateObjectProperty<EnumGameDirectory> gameDirTypeProperty = new ImmediateObjectProperty<>(this, "gameDirType", EnumGameDirectory.ROOT_FOLDER);
+    private final ObjectProperty<GameDirectoryType> gameDirTypeProperty = new SimpleObjectProperty<>(this, "gameDirType", GameDirectoryType.ROOT_FOLDER);
 
-    public ImmediateObjectProperty<EnumGameDirectory> gameDirTypeProperty() {
+    public ObjectProperty<GameDirectoryType> gameDirTypeProperty() {
         return gameDirTypeProperty;
     }
 
-    public EnumGameDirectory getGameDirType() {
+    public GameDirectoryType getGameDirType() {
         return gameDirTypeProperty.get();
     }
 
-    public void setGameDirType(EnumGameDirectory gameDirType) {
+    public void setGameDirType(GameDirectoryType gameDirType) {
         gameDirTypeProperty.set(gameDirType);
     }
 
     /**
      * Your custom gameDir
      */
-    private final ImmediateStringProperty gameDirProperty = new ImmediateStringProperty(this, "gameDir", "");
+    private final StringProperty gameDirProperty = new SimpleStringProperty(this, "gameDir", "");
 
-    public ImmediateStringProperty gameDirProperty() {
+    public StringProperty gameDirProperty() {
         return gameDirProperty;
     }
 
@@ -448,6 +526,48 @@ public final class VersionSetting {
         gameDirProperty.set(gameDir);
     }
 
+    private final ObjectProperty<ProcessPriority> processPriorityProperty = new SimpleObjectProperty<>(this, "processPriority", ProcessPriority.NORMAL);
+
+    public ObjectProperty<ProcessPriority> processPriorityProperty() {
+        return processPriorityProperty;
+    }
+
+    public ProcessPriority getProcessPriority() {
+        return processPriorityProperty.get();
+    }
+
+    public void setProcessPriority(ProcessPriority processPriority) {
+        processPriorityProperty.set(processPriority);
+    }
+
+    private final BooleanProperty useNativeGLFW = new SimpleBooleanProperty(this, "nativeGLFW", false);
+
+    public boolean isUseNativeGLFW() {
+        return useNativeGLFW.get();
+    }
+
+    public BooleanProperty useNativeGLFWProperty() {
+        return useNativeGLFW;
+    }
+
+    public void setUseNativeGLFW(boolean useNativeGLFW) {
+        this.useNativeGLFW.set(useNativeGLFW);
+    }
+
+    private final BooleanProperty useNativeOpenAL = new SimpleBooleanProperty(this, "nativeOpenAL", false);
+
+    public boolean isUseNativeOpenAL() {
+        return useNativeOpenAL.get();
+    }
+
+    public BooleanProperty useNativeOpenALProperty() {
+        return useNativeOpenAL;
+    }
+
+    public void setUseNativeOpenAL(boolean useNativeOpenAL) {
+        this.useNativeOpenAL.set(useNativeOpenAL);
+    }
+
     // launcher settings
 
     /**
@@ -455,9 +575,9 @@ public final class VersionSetting {
      * 1 - Hide the launcher when the game starts.<br/>
      * 2 - Keep the launcher open.<br/>
      */
-    private final ImmediateObjectProperty<LauncherVisibility> launcherVisibilityProperty = new ImmediateObjectProperty<>(this, "launcherVisibility", LauncherVisibility.HIDE);
+    private final ObjectProperty<LauncherVisibility> launcherVisibilityProperty = new SimpleObjectProperty<>(this, "launcherVisibility", LauncherVisibility.HIDE);
 
-    public ImmediateObjectProperty<LauncherVisibility> launcherVisibilityProperty() {
+    public ObjectProperty<LauncherVisibility> launcherVisibilityProperty() {
         return launcherVisibilityProperty;
     }
 
@@ -469,31 +589,50 @@ public final class VersionSetting {
         launcherVisibilityProperty.set(launcherVisibility);
     }
 
-    public JavaVersion getJavaVersion() throws InterruptedException {
-        // TODO: lazy initialization may result in UI suspension.
-        if (StringUtils.isBlank(getJava()))
-            setJava(StringUtils.isBlank(getJavaDir()) ? "Default" : "Custom");
-        if ("Default".equals(getJava())) return JavaVersion.fromCurrentEnvironment();
-        else if (isUsesCustomJavaDir()) {
+    public Task<JavaVersion> getJavaVersion(VersionNumber gameVersion, Version version) {
+        return getJavaVersion(gameVersion, version, true);
+    }
+
+    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");
+            }
+        }).thenSupplyAsync(() -> {
             try {
-                return JavaVersion.fromExecutable(Paths.get(getJavaDir()));
-            } catch (IOException e) {
-                return null; // Custom Java Directory not found,
+                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,
+                    }
+                } 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));
+                    }
+                } else throw new Error();
+            } catch (InterruptedException e) {
+                throw new CancellationException();
             }
-        } else if (StringUtils.isNotBlank(getJava())) {
-            List<JavaVersion> matchedJava = JavaVersion.getJavas().stream()
-                    .filter(java -> java.getVersion().equals(getJava()))
-                    .collect(Collectors.toList());
-            if (matchedJava.isEmpty()) {
-                setJava("Default");
-                return JavaVersion.fromCurrentEnvironment();
-            } else {
-                return matchedJava.stream()
-                        .filter(java -> java.getBinary().toString().equals(getDefaultJavaPath()))
-                        .findFirst()
-                        .orElse(matchedJava.get(0));
-            }
-        } else throw new Error();
+        });
     }
 
     public void setJavaVersion(JavaVersion java) {
@@ -509,7 +648,9 @@ public final class VersionSetting {
         permSizeProperty.addListener(listener);
         maxMemoryProperty.addListener(listener);
         minMemoryProperty.addListener(listener);
+        autoMemory.addListener(listener);
         preLaunchCommandProperty.addListener(listener);
+        postExitCommand.addListener(listener);
         javaArgsProperty.addListener(listener);
         minecraftArgsProperty.addListener(listener);
         noJVMArgsProperty.addListener(listener);
@@ -522,38 +663,47 @@ public final class VersionSetting {
         heightProperty.addListener(listener);
         gameDirTypeProperty.addListener(listener);
         gameDirProperty.addListener(listener);
+        processPriorityProperty.addListener(listener);
+        useNativeGLFW.addListener(listener);
+        useNativeOpenAL.addListener(listener);
         launcherVisibilityProperty.addListener(listener);
         defaultJavaPathProperty.addListener(listener);
+        nativesDirProperty.addListener(listener);
+        nativesDirTypeProperty.addListener(listener);
     }
 
-    public LaunchOptions toLaunchOptions(File gameDir) throws InterruptedException {
-        JavaVersion javaVersion = Optional.ofNullable(getJavaVersion()).orElse(JavaVersion.fromCurrentEnvironment());
-        LaunchOptions.Builder builder = new LaunchOptions.Builder()
-                .setGameDir(gameDir)
-                .setJava(javaVersion)
-                .setVersionName(Metadata.TITLE)
-                .setProfileName(Metadata.TITLE)
-                .setMinecraftArgs(getMinecraftArgs())
-                .setJavaArgs(getJavaArgs())
-                .setMaxMemory(getMaxMemory())
-                .setMinMemory(getMinMemory())
-                .setMetaspace(Lang.toIntOrNull(getPermSize()))
-                .setWidth(getWidth())
-                .setHeight(getHeight())
-                .setFullscreen(isFullscreen())
-                .setServerIp(getServerIp())
-                .setWrapper(getWrapper())
-                .setPrecalledCommand(getPreLaunchCommand())
-                .setNoGeneratedJVMArgs(isNoJVMArgs());
-        if (config().hasProxy()) {
-            builder.setProxyHost(config().getProxyHost());
-            builder.setProxyPort(config().getProxyPort());
-            if (config().hasProxyAuth()) {
-                builder.setProxyUser(config().getProxyUser());
-                builder.setProxyPass(config().getProxyPass());
-            }
-        }
-        return builder.create();
+    @Override
+    public VersionSetting clone() {
+        VersionSetting versionSetting = new VersionSetting();
+        versionSetting.setUsesGlobal(isUsesGlobal());
+        versionSetting.setJava(getJava());
+        versionSetting.setDefaultJavaPath(getDefaultJavaPath());
+        versionSetting.setJavaDir(getJavaDir());
+        versionSetting.setWrapper(getWrapper());
+        versionSetting.setPermSize(getPermSize());
+        versionSetting.setMaxMemory(getMaxMemory());
+        versionSetting.setMinMemory(getMinMemory());
+        versionSetting.setAutoMemory(isAutoMemory());
+        versionSetting.setPreLaunchCommand(getPreLaunchCommand());
+        versionSetting.setPostExitCommand(getPostExitCommand());
+        versionSetting.setJavaArgs(getJavaArgs());
+        versionSetting.setMinecraftArgs(getMinecraftArgs());
+        versionSetting.setNoJVMArgs(isNoJVMArgs());
+        versionSetting.setNotCheckGame(isNotCheckGame());
+        versionSetting.setNotCheckJVM(isNotCheckJVM());
+        versionSetting.setShowLogs(isShowLogs());
+        versionSetting.setServerIp(getServerIp());
+        versionSetting.setFullscreen(isFullscreen());
+        versionSetting.setWidth(getWidth());
+        versionSetting.setHeight(getHeight());
+        versionSetting.setGameDirType(getGameDirType());
+        versionSetting.setGameDir(getGameDir());
+        versionSetting.setProcessPriority(getProcessPriority());
+        versionSetting.setUseNativeGLFW(isUseNativeGLFW());
+        versionSetting.setUseNativeOpenAL(isUseNativeOpenAL());
+        versionSetting.setLauncherVisibility(getLauncherVisibility());
+        versionSetting.setNativesDir(getNativesDir());
+        return versionSetting;
     }
 
     public static class Serializer implements JsonSerializer<VersionSetting>, JsonDeserializer<VersionSetting> {
@@ -567,11 +717,13 @@ public final class VersionSetting {
             obj.addProperty("minecraftArgs", src.getMinecraftArgs());
             obj.addProperty("maxMemory", src.getMaxMemory() <= 0 ? OperatingSystem.SUGGESTED_MEMORY : src.getMaxMemory());
             obj.addProperty("minMemory", src.getMinMemory());
+            obj.addProperty("autoMemory", src.isAutoMemory());
             obj.addProperty("permSize", src.getPermSize());
             obj.addProperty("width", src.getWidth());
             obj.addProperty("height", src.getHeight());
             obj.addProperty("javaDir", src.getJavaDir());
             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());
@@ -582,15 +734,20 @@ public final class VersionSetting {
             obj.addProperty("showLogs", src.isShowLogs());
             obj.addProperty("gameDir", src.getGameDir());
             obj.addProperty("launcherVisibility", src.getLauncherVisibility().ordinal());
+            obj.addProperty("processPriority", src.getProcessPriority().ordinal());
+            obj.addProperty("useNativeGLFW", src.isUseNativeGLFW());
+            obj.addProperty("useNativeOpenAL", src.isUseNativeOpenAL());
             obj.addProperty("gameDirType", src.getGameDirType().ordinal());
             obj.addProperty("defaultJavaPath", src.getDefaultJavaPath());
+            obj.addProperty("nativesDir", src.getNativesDir());
+            obj.addProperty("nativesDirType", src.getNativesDirType().ordinal());
 
             return obj;
         }
 
         @Override
         public VersionSetting deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-            if (json == null || json == JsonNull.INSTANCE || !(json instanceof JsonObject))
+            if (json == JsonNull.INSTANCE || !(json instanceof JsonObject))
                 return null;
             JsonObject obj = (JsonObject) json;
 
@@ -604,6 +761,7 @@ public final class VersionSetting {
             vs.setMinecraftArgs(Optional.ofNullable(obj.get("minecraftArgs")).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));
             vs.setPermSize(Optional.ofNullable(obj.get("permSize")).map(JsonElement::getAsString).orElse(""));
             vs.setWidth(Optional.ofNullable(obj.get("width")).map(JsonElement::getAsJsonPrimitive).map(this::parseJsonPrimitive).orElse(0));
             vs.setHeight(Optional.ofNullable(obj.get("height")).map(JsonElement::getAsJsonPrimitive).map(this::parseJsonPrimitive).orElse(0));
@@ -613,14 +771,19 @@ public final class VersionSetting {
             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(""));
             vs.setFullscreen(Optional.ofNullable(obj.get("fullscreen")).map(JsonElement::getAsBoolean).orElse(false));
             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.setShowLogs(Optional.ofNullable(obj.get("showLogs")).map(JsonElement::getAsBoolean).orElse(false));
-            vs.setLauncherVisibility(LauncherVisibility.values()[Optional.ofNullable(obj.get("launcherVisibility")).map(JsonElement::getAsInt).orElse(1)]);
-            vs.setGameDirType(EnumGameDirectory.values()[Optional.ofNullable(obj.get("gameDirType")).map(JsonElement::getAsInt).orElse(0)]);
+            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(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(NativesDirectoryType.values()[Optional.ofNullable(obj.get("nativesDirType")).map(JsonElement::getAsInt).orElse(0)]);
 
             return vs;
         }

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

@@ -0,0 +1,20 @@
+package org.jackhuang.hmcl.ui;
+
+import java.awt.*;
+import java.lang.reflect.Method;
+
+public final class AwtUtils {
+    private AwtUtils() {
+    }
+
+    public static void setAppleIcon(Image image) {
+        try {
+            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);
+        } catch (Throwable ignore) {
+        }
+    }
+}

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -17,61 +17,85 @@
  */
 package org.jackhuang.hmcl.ui;
 
-import com.jfoenix.utils.JFXUtilities;
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXDialogLayout;
+import javafx.beans.property.DoubleProperty;
+import javafx.beans.property.SimpleDoubleProperty;
 import javafx.scene.Node;
 import javafx.scene.Scene;
-import javafx.scene.image.Image;
+import javafx.scene.control.ButtonBase;
+import javafx.scene.control.Label;
 import javafx.scene.layout.Region;
+import javafx.scene.paint.Color;
 import javafx.stage.Stage;
+import javafx.stage.StageStyle;
 import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.Metadata;
-import org.jackhuang.hmcl.game.HMCLGameRepository;
-import org.jackhuang.hmcl.game.Version;
+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.AccountList;
-import org.jackhuang.hmcl.ui.account.AuthlibInjectorServersPage;
+import org.jackhuang.hmcl.ui.account.AccountListPage;
 import org.jackhuang.hmcl.ui.construct.*;
+import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
 import org.jackhuang.hmcl.ui.decorator.DecoratorController;
+import org.jackhuang.hmcl.ui.download.DownloadPage;
 import org.jackhuang.hmcl.ui.download.ModpackInstallWizardProvider;
-import org.jackhuang.hmcl.ui.profile.ProfileList;
-import org.jackhuang.hmcl.ui.versions.GameItem;
-import org.jackhuang.hmcl.ui.versions.GameList;
+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.upgrade.UpdateChecker;
 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.javafx.MultiStepBinding;
 import org.jackhuang.hmcl.util.platform.JavaVersion;
-import org.jackhuang.hmcl.util.versioning.VersionNumber;
 
 import java.io.File;
-import java.util.Comparator;
-import java.util.Date;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
 
 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 {
+    private static DoubleProperty stageWidth = new SimpleDoubleProperty();
+    private static DoubleProperty stageHeight = new SimpleDoubleProperty();
 
     private static Scene scene;
     private static Stage stage;
-    private static MainPage mainPage = null;
-    private static SettingsPage settingsPage = null;
-    private static VersionPage versionPage = null;
-    private static GameList gameListPage = null;
-    private static AccountList accountListPage = null;
-    private static ProfileList profileListPage = null;
-    private static AuthlibInjectorServersPage serversPage = null;
-    private static LeftPaneController leftPaneController;
+    private static Lazy<VersionPage> versionPage = new Lazy<>(VersionPage::new);
+    private static Lazy<GameListPage> gameListPage = new Lazy<>(() -> {
+        GameListPage gameListPage = new GameListPage();
+        gameListPage.selectedProfileProperty().bindBidirectional(Profiles.selectedProfileProperty());
+        gameListPage.profilesProperty().bindContent(Profiles.profilesProperty());
+        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"));
+        });
+        return gameListPage;
+    });
+    private static Lazy<RootPage> rootPage = new Lazy<>(RootPage::new);
     private static DecoratorController decorator;
+    private static Lazy<DownloadPage> downloadPage = new Lazy<>(DownloadPage::new);
+    private static Lazy<AccountListPage> accountListPage = new Lazy<>(() -> {
+        AccountListPage accountListPage = new AccountListPage();
+        accountListPage.selectedAccountProperty().bindBidirectional(Accounts.selectedAccountProperty());
+        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() {
+    }
 
     public static Scene getScene() {
         return scene;
@@ -81,59 +105,39 @@ public final class Controllers {
         return stage;
     }
 
-    // FXThread
-    public static SettingsPage getSettingsPage() {
-        if (settingsPage == null)
-            settingsPage = new SettingsPage();
-        return settingsPage;
-    }
-
-    // FXThread
-    public static GameList getGameListPage() {
-        if (gameListPage == null) {
-            gameListPage = new GameList();
-            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"));
-            });
-        }
-        return gameListPage;
-    }
-
-    // FXThread
-    public static AccountList getAccountListPage() {
-        if (accountListPage == null) {
-            AccountList accountListPage = new AccountList();
-            accountListPage.selectedAccountProperty().bindBidirectional(Accounts.selectedAccountProperty());
-            accountListPage.accountsProperty().bindContent(Accounts.accountsProperty());
-            Controllers.accountListPage = accountListPage;
-        }
-        return accountListPage;
-    }
-
-    // FXThread
-    public static ProfileList getProfileListPage() {
-        if (profileListPage == null) {
-            ProfileList profileListPage = new ProfileList();
-            profileListPage.selectedProfileProperty().bindBidirectional(Profiles.selectedProfileProperty());
-            profileListPage.profilesProperty().bindContent(Profiles.profilesProperty());
-            Controllers.profileListPage = profileListPage;
-        }
-        return profileListPage;
-    }
-
     // FXThread
     public static VersionPage getVersionPage() {
-        if (versionPage == null)
-            versionPage = new VersionPage();
-        return versionPage;
+        return versionPage.get();
     }
 
     // FXThread
-    public static AuthlibInjectorServersPage getServersPage() {
-        if (serversPage == null)
-            serversPage = new AuthlibInjectorServersPage();
-        return serversPage;
+    public static GameListPage getGameListPage() {
+        return gameListPage.get();
+    }
+
+    // FXThread
+    public static RootPage getRootPage() {
+        return rootPage.get();
+    }
+
+    // FXThread
+    public static MultiplayerPage getMultiplayerPage() {
+        return multiplayerPage.get();
+    }
+
+    // FXThread
+    public static LauncherSettingsPage getSettingsPage() {
+        return settingsPage.get();
+    }
+
+    // FXThread
+    public static AccountListPage getAccountListPage() {
+        return accountListPage.get();
+    }
+
+    // FXThread
+    public static DownloadPage getDownloadPage() {
+        return downloadPage.get();
     }
 
     // FXThread
@@ -141,50 +145,11 @@ public final class Controllers {
         return decorator;
     }
 
-    public static MainPage getMainPage() {
-        if (mainPage == null) {
-            MainPage mainPage = new MainPage();
-            FXUtils.applyDragListener(mainPage, it -> "zip".equals(FileUtils.getExtension(it)), modpacks -> {
-                File modpack = modpacks.get(0);
-                Controllers.getDecorator().startWizard(new ModpackInstallWizardProvider(Profiles.getSelectedProfile(), modpack), i18n("install.modpack"));
-            });
-
-            FXUtils.onChangeAndOperate(Profiles.selectedVersionProperty(), version -> {
-                if (version != null) {
-                    mainPage.setCurrentGame(version);
-                } else {
-                    mainPage.setCurrentGame(i18n("version.empty"));
-                }
-            });
-            mainPage.showUpdateProperty().bind(UpdateChecker.outdatedProperty());
-            mainPage.latestVersionProperty().bind(
-                    MultiStepBinding.of(UpdateChecker.latestVersionProperty())
-                            .map(version -> version == null ? "" : i18n("update.bubble.title", version.getVersion())));
-
-            Profiles.registerVersionsListener(profile -> {
-                HMCLGameRepository repository = profile.getRepository();
-                List<Node> children = repository.getVersions().parallelStream()
-                        .filter(version -> !version.isHidden())
-                        .sorted(Comparator.comparing((Version version) -> version.getReleaseTime() == null ? new Date(0L) : version.getReleaseTime())
-                                .thenComparing(a -> VersionNumber.asVersion(a.getId())))
-                        .map(version -> {
-                            Node node = PopupMenu.wrapPopupMenuItem(new GameItem(profile, version.getId()));
-                            node.setOnMouseClicked(e -> profile.setSelectedVersion(version.getId()));
-                            return node;
-                        })
-                        .collect(Collectors.toList());
-                JFXUtilities.runInFX(() -> {
-                    if (profile == Profiles.getSelectedProfile())
-                        mainPage.getVersions().setAll(children);
-                });
-            });
-            Controllers.mainPage = mainPage;
-        }
-        return mainPage;
-    }
-
-    public static LeftPaneController getLeftPaneController() {
-        return leftPaneController;
+    public static void onApplicationStop() {
+        config().setHeight(stageHeight.get());
+        config().setWidth(stageWidth.get());
+        stageHeight = null;
+        stageWidth = null;
     }
 
     public static void initialize(Stage stage) {
@@ -192,11 +157,14 @@ public final class Controllers {
 
         Controllers.stage = stage;
 
+        stage.setHeight(config().getHeight());
+        stageHeight.bind(stage.heightProperty());
+        stage.setWidth(config().getWidth());
+        stageWidth.bind(stage.widthProperty());
+
         stage.setOnCloseRequest(e -> Launcher.stopApplication());
 
-        decorator = new DecoratorController(stage, getMainPage());
-        leftPaneController = new LeftPaneController();
-        decorator.getDecorator().drawerProperty().setAll(leftPaneController);
+        decorator = new DecoratorController(stage, getRootPage());
 
         if (config().getCommonDirType() == EnumCommonDirectory.CUSTOM &&
                 !FileUtils.canCreateDirectory(config().getCommonDirectory())) {
@@ -204,13 +172,41 @@ public final class Controllers {
             dialog(i18n("launcher.cache_directory.invalid"));
         }
 
-        Task.of(JavaVersion::initialize).start();
+        Task.runAsync(JavaVersion::initialize).thenRunAsync(JavaRepository::initialize).start();
 
-        scene = new Scene(decorator.getDecorator(), 800, 519);
-        scene.getStylesheets().setAll(config().getTheme().getStylesheets());
+        scene = new Scene(decorator.getDecorator());
+        scene.setFill(Color.TRANSPARENT);
+        stage.setMinHeight(450 + 2 + 40 + 16); // bg height + border width*2 + toolbar height + shadow width*2
+        stage.setMinWidth(800 + 2 + 16); // bg width + border width*2 + shadow width*2
+        decorator.getDecorator().prefWidthProperty().bind(scene.widthProperty());
+        decorator.getDecorator().prefHeightProperty().bind(scene.heightProperty());
+        scene.getStylesheets().setAll(config().getTheme().getStylesheets(config().getLauncherFontFamily()));
 
-        stage.getIcons().add(new Image("/assets/img/icon.png"));
-        stage.setTitle(Metadata.TITLE);
+        stage.getIcons().add(newImage("/assets/img/icon.png"));
+        stage.setTitle(Metadata.FULL_TITLE);
+        stage.initStyle(StageStyle.TRANSPARENT);
+        stage.setScene(scene);
+
+        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.setOnAction(e -> FXUtils.openLink(Metadata.EULA_URL));
+            JFXButton yesButton = new JFXButton(i18n("launcher.agreement.accept"));
+            yesButton.getStyleClass().add("dialog-accept");
+            yesButton.setOnAction(e -> {
+                globalConfig().setAgreementVersion(1);
+                agreementPane.fireEvent(new DialogCloseEvent());
+            });
+            JFXButton noButton = new JFXButton(i18n("launcher.agreement.decline"));
+            noButton.getStyleClass().add("dialog-cancel");
+            noButton.setOnAction(e -> {
+                System.exit(1);
+            });
+            agreementPane.setActions(agreementLink, yesButton, noButton);
+            Controllers.dialog(agreementPane);
+        }
     }
 
     public static void dialog(Region content) {
@@ -223,46 +219,88 @@ public final class Controllers {
     }
 
     public static void dialog(String text, String title) {
-        dialog(text, title, MessageBox.INFORMATION_MESSAGE);
+        dialog(text, title, MessageType.INFO);
     }
 
-    public static void dialog(String text, String title, int type) {
+    public static void dialog(String text, String title, MessageType type) {
         dialog(text, title, type, null);
     }
 
-    public static void dialog(String text, String title, int type, Runnable onAccept) {
-        dialog(new MessageDialogPane(text, title, type, onAccept));
+    public static void dialog(String text, String title, MessageType type, Runnable ok) {
+        dialog(new MessageDialogPane.Builder(text, title, type).ok(ok).build());
     }
 
-    public static void confirmDialog(String text, String title, Runnable onAccept, Runnable onCancel) {
-        dialog(new MessageDialogPane(text, title, onAccept, onCancel));
+    public static void confirm(String text, String title, Runnable yes, Runnable no) {
+        confirm(text, title, MessageType.QUESTION, yes, no);
     }
 
-    public static InputDialogPane inputDialog(String text, FutureCallback<String> onResult) {
-        InputDialogPane pane = new InputDialogPane(text, onResult);
+    public static void confirm(String text, String title, MessageType type, Runnable yes, Runnable no) {
+        dialog(new MessageDialogPane.Builder(text, title, type).yesOrNo(yes, no).build());
+    }
+
+    public static void confirmAction(String text, String title, MessageType type, ButtonBase actionButton) {
+        dialog(new MessageDialogPane.Builder(text, title, type).actionOrCancel(actionButton, null).build());
+    }
+
+    public static void confirmAction(String text, String title, MessageType type, ButtonBase actionButton, Runnable cancel) {
+        dialog(new MessageDialogPane.Builder(text, title, type).actionOrCancel(actionButton, cancel).build());
+    }
+
+    public static CompletableFuture<String> prompt(String title, FutureCallback<String> onResult) {
+        return prompt(title, onResult, "");
+    }
+
+    public static CompletableFuture<String> prompt(String title, FutureCallback<String> onResult, String initialValue) {
+        InputDialogPane pane = new InputDialogPane(title, initialValue, onResult);
         dialog(pane);
-        return pane;
+        return pane.getCompletableFuture();
     }
 
-    public static Region taskDialog(TaskExecutor executor, String title) {
-        return taskDialog(executor, title, "");
+    public static CompletableFuture<List<PromptDialogPane.Builder.Question<?>>> prompt(PromptDialogPane.Builder builder) {
+        PromptDialogPane pane = new PromptDialogPane(builder);
+        dialog(pane);
+        return pane.getCompletableFuture();
     }
 
-    public static Region taskDialog(TaskExecutor executor, String title, String subtitle) {
-        return taskDialog(executor, title, subtitle, null);
+    public static TaskExecutorDialogPane taskDialog(TaskExecutor executor, String title) {
+        return taskDialog(executor, title, null);
     }
 
-    public static Region taskDialog(TaskExecutor executor, String title, String subtitle, Consumer<Region> onCancel) {
+    public static TaskExecutorDialogPane taskDialog(TaskExecutor executor, String title, Consumer<Region> onCancel) {
         TaskExecutorDialogPane pane = new TaskExecutorDialogPane(onCancel);
         pane.setTitle(title);
-        pane.setSubtitle(subtitle);
         pane.setExecutor(executor);
         dialog(pane);
         return pane;
     }
 
+    public static TaskExecutorDialogPane taskDialog(Task<?> task, String title, Consumer<Region> onCancel) {
+        TaskExecutor executor = task.executor();
+        TaskExecutorDialogPane pane = new TaskExecutorDialogPane(onCancel);
+        pane.setTitle(title);
+        pane.setExecutor(executor);
+        dialog(pane);
+        executor.start();
+        return pane;
+    }
+
     public static void navigate(Node node) {
-        decorator.getNavigator().navigate(node);
+        decorator.navigate(node);
+    }
+
+    public static void showToast(String content) {
+        decorator.showToast(content);
+    }
+
+    public static void onHyperlinkAction(String href) {
+        if (href.startsWith("hmcl://")) {
+            if ("hmcl://settings/feedback".equals(href)) {
+                Controllers.getSettingsPage().showFeedback();
+                Controllers.navigate(Controllers.getSettingsPage());
+            }
+        } else {
+            FXUtils.openLink(href);
+        }
     }
 
     public static boolean isStopped() {
@@ -270,15 +308,12 @@ public final class Controllers {
     }
 
     public static void shutdown() {
-        mainPage = null;
-        settingsPage = null;
+        rootPage = null;
         versionPage = null;
-        serversPage = null;
+        gameListPage = null;
+        settingsPage = null;
         decorator = null;
         stage = null;
         scene = null;
-        gameListPage = null;
-        accountListPage = null;
-        profileListPage = null;
     }
 }

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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,7 +22,6 @@ import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextArea;
-import javafx.scene.image.Image;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
@@ -30,6 +29,7 @@ import javafx.stage.Stage;
 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.upgrade.UpdateChecker;
 
+import static org.jackhuang.hmcl.ui.FXUtils.newImage;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 /**
@@ -67,7 +67,7 @@ public class CrashWindow extends Stage {
 
         Scene scene = new Scene(pane, 800, 480);
         setScene(scene);
-        getIcons().add(new Image("/assets/img/icon.png"));
+        getIcons().add(newImage("/assets/img/icon.png"));
         setTitle(i18n("message.error"));
 
         setOnCloseRequest(e -> System.exit(1));

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -17,32 +17,46 @@
  */
 package org.jackhuang.hmcl.ui;
 
-import com.jfoenix.utils.JFXUtilities;
-import org.jackhuang.hmcl.auth.Account;
-import org.jackhuang.hmcl.auth.AuthInfo;
-import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
-import org.jackhuang.hmcl.task.SilentException;
-import org.jackhuang.hmcl.ui.account.AccountLoginPane;
+import org.jackhuang.hmcl.auth.*;
+import org.jackhuang.hmcl.ui.account.ClassicAccountLoginDialog;
+import org.jackhuang.hmcl.ui.account.OAuthAccountLoginDialog;
 
 import java.util.Optional;
+import java.util.concurrent.CancellationException;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicReference;
 
-public final class DialogController {
+import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 
-    public static AuthInfo logIn(Account account) throws Exception {
-        if (account instanceof YggdrasilAccount) {
+public final class DialogController {
+    private DialogController() {
+    }
+
+    public static AuthInfo logIn(Account account) throws CancellationException, AuthenticationException, InterruptedException {
+        if (account instanceof ClassicAccount) {
             CountDownLatch latch = new CountDownLatch(1);
             AtomicReference<AuthInfo> res = new AtomicReference<>(null);
-            JFXUtilities.runInFX(() -> {
-                AccountLoginPane pane = new AccountLoginPane(account, it -> {
-                        res.set(it);
-                        latch.countDown();
+            runInFX(() -> {
+                ClassicAccountLoginDialog pane = new ClassicAccountLoginDialog((ClassicAccount) account, it -> {
+                    res.set(it);
+                    latch.countDown();
                 }, latch::countDown);
                 Controllers.dialog(pane);
             });
             latch.await();
-            return Optional.ofNullable(res.get()).orElseThrow(SilentException::new);
+            return Optional.ofNullable(res.get()).orElseThrow(CancellationException::new);
+        } else if (account instanceof OAuthAccount) {
+            CountDownLatch latch = new CountDownLatch(1);
+            AtomicReference<AuthInfo> res = new AtomicReference<>(null);
+            runInFX(() -> {
+                OAuthAccountLoginDialog pane = new OAuthAccountLoginDialog((OAuthAccount) account, it -> {
+                    res.set(it);
+                    latch.countDown();
+                }, latch::countDown);
+                Controllers.dialog(pane);
+            });
+            latch.await();
+            return Optional.ofNullable(res.get()).orElseThrow(CancellationException::new);
         }
         return account.logIn();
     }

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -17,63 +17,92 @@
  */
 package org.jackhuang.hmcl.ui;
 
-import com.jfoenix.utils.JFXUtilities;
 import com.jfoenix.controls.*;
-import javafx.animation.Animation;
-import javafx.animation.Interpolator;
-import javafx.animation.KeyFrame;
-import javafx.animation.Timeline;
+import javafx.animation.*;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
+import javafx.beans.Observable;
+import javafx.beans.WeakInvalidationListener;
 import javafx.beans.property.Property;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.beans.value.WeakChangeListener;
-import javafx.event.EventHandler;
+import javafx.beans.value.WritableValue;
 import javafx.fxml.FXMLLoader;
+import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.*;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.input.ScrollEvent;
-import javafx.scene.input.TransferMode;
+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.shape.Rectangle;
+import javafx.scene.text.Text;
+import javafx.scene.text.TextFlow;
 import javafx.util.Callback;
 import javafx.util.Duration;
 import javafx.util.StringConverter;
-import org.jackhuang.hmcl.util.*;
+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.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.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
 
-import java.io.File;
-import java.io.FileFilter;
-import java.io.IOException;
-import java.io.UncheckedIOException;
+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.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.net.URI;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.atomic.AtomicReference;
+import java.util.Objects;
 import java.util.function.BooleanSupplier;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import java.util.function.Supplier;
 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.LOG;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class FXUtils {
     private FXUtils() {
     }
 
+    public static void runInFX(Runnable runnable) {
+        if (Platform.isFxApplicationThread()) {
+            runnable.run();
+        } else {
+            Platform.runLater(runnable);
+        }
+    }
+
     public static void checkFxUserThread() {
         if (!Platform.isFxApplicationThread()) {
             throw new IllegalStateException("Not on FX application thread; currentThread = "
@@ -89,8 +118,10 @@ public final class FXUtils {
         value.addListener((a, b, c) -> consumer.accept(c));
     }
 
-    public static <T> void onWeakChange(ObservableValue<T> value, Consumer<T> consumer) {
-        value.addListener(new WeakChangeListener<>((a, b, c) -> consumer.accept(c)));
+    public static <T> ChangeListener<T> onWeakChange(ObservableValue<T> value, Consumer<T> consumer) {
+        ChangeListener<T> listener = (a, b, c) -> consumer.accept(c);
+        value.addListener(new WeakChangeListener<>(listener));
+        return listener;
     }
 
     public static <T> void onChangeAndOperate(ObservableValue<T> value, Consumer<T> consumer) {
@@ -98,9 +129,19 @@ public final class FXUtils {
         onChange(value, consumer);
     }
 
-    public static <T> void onWeakChangeAndOperate(ObservableValue<T> value, Consumer<T> consumer) {
+    public static <T> ChangeListener<T> onWeakChangeAndOperate(ObservableValue<T> value, Consumer<T> consumer) {
         consumer.accept(value.getValue());
-        onWeakChange(value, consumer);
+        return onWeakChange(value, consumer);
+    }
+
+    public static InvalidationListener observeWeak(Runnable runnable, Observable... observables) {
+        InvalidationListener originalListener = observable -> runnable.run();
+        WeakInvalidationListener listener = new WeakInvalidationListener(originalListener);
+        for (Observable observable : observables) {
+            observable.addListener(listener);
+        }
+        runnable.run();
+        return originalListener;
     }
 
     public static void runLaterIf(BooleanSupplier condition, Runnable runnable) {
@@ -153,6 +194,20 @@ public final class FXUtils {
                 });
     }
 
+    public static <K, T> void setupCellValueFactory(JFXTreeTableColumn<K, T> column, Function<K, ObservableValue<T>> mapper) {
+        column.setCellValueFactory(param -> {
+            if (column.validateValue(param))
+                return mapper.apply(param.getValue().getValue());
+            else
+                return column.getComputedValue(param);
+        });
+    }
+
+    public static Node wrapMargin(Node node, Insets insets) {
+        StackPane.setMargin(node, insets);
+        return new StackPane(node);
+    }
+
     public static void setValidateWhileTextChanged(Node field, boolean validate) {
         if (field instanceof JFXTextField) {
             if (validate) {
@@ -176,19 +231,19 @@ public final class FXUtils {
         return field.getProperties().containsKey("FXUtils.validation");
     }
 
-    public static void setOverflowHidden(Region region, boolean hidden) {
-        if (hidden) {
-            Rectangle rectangle = new Rectangle();
-            rectangle.widthProperty().bind(region.widthProperty());
-            rectangle.heightProperty().bind(region.heightProperty());
-            region.setClip(rectangle);
-        } else {
-            region.setClip(null);
-        }
+    public static Rectangle setOverflowHidden(Region region) {
+        Rectangle rectangle = new Rectangle();
+        rectangle.widthProperty().bind(region.widthProperty());
+        rectangle.heightProperty().bind(region.heightProperty());
+        region.setClip(rectangle);
+        return rectangle;
     }
 
-    public static boolean getOverflowHidden(Region region) {
-        return region.getClip() != null;
+    public static Rectangle setOverflowHidden(Region region, double arc) {
+        Rectangle rectangle = setOverflowHidden(region);
+        rectangle.setArcWidth(arc);
+        rectangle.setArcHeight(arc);
+        return rectangle;
     }
 
     public static void setLimitWidth(Region region, double width) {
@@ -251,7 +306,7 @@ public final class FXUtils {
     }
 
     public static void installTooltip(Node node, double openDelay, double visibleDelay, double closeDelay, Tooltip tooltip) {
-        JFXUtilities.runInFX(() -> {
+        runInFX(() -> {
             try {
                 // Java 8
                 Class<?> behaviorClass = Class.forName("javafx.scene.control.Tooltip$TooltipBehavior");
@@ -276,6 +331,30 @@ public final class FXUtils {
         });
     }
 
+    public static void playAnimation(Node node, String animationKey, Timeline timeline) {
+        animationKey = "FXUTILS.ANIMATION." + animationKey;
+        Object oldTimeline = node.getProperties().get(animationKey);
+//        if (oldTimeline instanceof Timeline) ((Timeline) oldTimeline).stop();
+        if (timeline != null) timeline.play();
+        node.getProperties().put(animationKey, timeline);
+    }
+
+    public static <T> Animation playAnimation(Node node, String animationKey, Duration duration, WritableValue<T> property, T from, T to, Interpolator interpolator) {
+        if (from == null) from = property.getValue();
+        if (duration == null || Objects.equals(duration, Duration.ZERO) || Objects.equals(from, to)) {
+            playAnimation(node, animationKey, null);
+            property.setValue(to);
+            return null;
+        } else {
+            Timeline timeline = new Timeline(
+                    new KeyFrame(Duration.ZERO, new KeyValue(property, from, interpolator)),
+                    new KeyFrame(duration, new KeyValue(property, to, interpolator))
+            );
+            playAnimation(node, animationKey, timeline);
+            return timeline;
+        }
+    }
+
     public static void openFolder(File file) {
         if (!FileUtils.makeDirectory(file)) {
             Logging.LOG.log(Level.SEVERE, "Unable to make directory " + file);
@@ -305,16 +384,54 @@ public final class FXUtils {
         }
     }
 
+    public static void showFileInExplorer(Path file) {
+        switch (OperatingSystem.CURRENT_OS) {
+            case WINDOWS:
+                try {
+                    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);
+                }
+                break;
+            default:
+                // Currently unsupported.
+                break;
+        }
+    }
+
+    private static final String[] linuxBrowsers = {
+            "xdg-open",
+            "google-chrome",
+            "firefox",
+            "microsoft-edge",
+            "opera",
+            "konqueror",
+            "mozilla"
+    };
+
     /**
-     * Open URL by java.awt.Desktop
+     * Open URL in browser
      *
      * @param link null is allowed but will be ignored
      */
     public static void openLink(String link) {
         if (link == null)
             return;
-        thread(() -> {
-            if (java.awt.Desktop.isDesktopSupported()) {
+
+        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");
+                    }
+                }
                 try {
                     java.awt.Desktop.getDesktop().browse(new URI(link));
                 } catch (Throwable e) {
@@ -326,12 +443,59 @@ public final class FXUtils {
                         }
                     Logging.LOG.log(Level.WARNING, "Failed to open link: " + link, e);
                 }
-            }
-        });
+            });
+
+        }
+    }
+
+    public static void showWebDialog(String title, String content) {
+        showWebDialog(title, content, 800, 480);
+    }
+
+    public static void showWebDialog(String title, String content, int width, int height) {
+        try {
+            WebStage stage = new WebStage(width, height);
+            stage.getWebView().getEngine().loadContent(content);
+            stage.setTitle(title);
+            stage.showAndWait();
+        } catch (NoClassDefFoundError | UnsatisfiedLinkError e) {
+            LOG.log(Level.WARNING, "WebView is missing or initialization failed, use JEditorPane replaced", e);
+
+            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) {
-        textField.textProperty().bindBidirectional(property, SafeIntStringConverter.INSTANCE);
+        textField.textProperty().bindBidirectional(property, SafeStringConverter.fromInteger());
     }
 
     public static void unbindInt(JFXTextField textField, Property<Number> property) {
@@ -365,6 +529,7 @@ public final class FXUtils {
     /**
      * Bind combo box selection with given enum property bidirectionally.
      * You should <b>only and always</b> use {@code bindEnum} as well as {@code unbindEnum} at the same time.
+     *
      * @param comboBox the combo box being bound with {@code property}.
      * @param property the property being bound with {@code combo box}.
      * @see #unbindEnum(JFXComboBox)
@@ -372,8 +537,9 @@ public final class FXUtils {
      */
     @SuppressWarnings("unchecked")
     @Deprecated
-    public static void bindEnum(JFXComboBox<?> comboBox, Property<? extends Enum> property) {
+    public static void bindEnum(JFXComboBox<?> comboBox, Property<? extends Enum<?>> property) {
         unbindEnum(comboBox);
+        @SuppressWarnings("rawtypes")
         ChangeListener<Number> listener = (a, b, newValue) ->
                 ((Property) property).setValue(property.getValue().getClass().getEnumConstants()[newValue.intValue()]);
         comboBox.getSelectionModel().select(property.getValue().ordinal());
@@ -384,80 +550,33 @@ public final class FXUtils {
     /**
      * Unbind combo box selection with given enum property bidirectionally.
      * You should <b>only and always</b> use {@code bindEnum} as well as {@code unbindEnum} at the same time.
+     *
      * @param comboBox the combo box being bound with the property which can be inferred by {@code bindEnum}.
      * @see #bindEnum(JFXComboBox, Property)
+     * @deprecated Use {@link ExtendedProperties#selectedItemPropertyFor(ComboBox)}
      */
     @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);
     }
 
-    public static void smoothScrolling(ListView<?> listView) {
-        listView.skinProperty().addListener(o -> {
-            ScrollBar bar = (ScrollBar) listView.lookup(".scroll-bar");
-            Node virtualFlow = listView.lookup(".virtual-flow");
-            double[] frictions = new double[]{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};
-            double[] pushes = new double[]{1};
-            double[] derivatives = new double[frictions.length];
-
-            Timeline timeline = new Timeline();
-            bar.addEventHandler(MouseEvent.DRAG_DETECTED, e -> timeline.stop());
-
-            EventHandler<ScrollEvent> scrollEventHandler = event -> {
-                if (event.getEventType() == ScrollEvent.SCROLL) {
-                    int direction = event.getDeltaY() > 0 ? -1 : 1;
-                    for (int i = 0; i < pushes.length; ++i)
-                        derivatives[i] += direction * pushes[i];
-                    if (timeline.getStatus() == Animation.Status.STOPPED)
-                        timeline.play();
-                    event.consume();
-                }
-            };
-
-            bar.addEventHandler(ScrollEvent.ANY, scrollEventHandler);
-            virtualFlow.setOnScroll(scrollEventHandler);
-
-            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];
-                double height = listView.getLayoutBounds().getHeight();
-                bar.setValue(Math.min(Math.max(bar.getValue() + dy / height, 0), 1));
-                if (Math.abs(dy) < 0.001)
-                    timeline.stop();
-                listView.requestLayout();
-            }));
-            timeline.setCycleCount(Animation.INDEFINITE);
-        });
-    }
-
-    public static <T> T runInUIThread(Supplier<T> supplier) {
-        if (javafx.application.Platform.isFxApplicationThread()) {
-            return supplier.get();
-        } else {
-            CountDownLatch doneLatch = new CountDownLatch(1);
-            AtomicReference<T> reference = new AtomicReference<>();
-            Platform.runLater(() -> {
-                try {
-                    reference.set(supplier.get());
-                } finally {
-                    doneLatch.countDown();
-                }
-
-            });
-
-            try {
-                doneLatch.await();
-            } catch (InterruptedException var3) {
-                Thread.currentThread().interrupt();
-            }
-
-            return reference.get();
+    /**
+     * 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.
+     * @return the image resource within the jar.
+     * @see org.jackhuang.hmcl.util.CrashReporter
+     * @see ResourceNotFoundError
+     */
+    public static Image newImage(String url) {
+        try {
+            return new Image(url);
+        } catch (IllegalArgumentException e) {
+            throw new ResourceNotFoundError("Cannot access image: " + url, e);
         }
     }
 
@@ -510,12 +629,26 @@ public final class FXUtils {
             public void updateItem(T item, boolean empty) {
                 super.updateItem(item, empty);
                 if (!empty) {
+                    setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
                     setGraphic(graphicBuilder.apply(item));
                 }
             }
         };
     }
 
+    public static ColumnConstraints getColumnFillingWidth() {
+        ColumnConstraints constraint = new ColumnConstraints();
+        constraint.setFillWidth(true);
+        return constraint;
+    }
+
+    public static ColumnConstraints getColumnHgrowing() {
+        ColumnConstraints constraint = new ColumnConstraints();
+        constraint.setFillWidth(true);
+        constraint.setHgrow(Priority.ALWAYS);
+        return constraint;
+    }
+
     public static final Interpolator SINE = new Interpolator() {
         @Override
         protected double curve(double t) {
@@ -534,4 +667,83 @@ public final class FXUtils {
             popup.hide();
         };
     }
+
+    public static void onEscPressed(Node node, Runnable action) {
+        node.addEventHandler(KeyEvent.KEY_PRESSED, e -> {
+            if (e.getCode() == KeyCode.ESCAPE) {
+                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) {
+        ClipboardContent content = new ClipboardContent();
+        content.putString(text);
+        Clipboard.getSystemClipboard().setContent(content);
+
+        Controllers.showToast(i18n("message.copied"));
+    }
+
+    public static List<Node> parseSegment(String segment, Consumer<String> hyperlinkAction) {
+        try {
+            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+            DocumentBuilder builder = factory.newDocumentBuilder();
+            Document doc = builder.parse(new InputSource(new StringReader("<body>" + segment + "</body>")));
+            Element r = doc.getDocumentElement();
+
+            NodeList children = r.getChildNodes();
+            List<javafx.scene.Node> texts = new ArrayList<>();
+            for (int i = 0; i < children.getLength(); i++) {
+                org.w3c.dom.Node node = children.item(i);
+
+                if (node instanceof Element) {
+                    Element element = (Element) node;
+                    if ("a".equals(element.getTagName())) {
+                        String href = element.getAttribute("href");
+                        JFXHyperlink hyperlink = new JFXHyperlink(element.getTextContent());
+                        hyperlink.setOnAction(e -> hyperlinkAction.accept(href));
+                        texts.add(hyperlink);
+                    } else if ("b".equals(element.getTagName())) {
+                        Text text = new Text(element.getTextContent());
+                        text.getStyleClass().add("bold");
+                        texts.add(text);
+                    } else if ("br".equals(element.getTagName())) {
+                        texts.add(new Text("\n"));
+                    } else {
+                        throw new IllegalArgumentException("unsupported tag " + element.getTagName());
+                    }
+                } else {
+                    texts.add(new Text(node.getTextContent()));
+                }
+            }
+            return texts;
+        } catch (SAXException | ParserConfigurationException | IOException e) {
+            LOG.log(Level.WARNING, "Failed to parse xml", e);
+            return Collections.singletonList(new Text(segment));
+        }
+    }
+
+    public static TextFlow segmentToTextFlow(final String segment, Consumer<String> hyperlinkAction) {
+        TextFlow tf = new TextFlow();
+        tf.getChildren().setAll(parseSegment(segment, hyperlinkAction));
+        return tf;
+    }
+
 }

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

@@ -0,0 +1,368 @@
+/*
+ * 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.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.Scene;
+import javafx.scene.control.Alert;
+import javafx.scene.control.Label;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.VBox;
+import javafx.stage.Stage;
+import org.jackhuang.hmcl.download.LibraryAnalyzer;
+import org.jackhuang.hmcl.game.*;
+import org.jackhuang.hmcl.launch.ProcessListener;
+import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
+import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.Log4jLevel;
+import org.jackhuang.hmcl.util.Pair;
+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.Path;
+import java.nio.file.Paths;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.logging.Level;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.ui.FXUtils.newImage;
+import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.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 java;
+    private final LibraryAnalyzer analyzer;
+    private final StringProperty os = new SimpleStringProperty(OperatingSystem.SYSTEM_NAME);
+    private final StringProperty arch = new SimpleStringProperty(Architecture.SYSTEM_ARCH.getDisplayName());
+    private final StringProperty reason = new SimpleStringProperty(i18n("game.crash.reason.unknown"));
+    private final BooleanProperty loading = new SimpleBooleanProperty();
+    private final Label feedbackLabel = new Label(i18n("game.crash.feedback"));
+
+    private final ManagedProcess managedProcess;
+    private final DefaultGameRepository repository;
+    private final ProcessListener.ExitType exitType;
+    private final LaunchOptions launchOptions;
+    private final View view;
+
+    private final List<Pair<String, Log4jLevel>> 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);
+
+        memory = Optional.ofNullable(launchOptions.getMaxMemory()).map(i -> i + " MB").orElse("-");
+
+        this.java = launchOptions.getJava().getArchitecture() == Architecture.SYSTEM_ARCH
+                ? launchOptions.getJava().getVersion()
+                : launchOptions.getJava().getVersion() + " (" + launchOptions.getJava().getArchitecture().getDisplayName() + ")";
+
+        this.view = new View();
+
+        setScene(new Scene(view, 800, 480));
+        getScene().getStylesheets().addAll(config().getTheme().getStylesheets(config().getLauncherFontFamily()));
+        setTitle(i18n("game.crash.title"));
+        getIcons().add(newImage("/assets/img/icon.png"));
+
+        analyzeCrashReport();
+    }
+
+    private void analyzeCrashReport() {
+        loading.set(true);
+        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.log(Level.WARNING, "Failed to read crash report", e);
+            }
+            if (crashReport == null) {
+                crashReport = CrashReportAnalyzer.extractCrashReport(rawLog);
+            }
+            if (crashReport != null) {
+                keywords = CrashReportAnalyzer.findKeywordsFromCrashReport(crashReport);
+            }
+            return pair(
+                    CrashReportAnalyzer.anaylze(rawLog),
+                    keywords);
+        }).whenCompleteAsync((pair, exception) -> {
+            loading.set(false);
+
+            if (exception != null) {
+                LOG.log(Level.WARNING, "Failed to analyze crash report", exception);
+                reason.set(i18n("game.crash.reason.unknown"));
+            } else {
+                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:
+                            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:
+                            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"))));
+                            break;
+                        case MOD_RESOLUTION_MISSING_MINECRAFT:
+                            reasonText.append(i18n("game.crash.reason." + result.getRule().name().toLowerCase(Locale.ROOT),
+                                    translateFabricModId(result.getMatcher().group("mod")),
+                                    result.getMatcher().group("version")));
+                            break;
+                        case TWILIGHT_FOREST_OPTIFINE:
+                            reasonText.append(i18n("game.crash.reason.mod", "OptiFine"));
+                            break;
+                        default:
+                            reasonText.append(i18n("game.crash.reason." + result.getRule().name().toLowerCase(Locale.ROOT),
+                                    Arrays.stream(result.getRule().getGroupNames()).map(groupName -> result.getMatcher().group(groupName))
+                                            .toArray()))
+                                    .append("\n");
+                            break;
+                    }
+                }
+                if (results.isEmpty()) {
+                    if (!keywords.isEmpty()) {
+                        reason.set(i18n("game.crash.reason.stacktrace", String.join(", ", keywords)));
+                    } else {
+                        reason.set(i18n("game.crash.reason.unknown"));
+                    }
+
+                    feedbackLabel.setVisible(true);
+                } else {
+                    reason.set(reasonText.toString());
+                }
+            }
+        }, Schedulers.javafx()).exceptionally(Lang::handleUncaughtException);
+    }
+
+    private static final Pattern FABRIC_MOD_ID = Pattern.compile("\\{(?<modid>.*?) @ (?<version>.*?)}");
+
+    private String translateFabricModId(String modName) {
+        switch (modName) {
+            case "fabricloader":
+                return "Fabric";
+            case "fabric":
+                return "Fabric API";
+            case "minecraft":
+                return "Minecraft";
+            default:
+                return modName;
+        }
+    }
+
+    private String parseFabricModId(String modName) {
+        Matcher matcher = FABRIC_MOD_ID.matcher(modName);
+        if (matcher.find()) {
+            String modid = matcher.group("modid");
+            String version = matcher.group("version");
+            if ("[*]".equals(version)) {
+                return i18n("game.crash.reason.mod_resolution_mod_version.any", translateFabricModId(modid));
+            } else {
+                return i18n("game.crash.reason.mod_resolution_mod_version", translateFabricModId(modid), version);
+            }
+        }
+        return translateFabricModId(modName);
+    }
+
+    private void showLogWindow() {
+        LogWindow logWindow = new LogWindow();
+
+        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(Pair::getKey).collect(Collectors.joining(OperatingSystem.LINE_SEPARATOR)))
+                .thenComposeAsync(logs ->
+                        LogExporter.exportLogs(logFile, repository, launchOptions.getVersionName(), logs, new CommandBuilder().addAll(managedProcess.getCommands()).toString()))
+                .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;
+                });
+    }
+
+    private final class View extends VBox {
+
+        View() {
+            setStyle("-fx-background-color: white");
+
+            HBox titlePane = new HBox();
+            {
+                Label title = new Label();
+                HBox.setHgrow(title, Priority.ALWAYS);
+
+                switch (exitType) {
+                    case JVM_ERROR:
+                        title.setText(i18n("launch.failed.cannot_create_jvm"));
+                        break;
+                    case APPLICATION_ERROR:
+                        title.setText(i18n("launch.failed.exited_abnormally"));
+                        break;
+                }
+
+                titlePane.setAlignment(Pos.CENTER);
+                titlePane.getStyleClass().addAll("jfx-tool-bar-second", "depth-1", "padding-8");
+                titlePane.getChildren().setAll(title);
+            }
+
+            HBox infoPane = new HBox(8);
+            {
+                infoPane.setPadding(new Insets(8));
+                infoPane.setAlignment(Pos.CENTER_LEFT);
+
+                TwoLineListItem version = new TwoLineListItem();
+                version.getStyleClass().setAll("two-line-item-second-large");
+                version.setTitle(i18n("archive.game_version"));
+                version.setSubtitle(GameCrashWindow.this.version.getId());
+
+                TwoLineListItem memory = new TwoLineListItem();
+                memory.getStyleClass().setAll("two-line-item-second-large");
+                memory.setTitle(i18n("settings.memory"));
+                memory.setSubtitle(GameCrashWindow.this.memory);
+
+                TwoLineListItem java = new TwoLineListItem();
+                java.getStyleClass().setAll("two-line-item-second-large");
+                java.setTitle("Java");
+                java.setSubtitle(GameCrashWindow.this.java);
+
+                TwoLineListItem os = new TwoLineListItem();
+                os.getStyleClass().setAll("two-line-item-second-large");
+                os.setTitle(i18n("system.operating_system"));
+                os.subtitleProperty().bind(GameCrashWindow.this.os);
+
+                TwoLineListItem arch = new TwoLineListItem();
+                arch.getStyleClass().setAll("two-line-item-second-large");
+                arch.setTitle(i18n("system.architecture"));
+                arch.subtitleProperty().bind(GameCrashWindow.this.arch);
+
+                infoPane.getChildren().setAll(version, memory, java, os, arch);
+            }
+
+            HBox moddedPane = new HBox(8);
+            {
+                moddedPane.setPadding(new Insets(8));
+                moddedPane.setAlignment(Pos.CENTER_LEFT);
+
+                for (LibraryAnalyzer.LibraryType type : LibraryAnalyzer.LibraryType.values()) {
+                    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);
+                    });
+                }
+            }
+
+            VBox gameDirPane = new VBox(8);
+            {
+                TwoLineListItem gameDir = new TwoLineListItem();
+                gameDir.getStyleClass().setAll("two-line-item-second-large");
+                gameDir.setTitle(i18n("game.directory"));
+                gameDir.setSubtitle(launchOptions.getGameDir().getAbsolutePath());
+
+                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());
+
+                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);
+                gameDirPane.getChildren().setAll(gameDir, javaDir, reason);
+            }
+
+            HBox toolBar = new HBox();
+            {
+                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, feedbackLabel);
+            }
+
+            getChildren().setAll(titlePane, infoPane, moddedPane, gameDirPane, toolBar);
+        }
+
+    }
+}

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -17,39 +17,216 @@
  */
 package org.jackhuang.hmcl.ui;
 
-import com.jfoenix.effects.JFXDepthManager;
-import javafx.fxml.FXML;
+import com.jfoenix.controls.JFXButton;
+import javafx.beans.binding.Bindings;
+import javafx.beans.property.*;
+import javafx.event.EventHandler;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.Cursor;
+import javafx.scene.Node;
+import javafx.scene.control.Control;
 import javafx.scene.control.Label;
+import javafx.scene.control.Skin;
+import javafx.scene.control.SkinBase;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import org.jackhuang.hmcl.download.LibraryAnalyzer;
+import org.jackhuang.hmcl.setting.Theme;
+import org.jackhuang.hmcl.ui.construct.RipplerContainer;
+import org.jackhuang.hmcl.util.i18n.I18n;
 
-import java.util.function.Consumer;
-
+import static org.jackhuang.hmcl.download.LibraryAnalyzer.LibraryType.*;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 /**
  * @author huangyuhui
  */
-public class InstallerItem extends BorderPane {
-    private final Consumer<InstallerItem> deleteCallback;
+public class InstallerItem extends Control {
+    private final String id;
+    private final String imageUrl;
+    public final StringProperty libraryVersion = new SimpleStringProperty();
+    public final StringProperty incompatibleLibraryName = new SimpleStringProperty();
+    public final StringProperty dependencyName = new SimpleStringProperty();
+    public final BooleanProperty incompatibleWithGame = new SimpleBooleanProperty();
+    public final BooleanProperty removable = new SimpleBooleanProperty();
+    public final BooleanProperty upgradable = new SimpleBooleanProperty(false);
+    public final BooleanProperty installable = new SimpleBooleanProperty(true);
+    public final ObjectProperty<EventHandler<? super MouseEvent>> removeAction = new SimpleObjectProperty<>();
+    public final ObjectProperty<EventHandler<? super MouseEvent>> action = new SimpleObjectProperty<>();
 
-    @FXML
-    private Label lblInstallerArtifact;
-
-    @FXML
-    private Label lblInstallerVersion;
-
-    public InstallerItem(String artifact, String version, Consumer<InstallerItem> deleteCallback) {
-        this.deleteCallback = deleteCallback;
-        FXUtils.loadFXML(this, "/assets/fxml/version/installer-item.fxml");
-
-        setStyle("-fx-background-radius: 2; -fx-background-color: white; -fx-padding: 8;");
-        JFXDepthManager.setDepth(this, 1);
-        lblInstallerArtifact.setText(artifact);
-        lblInstallerVersion.setText(i18n("archive.version") + ": " + version);
+    public InstallerItem(LibraryAnalyzer.LibraryType id) {
+        this(id.getPatchId());
     }
 
-    @FXML
-    private void onDelete() {
-        deleteCallback.accept(this);
+    public InstallerItem(String id) {
+        this.id = id;
+
+        switch (id) {
+            case "game":
+                imageUrl = "/assets/img/grass.png";
+                break;
+            case "fabric":
+            case "fabric-api":
+                imageUrl = "/assets/img/fabric.png";
+                break;
+            case "forge":
+                imageUrl = "/assets/img/forge.png";
+                break;
+            case "liteloader":
+                imageUrl = "/assets/img/chicken.png";
+                break;
+            case "optifine":
+                imageUrl = "/assets/img/command.png";
+                break;
+            default:
+                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;
+    }
+
+    @Override
+    protected Skin<?> createDefaultSkin() {
+        return new InstallerItemSkin(this);
+    }
+
+    public static class InstallerItemGroup {
+        public final InstallerItem game = new InstallerItem(MINECRAFT);
+        public final InstallerItem fabric = new InstallerItem(FABRIC);
+        public final InstallerItem fabricApi = new InstallerItem(FABRIC_API);
+        public final InstallerItem forge = new InstallerItem(FORGE);
+        public final InstallerItem liteLoader = new InstallerItem(LITELOADER);
+        public final InstallerItem optiFine = new InstallerItem(OPTIFINE);
+
+        public InstallerItemGroup() {
+            forge.incompatibleLibraryName.bind(Bindings.createStringBinding(() -> {
+                if (fabric.libraryVersion.get() != null) return FABRIC.getPatchId();
+                return null;
+            }, fabric.libraryVersion));
+
+            liteLoader.incompatibleLibraryName.bind(Bindings.createStringBinding(() -> {
+                if (fabric.libraryVersion.get() != null) return FABRIC.getPatchId();
+                return null;
+            }, fabric.libraryVersion));
+
+            optiFine.incompatibleLibraryName.bind(Bindings.createStringBinding(() -> {
+                if (fabric.libraryVersion.get() != null) return FABRIC.getPatchId();
+                return null;
+            }, fabric.libraryVersion));
+
+            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));
+            }
+
+            fabricApi.dependencyName.bind(Bindings.createStringBinding(() -> {
+                if (fabric.libraryVersion.get() == null) return FABRIC.getPatchId();
+                else return null;
+            }, fabric.libraryVersion));
+        }
+
+        public InstallerItem[] getLibraries() {
+            return new InstallerItem[]{game, forge, liteLoader, optiFine, fabric, fabricApi};
+        }
+    }
+
+    public static class InstallerItemSkin extends SkinBase<InstallerItem> {
+
+        InstallerItemSkin(InstallerItem control) {
+            super(control);
+
+            HBox hbox = new HBox();
+            hbox.getStyleClass().add("md-list-cell");
+            hbox.setPadding(new Insets(8));
+            RipplerContainer container = new RipplerContainer(hbox);
+            getChildren().setAll(container);
+
+            hbox.setAlignment(Pos.CENTER_LEFT);
+
+            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);
+                hbox.getChildren().add(node);
+            }
+
+            Label nameLabel = new Label();
+            nameLabel.setMouseTransparent(true);
+            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 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 {
+                    return i18n("install.installer.version", version);
+                }
+            }, control.incompatibleLibraryName, control.incompatibleWithGame, control.libraryVersion));
+            BorderPane.setMargin(label, new Insets(0, 0, 0, 8));
+            BorderPane.setAlignment(label, Pos.CENTER_LEFT);
+
+            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 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);
+
+            FXUtils.onChangeAndOperate(arrowButton.visibleProperty(), clickable -> {
+                if (clickable) {
+                    container.onMouseClickedProperty().bind(control.action);
+                    hbox.setCursor(Cursor.HAND);
+                } else {
+                    container.onMouseClickedProperty().unbind();
+                    container.onMouseClickedProperty().set(null);
+                    hbox.setCursor(Cursor.DEFAULT);
+                }
+            });
+        }
     }
 }

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

@@ -1,139 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.jackhuang.hmcl.ui;
-
-import com.jfoenix.utils.JFXUtilities;
-import javafx.application.Platform;
-import javafx.scene.image.Image;
-import javafx.scene.layout.Region;
-import org.jackhuang.hmcl.event.EventBus;
-import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
-import org.jackhuang.hmcl.game.HMCLGameRepository;
-import org.jackhuang.hmcl.game.ModpackHelper;
-import org.jackhuang.hmcl.mod.Modpack;
-import org.jackhuang.hmcl.setting.Accounts;
-import org.jackhuang.hmcl.setting.Profile;
-import org.jackhuang.hmcl.setting.Profiles;
-import org.jackhuang.hmcl.task.Schedulers;
-import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.task.TaskExecutor;
-import org.jackhuang.hmcl.ui.account.AccountAdvancedListItem;
-import org.jackhuang.hmcl.ui.account.AddAccountPane;
-import org.jackhuang.hmcl.ui.construct.AdvancedListBox;
-import org.jackhuang.hmcl.ui.construct.AdvancedListItem;
-import org.jackhuang.hmcl.ui.profile.ProfileAdvancedListItem;
-import org.jackhuang.hmcl.ui.versions.GameAdvancedListItem;
-import org.jackhuang.hmcl.ui.versions.Versions;
-import org.jackhuang.hmcl.util.io.CompressingUtils;
-
-import java.io.File;
-import java.util.concurrent.atomic.AtomicReference;
-
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
-public final class LeftPaneController extends AdvancedListBox {
-
-    public LeftPaneController() {
-
-        AccountAdvancedListItem accountListItem = new AccountAdvancedListItem();
-        accountListItem.setOnAction(e -> Controllers.navigate(Controllers.getAccountListPage()));
-        accountListItem.accountProperty().bind(Accounts.selectedAccountProperty());
-
-        GameAdvancedListItem gameListItem = new GameAdvancedListItem();
-        gameListItem.actionButtonVisibleProperty().bind(Profiles.selectedVersionProperty().isNotNull());
-        gameListItem.setOnAction(e -> {
-        	Profile profile = Profiles.getSelectedProfile();
-        	String version = Profiles.getSelectedVersion();
-        	if (version == null) {
-        		Controllers.navigate(Controllers.getGameListPage());
-        	} else {
-        		Versions.modifyGameSettings(profile, version);        	
-        	}
-        });
-
-        ProfileAdvancedListItem profileListItem = new ProfileAdvancedListItem();
-        profileListItem.setOnAction(e -> Controllers.navigate(Controllers.getProfileListPage()));
-        profileListItem.profileProperty().bind(Profiles.selectedProfileProperty());
-
-        AdvancedListItem gameItem = new AdvancedListItem();
-        gameItem.setImage(new Image("/assets/img/bookshelf.png"));
-        gameItem.setTitle(i18n("version.manage"));
-        gameItem.setOnAction(e -> Controllers.navigate(Controllers.getGameListPage()));
-
-        AdvancedListItem launcherSettingsItem = new AdvancedListItem();
-        launcherSettingsItem.setImage(new Image("/assets/img/command.png"));
-        launcherSettingsItem.setTitle(i18n("settings.launcher"));
-        launcherSettingsItem.setOnAction(e -> Controllers.navigate(Controllers.getSettingsPage()));
-
-        this
-                .startCategory(i18n("account").toUpperCase())
-                .add(accountListItem)
-                .startCategory(i18n("version").toUpperCase())
-                .add(gameListItem)
-                .add(gameItem)
-                .startCategory(i18n("profile.title").toUpperCase())
-                .add(profileListItem)
-                .startCategory(i18n("launcher").toUpperCase())
-                .add(launcherSettingsItem);
-
-        EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).register(event -> onRefreshedVersions((HMCLGameRepository) event.getSource()));
-
-        Profile profile = Profiles.getSelectedProfile();
-        if (profile != null && profile.getRepository().isLoaded())
-            onRefreshedVersions(Profiles.selectedProfileProperty().get().getRepository());
-    }
-
-    // ==== Accounts ====
-    public void checkAccount() {
-        if (Accounts.getAccounts().isEmpty())
-            Platform.runLater(this::addNewAccount);
-    }
-
-    private void addNewAccount() {
-        Controllers.dialog(new AddAccountPane());
-    }
-    // ====
-
-    private boolean checkedModpack = false;
-
-    private void onRefreshedVersions(HMCLGameRepository repository) {
-        JFXUtilities.runInFX(() -> {
-            if (!checkedModpack) {
-                checkedModpack = true;
-
-                if (repository.getVersionCount() == 0) {
-                    File modpackFile = new File("modpack.zip").getAbsoluteFile();
-                    if (modpackFile.exists()) {
-                        Task.ofResult(() -> CompressingUtils.findSuitableEncoding(modpackFile.toPath()))
-                                .thenResult(encoding -> ModpackHelper.readModpackManifest(modpackFile.toPath(), encoding))
-                                .thenResult(modpack -> {
-                                    AtomicReference<Region> region = new AtomicReference<>();
-                                    TaskExecutor executor = ModpackHelper.getInstallTask(repository.getProfile(), modpackFile, modpack.getName(), modpack)
-                                            .with(Task.of(Schedulers.javafx(), this::checkAccount)).executor();
-                                    region.set(Controllers.taskDialog(executor, i18n("modpack.installing")));
-                                    executor.start();
-                                    return null;
-                                }).start();
-                    }
-                }
-            }
-
-            checkAccount();
-        });
-    }
-}

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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,18 +18,11 @@
 package org.jackhuang.hmcl.ui;
 
 import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleListProperty;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
 import javafx.scene.Node;
-import javafx.scene.control.Control;
 import javafx.scene.control.Skin;
 
-public abstract class ListPage<T extends Node> extends Control {
-    private final ListProperty<T> items = new SimpleListProperty<>(this, "items", FXCollections.observableArrayList());
-    private final BooleanProperty loading = new SimpleBooleanProperty(this, "loading", false);
+public abstract class ListPage<T extends Node> extends ListPageBase<T> {
     private final BooleanProperty refreshable = new SimpleBooleanProperty(this, "refreshable", false);
 
     public abstract void add();
@@ -42,30 +35,6 @@ public abstract class ListPage<T extends Node> extends Control {
         return new ListPageSkin(this);
     }
 
-    public ObservableList<T> getItems() {
-        return items.get();
-    }
-
-    public void setItems(ObservableList<T> items) {
-        this.items.set(items);
-    }
-
-    public ListProperty<T> itemsProperty() {
-        return items;
-    }
-
-    public boolean isLoading() {
-        return loading.get();
-    }
-
-    public void setLoading(boolean loading) {
-        this.loading.set(loading);
-    }
-
-    public BooleanProperty loadingProperty() {
-        return loading;
-    }
-
     public boolean isRefreshable() {
         return refreshable.get();
     }

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

@@ -0,0 +1,88 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui;
+
+import javafx.beans.property.*;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.event.Event;
+import javafx.event.EventHandler;
+import javafx.scene.control.Control;
+
+import static org.jackhuang.hmcl.ui.construct.SpinnerPane.FAILED_ACTION;
+
+public class ListPageBase<T> extends Control {
+    private final ListProperty<T> items = new SimpleListProperty<>(this, "items", FXCollections.observableArrayList());
+    private final BooleanProperty loading = new SimpleBooleanProperty(this, "loading", false);
+    private final StringProperty failedReason = new SimpleStringProperty(this, "failed");
+
+    public ObservableList<T> getItems() {
+        return items.get();
+    }
+
+    public void setItems(ObservableList<T> items) {
+        this.items.set(items);
+    }
+
+    public ListProperty<T> itemsProperty() {
+        return items;
+    }
+
+    public boolean isLoading() {
+        return loading.get();
+    }
+
+    public void setLoading(boolean loading) {
+        this.loading.set(loading);
+    }
+
+    public BooleanProperty loadingProperty() {
+        return loading;
+    }
+
+    public String getFailedReason() {
+        return failedReason.get();
+    }
+
+    public StringProperty failedReasonProperty() {
+        return failedReason;
+    }
+
+    public void setFailedReason(String failedReason) {
+        this.failedReason.set(failedReason);
+    }
+
+    public final ObjectProperty<EventHandler<Event>> onFailedActionProperty() {
+        return onFailedAction;
+    }
+
+    public final void setOnFailedAction(EventHandler<Event> value) {
+        onFailedActionProperty().set(value);
+    }
+
+    public final EventHandler<Event> getOnFailedAction() {
+        return onFailedActionProperty().get();
+    }
+
+    private ObjectProperty<EventHandler<Event>> onFailedAction = new SimpleObjectProperty<EventHandler<Event>>(this, "onFailedAction") {
+        @Override
+        protected void invalidated() {
+            setEventHandler(FAILED_ACTION, get());
+        }
+    };
+}

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -39,6 +39,7 @@ public class ListPageSkin extends SkinBase<ListPage<?>> {
         SpinnerPane spinnerPane = new SpinnerPane();
         spinnerPane.getStyleClass().add("large-spinner-pane");
         Pane placeholder = new Pane();
+        VBox list = new VBox();
 
         StackPane contentPane = new StackPane();
         {
@@ -46,10 +47,8 @@ public class ListPageSkin extends SkinBase<ListPage<?>> {
             {
                 scrollPane.setFitToWidth(true);
 
-                VBox list = new VBox();
                 list.maxWidthProperty().bind(scrollPane.widthProperty());
                 list.setSpacing(10);
-                list.setPadding(new Insets(10));
 
                 VBox content = new VBox();
                 content.getChildren().setAll(list, placeholder);
@@ -62,10 +61,9 @@ public class ListPageSkin extends SkinBase<ListPage<?>> {
             
             VBox vBox = new VBox();
             {
+                vBox.getStyleClass().add("card-list");
                 vBox.setAlignment(Pos.BOTTOM_RIGHT);
                 vBox.setPickOnBounds(false);
-                vBox.setPadding(new Insets(15));
-                vBox.setSpacing(15);
 
                 JFXButton btnAdd = new JFXButton();
                 FXUtils.setLimitWidth(btnAdd, 40);
@@ -87,8 +85,13 @@ public class ListPageSkin extends SkinBase<ListPage<?>> {
 
                 FXUtils.onChangeAndOperate(skinnable.refreshableProperty(),
                         refreshable -> {
-                            if (refreshable) vBox.getChildren().setAll(btnRefresh, btnAdd);
-                            else vBox.getChildren().setAll(btnAdd);
+                            if (refreshable) {
+                                list.setPadding(new Insets(10, 10, 15 + 40 + 15 + 40 + 15, 10));
+                                vBox.getChildren().setAll(btnRefresh, btnAdd);
+                            } else {
+                                list.setPadding(new Insets(10, 10, 15 + 40 + 15, 10));
+                                vBox.getChildren().setAll(btnAdd);
+                            }
                         });
             }
 

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -17,33 +17,49 @@
  */
 package org.jackhuang.hmcl.ui;
 
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXCheckBox;
+import com.jfoenix.controls.JFXComboBox;
+import com.jfoenix.controls.JFXListView;
+import javafx.application.Platform;
+import javafx.beans.InvalidationListener;
 import javafx.beans.binding.Bindings;
-import javafx.beans.property.ReadOnlyIntegerProperty;
-import javafx.beans.property.ReadOnlyIntegerWrapper;
-import javafx.concurrent.Worker;
-import javafx.fxml.FXML;
+import javafx.beans.property.*;
+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.ComboBox;
-import javafx.scene.control.ToggleButton;
-import javafx.scene.image.Image;
-import javafx.scene.layout.StackPane;
-import javafx.scene.web.WebEngine;
-import javafx.scene.web.WebView;
+import javafx.scene.control.Label;
+import javafx.scene.control.*;
+import javafx.scene.layout.*;
 import javafx.stage.Stage;
-import org.jackhuang.hmcl.event.Event;
-import org.jackhuang.hmcl.event.EventManager;
 import org.jackhuang.hmcl.game.LauncherHelper;
-import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.Log4jLevel;
-import org.jackhuang.hmcl.util.StringUtils;
-import org.jackhuang.hmcl.util.io.IOUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;
 
-import java.util.concurrent.CountDownLatch;
+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.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.LOG;
+import static org.jackhuang.hmcl.util.StringUtils.parseEscapeSequence;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 /**
@@ -52,141 +68,104 @@ import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
  */
 public final class LogWindow extends Stage {
 
-    private final ReadOnlyIntegerWrapper fatal = new ReadOnlyIntegerWrapper(0);
-    private final ReadOnlyIntegerWrapper error = new ReadOnlyIntegerWrapper(0);
-    private final ReadOnlyIntegerWrapper warn = new ReadOnlyIntegerWrapper(0);
-    private final ReadOnlyIntegerWrapper info = new ReadOnlyIntegerWrapper(0);
-    private final ReadOnlyIntegerWrapper debug = new ReadOnlyIntegerWrapper(0);
+    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 CountDownLatch latch = new CountDownLatch(1);
-    public final EventManager<Event> onDone = new EventManager<>();
+    private final ChangeListener<Number> logLinesListener = FXUtils.onWeakChange(config().logLinesProperty(), logLines -> checkLogCount());
+
+    private Consumer<String> exportGameCrashInfoCallback;
+
+    private boolean stopCheckLogCount = false;
 
     public LogWindow() {
         setScene(new Scene(impl, 800, 480));
-        getScene().getStylesheets().addAll(config().getTheme().getStylesheets());
+        getScene().getStylesheets().addAll(config().getTheme().getStylesheets(config().getLauncherFontFamily()));
         setTitle(i18n("logwindow.title"));
-        getIcons().add(new Image("/assets/img/icon.png"));
-    }
+        getIcons().add(newImage("/assets/img/icon.png"));
 
-    public LogWindow(String text) {
-        this();
-
-        onDone.register(() -> logLine(text, Log4jLevel.INFO));
-    }
-
-    public ReadOnlyIntegerProperty fatalProperty() {
-        return fatal.getReadOnlyProperty();
-    }
-
-    public int getFatal() {
-        return fatal.get();
-    }
-
-    public ReadOnlyIntegerProperty errorProperty() {
-        return error.getReadOnlyProperty();
-    }
-
-    public int getError() {
-        return error.get();
-    }
-
-    public ReadOnlyIntegerProperty warnProperty() {
-        return warn.getReadOnlyProperty();
-    }
-
-    public int getWarn() {
-        return warn.get();
-    }
-
-    public ReadOnlyIntegerProperty infoProperty() {
-        return info.getReadOnlyProperty();
-    }
-
-    public int getInfo() {
-        return info.get();
-    }
-
-    public ReadOnlyIntegerProperty debugProperty() {
-        return debug.getReadOnlyProperty();
-    }
-
-    public int getDebug() {
-        return debug.get();
+        levelShownMap.values().forEach(property -> property.addListener((a, b, newValue) -> shakeLogs()));
     }
 
     public void logLine(String line, Log4jLevel level) {
-        Element div = impl.document.createElement("div");
-        // a <pre> element to prevent multiple spaces and tabs being removed.
-        Element pre = impl.document.createElement("pre");
-        pre.setTextContent(line);
-        div.appendChild(pre);
-        impl.body.appendChild(div);
-        impl.engine.executeScript("checkNewLog(\"" + level.name().toLowerCase() + "\");scrollToBottom();");
+        Log log = new Log(parseEscapeSequence(line), level);
+        logs.add(log);
+        if (levelShownMap.get(level).get())
+            impl.listView.getItems().add(log);
 
-        switch (level) {
-            case FATAL:
-                fatal.set(fatal.get() + 1);
-                break;
-            case ERROR:
-                error.set(error.get() + 1);
-                break;
-            case WARN:
-                warn.set(warn.get() + 1);
-                break;
-            case INFO:
-                info.set(info.get() + 1);
-                break;
-            case DEBUG:
-                debug.set(debug.get() + 1);
-                break;
-            default:
-                // ignore
+        levelCountMap.get(level).setValue(levelCountMap.get(level).getValue() + 1);
+        if (!stopCheckLogCount) checkLogCount();
+    }
+
+    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;
+            }
+        }
+        show();
+    }
+
+    public void showNormal() {
+        this.impl.showCrashReport.set(false);
+        show();
+    }
+
+    private void shakeLogs() {
+        impl.listView.getItems().setAll(logs.stream().filter(log -> levelShownMap.get(log.level).get()).collect(Collectors.toList()));
+    }
+
+    private void checkLogCount() {
+        while (logs.size() > config().getLogLines()) {
+            Log removedLog = logs.removeFirst();
+            if (!impl.listView.getItems().isEmpty() && impl.listView.getItems().get(0) == removedLog) {
+                // TODO: fix O(n)
+                impl.listView.getItems().remove(0);
+            }
         }
     }
 
-    public void waitForLoaded() throws InterruptedException {
-        latch.await();
+    private static class Log {
+        private final String log;
+        private final Log4jLevel level;
+
+        public Log(String log, Log4jLevel level) {
+            this.log = log;
+            this.level = level;
+        }
     }
 
-    public class LogWindowImpl extends StackPane {
+    public class LogWindowImpl extends Control {
 
-        @FXML
-        private WebView webView;
-        @FXML
-        private ToggleButton btnFatals;
-        @FXML
-        private ToggleButton btnErrors;
-        @FXML
-        private ToggleButton btnWarns;
-        @FXML
-        private ToggleButton btnInfos;
-        @FXML
-        private ToggleButton btnDebugs;
-        @FXML
-        private ComboBox<String> cboLines;
-
-        final WebEngine engine;
-        Node body;
-        Document document;
+        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() {
-            FXUtils.loadFXML(this, "/assets/fxml/log.fxml");
-
-            engine = webView.getEngine();
-            engine.loadContent(Lang.ignoringException(() -> IOUtils.readFullyAsString(getClass().getResourceAsStream("/assets/log-window-content.html")))
-                    .replace("${FONT}", config().getFontSize() + "px \"" + config().getFontFamily() + "\""));
-            engine.getLoadWorker().stateProperty().addListener((a, b, newValue) -> {
-                if (newValue == Worker.State.SUCCEEDED) {
-                    document = engine.getDocument();
-                    body = document.getElementsByTagName("body").item(0);
-                    engine.executeScript("limitedLogs=" + config().getLogLines());
-                    latch.countDown();
-                    onDone.fireEvent(new Event(LogWindow.this));
-                }
-            });
+            getStyleClass().add("log-window");
 
             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);
@@ -195,50 +174,187 @@ public final class LogWindow extends Stage {
 
             cboLines.getSelectionModel().selectedItemProperty().addListener((a, b, newValue) -> {
                 config().setLogLines(newValue == null ? 100 : Integer.parseInt(newValue));
-                engine.executeScript("limitedLogs=" + config().getLogLines());
             });
 
             if (!flag)
                 cboLines.getSelectionModel().select(0);
 
-            btnFatals.textProperty().bind(Bindings.createStringBinding(() -> Integer.toString(fatal.get()) + " fatals", fatal));
-            btnErrors.textProperty().bind(Bindings.createStringBinding(() -> Integer.toString(error.get()) + " errors", error));
-            btnWarns.textProperty().bind(Bindings.createStringBinding(() -> Integer.toString(warn.get()) + " warns", warn));
-            btnInfos.textProperty().bind(Bindings.createStringBinding(() -> Integer.toString(info.get()) + " infos", info));
-            btnDebugs.textProperty().bind(Bindings.createStringBinding(() -> Integer.toString(debug.get()) + " debugs", debug));
-
-            btnFatals.selectedProperty().addListener(o -> specificChanged());
-            btnErrors.selectedProperty().addListener(o -> specificChanged());
-            btnWarns.selectedProperty().addListener(o -> specificChanged());
-            btnInfos.selectedProperty().addListener(o -> specificChanged());
-            btnDebugs.selectedProperty().addListener(o -> specificChanged());
+            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));
+            }
         }
 
-        private void specificChanged() {
-            String res = "";
-            if (btnFatals.isSelected())
-                res += "\"fatal\", ";
-            if (btnErrors.isSelected())
-                res += "\"error\", ";
-            if (btnWarns.isSelected())
-                res += "\"warn\", ";
-            if (btnInfos.isSelected())
-                res += "\"info\", ";
-            if (btnDebugs.isSelected())
-                res += "\"debug\", ";
-            if (StringUtils.isNotBlank(res))
-                res = StringUtils.substringBeforeLast(res, ", ");
-            engine.executeScript("specific([" + res + "])");
-        }
-
-        @FXML
         private void onTerminateGame() {
             LauncherHelper.stopManagedProcesses();
         }
 
-        @FXML
         private void onClear() {
-            engine.executeScript("clear()");
+            impl.listView.getItems().clear();
+            logs.clear();
+        }
+
+        private void onExportLogs() {
+            thread(() -> {
+                Path logFile = Paths.get("minecraft-exported-logs-" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH-mm-ss")) + ".log").toAbsolutePath();
+                try {
+                    Files.write(logFile, logs.stream().map(x -> x.log).collect(Collectors.toList()));
+                } catch (IOException e) {
+                    LOG.log(Level.WARNING, "Failed to export logs", e);
+                    return;
+                }
+
+                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 onExportGameCrashInfo() {
+            if (exportGameCrashInfoCallback == null) return;
+            exportGameCrashInfoCallback.accept(logs.stream().map(x -> x.log).collect(Collectors.joining(OperatingSystem.LINE_SEPARATOR)));
+        }
+
+        @Override
+        protected Skin<?> createDefaultSkin() {
+            return new LogWindowSkin(this);
+        }
+    }
+
+    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 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;
+        }
+
+        protected LogWindowSkin(LogWindowImpl control) {
+            super(control);
+
+            VBox vbox = new VBox(3);
+            vbox.setPadding(new Insets(3, 0, 3, 0));
+            vbox.setStyle("-fx-background-color: white");
+            getChildren().setAll(vbox);
+
+            {
+                BorderPane borderPane = new BorderPane();
+                borderPane.setPadding(new Insets(0, 3, 0, 3));
+
+                {
+                    HBox hBox = new HBox(3);
+                    hBox.setPadding(new Insets(0, 0, 0, 4));
+                    hBox.setAlignment(Pos.CENTER_LEFT);
+
+                    Label label = new Label(i18n("logwindow.show_lines"));
+                    hBox.getChildren().setAll(label, control.cboLines);
+
+                    borderPane.setLeft(hBox);
+                }
+
+                {
+                    HBox hBox = new HBox(3);
+                    hBox.getChildren().setAll(
+                            createToggleButton("#F7A699", control.buttonText.get(0), control.showLevel.get(0)),
+                            createToggleButton("#FFCCBB", control.buttonText.get(1), control.showLevel.get(1)),
+                            createToggleButton("#FFEECC", control.buttonText.get(2), control.showLevel.get(2)),
+                            createToggleButton("#FBFBFB", control.buttonText.get(3), control.showLevel.get(3)),
+                            createToggleButton("#EEE9E0", control.buttonText.get(4), control.showLevel.get(4))
+                    );
+                    borderPane.setRight(hBox);
+                }
+
+                vbox.getChildren().add(borderPane);
+            }
+
+            {
+                ListView<Log> listView = control.listView;
+                listView.getItems().addListener((InvalidationListener) observable -> {
+                    if (!listView.getItems().isEmpty() && control.autoScroll.get())
+                        listView.scrollTo(listView.getItems().size() - 1);
+                });
+                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");
+                        if (clippedContainer != null) {
+                            maxWidthProperty().bind(clippedContainer.widthProperty());
+                            prefWidthProperty().bind(clippedContainer.widthProperty());
+                        }
+                        setPadding(new Insets(2));
+                        setWrapText(true);
+                        setGraphic(null);
+                    }
+
+                    @Override
+                    protected void updateItem(Log item, boolean empty) {
+                        super.updateItem(item, empty);
+                        pseudoClassStateChanged(EMPTY, empty);
+                        pseudoClassStateChanged(FATAL, !empty && item.level == Log4jLevel.FATAL);
+                        pseudoClassStateChanged(ERROR, !empty && item.level == Log4jLevel.ERROR);
+                        pseudoClassStateChanged(WARN, !empty && item.level == Log4jLevel.WARN);
+                        pseudoClassStateChanged(INFO, !empty && item.level == Log4jLevel.INFO);
+                        pseudoClassStateChanged(DEBUG, !empty && item.level == Log4jLevel.DEBUG);
+                        pseudoClassStateChanged(TRACE, !empty && item.level == Log4jLevel.TRACE);
+                        if (empty) {
+                            setText(null);
+                        } else {
+                            setText(item.log);
+                        }
+                    }
+                });
+
+                VBox.setVgrow(listView, Priority.ALWAYS);
+                vbox.getChildren().add(listView);
+            }
+
+            {
+                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);
+                hBox.setPadding(new Insets(0, 3, 0, 3));
+
+                JFXCheckBox autoScrollCheckBox = new JFXCheckBox(i18n("logwindow.autoscroll"));
+                autoScrollCheckBox.setSelected(true);
+                control.autoScroll.bind(autoScrollCheckBox.selectedProperty());
+
+                JFXButton terminateButton = new JFXButton(i18n("logwindow.terminate_game"));
+                terminateButton.setOnMouseClicked(e -> getSkinnable().onTerminateGame());
+
+                JFXButton exportLogsButton = new JFXButton(i18n("button.export"));
+                exportLogsButton.setOnMouseClicked(e -> getSkinnable().onExportLogs());
+
+                JFXButton clearButton = new JFXButton(i18n("button.clear"));
+                clearButton.setOnMouseClicked(e -> getSkinnable().onClear());
+                hBox.getChildren().setAll(autoScrollCheckBox, exportLogsButton, terminateButton, clearButton);
+
+                vbox.getChildren().add(bottom);
+            }
         }
     }
 }

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -29,11 +29,16 @@ public final class SVG {
     private SVG() {
     }
 
+    public interface SVGIcon {
+        Node createIcon(ObjectBinding<? extends Paint> fill, 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);
-        path.fillProperty().bind(fill);
+        if (fill != null)
+            path.fillProperty().bind(fill);
 
         if (width < 0 || height < 0) {
             StackPane pane = new StackPane(path);
@@ -42,37 +47,77 @@ public final class SVG {
         }
 
         Group svg = new Group(path);
-        double scale = Math.min(width / svg.getBoundsInParent().getWidth(), height / svg.getBoundsInParent().getHeight());
+        double scale = Math.min(width / 24, height / 24);
         svg.setScaleX(scale);
         svg.setScaleY(scale);
 
         return svg;
     }
 
-    // default fill: white, width: 20, height 20
+    // default fill: white, width: 24, height 24
 
     public static Node gear(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath("M12,15.5A3.5,3.5 0 0,1 8.5,12A3.5,3.5 0 0,1 12,8.5A3.5,3.5 0 0,1 15.5,12A3.5,3.5 0 0,1 12,15.5M19.43,12.97C19.47,12.65 19.5,12.33 19.5,12C19.5,11.67 19.47,11.34 19.43,11L21.54,9.37C21.73,9.22 21.78,8.95 21.66,8.73L19.66,5.27C19.54,5.05 19.27,4.96 19.05,5.05L16.56,6.05C16.04,5.66 15.5,5.32 14.87,5.07L14.5,2.42C14.46,2.18 14.25,2 14,2H10C9.75,2 9.54,2.18 9.5,2.42L9.13,5.07C8.5,5.32 7.96,5.66 7.44,6.05L4.95,5.05C4.73,4.96 4.46,5.05 4.34,5.27L2.34,8.73C2.21,8.95 2.27,9.22 2.46,9.37L4.57,11C4.53,11.34 4.5,11.67 4.5,12C4.5,12.33 4.53,12.65 4.57,12.97L2.46,14.63C2.27,14.78 2.21,15.05 2.34,15.27L4.34,18.73C4.46,18.95 4.73,19.03 4.95,18.95L7.44,17.94C7.96,18.34 8.5,18.68 9.13,18.93L9.5,21.58C9.54,21.82 9.75,22 10,22H14C14.25,22 14.46,21.82 14.5,21.58L14.87,18.93C15.5,18.67 16.04,18.34 16.56,17.94L19.05,18.95C19.27,19.03 19.54,18.95 19.66,18.73L21.66,15.27C21.78,15.05 21.73,14.78 21.54,14.63L19.43,12.97Z", fill, width, height);
+        return createSVGPath(
+                "M12,15.5A3.5,3.5 0 0,1 8.5,12A3.5,3.5 0 0,1 12,8.5A3.5,3.5 0 0,1 15.5,12A3.5,3.5 0 0,1 12,15.5M19.43,12.97C19.47,12.65 19.5,12.33 19.5,12C19.5,11.67 19.47,11.34 19.43,11L21.54,9.37C21.73,9.22 21.78,8.95 21.66,8.73L19.66,5.27C19.54,5.05 19.27,4.96 19.05,5.05L16.56,6.05C16.04,5.66 15.5,5.32 14.87,5.07L14.5,2.42C14.46,2.18 14.25,2 14,2H10C9.75,2 9.54,2.18 9.5,2.42L9.13,5.07C8.5,5.32 7.96,5.66 7.44,6.05L4.95,5.05C4.73,4.96 4.46,5.05 4.34,5.27L2.34,8.73C2.21,8.95 2.27,9.22 2.46,9.37L4.57,11C4.53,11.34 4.5,11.67 4.5,12C4.5,12.33 4.53,12.65 4.57,12.97L2.46,14.63C2.27,14.78 2.21,15.05 2.34,15.27L4.34,18.73C4.46,18.95 4.73,19.03 4.95,18.95L7.44,17.94C7.96,18.34 8.5,18.68 9.13,18.93L9.5,21.58C9.54,21.82 9.75,22 10,22H14C14.25,22 14.46,21.82 14.5,21.58L14.87,18.93C15.5,18.67 16.04,18.34 16.56,17.94L19.05,18.95C19.27,19.03 19.54,18.95 19.66,18.73L21.66,15.27C21.78,15.05 21.73,14.78 21.54,14.63L19.43,12.97Z",
+                fill, width, height);
+    }
+
+    public static Node gearOutline(ObjectBinding<? extends Paint> fill, double width, double height) {
+        return createSVGPath(
+                "M12,8A4,4 0 0,1 16,12A4,4 0 0,1 12,16A4,4 0 0,1 8,12A4,4 0 0,1 12,8M12,10A2,2 0 0,0 10,12A2,2 0 0,0 12,14A2,2 0 0,0 14,12A2,2 0 0,0 12,10M10,22C9.75,22 9.54,21.82 9.5,21.58L9.13,18.93C8.5,18.68 7.96,18.34 7.44,17.94L4.95,18.95C4.73,19.03 4.46,18.95 4.34,18.73L2.34,15.27C2.21,15.05 2.27,14.78 2.46,14.63L4.57,12.97L4.5,12L4.57,11L2.46,9.37C2.27,9.22 2.21,8.95 2.34,8.73L4.34,5.27C4.46,5.05 4.73,4.96 4.95,5.05L7.44,6.05C7.96,5.66 8.5,5.32 9.13,5.07L9.5,2.42C9.54,2.18 9.75,2 10,2H14C14.25,2 14.46,2.18 14.5,2.42L14.87,5.07C15.5,5.32 16.04,5.66 16.56,6.05L19.05,5.05C19.27,4.96 19.54,5.05 19.66,5.27L21.66,8.73C21.79,8.95 21.73,9.22 21.54,9.37L19.43,11L19.5,12L19.43,13L21.54,14.63C21.73,14.78 21.79,15.05 21.66,15.27L19.66,18.73C19.54,18.95 19.27,19.04 19.05,18.95L16.56,17.95C16.04,18.34 15.5,18.68 14.87,18.93L14.5,21.58C14.46,21.82 14.25,22 14,22H10M11.25,4L10.88,6.61C9.68,6.86 8.62,7.5 7.85,8.39L5.44,7.35L4.69,8.65L6.8,10.2C6.4,11.37 6.4,12.64 6.8,13.8L4.68,15.36L5.43,16.66L7.86,15.62C8.63,16.5 9.68,17.14 10.87,17.38L11.24,20H12.76L13.13,17.39C14.32,17.14 15.37,16.5 16.14,15.62L18.57,16.66L19.32,15.36L17.2,13.81C17.6,12.64 17.6,11.37 17.2,10.2L19.31,8.65L18.56,7.35L16.15,8.39C15.38,7.5 14.32,6.86 13.12,6.62L12.75,4H11.25Z",
+                fill, width, height);
     }
 
     public static Node back(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath("M20,11V13H8L13.5,18.5L12.08,19.92L4.16,12L12.08,4.08L13.5,5.5L8,11H20Z", fill, width, height);
+        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);
+        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);
+        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);
+        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);
+        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) {
@@ -84,71 +129,129 @@ public final class SVG {
     }
 
     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);
+        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 launch(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath("M1008 6.286q18.857 13.714 15.429 36.571l-146.286 877.714q-2.857 16.571-18.286 25.714-8 4.571-17.714 4.571-6.286 0-13.714-2.857l-258.857-105.714-138.286 168.571q-10.286 13.143-28 13.143-7.429 0-12.571-2.286-10.857-4-17.429-13.429t-6.571-20.857v-199.429l493.714-605.143-610.857 528.571-225.714-92.571q-21.143-8-22.857-31.429-1.143-22.857 18.286-33.714l950.857-548.571q8.571-5.143 18.286-5.14311.429 0 20.571 6.286z", 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 launch2(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 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);
+        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);
+        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);
+        return createSVGPath(
+                "M17.65,6.35C16.2,4.9 14.21,4 12,4A8,8 0 0,0 4,12A8,8 0 0,0 12,20C15.73,20 18.84,17.45 19.73,14H17.65C16.83,16.33 14.61,18 12,18A6,6 0 0,1 6,12A6,6 0 0,1 12,6C13.66,6 15.14,6.69 16.22,7.78L13,11H20V4L17.65,6.35Z",
+                fill, width, height);
     }
 
     public static Node folderOpen(ObjectBinding<? extends Paint> fill, double width, double height) {
-        return createSVGPath("M19,20H4C2.89,20 2,19.1 2,18V6C2,4.89 2.89,4 4,4H10L12,6H19A2,2 0 0,1 21,8H21L4,8V18L6.14,10H23.21L20.93,18.5C20.7,19.37 19.92,20 19,20Z", fill, width, height);
+        return 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);
+        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);
+        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);
+        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);
+        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);
+        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);
+        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);
+        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);
+        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) {
@@ -160,10 +263,279 @@ public final class SVG {
     }
 
     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);
+        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);
+    }
 }

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

@@ -1,509 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.jackhuang.hmcl.ui;
-
-import com.jfoenix.controls.*;
-import javafx.geometry.HPos;
-import javafx.geometry.Pos;
-import javafx.geometry.VPos;
-import javafx.scene.Cursor;
-import javafx.scene.control.Label;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.layout.*;
-import javafx.scene.text.Text;
-import javafx.scene.text.TextAlignment;
-import org.jackhuang.hmcl.setting.EnumBackgroundImage;
-import org.jackhuang.hmcl.setting.EnumCommonDirectory;
-import org.jackhuang.hmcl.setting.Theme;
-import org.jackhuang.hmcl.ui.construct.*;
-import org.jackhuang.hmcl.util.i18n.Locales.SupportedLocale;
-
-import static org.jackhuang.hmcl.setting.ConfigHolder.config;
-import static org.jackhuang.hmcl.ui.FXUtils.stringConverter;
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
-public abstract class SettingsView extends StackPane {
-    protected final JFXTextField txtProxyHost;
-    protected final JFXTextField txtProxyPort;
-    protected final JFXTextField txtProxyUsername;
-    protected final JFXPasswordField txtProxyPassword;
-    protected final JFXTextField txtFontSize;
-    protected final JFXComboBox<SupportedLocale> cboLanguage;
-    protected final JFXComboBox<String> cboDownloadSource;
-    protected final FontComboBox cboFont;
-    protected final MultiFileItem<EnumCommonDirectory> fileCommonLocation;
-    protected final Label lblDisplay;
-    protected final Label lblUpdate;
-    protected final Label lblUpdateSub;
-    protected final Text lblUpdateNote;
-    protected final JFXRadioButton chkUpdateStable;
-    protected final JFXRadioButton chkUpdateDev;
-    protected final JFXButton btnUpdate;
-    protected final ScrollPane scroll;
-    protected final MultiFileItem<EnumBackgroundImage> backgroundItem;
-    protected final StackPane themeColorPickerContainer;
-    protected final JFXCheckBox chkDisableProxy;
-    protected final JFXRadioButton chkProxyHttp;
-    protected final JFXRadioButton chkProxySocks;
-    protected final JFXCheckBox chkProxyAuthentication;
-    protected final GridPane authPane;
-    protected final Pane proxyPane;
-
-    public SettingsView() {
-        scroll = new ScrollPane();
-        getChildren().setAll(scroll);
-        scroll.setStyle("-fx-font-size: 14;");
-        scroll.setFitToWidth(true);
-
-        {
-            VBox rootPane = new VBox();
-            rootPane.setStyle("-fx-padding: 18;");
-            {
-                ComponentList settingsPane = new ComponentList();
-                {
-                    {
-                        StackPane sponsorPane = new StackPane();
-                        sponsorPane.setCursor(Cursor.HAND);
-                        sponsorPane.setOnMouseClicked(e -> onSponsor());
-                        {
-                            Label label = new Label(i18n("sponsor.hmcl"));
-                            label.setWrapText(true);
-                            label.prefWidthProperty().bind(sponsorPane.widthProperty());
-                            sponsorPane.getChildren().add(label);
-                        }
-                        settingsPane.getContent().add(sponsorPane);
-                    }
-
-                    ComponentSublist updatePane = new ComponentSublist();
-                    updatePane.setTitle(i18n("update"));
-                    updatePane.setHasSubtitle(true);
-                    {
-                        VBox headerLeft = new VBox();
-
-                        lblUpdate = new Label(i18n("update"));
-                        lblUpdateSub = new Label();
-                        lblUpdateSub.getStyleClass().add("subtitle-label");
-
-                        headerLeft.getChildren().setAll(lblUpdate, lblUpdateSub);
-                        updatePane.setHeaderLeft(headerLeft);
-                    }
-
-                    {
-                        btnUpdate = new JFXButton();
-                        btnUpdate.setOnMouseClicked(e -> onUpdate());
-                        btnUpdate.getStyleClass().add("toggle-icon4");
-                        btnUpdate.setGraphic(SVG.update(Theme.blackFillBinding(), 20, 20));
-
-                        updatePane.setHeaderRight(btnUpdate);
-                    }
-
-                    {
-                        VBox content = new VBox();
-                        content.setSpacing(8);
-
-                        chkUpdateStable = new JFXRadioButton(i18n("update.channel.stable"));
-                        chkUpdateDev = new JFXRadioButton(i18n("update.channel.dev"));
-
-                        VBox noteWrapper = new VBox();
-                        noteWrapper.setStyle("-fx-padding: 10 0 0 0;");
-                        lblUpdateNote = new Text(i18n("update.note"));
-                        noteWrapper.getChildren().setAll(lblUpdateNote);
-
-                        content.getChildren().setAll(chkUpdateStable, chkUpdateDev, noteWrapper);
-
-                        updatePane.getContent().add(content);
-                    }
-                    settingsPane.getContent().add(updatePane);
-                }
-
-                {
-                    BorderPane updatePane = new BorderPane();
-                    {
-                        VBox headerLeft = new VBox();
-
-                        Label help = new Label(i18n("help"));
-                        Label helpSubtitle = new Label(i18n("help.detail"));
-                        helpSubtitle.getStyleClass().add("subtitle-label");
-
-                        headerLeft.getChildren().setAll(help, helpSubtitle);
-                        updatePane.setLeft(headerLeft);
-                    }
-
-                    {
-                        JFXButton btnExternal = new JFXButton();
-                        btnExternal.setOnMouseClicked(e -> onHelp());
-                        btnExternal.getStyleClass().add("toggle-icon4");
-                        btnExternal.setGraphic(SVG.openInNew(Theme.blackFillBinding(), -1, -1));
-
-                        updatePane.setRight(btnExternal);
-                    }
-                    settingsPane.getContent().add(updatePane);
-                }
-
-                {
-                    fileCommonLocation = new MultiFileItem<>(true);
-                    fileCommonLocation.setTitle(i18n("launcher.cache_directory"));
-                    fileCommonLocation.setDirectory(true);
-                    fileCommonLocation.setChooserTitle(i18n("launcher.cache_directory.choose"));
-                    fileCommonLocation.setHasSubtitle(true);
-                    fileCommonLocation.setCustomText("settings.custom");
-
-                    settingsPane.getContent().add(fileCommonLocation);
-                }
-
-                {
-                    backgroundItem = new MultiFileItem<>(true);
-                    backgroundItem.setTitle(i18n("launcher.background"));
-                    backgroundItem.setChooserTitle(i18n("launcher.background.choose"));
-                    backgroundItem.setHasSubtitle(true);
-                    backgroundItem.setCustomText(i18n("settings.custom"));
-
-                    settingsPane.getContent().add(backgroundItem);
-                }
-
-                {
-                    BorderPane downloadSourcePane = new BorderPane();
-                    {
-                        Label label = new Label(i18n("settings.launcher.download_source"));
-                        BorderPane.setAlignment(label, Pos.CENTER_LEFT);
-                        downloadSourcePane.setLeft(label);
-                    }
-
-                    {
-                        cboDownloadSource = new JFXComboBox<>();
-                        cboDownloadSource.setConverter(stringConverter(key -> i18n("download.provider." + key)));
-                        downloadSourcePane.setRight(cboDownloadSource);
-                    }
-                    settingsPane.getContent().add(downloadSourcePane);
-                }
-
-                {
-                    BorderPane languagePane = new BorderPane();
-
-                    Label left = new Label(i18n("settings.launcher.language"));
-                    BorderPane.setAlignment(left, Pos.CENTER_LEFT);
-                    languagePane.setLeft(left);
-
-                    cboLanguage = new JFXComboBox<>();
-                    cboLanguage.setConverter(stringConverter(locale -> locale.getName(config().getLocalization().getResourceBundle())));
-                    FXUtils.setLimitWidth(cboLanguage, 400);
-                    languagePane.setRight(cboLanguage);
-
-                    settingsPane.getContent().add(languagePane);
-                }
-
-                {
-                    ComponentList proxyList = new ComponentList();
-                    proxyList.setTitle(i18n("settings.launcher.proxy"));
-
-                    VBox proxyWrapper = new VBox();
-                    proxyWrapper.setSpacing(10);
-
-                    {
-                        chkDisableProxy = new JFXCheckBox(i18n("settings.launcher.proxy.disable"));
-                        proxyWrapper.getChildren().add(chkDisableProxy);
-                    }
-
-                    {
-                        proxyPane = new VBox();
-                        proxyPane.setStyle("-fx-padding: 0 0 0 30;");
-
-                        ColumnConstraints colHgrow = new ColumnConstraints();
-                        colHgrow.setHgrow(Priority.ALWAYS);
-
-                        {
-                            HBox hBox = new HBox();
-                            chkProxyHttp = new JFXRadioButton(i18n("settings.launcher.proxy.http"));
-                            chkProxySocks = new JFXRadioButton(i18n("settings.launcher.proxy.socks"));
-                            hBox.getChildren().setAll(chkProxyHttp, chkProxySocks);
-                            proxyPane.getChildren().add(hBox);
-                        }
-
-                        {
-                            GridPane gridPane = new GridPane();
-                            gridPane.setHgap(20);
-                            gridPane.setVgap(10);
-                            gridPane.setStyle("-fx-padding: 0 0 0 15;");
-                            gridPane.getColumnConstraints().setAll(new ColumnConstraints(), colHgrow);
-                            gridPane.getRowConstraints().setAll(new RowConstraints(), new RowConstraints());
-
-                            {
-                                Label host = new Label(i18n("settings.launcher.proxy.host"));
-                                GridPane.setRowIndex(host, 1);
-                                GridPane.setColumnIndex(host, 0);
-                                GridPane.setHalignment(host, HPos.RIGHT);
-                                gridPane.getChildren().add(host);
-                            }
-
-                            {
-                                txtProxyHost = new JFXTextField();
-                                GridPane.setRowIndex(txtProxyHost, 1);
-                                GridPane.setColumnIndex(txtProxyHost, 1);
-                                gridPane.getChildren().add(txtProxyHost);
-                            }
-
-                            {
-                                Label port = new Label(i18n("settings.launcher.proxy.port"));
-                                GridPane.setRowIndex(port, 2);
-                                GridPane.setColumnIndex(port, 0);
-                                GridPane.setHalignment(port, HPos.RIGHT);
-                                gridPane.getChildren().add(port);
-                            }
-
-                            {
-                                txtProxyPort = new JFXTextField();
-                                GridPane.setRowIndex(txtProxyPort, 2);
-                                GridPane.setColumnIndex(txtProxyPort, 1);
-                                FXUtils.setValidateWhileTextChanged(txtProxyPort, true);
-                                txtProxyHost.getValidators().setAll(new NumberValidator(i18n("input.number"), false));
-                                gridPane.getChildren().add(txtProxyPort);
-                            }
-                            proxyPane.getChildren().add(gridPane);
-                        }
-
-                        {
-                            VBox vBox = new VBox();
-                            vBox.setStyle("-fx-padding: 20 0 20 5;");
-
-                            chkProxyAuthentication = new JFXCheckBox(i18n("settings.launcher.proxy.authentication"));
-                            vBox.getChildren().setAll(chkProxyAuthentication);
-
-                            proxyPane.getChildren().add(vBox);
-                        }
-
-                        {
-                            authPane = new GridPane();
-                            authPane.setHgap(20);
-                            authPane.setVgap(10);
-                            authPane.setStyle("-fx-padding: 0 0 0 15;");
-                            authPane.getColumnConstraints().setAll(new ColumnConstraints(), colHgrow);
-                            authPane.getRowConstraints().setAll(new RowConstraints(), new RowConstraints());
-
-                            {
-                                Label username = new Label(i18n("settings.launcher.proxy.username"));
-                                GridPane.setRowIndex(username, 0);
-                                GridPane.setColumnIndex(username, 0);
-                                authPane.getChildren().add(username);
-                            }
-
-                            {
-                                txtProxyUsername = new JFXTextField();
-                                GridPane.setRowIndex(txtProxyUsername, 0);
-                                GridPane.setColumnIndex(txtProxyUsername, 1);
-                                authPane.getChildren().add(txtProxyUsername);
-                            }
-
-                            {
-                                Label password = new Label(i18n("settings.launcher.proxy.password"));
-                                GridPane.setRowIndex(password, 1);
-                                GridPane.setColumnIndex(password, 0);
-                                authPane.getChildren().add(password);
-                            }
-
-                            {
-                                txtProxyPassword = new JFXPasswordField();
-                                GridPane.setRowIndex(txtProxyPassword, 1);
-                                GridPane.setColumnIndex(txtProxyPassword, 1);
-                                authPane.getChildren().add(txtProxyPassword);
-                            }
-
-                            proxyPane.getChildren().add(authPane);
-                        }
-                        proxyWrapper.getChildren().add(proxyPane);
-                    }
-                    proxyList.getContent().add(proxyWrapper);
-                    settingsPane.getContent().add(proxyList);
-                }
-
-                {
-                    BorderPane themePane = new BorderPane();
-
-                    Label left = new Label(i18n("settings.launcher.theme"));
-                    BorderPane.setAlignment(left, Pos.CENTER_LEFT);
-                    themePane.setLeft(left);
-
-                    themeColorPickerContainer = new StackPane();
-                    themeColorPickerContainer.setMinHeight(30);
-                    themePane.setRight(themeColorPickerContainer);
-
-                    settingsPane.getContent().add(themePane);
-                }
-
-                {
-                    ComponentSublist logPane = new ComponentSublist();
-                    logPane.setTitle(i18n("settings.launcher.log"));
-
-                    {
-                        JFXButton logButton = new JFXButton(i18n("settings.launcher.launcher_log.export"));
-                        logButton.setOnMouseClicked(e -> onExportLogs());
-                        logButton.getStyleClass().add("jfx-button-border");
-
-                        logPane.setHeaderRight(logButton);
-                    }
-
-                    {
-                        VBox fontPane = new VBox();
-                        fontPane.setSpacing(5);
-
-                        {
-                            BorderPane borderPane = new BorderPane();
-                            fontPane.getChildren().add(borderPane);
-                            {
-                                Label left = new Label(i18n("settings.launcher.log.font"));
-                                BorderPane.setAlignment(left, Pos.CENTER_LEFT);
-                                borderPane.setLeft(left);
-                            }
-
-                            {
-                                HBox hBox = new HBox();
-                                hBox.setSpacing(3);
-
-                                cboFont = new FontComboBox(12);
-                                txtFontSize = new JFXTextField();
-                                FXUtils.setLimitWidth(txtFontSize, 50);
-                                hBox.getChildren().setAll(cboFont, txtFontSize);
-
-                                borderPane.setRight(hBox);
-                            }
-                        }
-
-                        lblDisplay = new Label("[23:33:33] [Client Thread/INFO] [WaterPower]: Loaded mod WaterPower.");
-                        fontPane.getChildren().add(lblDisplay);
-
-                        logPane.getContent().add(fontPane);
-                    }
-                    settingsPane.getContent().add(logPane);
-                }
-
-                {
-                    StackPane aboutPane = new StackPane();
-                    GridPane gridPane = new GridPane();
-                    gridPane.setHgap(20);
-                    gridPane.setVgap(10);
-
-                    ColumnConstraints col1 = new ColumnConstraints();
-                    col1.setHgrow(Priority.SOMETIMES);
-                    col1.setMaxWidth(Double.NEGATIVE_INFINITY);
-                    col1.setMinWidth(Double.NEGATIVE_INFINITY);
-
-                    ColumnConstraints col2 = new ColumnConstraints();
-                    col2.setHgrow(Priority.SOMETIMES);
-                    col2.setMinWidth(20);
-                    col2.setMaxWidth(Double.POSITIVE_INFINITY);
-
-                    gridPane.getColumnConstraints().setAll(col1, col2);
-
-                    RowConstraints row = new RowConstraints();
-                    row.setMinHeight(Double.NEGATIVE_INFINITY);
-                    row.setValignment(VPos.TOP);
-                    row.setVgrow(Priority.SOMETIMES);
-                    gridPane.getRowConstraints().setAll(row, row, row, row, row, row);
-
-                    {
-                        Label label = new Label(i18n("about.copyright"));
-                        GridPane.setRowIndex(label, 0);
-                        GridPane.setColumnIndex(label, 0);
-                        gridPane.getChildren().add(label);
-                    }
-                    {
-                        Label label = new Label(i18n("about.copyright.statement"));
-                        label.setWrapText(true);
-                        GridPane.setRowIndex(label, 0);
-                        GridPane.setColumnIndex(label, 1);
-                        gridPane.getChildren().add(label);
-                    }
-                    {
-                        Label label = new Label(i18n("about.author"));
-                        GridPane.setRowIndex(label, 1);
-                        GridPane.setColumnIndex(label, 0);
-                        gridPane.getChildren().add(label);
-                    }
-                    {
-                        Label label = new Label(i18n("about.author.statement"));
-                        label.setWrapText(true);
-                        GridPane.setRowIndex(label, 1);
-                        GridPane.setColumnIndex(label, 1);
-                        gridPane.getChildren().add(label);
-                    }
-                    {
-                        Label label = new Label(i18n("about.thanks_to"));
-                        GridPane.setRowIndex(label, 2);
-                        GridPane.setColumnIndex(label, 0);
-                        gridPane.getChildren().add(label);
-                    }
-                    {
-                        Label label = new Label(i18n("about.thanks_to.statement"));
-                        label.setWrapText(true);
-                        GridPane.setRowIndex(label, 2);
-                        GridPane.setColumnIndex(label, 1);
-                        gridPane.getChildren().add(label);
-                    }
-                    {
-                        Label label = new Label(i18n("about.dependency"));
-                        GridPane.setRowIndex(label, 3);
-                        GridPane.setColumnIndex(label, 0);
-                        gridPane.getChildren().add(label);
-                    }
-                    {
-                        Label label = new Label(i18n("about.dependency.statement"));
-                        label.setWrapText(true);
-                        GridPane.setRowIndex(label, 3);
-                        GridPane.setColumnIndex(label, 1);
-                        gridPane.getChildren().add(label);
-                    }
-                    {
-                        Label label = new Label(i18n("about.claim"));
-                        GridPane.setRowIndex(label, 4);
-                        GridPane.setColumnIndex(label, 0);
-                        gridPane.getChildren().add(label);
-                    }
-                    {
-                        Label label = new Label(i18n("about.claim.statement"));
-                        label.setWrapText(true);
-                        label.setTextAlignment(TextAlignment.JUSTIFY);
-                        GridPane.setRowIndex(label, 4);
-                        GridPane.setColumnIndex(label, 1);
-                        gridPane.getChildren().add(label);
-                    }
-                    {
-                        Label label = new Label(i18n("about.open_source"));
-                        GridPane.setRowIndex(label, 5);
-                        GridPane.setColumnIndex(label, 0);
-                        gridPane.getChildren().add(label);
-                    }
-                    {
-                        Label label = new Label(i18n("about.open_source.statement"));
-                        label.setWrapText(true);
-                        GridPane.setRowIndex(label, 5);
-                        GridPane.setColumnIndex(label, 1);
-                        gridPane.getChildren().add(label);
-                    }
-                    aboutPane.getChildren().setAll(gridPane);
-                    settingsPane.getContent().add(aboutPane);
-                }
-                rootPane.getChildren().add(settingsPane);
-            }
-            scroll.setContent(rootPane);
-        }
-    }
-
-    protected abstract void onUpdate();
-    protected abstract void onHelp();
-    protected abstract void onExportLogs();
-    protected abstract void onSponsor();
-}

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

@@ -0,0 +1,119 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui;
+
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXScrollPane;
+import javafx.beans.binding.Bindings;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.SkinBase;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
+import org.jackhuang.hmcl.setting.Theme;
+import org.jackhuang.hmcl.ui.construct.ComponentList;
+import org.jackhuang.hmcl.ui.construct.SpinnerPane;
+
+import java.util.List;
+
+public abstract class ToolbarListPageSkin<T extends ListPageBase<? extends Node>> extends SkinBase<T> {
+
+    public ToolbarListPageSkin(T skinnable) {
+        super(skinnable);
+
+        SpinnerPane spinnerPane = new SpinnerPane();
+        spinnerPane.loadingProperty().bind(skinnable.loadingProperty());
+        spinnerPane.failedReasonProperty().bind(skinnable.failedReasonProperty());
+        spinnerPane.onFailedActionProperty().bind(skinnable.onFailedActionProperty());
+        spinnerPane.getStyleClass().add("large-spinner-pane");
+
+        ComponentList root = new ComponentList();
+        root.getStyleClass().add("no-padding");
+        StackPane.setMargin(root, new Insets(10));
+
+        List<Node> toolbarButtons = initializeToolbar(skinnable);
+        if (!toolbarButtons.isEmpty()) {
+            HBox toolbar = new HBox();
+            toolbar.setAlignment(Pos.CENTER_LEFT);
+            toolbar.setPickOnBounds(false);
+            toolbar.getChildren().setAll(toolbarButtons);
+            root.getContent().add(toolbar);
+        }
+
+        {
+            ScrollPane scrollPane = new ScrollPane();
+            ComponentList.setVgrow(scrollPane, Priority.ALWAYS);
+            scrollPane.setFitToWidth(true);
+
+            VBox content = new VBox();
+
+            Bindings.bindContent(content.getChildren(), skinnable.itemsProperty());
+
+            scrollPane.setContent(content);
+            JFXScrollPane.smoothScrolling(scrollPane);
+
+            root.getContent().add(scrollPane);
+        }
+
+        spinnerPane.setContent(root);
+
+        getChildren().setAll(spinnerPane);
+    }
+
+    public static Node wrap(Node node) {
+        StackPane stackPane = new StackPane();
+        stackPane.setPadding(new Insets(0, 5, 0, 2));
+        stackPane.getChildren().setAll(node);
+        return stackPane;
+    }
+
+    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(creator.createIcon(Theme.foregroundFillBinding(), -1, -1)));
+        ret.setText(text);
+        ret.setOnMouseClicked(e -> onClick.run());
+        return ret;
+    }
+
+    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(creator.createIcon(Theme.blackFillBinding(), -1, -1)));
+        ret.setText(text);
+        ret.setOnMouseClicked(e -> onClick.run());
+        return ret;
+    }
+
+    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(creator.createIcon(Theme.foregroundFillBinding(), -1, -1)));
+        FXUtils.installFastTooltip(ret, tooltip);
+        ret.setOnMouseClicked(e -> onClick.run());
+        return ret;
+    }
+
+    protected abstract List<Node> initializeToolbar(T skinnable);
+}

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

@@ -0,0 +1,76 @@
+/*
+ * 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.ui;
+
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXDialogLayout;
+import javafx.scene.control.Label;
+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.upgrade.RemoteVersion;
+
+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;
+
+public class UpgradeDialog extends JFXDialogLayout {
+    public UpgradeDialog(RemoteVersion remoteVersion, Runnable updateRunnable) {
+        {
+            setHeading(new Label(i18n("update.changelog")));
+        }
+
+        {
+            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(webView);
+        }
+
+        {
+            JFXButton updateButton = new JFXButton(i18n("update.accept"));
+            updateButton.getStyleClass().add("dialog-accept");
+            updateButton.setOnMouseClicked(e -> updateRunnable.run());
+
+            JFXButton cancelButton = new JFXButton(i18n("button.cancel"));
+            cancelButton.getStyleClass().add("dialog-cancel");
+            cancelButton.setOnMouseClicked(e -> fireEvent(new DialogCloseEvent()));
+
+            setActions(updateButton, cancelButton);
+            onEscPressed(this, cancelButton::fire);
+        }
+    }
+}

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -17,20 +17,53 @@
  */
 package org.jackhuang.hmcl.ui;
 
+import com.jfoenix.controls.JFXProgressBar;
+import javafx.beans.binding.Bindings;
 import javafx.scene.Scene;
-import javafx.scene.image.Image;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.StackPane;
+import javafx.scene.web.WebEngine;
 import javafx.scene.web.WebView;
 import javafx.stage.Stage;
+import org.jackhuang.hmcl.Metadata;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.ui.FXUtils.newImage;
 
 public class WebStage extends Stage {
-    private final WebView webView = new WebView();
+    protected final StackPane pane = new StackPane();
+    protected final JFXProgressBar progressBar = new JFXProgressBar();
+    protected final WebView webView = new WebView();
+    protected final WebEngine webEngine = webView.getEngine();
 
     public WebStage() {
-        setScene(new Scene(webView, 800, 480));
-        getScene().getStylesheets().addAll(config().getTheme().getStylesheets());
-        getIcons().add(new Image("/assets/img/icon.png"));
+        this(800, 480);
+    }
+
+    public WebStage(int width, int height) {
+        setScene(new Scene(pane, width, height));
+        getScene().getStylesheets().addAll(config().getTheme().getStylesheets(config().getLauncherFontFamily()));
+        getIcons().add(newImage("/assets/img/icon.png"));
+        webView.getEngine().setUserDataDirectory(Metadata.HMCL_DIRECTORY.toFile());
+        webView.setContextMenuEnabled(false);
+        progressBar.progressProperty().bind(webView.getEngine().getLoadWorker().progressProperty());
+
+        progressBar.visibleProperty().bind(Bindings.createBooleanBinding(() -> {
+            switch (webView.getEngine().getLoadWorker().getState()) {
+                case SUCCEEDED:
+                case FAILED:
+                case CANCELLED:
+                    return false;
+                default:
+                    return true;
+            }
+        }, webEngine.getLoadWorker().stateProperty()));
+
+        BorderPane borderPane = new BorderPane();
+        borderPane.setPickOnBounds(false);
+        borderPane.setTop(progressBar);
+        progressBar.prefWidthProperty().bind(borderPane.widthProperty());
+        pane.getChildren().setAll(webView, borderPane);
     }
 
     public WebView getWebView() {

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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,18 +20,33 @@ package org.jackhuang.hmcl.ui.account;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
-import javafx.scene.image.Image;
+import javafx.beans.value.ObservableValue;
+import javafx.collections.ObservableList;
+import javafx.scene.Node;
+import javafx.scene.control.Tooltip;
+import javafx.scene.image.ImageView;
 import org.jackhuang.hmcl.auth.Account;
-import org.jackhuang.hmcl.auth.offline.OfflineAccount;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
+import org.jackhuang.hmcl.auth.yggdrasil.TextureModel;
 import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
 import org.jackhuang.hmcl.game.TexturesLoader;
-import org.jackhuang.hmcl.setting.Theme;
-import org.jackhuang.hmcl.ui.SVG;
+import org.jackhuang.hmcl.setting.Accounts;
+import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.construct.AdvancedListItem;
+import org.jackhuang.hmcl.util.Pair;
+import org.jackhuang.hmcl.util.javafx.BindingMapping;
 
+import static javafx.beans.binding.Bindings.createStringBinding;
+import static org.jackhuang.hmcl.setting.Accounts.getAccountFactory;
+import static org.jackhuang.hmcl.setting.Accounts.getLocalizedLoginTypeName;
+import static org.jackhuang.hmcl.ui.FXUtils.toFXImage;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public class AccountAdvancedListItem extends AdvancedListItem {
+    private final Tooltip tooltip;
+    private final ImageView imageView;
+
     private ObjectProperty<Account> account = new SimpleObjectProperty<Account>() {
 
         @Override
@@ -39,32 +54,72 @@ public class AccountAdvancedListItem extends AdvancedListItem {
             Account account = get();
             if (account == null) {
                 titleProperty().unbind();
+                subtitleProperty().unbind();
+                imageView.imageProperty().unbind();
+                tooltip.textProperty().unbind();
                 setTitle(i18n("account.missing"));
                 setSubtitle(i18n("account.missing.add"));
-                imageProperty().unbind();
-                setImage(new Image("/assets/img/craft_table.png"));
+                imageView.setImage(toFXImage(TexturesLoader.toAvatar(TexturesLoader.getDefaultSkin(TextureModel.STEVE).getImage(), 32)));
+                tooltip.setText(i18n("account.create"));
             } else {
-                titleProperty().bind(Bindings.createStringBinding(account::getCharacter, account));
-                setSubtitle(accountSubtitle(account));
-                imageProperty().bind(TexturesLoader.fxAvatarBinding(account, 32));
+                titleProperty().bind(BindingMapping.of(account, Account::getCharacter));
+                subtitleProperty().bind(accountSubtitle(account));
+                imageView.imageProperty().bind(TexturesLoader.fxAvatarBinding(account, 32));
+                tooltip.textProperty().bind(accountTooltip(account));
             }
         }
     };
 
     public AccountAdvancedListItem() {
-        setRightGraphic(SVG.viewList(Theme.blackFillBinding(), -1, -1));
+        tooltip = new Tooltip();
+        FXUtils.installFastTooltip(this, tooltip);
+
+        Pair<Node, ImageView> view = createImageView(null);
+        setLeftGraphic(view.getKey());
+        imageView = view.getValue();
+
+        setActionButtonVisible(false);
+
+        setOnScroll(event -> {
+            Account current = account.get();
+            if (current == null) return;
+            ObservableList<Account> accounts = Accounts.getAccounts();
+            int currentIndex = accounts.indexOf(account.get());
+            if (event.getDeltaY() > 0) { // up
+                currentIndex--;
+            } else { // down
+                currentIndex++;
+            }
+            Accounts.setSelectedAccount(accounts.get((currentIndex + accounts.size()) % accounts.size()));
+        });
     }
 
     public ObjectProperty<Account> accountProperty() {
         return account;
     }
 
-    private static String accountSubtitle(Account account) {
-        if (account instanceof OfflineAccount)
-            return i18n("account.methods.offline");
-        else if (account instanceof YggdrasilAccount)
-            return account.getUsername();
-        else
-            return "";
+    private static ObservableValue<String> accountSubtitle(Account account) {
+        if (account instanceof AuthlibInjectorAccount) {
+            return BindingMapping.of(((AuthlibInjectorAccount) account).getServer(), AuthlibInjectorServer::getName);
+        } else {
+            return createStringBinding(() -> getLocalizedLoginTypeName(getAccountFactory(account)));
+        }
     }
+
+    private static ObservableValue<String> accountTooltip(Account account) {
+        if (account instanceof AuthlibInjectorAccount) {
+            AuthlibInjectorServer server = ((AuthlibInjectorAccount) account).getServer();
+            return Bindings.format("%s (%s) (%s)",
+                    BindingMapping.of(account, Account::getCharacter),
+                    account.getUsername(),
+                    BindingMapping.of(server, AuthlibInjectorServer::getName));
+        } else if (account instanceof YggdrasilAccount) {
+            return Bindings.format("%s (%s)",
+                    BindingMapping.of(account, Account::getCharacter),
+                    account.getUsername());
+        } else {
+            return BindingMapping.of(account, Account::getCharacter);
+        }
+    }
+
 }

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

@@ -1,57 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  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.account;
-
-import javafx.beans.property.*;
-import javafx.collections.FXCollections;
-import org.jackhuang.hmcl.auth.Account;
-import org.jackhuang.hmcl.ui.Controllers;
-import org.jackhuang.hmcl.ui.ListPage;
-import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
-import org.jackhuang.hmcl.util.javafx.MappedObservableList;
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-import static org.jackhuang.hmcl.util.javafx.ExtendedProperties.createSelectedItemPropertyFor;
-
-public class AccountList extends ListPage<AccountListItem> implements DecoratorPage {
-    private final ReadOnlyStringWrapper title = new ReadOnlyStringWrapper(this, "title", i18n("account.manage"));
-    private final ListProperty<Account> accounts = new SimpleListProperty<>(this, "accounts", FXCollections.observableArrayList());
-    private final ObjectProperty<Account> selectedAccount;
-
-    public AccountList() {
-        setItems(MappedObservableList.create(accounts, AccountListItem::new));
-        selectedAccount = createSelectedItemPropertyFor(getItems(), Account.class);
-    }
-
-    public ObjectProperty<Account> selectedAccountProperty() {
-        return selectedAccount;
-    }
-
-    public ListProperty<Account> accountsProperty() {
-        return accounts;
-    }
-
-    @Override
-    public void add() {
-        Controllers.dialog(new AddAccountPane());
-    }
-
-    @Override
-    public ReadOnlyStringProperty titleProperty() {
-        return title.getReadOnlyProperty();
-    }
-}

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -18,27 +18,51 @@
 package org.jackhuang.hmcl.ui.account;
 
 import javafx.beans.binding.Bindings;
+import javafx.beans.binding.ObjectBinding;
 import javafx.beans.binding.StringBinding;
-import javafx.beans.property.*;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.beans.value.ObservableBooleanValue;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.Skin;
 import javafx.scene.image.Image;
+import javafx.stage.FileChooser;
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.auth.AuthenticationException;
 import org.jackhuang.hmcl.auth.CredentialExpiredException;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.auth.offline.OfflineAccount;
+import org.jackhuang.hmcl.auth.yggdrasil.CompleteGameProfile;
+import org.jackhuang.hmcl.auth.yggdrasil.TextureType;
+import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
 import org.jackhuang.hmcl.game.TexturesLoader;
 import org.jackhuang.hmcl.setting.Accounts;
+import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.DialogController;
+import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
+import org.jackhuang.hmcl.util.skin.InvalidSkinException;
+import org.jackhuang.hmcl.util.skin.NormalizedSkin;
+import org.jetbrains.annotations.Nullable;
 
-import static org.jackhuang.hmcl.util.Lang.thread;
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.CancellationException;
+import java.util.logging.Level;
+
+import static java.util.Collections.emptySet;
+import static javafx.beans.binding.Bindings.createBooleanBinding;
 import static org.jackhuang.hmcl.util.Logging.LOG;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
-import java.util.logging.Level;
-
 public class AccountListItem extends RadioButton {
 
     private final Account account;
@@ -65,7 +89,9 @@ public class AccountListItem extends RadioButton {
         if (account instanceof OfflineAccount) {
             title.bind(characterName);
         } else {
-            title.bind(Bindings.concat(account.getUsername(), " - ", characterName));
+            title.bind(
+                    account.getUsername().isEmpty() ? characterName :
+                            Bindings.concat(account.getUsername(), " - ", characterName));
         }
 
         image.bind(TexturesLoader.fxAvatarBinding(account, 32));
@@ -76,23 +102,93 @@ public class AccountListItem extends RadioButton {
         return new AccountListItemSkin(this);
     }
 
-    public void refresh() {
-        account.clearCache();
-        thread(() -> {
+    public Task<?> refreshAsync() {
+        return Task.runAsync(() -> {
+            account.clearCache();
             try {
                 account.logIn();
             } catch (CredentialExpiredException e) {
                 try {
                     DialogController.logIn(account);
+                } catch (CancellationException e1) {
+                    // ignore cancellation
                 } catch (Exception e1) {
                     LOG.log(Level.WARNING, "Failed to refresh " + account + " with password", e1);
+                    throw e1;
                 }
             } catch (AuthenticationException e) {
                 LOG.log(Level.WARNING, "Failed to refresh " + account + " with token", e);
+                throw e;
             }
         });
     }
 
+    public ObservableBooleanValue canUploadSkin() {
+        if (account instanceof YggdrasilAccount) {
+            if (account instanceof AuthlibInjectorAccount) {
+                AuthlibInjectorAccount aiAccount = (AuthlibInjectorAccount) account;
+                ObjectBinding<Optional<CompleteGameProfile>> profile = aiAccount.getYggdrasilService().getProfileRepository().binding(aiAccount.getUUID());
+                return createBooleanBinding(() -> {
+                    Set<TextureType> uploadableTextures = profile.get()
+                            .map(AuthlibInjectorAccount::getUploadableTextures)
+                            .orElse(emptySet());
+                    return uploadableTextures.contains(TextureType.SKIN);
+                }, profile);
+            } else {
+                return createBooleanBinding(() -> true);
+            }
+        } else if (account instanceof OfflineAccount) {
+            return createBooleanBinding(() -> true);
+        } else {
+            return createBooleanBinding(() -> false);
+        }
+    }
+
+    /**
+     * @return the skin upload task, null if no file is selected
+     */
+    @Nullable
+    public Task<?> uploadSkin() {
+        if (account instanceof OfflineAccount) {
+            Controllers.dialog(new OfflineAccountSkinPane((OfflineAccount) account));
+            return null;
+        }
+        if (!(account instanceof YggdrasilAccount)) {
+            return null;
+        }
+
+        FileChooser chooser = new FileChooser();
+        chooser.setTitle(i18n("account.skin.upload"));
+        chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(i18n("account.skin.file"), "*.png"));
+        File selectedFile = chooser.showOpenDialog(Controllers.getStage());
+        if (selectedFile == null) {
+            return null;
+        }
+
+        return refreshAsync()
+                .thenRunAsync(() -> {
+                    BufferedImage skinImg;
+                    try {
+                        skinImg = ImageIO.read(selectedFile);
+                    } catch (IOException e) {
+                        throw new InvalidSkinException("Failed to read skin image", e);
+                    }
+                    if (skinImg == null) {
+                        throw new InvalidSkinException("Failed to read skin image");
+                    }
+                    NormalizedSkin skin = new NormalizedSkin(skinImg);
+                    String model = skin.isSlim() ? "slim" : "";
+                    LOG.info("Uploading skin [" + selectedFile + "], model [" + model + "]");
+                    ((YggdrasilAccount) account).uploadSkin(model, selectedFile.toPath());
+                })
+                .thenComposeAsync(refreshAsync())
+                .whenComplete(Schedulers.javafx(), e -> {
+                    if (e != null) {
+                        Controllers.dialog(Accounts.localizeErrorMessage(e), i18n("account.skin.upload.failed"), MessageType.ERROR);
+                    }
+                });
+    }
+
     public void remove() {
         Accounts.getAccounts().remove(account);
     }

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -17,12 +17,9 @@
  */
 package org.jackhuang.hmcl.ui.account;
 
-import com.jfoenix.utils.JFXUtilities;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXRadioButton;
 import com.jfoenix.effects.JFXDepthManager;
-
-import javafx.beans.binding.Bindings;
 import javafx.geometry.Pos;
 import javafx.scene.control.Label;
 import javafx.scene.control.SkinBase;
@@ -31,15 +28,20 @@ import javafx.scene.image.ImageView;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
-
-import org.jackhuang.hmcl.setting.Theme;
-import org.jackhuang.hmcl.ui.FXUtils;
-import org.jackhuang.hmcl.ui.SVG;
-
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
+import org.jackhuang.hmcl.setting.Accounts;
+import org.jackhuang.hmcl.setting.Theme;
+import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.ui.Controllers;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.SVG;
+import org.jackhuang.hmcl.ui.construct.SpinnerPane;
+import org.jackhuang.hmcl.util.javafx.BindingMapping;
+
+import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public class AccountListItemSkin extends SkinBase<AccountListItem> {
 
@@ -75,7 +77,7 @@ public class AccountListItemSkin extends SkinBase<AccountListItem> {
         if (skinnable.getAccount() instanceof AuthlibInjectorAccount) {
             Tooltip tooltip = new Tooltip();
             AuthlibInjectorServer server = ((AuthlibInjectorAccount) skinnable.getAccount()).getServer();
-            tooltip.textProperty().bind(Bindings.createStringBinding(server::toString, server));
+            tooltip.textProperty().bind(BindingMapping.of(server, AuthlibInjectorServer::toString));
             FXUtils.installSlowTooltip(subtitle, tooltip);
         }
         VBox item = new VBox(title, subtitle);
@@ -87,23 +89,59 @@ public class AccountListItemSkin extends SkinBase<AccountListItem> {
 
         HBox right = new HBox();
         right.setAlignment(Pos.CENTER_RIGHT);
+
         JFXButton btnRefresh = new JFXButton();
-        btnRefresh.setOnMouseClicked(e -> skinnable.refresh());
+        SpinnerPane spinnerRefresh = new SpinnerPane();
+        spinnerRefresh.getStyleClass().setAll("small-spinner-pane");
+        btnRefresh.setOnMouseClicked(e -> {
+            spinnerRefresh.showSpinner();
+            skinnable.refreshAsync()
+                    .whenComplete(Schedulers.javafx(), ex -> {
+                        spinnerRefresh.hideSpinner();
+
+                        if (ex != null) {
+                            Controllers.showToast(Accounts.localizeErrorMessage(ex));
+                        }
+                    })
+                    .start();
+        });
         btnRefresh.getStyleClass().add("toggle-icon4");
         btnRefresh.setGraphic(SVG.refresh(Theme.blackFillBinding(), -1, -1));
-        JFXUtilities.runInFX(() -> FXUtils.installFastTooltip(btnRefresh, i18n("button.refresh")));
-        right.getChildren().add(btnRefresh);
+        runInFX(() -> FXUtils.installFastTooltip(btnRefresh, i18n("button.refresh")));
+        spinnerRefresh.setContent(btnRefresh);
+        right.getChildren().add(spinnerRefresh);
+
+        JFXButton btnUpload = new JFXButton();
+        SpinnerPane spinnerUpload = new SpinnerPane();
+        btnUpload.setOnMouseClicked(e -> {
+            Task<?> uploadTask = skinnable.uploadSkin();
+            if (uploadTask != null) {
+                spinnerUpload.showSpinner();
+                uploadTask
+                        .whenComplete(Schedulers.javafx(), ex -> spinnerUpload.hideSpinner())
+                        .start();
+            }
+        });
+        btnUpload.getStyleClass().add("toggle-icon4");
+        btnUpload.setGraphic(SVG.hanger(Theme.blackFillBinding(), -1, -1));
+        runInFX(() -> FXUtils.installFastTooltip(btnUpload, i18n("account.skin.upload")));
+        spinnerUpload.managedProperty().bind(spinnerUpload.visibleProperty());
+        spinnerUpload.visibleProperty().bind(skinnable.canUploadSkin());
+        spinnerUpload.setContent(btnUpload);
+        spinnerUpload.getStyleClass().add("small-spinner-pane");
+        right.getChildren().add(spinnerUpload);
 
         JFXButton btnRemove = new JFXButton();
         btnRemove.setOnMouseClicked(e -> skinnable.remove());
         btnRemove.getStyleClass().add("toggle-icon4");
         BorderPane.setAlignment(btnRemove, Pos.CENTER);
         btnRemove.setGraphic(SVG.delete(Theme.blackFillBinding(), -1, -1));
-        JFXUtilities.runInFX(() -> FXUtils.installFastTooltip(btnRemove, i18n("button.delete")));
+        runInFX(() -> FXUtils.installFastTooltip(btnRemove, i18n("button.delete")));
         right.getChildren().add(btnRemove);
         root.setRight(right);
 
-        root.setStyle("-fx-background-color: white; -fx-padding: 8 8 8 12;");
+        root.getStyleClass().add("card");
+        root.setStyle("-fx-padding: 8 8 8 0;");
         JFXDepthManager.setDepth(root, 1);
 
         getChildren().setAll(root);

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

@@ -0,0 +1,188 @@
+/*
+ * 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.ui.account;
+
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXScrollPane;
+import javafx.beans.binding.Bindings;
+import javafx.beans.property.*;
+import javafx.beans.value.ObservableValue;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.geometry.Insets;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.Skin;
+import javafx.scene.control.Tooltip;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.VBox;
+import org.jackhuang.hmcl.auth.Account;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
+import org.jackhuang.hmcl.setting.Accounts;
+import org.jackhuang.hmcl.setting.Theme;
+import org.jackhuang.hmcl.ui.Controllers;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.SVG;
+import org.jackhuang.hmcl.ui.construct.AdvancedListItem;
+import org.jackhuang.hmcl.ui.construct.ClassTitle;
+import org.jackhuang.hmcl.ui.decorator.DecoratorAnimatedPage;
+import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
+import org.jackhuang.hmcl.util.javafx.BindingMapping;
+import org.jackhuang.hmcl.util.javafx.MappedObservableList;
+
+import java.net.URI;
+
+import static org.jackhuang.hmcl.ui.versions.VersionPage.wrap;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+import static org.jackhuang.hmcl.util.javafx.ExtendedProperties.createSelectedItemPropertyFor;
+
+public class AccountListPage extends DecoratorAnimatedPage implements DecoratorPage {
+    private final ObservableList<AccountListItem> items;
+    private final ReadOnlyObjectWrapper<State> state = new ReadOnlyObjectWrapper<>(State.fromTitle(i18n("account.manage")));
+    private final ListProperty<Account> accounts = new SimpleListProperty<>(this, "accounts", FXCollections.observableArrayList());
+    private final ListProperty<AuthlibInjectorServer> authServers = new SimpleListProperty<>(this, "authServers", FXCollections.observableArrayList());
+    private final ObjectProperty<Account> selectedAccount;
+
+    public AccountListPage() {
+        items = MappedObservableList.create(accounts, AccountListItem::new);
+        selectedAccount = createSelectedItemPropertyFor(items, Account.class);
+    }
+
+    public ObjectProperty<Account> selectedAccountProperty() {
+        return selectedAccount;
+    }
+
+    public ListProperty<Account> accountsProperty() {
+        return accounts;
+    }
+
+    @Override
+    public ReadOnlyObjectProperty<State> stateProperty() {
+        return state.getReadOnlyProperty();
+    }
+
+    public ListProperty<AuthlibInjectorServer> authServersProperty() {
+        return authServers;
+    }
+
+    @Override
+    protected Skin<?> createDefaultSkin() {
+        return new AccountListPageSkin(this);
+    }
+
+    private static class AccountListPageSkin extends DecoratorAnimatedPageSkin<AccountListPage> {
+
+        private final ObservableList<AdvancedListItem> authServerItems;
+
+        public AccountListPageSkin(AccountListPage skinnable) {
+            super(skinnable);
+
+            {
+                VBox boxMethods = new VBox();
+                {
+                    boxMethods.getStyleClass().add("advanced-list-box-content");
+                    boxMethods.getChildren().add(new ClassTitle(i18n("account.create")));
+                    FXUtils.setLimitWidth(boxMethods, 200);
+
+                    AdvancedListItem offlineItem = new AdvancedListItem();
+                    offlineItem.getStyleClass().add("navigation-drawer-item");
+                    offlineItem.setActionButtonVisible(false);
+                    offlineItem.setTitle(i18n("account.methods.offline"));
+                    offlineItem.setLeftGraphic(wrap(SVG::account));
+                    offlineItem.setOnAction(e -> Controllers.dialog(new CreateAccountPane(Accounts.FACTORY_OFFLINE)));
+                    boxMethods.getChildren().add(offlineItem);
+
+                    AdvancedListItem mojangItem = new AdvancedListItem();
+                    mojangItem.getStyleClass().add("navigation-drawer-item");
+                    mojangItem.setActionButtonVisible(false);
+                    mojangItem.setTitle(i18n("account.methods.yggdrasil"));
+                    mojangItem.setLeftGraphic(wrap(SVG::mojang));
+                    mojangItem.setOnAction(e -> Controllers.dialog(new CreateAccountPane(Accounts.FACTORY_MOJANG)));
+                    boxMethods.getChildren().add(mojangItem);
+
+                    AdvancedListItem microsoftItem = new AdvancedListItem();
+                    microsoftItem.getStyleClass().add("navigation-drawer-item");
+                    microsoftItem.setActionButtonVisible(false);
+                    microsoftItem.setTitle(i18n("account.methods.microsoft"));
+                    microsoftItem.setLeftGraphic(wrap(SVG::microsoft));
+                    microsoftItem.setOnAction(e -> Controllers.dialog(new CreateAccountPane(Accounts.FACTORY_MICROSOFT)));
+                    boxMethods.getChildren().add(microsoftItem);
+
+                    VBox boxAuthServers = new VBox();
+                    authServerItems = MappedObservableList.create(skinnable.authServersProperty(), server -> {
+                        AdvancedListItem item = new AdvancedListItem();
+                        item.getStyleClass().add("navigation-drawer-item");
+                        item.setLeftGraphic(wrap(SVG::server));
+                        item.setOnAction(e -> Controllers.dialog(new CreateAccountPane(server)));
+
+                        JFXButton btnRemove = new JFXButton();
+                        btnRemove.setOnAction(e -> {
+                            skinnable.authServersProperty().remove(server);
+                            e.consume();
+                        });
+                        btnRemove.getStyleClass().add("toggle-icon4");
+                        btnRemove.setGraphic(SVG.close(Theme.blackFillBinding(), 14, 14));
+                        item.setRightGraphic(btnRemove);
+
+                        ObservableValue<String> title = BindingMapping.of(server, AuthlibInjectorServer::getName);
+                        item.titleProperty().bind(title);
+                        item.subtitleProperty().set(URI.create(server.getUrl()).getHost());
+                        Tooltip tooltip = new Tooltip();
+                        tooltip.textProperty().bind(Bindings.format("%s (%s)", title, server.getUrl()));
+                        FXUtils.installFastTooltip(item, tooltip);
+
+                        return item;
+                    });
+                    Bindings.bindContent(boxAuthServers.getChildren(), authServerItems);
+                    boxMethods.getChildren().add(boxAuthServers);
+                }
+
+                AdvancedListItem addAuthServerItem = new AdvancedListItem();
+                {
+                    addAuthServerItem.getStyleClass().add("navigation-drawer-item");
+                    addAuthServerItem.setTitle(i18n("account.injector.add"));
+                    addAuthServerItem.setSubtitle(i18n("account.methods.authlib_injector"));
+                    addAuthServerItem.setActionButtonVisible(false);
+                    addAuthServerItem.setLeftGraphic(wrap(SVG::plusCircleOutline));
+                    addAuthServerItem.setOnAction(e -> Controllers.dialog(new AddAuthlibInjectorServerPane()));
+                    VBox.setMargin(addAuthServerItem, new Insets(0, 0, 12, 0));
+                }
+
+                ScrollPane scrollPane = new ScrollPane(boxMethods);
+                VBox.setVgrow(scrollPane, Priority.ALWAYS);
+                setLeft(scrollPane, addAuthServerItem);
+            }
+
+            ScrollPane scrollPane = new ScrollPane();
+            VBox list = new VBox();
+            {
+                scrollPane.setFitToWidth(true);
+
+                list.maxWidthProperty().bind(scrollPane.widthProperty());
+                list.setSpacing(10);
+                list.getStyleClass().add("card-list");
+
+                Bindings.bindContent(list.getChildren(), skinnable.items);
+
+                scrollPane.setContent(list);
+                JFXScrollPane.smoothScrolling(scrollPane);
+
+                setCenter(scrollPane);
+            }
+        }
+    }
+}

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

@@ -1,85 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  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.account;
-
-import com.jfoenix.controls.JFXPasswordField;
-import com.jfoenix.controls.JFXProgressBar;
-import javafx.fxml.FXML;
-import javafx.scene.control.Label;
-import javafx.scene.layout.StackPane;
-import org.jackhuang.hmcl.auth.Account;
-import org.jackhuang.hmcl.auth.AuthInfo;
-import org.jackhuang.hmcl.auth.NoSelectedCharacterException;
-import org.jackhuang.hmcl.task.Schedulers;
-import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.ui.FXUtils;
-import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
-
-import java.util.function.Consumer;
-import java.util.logging.Level;
-
-import static org.jackhuang.hmcl.util.Logging.LOG;
-
-public class AccountLoginPane extends StackPane {
-    private final Account oldAccount;
-    private final Consumer<AuthInfo> success;
-    private final Runnable failed;
-
-    @FXML private Label lblUsername;
-    @FXML private JFXPasswordField txtPassword;
-    @FXML private Label lblCreationWarning;
-    @FXML private JFXProgressBar progressBar;
-
-    public AccountLoginPane(Account oldAccount, Consumer<AuthInfo> success, Runnable failed) {
-        this.oldAccount = oldAccount;
-        this.success = success;
-        this.failed = failed;
-
-        FXUtils.loadFXML(this, "/assets/fxml/account-login.fxml");
-
-        lblUsername.setText(oldAccount.getUsername());
-        txtPassword.setOnAction(e -> onAccept());
-    }
-
-    @FXML
-    private void onAccept() {
-        String password = txtPassword.getText();
-        progressBar.setVisible(true);
-        lblCreationWarning.setText("");
-        Task.ofResult(() -> oldAccount.logInWithPassword(password))
-                .finalizedResult(Schedulers.javafx(), authInfo -> {
-                    success.accept(authInfo);
-                    fireEvent(new DialogCloseEvent());
-                    progressBar.setVisible(false);
-                }, e -> {
-                    LOG.log(Level.INFO, "Failed to login with password: " + oldAccount, e);
-                    if (e instanceof NoSelectedCharacterException) {
-                        fireEvent(new DialogCloseEvent());
-                    } else {
-                        lblCreationWarning.setText(AddAccountPane.accountException(e));
-                    }
-                    progressBar.setVisible(false);
-                }).start();
-    }
-
-    @FXML
-    private void onCancel() {
-        failed.run();
-        fireEvent(new DialogCloseEvent());
-    }
-}

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

@@ -1,330 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  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.account;
-
-import com.jfoenix.utils.JFXUtilities;
-import com.jfoenix.controls.*;
-
-import javafx.application.Platform;
-import javafx.beans.binding.Bindings;
-import javafx.beans.property.ListProperty;
-import javafx.beans.property.ReadOnlyObjectProperty;
-import javafx.beans.property.SimpleListProperty;
-import javafx.collections.FXCollections;
-import javafx.fxml.FXML;
-import javafx.geometry.Pos;
-import javafx.scene.control.Hyperlink;
-import javafx.scene.control.Label;
-import javafx.scene.image.ImageView;
-import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.StackPane;
-import org.jackhuang.hmcl.auth.*;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorDownloadException;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
-import org.jackhuang.hmcl.auth.yggdrasil.GameProfile;
-import org.jackhuang.hmcl.auth.yggdrasil.RemoteAuthenticationException;
-import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilService;
-import org.jackhuang.hmcl.game.TexturesLoader;
-import org.jackhuang.hmcl.setting.Accounts;
-import org.jackhuang.hmcl.task.Schedulers;
-import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.ui.Controllers;
-import org.jackhuang.hmcl.ui.FXUtils;
-import org.jackhuang.hmcl.ui.construct.*;
-import org.jackhuang.hmcl.util.javafx.MultiStepBinding;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-import static java.util.Collections.emptyList;
-import static java.util.Collections.unmodifiableList;
-import static java.util.Objects.requireNonNull;
-import static org.jackhuang.hmcl.setting.ConfigHolder.config;
-import static org.jackhuang.hmcl.ui.FXUtils.*;
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
-public class AddAccountPane extends StackPane {
-
-    @FXML private JFXTextField txtUsername;
-    @FXML private JFXPasswordField txtPassword;
-    @FXML private Label lblCreationWarning;
-    @FXML private Label lblPassword;
-    @FXML private JFXComboBox<AccountFactory<?>> cboType;
-    @FXML private JFXComboBox<AuthlibInjectorServer> cboServers;
-    @FXML private Label lblInjectorServer;
-    @FXML private JFXButton btnAccept;
-    @FXML private JFXButton btnAddServer;
-    @FXML private JFXButton btnManageServer;
-    @FXML private SpinnerPane acceptPane;
-    @FXML private HBox linksContainer;
-
-    private ListProperty<Hyperlink> links = new SimpleListProperty<>();;
-
-    public AddAccountPane() {
-        FXUtils.loadFXML(this, "/assets/fxml/account-add.fxml");
-
-        cboServers.setCellFactory(jfxListCellFactory(server -> new TwoLineListItem(server.getName(), server.getUrl())));
-        cboServers.setConverter(stringConverter(AuthlibInjectorServer::getName));
-        Bindings.bindContent(cboServers.getItems(), config().getAuthlibInjectorServers());
-        cboServers.getItems().addListener(onInvalidating(this::selectDefaultServer));
-        selectDefaultServer();
-
-        cboType.getItems().setAll(Accounts.FACTORY_OFFLINE, Accounts.FACTORY_MOJANG, Accounts.FACTORY_AUTHLIB_INJECTOR);
-        cboType.setConverter(stringConverter(Accounts::getLocalizedLoginTypeName));
-        // try selecting the preferred login type
-        cboType.getSelectionModel().select(
-                cboType.getItems().stream()
-                        .filter(type -> Accounts.getLoginType(type).equals(config().getPreferredLoginType()))
-                        .findFirst()
-                        .orElse(Accounts.FACTORY_OFFLINE));
-
-        btnAddServer.visibleProperty().bind(cboServers.visibleProperty());
-        btnManageServer.visibleProperty().bind(cboServers.visibleProperty());
-
-        cboServers.getItems().addListener(onInvalidating(this::checkIfNoServer));
-        checkIfNoServer();
-
-        ReadOnlyObjectProperty<AccountFactory<?>> loginType = cboType.getSelectionModel().selectedItemProperty();
-
-        // remember the last used login type
-        loginType.addListener((observable, oldValue, newValue) -> config().setPreferredLoginType(Accounts.getLoginType(newValue)));
-
-        txtPassword.visibleProperty().bind(loginType.isNotEqualTo(Accounts.FACTORY_OFFLINE));
-        lblPassword.visibleProperty().bind(txtPassword.visibleProperty());
-
-        cboServers.visibleProperty().bind(loginType.isEqualTo(Accounts.FACTORY_AUTHLIB_INJECTOR));
-        lblInjectorServer.visibleProperty().bind(cboServers.visibleProperty());
-
-        txtUsername.getValidators().add(new Validator(i18n("input.email"), str -> !txtPassword.isVisible() || str.contains("@")));
-
-        btnAccept.disableProperty().bind(Bindings.createBooleanBinding(
-                () -> !( // consider the opposite situation: input is valid
-                        txtUsername.validate() &&
-                        // invisible means the field is not needed, neither should it be validated
-                        (!txtPassword.isVisible() || txtPassword.validate()) &&
-                        (!cboServers.isVisible() || cboServers.getSelectionModel().getSelectedItem() != null)
-                ),
-                txtUsername.textProperty(),
-                txtPassword.textProperty(), txtPassword.visibleProperty(),
-                cboServers.getSelectionModel().selectedItemProperty(), cboServers.visibleProperty()));
-
-        // authlib-injector links
-        links.bind(MultiStepBinding.of(cboServers.getSelectionModel().selectedItemProperty())
-                .map(AddAccountPane::createHyperlinks)
-                .map(FXCollections::observableList));
-        Bindings.bindContent(linksContainer.getChildren(), links);
-        linksContainer.visibleProperty().bind(cboServers.visibleProperty());
-    }
-
-    private static final String[] ALLOWED_LINKS = { "register" };
-
-    public static List<Hyperlink> createHyperlinks(AuthlibInjectorServer server) {
-        if (server == null) {
-            return emptyList();
-        }
-
-        Map<String, String> links = server.getLinks();
-        List<Hyperlink> result = new ArrayList<>();
-        for (String key : ALLOWED_LINKS) {
-            String value = links.get(key);
-            if (value != null) {
-                Hyperlink link = new Hyperlink(i18n("account.injector.link." + key));
-                FXUtils.installSlowTooltip(link, value);
-                link.setOnAction(e -> FXUtils.openLink(value));
-                result.add(link);
-            }
-        }
-        return unmodifiableList(result);
-    }
-
-    /**
-     * Selects the first server if no server is selected.
-     */
-    private void selectDefaultServer() {
-        if (!cboServers.getItems().isEmpty() && cboServers.getSelectionModel().isEmpty()) {
-            cboServers.getSelectionModel().select(0);
-        }
-    }
-
-    private void checkIfNoServer() {
-        if (cboServers.getItems().isEmpty())
-            cboServers.getStyleClass().setAll("jfx-combo-box-warning");
-        else
-            cboServers.getStyleClass().setAll("jfx-combo-box");
-    }
-
-    /**
-     * Gets the additional data that needs to be passed into {@link AccountFactory#create(CharacterSelector, String, String, Object)}.
-     */
-    private Object getAuthAdditionalData() {
-        AccountFactory<?> factory = cboType.getSelectionModel().getSelectedItem();
-        if (factory == Accounts.FACTORY_AUTHLIB_INJECTOR) {
-            return requireNonNull(cboServers.getSelectionModel().getSelectedItem(), "selected server cannot be null");
-        }
-        return null;
-    }
-
-    @FXML
-    private void onCreationAccept() {
-        if (btnAccept.isDisabled())
-            return;
-
-        acceptPane.showSpinner();
-        lblCreationWarning.setText("");
-        setDisable(true);
-
-        String username = txtUsername.getText();
-        String password = txtPassword.getText();
-        AccountFactory<?> factory = cboType.getSelectionModel().getSelectedItem();
-        Object additionalData = getAuthAdditionalData();
-
-        Task.ofResult(() -> factory.create(new Selector(), username, password, additionalData))
-                .finalizedResult(Schedulers.javafx(), account -> {
-                    int oldIndex = Accounts.getAccounts().indexOf(account);
-                    if (oldIndex == -1) {
-                        Accounts.getAccounts().add(account);
-                    } else {
-                        // adding an already-added account
-                        // instead of discarding the new account, we first remove the existing one then add the new one
-                        Accounts.getAccounts().remove(oldIndex);
-                        Accounts.getAccounts().add(oldIndex, account);
-                    }
-
-                    // select the new account
-                    Accounts.setSelectedAccount(account);
-
-                    acceptPane.hideSpinner();
-                    fireEvent(new DialogCloseEvent());
-                }, exception -> {
-                    if (exception instanceof NoSelectedCharacterException) {
-                        fireEvent(new DialogCloseEvent());
-                    } else {
-                        lblCreationWarning.setText(accountException(exception));
-                    }
-                    setDisable(false);
-                    acceptPane.hideSpinner();
-                }).start();
-    }
-
-    @FXML
-    private void onCreationCancel() {
-        fireEvent(new DialogCloseEvent());
-    }
-
-    @FXML
-    private void onManageInjecterServers() {
-        fireEvent(new DialogCloseEvent());
-        Controllers.navigate(Controllers.getServersPage());
-    }
-
-    @FXML
-    private void onAddInjecterServer() {
-        Controllers.dialog(new AddAuthlibInjectorServerPane());
-    }
-
-    private class Selector extends BorderPane implements CharacterSelector {
-
-        private final AdvancedListBox listBox = new AdvancedListBox();
-        private final JFXButton cancel = new JFXButton();
-
-        private final CountDownLatch latch = new CountDownLatch(1);
-        private GameProfile selectedProfile = null;
-
-        public Selector() {
-            setStyle("-fx-padding: 8px;");
-
-            cancel.setText(i18n("button.cancel"));
-            StackPane.setAlignment(cancel, Pos.BOTTOM_RIGHT);
-            cancel.setOnMouseClicked(e -> latch.countDown());
-
-            listBox.startCategory(i18n("account.choose"));
-
-            setCenter(listBox);
-
-            HBox hbox = new HBox();
-            hbox.setAlignment(Pos.CENTER_RIGHT);
-            hbox.getChildren().add(cancel);
-            setBottom(hbox);
-        }
-
-        @Override
-        public GameProfile select(YggdrasilService service, List<GameProfile> profiles) throws NoSelectedCharacterException {
-            Platform.runLater(() -> {
-                for (GameProfile profile : profiles) {
-                    ImageView portraitView = new ImageView();
-                    portraitView.setSmooth(false);
-                    portraitView.imageProperty().bind(TexturesLoader.fxAvatarBinding(service, profile.getId(), 32));
-                    FXUtils.limitSize(portraitView, 32, 32);
-
-                    IconedItem accountItem = new IconedItem(portraitView, profile.getName());
-                    accountItem.setOnMouseClicked(e -> {
-                        selectedProfile = profile;
-                        latch.countDown();
-                    });
-                    listBox.add(accountItem);
-                }
-                Controllers.dialog(this);
-            });
-
-            try {
-                latch.await();
-
-                if (selectedProfile == null)
-                    throw new NoSelectedCharacterException();
-
-                return selectedProfile;
-            } catch (InterruptedException ignore) {
-                throw new NoSelectedCharacterException();
-            } finally {
-                JFXUtilities.runInFX(() -> Selector.this.fireEvent(new DialogCloseEvent()));
-            }
-        }
-    }
-
-    public static String accountException(Exception exception) {
-        if (exception instanceof NoCharacterException) {
-            return i18n("account.failed.no_character");
-        } else if (exception instanceof ServerDisconnectException) {
-            return i18n("account.failed.connect_authentication_server");
-        } else if (exception instanceof ServerResponseMalformedException) {
-            return i18n("account.failed.server_response_malformed");
-        } else if (exception instanceof RemoteAuthenticationException) {
-            RemoteAuthenticationException remoteException = (RemoteAuthenticationException) exception;
-            String remoteMessage = remoteException.getRemoteMessage();
-            if ("ForbiddenOperationException".equals(remoteException.getRemoteName()) && remoteMessage != null) {
-                if (remoteMessage.contains("Invalid credentials"))
-                    return i18n("account.failed.invalid_credentials");
-                else if (remoteMessage.contains("Invalid token"))
-                    return i18n("account.failed.invalid_token");
-                else if (remoteMessage.contains("Invalid username or password"))
-                    return i18n("account.failed.invalid_password");
-            }
-            return exception.getMessage();
-        } else if (exception instanceof AuthlibInjectorDownloadException) {
-            return i18n("account.failed.injector_download_failure");
-        } else if (exception instanceof CharacterDeletedException) {
-            return i18n("account.failed.character_deleted");
-        } else if (exception.getClass() == AuthenticationException.class) {
-            return exception.getLocalizedMessage();
-        } else {
-            return exception.getClass().getName() + ": " + exception.getLocalizedMessage();
-        }
-    }
-}

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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,7 +20,6 @@ package org.jackhuang.hmcl.ui.account;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXDialogLayout;
 import com.jfoenix.controls.JFXTextField;
-
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
 import javafx.scene.layout.StackPane;
@@ -28,7 +27,7 @@ import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
-import org.jackhuang.hmcl.ui.animation.TransitionHandler;
+import org.jackhuang.hmcl.ui.animation.TransitionPane;
 import org.jackhuang.hmcl.ui.construct.DialogAware;
 import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
 import org.jackhuang.hmcl.ui.construct.SpinnerPane;
@@ -39,12 +38,13 @@ import java.util.logging.Level;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 import static org.jackhuang.hmcl.ui.FXUtils.loadFXML;
+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;
 
 public class AddAuthlibInjectorServerPane extends StackPane implements DialogAware {
 
-    @FXML private StackPane addServerContainer;
+    @FXML private TransitionPane root;
     @FXML private Label lblServerUrl;
     @FXML private Label lblServerName;
     @FXML private Label lblCreationWarning;
@@ -55,8 +55,6 @@ public class AddAuthlibInjectorServerPane extends StackPane implements DialogAwa
     @FXML private SpinnerPane nextPane;
     @FXML private JFXButton btnAddNext;
 
-    private TransitionHandler transitionHandler;
-
     private AuthlibInjectorServer serverBeingAdded;
 
     public AddAuthlibInjectorServerPane(String url) {
@@ -67,11 +65,12 @@ public class AddAuthlibInjectorServerPane extends StackPane implements DialogAwa
 
     public AddAuthlibInjectorServerPane() {
         loadFXML(this, "/assets/fxml/authlib-injector-server-add.fxml");
-        transitionHandler = new TransitionHandler(addServerContainer);
-        transitionHandler.setContent(addServerPane, ContainerAnimations.NONE.getAnimationProducer());
+        root.setContent(addServerPane, ContainerAnimations.NONE.getAnimationProducer());
 
         btnAddNext.disableProperty().bind(txtServerUrl.textProperty().isEmpty());
         nextPane.hideSpinner();
+
+        onEscPressed(this, this::onAddCancel);
     }
 
     @Override
@@ -104,21 +103,20 @@ public class AddAuthlibInjectorServerPane extends StackPane implements DialogAwa
         nextPane.showSpinner();
         addServerPane.setDisable(true);
 
-        Task.of(() -> {
+        Task.runAsync(() -> {
             serverBeingAdded = AuthlibInjectorServer.locateServer(url);
-        }).finalized(Schedulers.javafx(), (variables, isDependentsSucceeded) -> {
+        }).whenComplete(Schedulers.javafx(), exception -> {
             addServerPane.setDisable(false);
             nextPane.hideSpinner();
 
-            if (isDependentsSucceeded) {
+            if (exception == null) {
                 lblServerName.setText(serverBeingAdded.getName());
                 lblServerUrl.setText(serverBeingAdded.getUrl());
 
                 lblServerWarning.setVisible("http".equals(NetworkUtils.toURL(serverBeingAdded.getUrl()).getProtocol()));
 
-                transitionHandler.setContent(confirmServerPane, ContainerAnimations.SWIPE_LEFT.getAnimationProducer());
+                root.setContent(confirmServerPane, ContainerAnimations.SWIPE_LEFT.getAnimationProducer());
             } else {
-                Exception exception = variables.get("lastException");
                 LOG.log(Level.WARNING, "Failed to resolve auth server: " + url, exception);
                 lblCreationWarning.setText(resolveFetchExceptionMessage(exception));
             }
@@ -128,7 +126,7 @@ public class AddAuthlibInjectorServerPane extends StackPane implements DialogAwa
 
     @FXML
     private void onAddPrev() {
-        transitionHandler.setContent(addServerPane, ContainerAnimations.SWIPE_RIGHT.getAnimationProducer());
+        root.setContent(addServerPane, ContainerAnimations.SWIPE_RIGHT.getAnimationProducer());
     }
 
     @FXML

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

@@ -1,67 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  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.account;
-
-import com.jfoenix.controls.JFXButton;
-import com.jfoenix.effects.JFXDepthManager;
-
-import javafx.beans.binding.Bindings;
-import javafx.geometry.Pos;
-import javafx.scene.control.Label;
-import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.VBox;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
-import org.jackhuang.hmcl.setting.Theme;
-import org.jackhuang.hmcl.ui.SVG;
-
-import java.util.function.Consumer;
-
-public final class AuthlibInjectorServerItem extends BorderPane {
-    private final AuthlibInjectorServer server;
-
-    private final Label lblServerName = new Label();
-    private final Label lblServerUrl = new Label();
-
-    public AuthlibInjectorServerItem(AuthlibInjectorServer server, Consumer<AuthlibInjectorServerItem> deleteCallback) {
-        this.server = server;
-
-        lblServerName.setStyle("-fx-font-size: 15;");
-        lblServerUrl.setStyle("-fx-font-size: 10;");
-
-        VBox center = new VBox();
-        BorderPane.setAlignment(center, Pos.CENTER);
-        center.getChildren().addAll(lblServerName, lblServerUrl);
-        setCenter(center);
-
-        JFXButton right = new JFXButton();
-        right.setOnMouseClicked(e -> deleteCallback.accept(this));
-        right.getStyleClass().add("toggle-icon4");
-        BorderPane.setAlignment(right, Pos.CENTER);
-        right.setGraphic(SVG.close(Theme.blackFillBinding(), 15, 15));
-        setRight(right);
-
-        setStyle("-fx-background-radius: 2; -fx-background-color: white; -fx-padding: 8;");
-        JFXDepthManager.setDepth(this, 1);
-        lblServerName.textProperty().bind(Bindings.createStringBinding(server::getName, server));
-        lblServerUrl.setText(server.getUrl());
-    }
-
-    public AuthlibInjectorServer getServer() {
-        return server;
-    }
-}

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

@@ -1,77 +0,0 @@
-/*
- * Hello Minecraft! Launcher
- * Copyright (C) 2019  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.account;
-
-import javafx.beans.binding.Bindings;
-import javafx.beans.property.ReadOnlyStringProperty;
-import javafx.beans.property.ReadOnlyStringWrapper;
-import javafx.collections.ObservableList;
-import javafx.fxml.FXML;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
-import org.jackhuang.hmcl.ui.Controllers;
-import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
-import org.jackhuang.hmcl.util.javafx.MappedObservableList;
-
-import static org.jackhuang.hmcl.setting.ConfigHolder.config;
-import static org.jackhuang.hmcl.ui.FXUtils.loadFXML;
-import static org.jackhuang.hmcl.ui.FXUtils.smoothScrolling;
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
-public class AuthlibInjectorServersPage extends StackPane implements DecoratorPage {
-    private final ReadOnlyStringWrapper title = new ReadOnlyStringWrapper(this, "title", i18n("account.injector.manage.title"));
-
-    @FXML private ScrollPane scrollPane;
-    @FXML private VBox listPane;
-    @FXML private StackPane contentPane;
-
-    private ObservableList<AuthlibInjectorServerItem> serverItems;
-
-    public AuthlibInjectorServersPage() {
-        loadFXML(this, "/assets/fxml/authlib-injector-servers.fxml");
-        smoothScrolling(scrollPane);
-
-        serverItems = MappedObservableList.create(config().getAuthlibInjectorServers(), this::createServerItem);
-        Bindings.bindContent(listPane.getChildren(), serverItems);
-    }
-
-    private AuthlibInjectorServerItem createServerItem(AuthlibInjectorServer server) {
-        return new AuthlibInjectorServerItem(server,
-                item -> config().getAuthlibInjectorServers().remove(item.getServer()));
-    }
-
-    @FXML
-    private void onAdd() {
-        Controllers.dialog(new AddAuthlibInjectorServerPane());
-    }
-
-    public String getTitle() {
-        return title.get();
-    }
-
-    @Override
-    public ReadOnlyStringProperty titleProperty() {
-        return title.getReadOnlyProperty();
-    }
-
-    public void setTitle(String title) {
-        this.title.set(title);
-    }
-}

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

@@ -0,0 +1,146 @@
+/*
+ * 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.ui.account;
+
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXDialogLayout;
+import com.jfoenix.controls.JFXPasswordField;
+import com.jfoenix.controls.JFXProgressBar;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.control.Label;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
+import org.jackhuang.hmcl.auth.AuthInfo;
+import org.jackhuang.hmcl.auth.ClassicAccount;
+import org.jackhuang.hmcl.auth.NoSelectedCharacterException;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
+import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
+import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilService;
+import org.jackhuang.hmcl.setting.Accounts;
+import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
+import org.jackhuang.hmcl.ui.construct.JFXHyperlink;
+import org.jackhuang.hmcl.ui.construct.RequiredValidator;
+
+import java.util.function.Consumer;
+import java.util.logging.Level;
+
+import static org.jackhuang.hmcl.ui.FXUtils.onEscPressed;
+import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+public class ClassicAccountLoginDialog extends StackPane {
+    private final ClassicAccount oldAccount;
+    private final Consumer<AuthInfo> success;
+    private final Runnable failed;
+
+    private final JFXPasswordField txtPassword;
+    private final Label lblCreationWarning = new Label();
+    private final JFXProgressBar progressBar;
+
+    public ClassicAccountLoginDialog(ClassicAccount oldAccount, Consumer<AuthInfo> success, Runnable failed) {
+        this.oldAccount = oldAccount;
+        this.success = success;
+        this.failed = failed;
+
+        progressBar = new JFXProgressBar();
+        StackPane.setAlignment(progressBar, Pos.TOP_CENTER);
+        progressBar.setVisible(false);
+
+        JFXDialogLayout dialogLayout = new JFXDialogLayout();
+
+        {
+            dialogLayout.setHeading(new Label(i18n("login.enter_password")));
+        }
+
+        {
+            VBox body = new VBox(15);
+            body.setPadding(new Insets(15, 0, 0, 0));
+
+            Label usernameLabel = new Label(oldAccount.getUsername());
+
+            txtPassword = new JFXPasswordField();
+            txtPassword.setOnAction(e -> onAccept());
+            txtPassword.getValidators().add(new RequiredValidator());
+            txtPassword.setLabelFloat(true);
+            txtPassword.setPromptText(i18n("account.password"));
+
+            body.getChildren().setAll(usernameLabel, txtPassword);
+
+            if (oldAccount instanceof YggdrasilAccount && !(oldAccount instanceof AuthlibInjectorAccount)) {
+                HBox linkPane = new HBox(8);
+                body.getChildren().add(linkPane);
+
+                JFXHyperlink migrationLink = new JFXHyperlink(i18n("account.methods.yggdrasil.migration"));
+                migrationLink.setOnAction(e -> FXUtils.openLink(YggdrasilService.PROFILE_URL));
+
+                JFXHyperlink migrationHowLink = new JFXHyperlink(i18n("account.methods.yggdrasil.migration.how"));
+                migrationHowLink.setOnAction(e -> FXUtils.openLink(YggdrasilService.MIGRATION_FAQ_URL));
+
+                linkPane.getChildren().setAll(migrationLink, migrationHowLink);
+            }
+
+            dialogLayout.setBody(body);
+        }
+
+        {
+            JFXButton acceptButton = new JFXButton(i18n("button.ok"));
+            acceptButton.setOnAction(e -> onAccept());
+            acceptButton.getStyleClass().add("dialog-accept");
+
+            JFXButton cancelButton = new JFXButton(i18n("button.cancel"));
+            cancelButton.setOnAction(e -> onCancel());
+            cancelButton.getStyleClass().add("dialog-cancel");
+
+            dialogLayout.setActions(lblCreationWarning, acceptButton, cancelButton);
+        }
+
+        getChildren().setAll(dialogLayout);
+
+        onEscPressed(this, this::onCancel);
+    }
+
+    private void onAccept() {
+        String password = txtPassword.getText();
+        progressBar.setVisible(true);
+        lblCreationWarning.setText("");
+        Task.supplyAsync(() -> oldAccount.logInWithPassword(password))
+                .whenComplete(Schedulers.javafx(), authInfo -> {
+                    success.accept(authInfo);
+                    fireEvent(new DialogCloseEvent());
+                    progressBar.setVisible(false);
+                }, e -> {
+                    LOG.log(Level.INFO, "Failed to login with password: " + oldAccount, e);
+                    if (e instanceof NoSelectedCharacterException) {
+                        fireEvent(new DialogCloseEvent());
+                    } else {
+                        lblCreationWarning.setText(Accounts.localizeErrorMessage(e));
+                    }
+                    progressBar.setVisible(false);
+                }).start();
+    }
+
+    private void onCancel() {
+        failed.run();
+        fireEvent(new DialogCloseEvent());
+    }
+}

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

@@ -0,0 +1,675 @@
+/*
+ * 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.ui.account;
+
+import com.jfoenix.controls.*;
+import com.jfoenix.validation.base.ValidatorBase;
+import javafx.application.Platform;
+import javafx.beans.NamedArg;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.geometry.HPos;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.Hyperlink;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextInputControl;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.*;
+import org.jackhuang.hmcl.auth.AccountFactory;
+import org.jackhuang.hmcl.auth.CharacterSelector;
+import org.jackhuang.hmcl.auth.NoSelectedCharacterException;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccountFactory;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
+import org.jackhuang.hmcl.auth.microsoft.MicrosoftAccountFactory;
+import org.jackhuang.hmcl.auth.offline.OfflineAccountFactory;
+import org.jackhuang.hmcl.auth.yggdrasil.GameProfile;
+import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccountFactory;
+import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilService;
+import org.jackhuang.hmcl.game.OAuthServer;
+import org.jackhuang.hmcl.game.TexturesLoader;
+import org.jackhuang.hmcl.setting.Accounts;
+import org.jackhuang.hmcl.setting.Theme;
+import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.task.TaskExecutor;
+import org.jackhuang.hmcl.ui.Controllers;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.SVG;
+import org.jackhuang.hmcl.ui.WeakListenerHolder;
+import org.jackhuang.hmcl.ui.construct.*;
+import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.gson.UUIDTypeAdapter;
+import org.jackhuang.hmcl.util.javafx.BindingMapping;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
+
+import static java.util.Collections.emptyList;
+import static java.util.Collections.unmodifiableList;
+import static javafx.beans.binding.Bindings.bindContent;
+import static javafx.beans.binding.Bindings.createBooleanBinding;
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
+import static org.jackhuang.hmcl.ui.FXUtils.*;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+import static org.jackhuang.hmcl.util.javafx.ExtendedProperties.classPropertyFor;
+
+public class CreateAccountPane extends JFXDialogLayout implements DialogAware {
+
+    private boolean showMethodSwitcher;
+    private AccountFactory<?> factory;
+
+    private final Label lblErrorMessage;
+    private final JFXButton btnAccept;
+    private final SpinnerPane spinner;
+    private final Node body;
+
+    private Node detailsPane; // AccountDetailsInputPane for Offline / Mojang / authlib-injector, Label for Microsoft
+    private final Pane detailsContainer;
+
+    private final BooleanProperty logging = new SimpleBooleanProperty();
+    private final ObjectProperty<OAuthServer.GrantDeviceCodeEvent> deviceCode = new SimpleObjectProperty<>();
+    private final WeakListenerHolder holder = new WeakListenerHolder();
+
+    private TaskExecutor loginTask;
+
+    public CreateAccountPane() {
+        this((AccountFactory<?>) null);
+    }
+
+    public CreateAccountPane(AccountFactory<?> factory) {
+        if (factory == null) {
+            showMethodSwitcher = true;
+            String preferred = config().getPreferredLoginType();
+            try {
+                factory = Accounts.getAccountFactory(preferred);
+            } catch (IllegalArgumentException e) {
+                factory = Accounts.FACTORY_OFFLINE;
+            }
+        } else {
+            showMethodSwitcher = false;
+        }
+        this.factory = factory;
+
+        {
+            String title;
+            if (showMethodSwitcher) {
+                title = "account.create";
+            } else {
+                title = "account.create." + Accounts.getLoginType(factory);
+            }
+            setHeading(new Label(i18n(title)));
+        }
+
+        {
+            lblErrorMessage = new Label();
+            lblErrorMessage.setWrapText(true);
+            lblErrorMessage.setMaxWidth(400);
+
+            btnAccept = new JFXButton(i18n("account.login"));
+            btnAccept.getStyleClass().add("dialog-accept");
+            btnAccept.setOnAction(e -> onAccept());
+
+            spinner = new SpinnerPane();
+            spinner.getStyleClass().add("small-spinner-pane");
+            spinner.setContent(btnAccept);
+
+            JFXButton btnCancel = new JFXButton(i18n("button.cancel"));
+            btnCancel.getStyleClass().add("dialog-cancel");
+            btnCancel.setOnAction(e -> onCancel());
+            onEscPressed(this, btnCancel::fire);
+
+            HBox hbox = new HBox(spinner, btnCancel);
+            hbox.setAlignment(Pos.CENTER_RIGHT);
+
+            setActions(lblErrorMessage, hbox);
+        }
+
+        if (showMethodSwitcher) {
+            TabControl.Tab<?>[] tabs = new TabControl.Tab[Accounts.FACTORIES.size()];
+            TabControl.Tab<?> selected = null;
+            for (int i = 0; i < tabs.length; i++) {
+                AccountFactory<?> f = Accounts.FACTORIES.get(i);
+                tabs[i] = new TabControl.Tab<>(Accounts.getLoginType(f), Accounts.getLocalizedLoginTypeName(f));
+                tabs[i].setUserData(f);
+                if (factory == f) {
+                    selected = tabs[i];
+                }
+            }
+
+            TabHeader tabHeader = new TabHeader(tabs);
+            tabHeader.getStyleClass().add("add-account-tab-header");
+            tabHeader.setMinWidth(USE_PREF_SIZE);
+            tabHeader.setMaxWidth(USE_PREF_SIZE);
+            tabHeader.getSelectionModel().select(selected);
+            onChange(tabHeader.getSelectionModel().selectedItemProperty(),
+                    newItem -> {
+                        if (newItem == null)
+                            return;
+                        AccountFactory<?> newMethod = (AccountFactory<?>) newItem.getUserData();
+                        config().setPreferredLoginType(Accounts.getLoginType(newMethod));
+                        this.factory = newMethod;
+                        initDetailsPane();
+                    });
+
+            detailsContainer = new StackPane();
+            detailsContainer.setPadding(new Insets(15, 0, 0, 0));
+
+            VBox boxBody = new VBox(tabHeader, detailsContainer);
+            boxBody.setAlignment(Pos.CENTER);
+            body = boxBody;
+            setBody(body);
+
+        } else {
+            detailsContainer = new StackPane();
+            detailsContainer.setPadding(new Insets(10, 0, 0, 0));
+            body = detailsContainer;
+            setBody(body);
+        }
+        initDetailsPane();
+
+        setPrefWidth(560);
+    }
+
+    public CreateAccountPane(AuthlibInjectorServer authserver) {
+        this(Accounts.FACTORY_AUTHLIB_INJECTOR);
+        ((AccountDetailsInputPane) detailsPane).selectAuthServer(authserver);
+    }
+
+    private void onAccept() {
+        spinner.showSpinner();
+        lblErrorMessage.setText("");
+
+        if (!(factory instanceof MicrosoftAccountFactory)) {
+            body.setDisable(true);
+        }
+
+        String username;
+        String password;
+        Object additionalData;
+        if (detailsPane instanceof AccountDetailsInputPane) {
+            AccountDetailsInputPane details = (AccountDetailsInputPane) detailsPane;
+            username = details.getUsername();
+            password = details.getPassword();
+            additionalData = details.getAdditionalData();
+        } else {
+            username = null;
+            password = null;
+            additionalData = null;
+        }
+
+        logging.set(true);
+        deviceCode.set(null);
+
+        loginTask = Task.supplyAsync(() -> factory.create(new DialogCharacterSelector(), username, password, null, additionalData))
+                .whenComplete(Schedulers.javafx(), account -> {
+                    int oldIndex = Accounts.getAccounts().indexOf(account);
+                    if (oldIndex == -1) {
+                        Accounts.getAccounts().add(account);
+                    } else {
+                        // adding an already-added account
+                        // instead of discarding the new account, we first remove the existing one then add the new one
+                        Accounts.getAccounts().remove(oldIndex);
+                        Accounts.getAccounts().add(oldIndex, account);
+                    }
+
+                    // select the new account
+                    Accounts.setSelectedAccount(account);
+
+                    spinner.hideSpinner();
+                    fireEvent(new DialogCloseEvent());
+                }, exception -> {
+                    if (exception instanceof NoSelectedCharacterException) {
+                        fireEvent(new DialogCloseEvent());
+                    } else {
+                        lblErrorMessage.setText(Accounts.localizeErrorMessage(exception));
+                    }
+                    body.setDisable(false);
+                    spinner.hideSpinner();
+                }).executor(true);
+    }
+
+    private void onCancel() {
+        if (loginTask != null) {
+            loginTask.cancel();
+        }
+        fireEvent(new DialogCloseEvent());
+    }
+
+    private void initDetailsPane() {
+        if (detailsPane != null) {
+            btnAccept.disableProperty().unbind();
+            detailsContainer.getChildren().remove(detailsPane);
+            lblErrorMessage.setText("");
+        }
+        if (factory == Accounts.FACTORY_MICROSOFT) {
+            VBox vbox = new VBox(8);
+            HintPane hintPane = new HintPane(MessageDialogPane.MessageType.INFO);
+            FXUtils.onChangeAndOperate(deviceCode, deviceCode -> {
+                if (deviceCode != null) {
+                    FXUtils.copyText(deviceCode.getUserCode());
+                    hintPane.setSegment(i18n("account.methods.microsoft.manual", deviceCode.getUserCode(), deviceCode.getVerificationUri()));
+                } else {
+                    hintPane.setSegment(i18n("account.methods.microsoft.hint"));
+                }
+            });
+            hintPane.setOnMouseClicked(e -> {
+                if (deviceCode.get() != null) {
+                    FXUtils.copyText(deviceCode.get().getUserCode());
+                }
+            });
+
+            holder.add(Accounts.OAUTH_CALLBACK.onGrantDeviceCode.registerWeak(value -> {
+                runInFX(() -> deviceCode.set(value));
+            }));
+
+            HBox box = new HBox(8);
+            JFXHyperlink birthLink = new JFXHyperlink(i18n("account.methods.microsoft.birth"));
+            birthLink.setOnAction(e -> FXUtils.openLink("https://support.microsoft.com/zh-cn/account-billing/如何更改-microsoft-帐户上的出生日期-837badbc-999e-54d2-2617-d19206b9540a"));
+            JFXHyperlink profileLink = new JFXHyperlink(i18n("account.methods.microsoft.profile"));
+            profileLink.setOnAction(e -> FXUtils.openLink("https://account.live.com/editprof.aspx"));
+            JFXHyperlink purchaseLink = new JFXHyperlink(i18n("account.methods.yggdrasil.purchase"));
+            purchaseLink.setOnAction(e -> FXUtils.openLink(YggdrasilService.PURCHASE_URL));
+            box.getChildren().setAll(profileLink, birthLink, purchaseLink);
+            GridPane.setColumnSpan(box, 2);
+
+            vbox.getChildren().setAll(hintPane, box);
+
+            detailsPane = vbox;
+            btnAccept.setDisable(false);
+        } else {
+            detailsPane = new AccountDetailsInputPane(factory, btnAccept::fire);
+            btnAccept.disableProperty().bind(((AccountDetailsInputPane) detailsPane).validProperty().not());
+        }
+        detailsContainer.getChildren().add(detailsPane);
+    }
+
+    private static class AccountDetailsInputPane extends GridPane {
+
+        // ==== authlib-injector hyperlinks ====
+        private static final String[] ALLOWED_LINKS = { "register" };
+
+        private static List<Hyperlink> createHyperlinks(AuthlibInjectorServer server) {
+            if (server == null) {
+                return emptyList();
+            }
+
+            Map<String, String> links = server.getLinks();
+            List<Hyperlink> result = new ArrayList<>();
+            for (String key : ALLOWED_LINKS) {
+                String value = links.get(key);
+                if (value != null) {
+                    Hyperlink link = new Hyperlink(i18n("account.injector.link." + key));
+                    FXUtils.installSlowTooltip(link, value);
+                    link.setOnAction(e -> FXUtils.openLink(value));
+                    result.add(link);
+                }
+            }
+            return unmodifiableList(result);
+        }
+        // =====
+
+        private AccountFactory<?> factory;
+        private @Nullable JFXComboBox<AuthlibInjectorServer> cboServers;
+        private @Nullable JFXTextField txtUsername;
+        private @Nullable JFXPasswordField txtPassword;
+        private @Nullable JFXTextField txtUUID;
+        private BooleanBinding valid;
+
+        public AccountDetailsInputPane(AccountFactory<?> factory, Runnable onAction) {
+            this.factory = factory;
+
+            setVgap(22);
+            setHgap(15);
+            setAlignment(Pos.CENTER);
+
+            ColumnConstraints col0 = new ColumnConstraints();
+            col0.setMinWidth(USE_PREF_SIZE);
+            getColumnConstraints().add(col0);
+            ColumnConstraints col1 = new ColumnConstraints();
+            col1.setHgrow(Priority.ALWAYS);
+            getColumnConstraints().add(col1);
+
+            int rowIndex = 0;
+
+            if (factory instanceof AuthlibInjectorAccountFactory) {
+                Label lblServers = new Label(i18n("account.injector.server"));
+                setHalignment(lblServers, HPos.LEFT);
+                add(lblServers, 0, rowIndex);
+
+                cboServers = new JFXComboBox<>();
+                cboServers.setCellFactory(jfxListCellFactory(server -> new TwoLineListItem(server.getName(), server.getUrl())));
+                cboServers.setConverter(stringConverter(AuthlibInjectorServer::getName));
+                bindContent(cboServers.getItems(), config().getAuthlibInjectorServers());
+                cboServers.getItems().addListener(onInvalidating(
+                        () -> Platform.runLater( // the selection will not be updated as expected if we call it immediately
+                                cboServers.getSelectionModel()::selectFirst)));
+                cboServers.getSelectionModel().selectFirst();
+                cboServers.setPromptText(i18n("account.injector.empty"));
+                BooleanBinding noServers = createBooleanBinding(cboServers.getItems()::isEmpty, cboServers.getItems());
+                classPropertyFor(cboServers, "jfx-combo-box-warning").bind(noServers);
+                classPropertyFor(cboServers, "jfx-combo-box").bind(noServers.not());
+                HBox.setHgrow(cboServers, Priority.ALWAYS);
+                HBox.setMargin(cboServers, new Insets(0, 10, 0, 0));
+                cboServers.setMaxWidth(Double.MAX_VALUE);
+
+                HBox linksContainer = new HBox();
+                linksContainer.setAlignment(Pos.CENTER);
+                onChangeAndOperate(cboServers.valueProperty(), server -> linksContainer.getChildren().setAll(createHyperlinks(server)));
+                linksContainer.setMinWidth(USE_PREF_SIZE);
+
+                JFXButton btnAddServer = new JFXButton();
+                btnAddServer.setGraphic(SVG.plus(Theme.blackFillBinding(), 20, 20));
+                btnAddServer.getStyleClass().add("toggle-icon4");
+                btnAddServer.setOnAction(e -> {
+                    Controllers.dialog(new AddAuthlibInjectorServerPane());
+                });
+
+                HBox boxServers = new HBox(cboServers, linksContainer, btnAddServer);
+                add(boxServers, 1, rowIndex);
+
+                rowIndex++;
+            }
+
+            if (factory.getLoginType().requiresUsername) {
+                Label lblUsername = new Label(i18n("account.username"));
+                setHalignment(lblUsername, HPos.LEFT);
+                add(lblUsername, 0, rowIndex);
+
+                txtUsername = new JFXTextField();
+                txtUsername.setValidators(
+                        new RequiredValidator(),
+                        new Validator(i18n("input.email"), username -> {
+                            if (requiresEmailAsUsername()) {
+                                return username.contains("@");
+                            } else {
+                                return true;
+                            }
+                        }));
+                setValidateWhileTextChanged(txtUsername, true);
+                txtUsername.setOnAction(e -> onAction.run());
+                add(txtUsername, 1, rowIndex);
+
+                rowIndex++;
+            }
+
+            if (factory.getLoginType().requiresPassword) {
+                Label lblPassword = new Label(i18n("account.password"));
+                setHalignment(lblPassword, HPos.LEFT);
+                add(lblPassword, 0, rowIndex);
+
+                txtPassword = new JFXPasswordField();
+                txtPassword.setValidators(new RequiredValidator());
+                setValidateWhileTextChanged(txtPassword, true);
+                txtPassword.setOnAction(e -> onAction.run());
+                add(txtPassword, 1, rowIndex);
+
+                rowIndex++;
+            }
+
+            if (factory instanceof YggdrasilAccountFactory) {
+                HBox box = new HBox();
+                GridPane.setColumnSpan(box, 2);
+
+                JFXHyperlink migrationLink = new JFXHyperlink(i18n("account.methods.yggdrasil.migration"));
+                migrationLink.setOnAction(e -> FXUtils.openLink(YggdrasilService.PROFILE_URL));
+
+                JFXHyperlink migrationHowLink = new JFXHyperlink(i18n("account.methods.yggdrasil.migration.how"));
+                migrationHowLink.setOnAction(e -> FXUtils.openLink(YggdrasilService.MIGRATION_FAQ_URL));
+
+                JFXHyperlink purchaseLink = new JFXHyperlink(i18n("account.methods.yggdrasil.purchase"));
+                purchaseLink.setOnAction(e -> FXUtils.openLink(YggdrasilService.PURCHASE_URL));
+
+                box.getChildren().setAll(migrationLink, migrationHowLink, purchaseLink);
+                add(box, 0, rowIndex);
+
+                rowIndex++;
+            }
+
+            if (factory instanceof OfflineAccountFactory) {
+                JFXHyperlink purchaseLink = new JFXHyperlink(i18n("account.methods.yggdrasil.purchase"));
+                purchaseLink.setOnAction(e -> FXUtils.openLink(YggdrasilService.PURCHASE_URL));
+                HBox linkPane = new HBox(purchaseLink);
+                GridPane.setColumnSpan(linkPane, 2);
+                add(linkPane, 0, rowIndex);
+
+                rowIndex++;
+
+                HBox box = new HBox();
+                MenuUpDownButton advancedButton = new MenuUpDownButton();
+                box.getChildren().setAll(advancedButton);
+                advancedButton.setText(i18n("settings.advanced"));
+                GridPane.setColumnSpan(box, 2);
+                add(box, 0, rowIndex);
+
+                rowIndex++;
+
+                Label lblUUID = new Label(i18n("account.methods.offline.uuid"));
+                lblUUID.managedProperty().bind(advancedButton.selectedProperty());
+                lblUUID.visibleProperty().bind(advancedButton.selectedProperty());
+                setHalignment(lblUUID, HPos.LEFT);
+                add(lblUUID, 0, rowIndex);
+
+                txtUUID = new JFXTextField();
+                txtUUID.managedProperty().bind(advancedButton.selectedProperty());
+                txtUUID.visibleProperty().bind(advancedButton.selectedProperty());
+                txtUUID.setValidators(new UUIDValidator());
+                txtUUID.promptTextProperty().bind(BindingMapping.of(txtUsername.textProperty()).map(name -> OfflineAccountFactory.getUUIDFromUserName(name).toString()));
+                txtUUID.setOnAction(e -> onAction.run());
+                add(txtUUID, 1, rowIndex);
+
+                rowIndex++;
+
+                HintPane hintPane = new HintPane(MessageDialogPane.MessageType.WARNING);
+                hintPane.managedProperty().bind(advancedButton.selectedProperty());
+                hintPane.visibleProperty().bind(advancedButton.selectedProperty());
+                hintPane.setText(i18n("account.methods.offline.uuid.hint"));
+                GridPane.setColumnSpan(hintPane, 2);
+                add(hintPane, 0, rowIndex);
+
+                rowIndex++;
+            }
+
+            valid = new BooleanBinding() {
+                {
+                    if (cboServers != null)
+                        bind(cboServers.valueProperty());
+                    if (txtUsername != null)
+                        bind(txtUsername.textProperty());
+                    if (txtPassword != null)
+                        bind(txtPassword.textProperty());
+                    if (txtUUID != null)
+                        bind(txtUUID.textProperty());
+                }
+
+                @Override
+                protected boolean computeValue() {
+                    if (cboServers != null && cboServers.getValue() == null)
+                        return false;
+                    if (txtUsername != null && !txtUsername.validate())
+                        return false;
+                    if (txtPassword != null && !txtPassword.validate())
+                        return false;
+                    if (txtUUID != null && !txtUUID.validate())
+                        return false;
+                    return true;
+                }
+            };
+        }
+
+        private boolean requiresEmailAsUsername() {
+            if (factory instanceof YggdrasilAccountFactory) {
+                return true;
+            } else if ((factory instanceof AuthlibInjectorAccountFactory) && cboServers != null) {
+                AuthlibInjectorServer server = cboServers.getValue();
+                if (server != null && !server.isNonEmailLogin()) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        public Object getAdditionalData() {
+            if (factory instanceof AuthlibInjectorAccountFactory) {
+                return getAuthServer();
+            } else if (factory instanceof OfflineAccountFactory) {
+                UUID uuid = txtUUID == null ? null : StringUtils.isBlank(txtUUID.getText()) ? null : UUIDTypeAdapter.fromString(txtUUID.getText());
+                return new OfflineAccountFactory.AdditionalData(uuid, null);
+            } else {
+                return null;
+            }
+        }
+
+        public @Nullable AuthlibInjectorServer getAuthServer() {
+            return cboServers == null ? null : cboServers.getValue();
+        }
+
+        public @Nullable String getUsername() {
+            return txtUsername == null ? null : txtUsername.getText();
+        }
+
+        public @Nullable String getPassword() {
+            return txtPassword == null ? null : txtPassword.getText();
+        }
+
+        public BooleanBinding validProperty() {
+            return valid;
+        }
+
+        public void selectAuthServer(AuthlibInjectorServer authserver) {
+            cboServers.getSelectionModel().select(authserver);
+        }
+
+        public void focus() {
+            if (txtUsername != null) {
+                txtUsername.requestFocus();
+            }
+        }
+    }
+
+    private static class DialogCharacterSelector extends BorderPane implements CharacterSelector {
+
+        private final AdvancedListBox listBox = new AdvancedListBox();
+        private final JFXButton cancel = new JFXButton();
+
+        private final CountDownLatch latch = new CountDownLatch(1);
+        private GameProfile selectedProfile = null;
+
+        public DialogCharacterSelector() {
+            setStyle("-fx-padding: 8px;");
+
+            cancel.setText(i18n("button.cancel"));
+            StackPane.setAlignment(cancel, Pos.BOTTOM_RIGHT);
+            cancel.setOnAction(e -> latch.countDown());
+
+            listBox.startCategory(i18n("account.choose"));
+
+            setCenter(listBox);
+
+            HBox hbox = new HBox();
+            hbox.setAlignment(Pos.CENTER_RIGHT);
+            hbox.getChildren().add(cancel);
+            setBottom(hbox);
+
+            onEscPressed(this, cancel::fire);
+        }
+
+        @Override
+        public GameProfile select(YggdrasilService service, List<GameProfile> profiles) throws NoSelectedCharacterException {
+            Platform.runLater(() -> {
+                for (GameProfile profile : profiles) {
+                    ImageView portraitView = new ImageView();
+                    portraitView.setSmooth(false);
+                    portraitView.imageProperty().bind(TexturesLoader.fxAvatarBinding(service, profile.getId(), 32));
+                    FXUtils.limitSize(portraitView, 32, 32);
+
+                    IconedItem accountItem = new IconedItem(portraitView, profile.getName());
+                    accountItem.setOnMouseClicked(e -> {
+                        selectedProfile = profile;
+                        latch.countDown();
+                    });
+                    listBox.add(accountItem);
+                }
+                Controllers.dialog(this);
+            });
+
+            try {
+                latch.await();
+
+                if (selectedProfile == null)
+                    throw new NoSelectedCharacterException();
+
+                return selectedProfile;
+            } catch (InterruptedException ignored) {
+                throw new NoSelectedCharacterException();
+            } finally {
+                Platform.runLater(() -> fireEvent(new DialogCloseEvent()));
+            }
+        }
+    }
+
+    @Override
+    public void onDialogShown() {
+        if (detailsPane instanceof AccountDetailsInputPane) {
+            ((AccountDetailsInputPane) detailsPane).focus();
+        }
+    }
+
+    private static class UUIDValidator extends ValidatorBase {
+
+        public UUIDValidator() {
+            this(i18n("account.methods.offline.uuid.malformed"));
+        }
+
+        public UUIDValidator(@NamedArg("message") String message) {
+            super(message);
+        }
+
+        @Override
+        protected void eval() {
+            if (srcControl.get() instanceof TextInputControl) {
+                evalTextInputField();
+            }
+        }
+
+        private void evalTextInputField() {
+            TextInputControl textField = ((TextInputControl) srcControl.get());
+            if (StringUtils.isBlank(textField.getText())) {
+                hasErrors.set(false);
+                return;
+            }
+
+            try {
+                UUIDTypeAdapter.fromString(textField.getText());
+                hasErrors.set(false);
+            } catch (IllegalArgumentException ignored) {
+                hasErrors.set(true);
+            }
+        }
+    }
+
+    private static final String MICROSOFT_ACCOUNT_EDIT_PROFILE_URL = "https://support.microsoft.com/zh-cn/account-billing/%E5%A6%82%E4%BD%95%E6%9B%B4%E6%94%B9-microsoft-%E5%B8%90%E6%88%B7%E4%B8%8A%E7%9A%84%E5%87%BA%E7%94%9F%E6%97%A5%E6%9C%9F-837badbc-999e-54d2-2617-d19206b9540a";
+}

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

@@ -0,0 +1,104 @@
+package org.jackhuang.hmcl.ui.account;
+
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.scene.control.Label;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.VBox;
+import org.jackhuang.hmcl.auth.AuthInfo;
+import org.jackhuang.hmcl.auth.OAuthAccount;
+import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilService;
+import org.jackhuang.hmcl.game.OAuthServer;
+import org.jackhuang.hmcl.setting.Accounts;
+import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.WeakListenerHolder;
+import org.jackhuang.hmcl.ui.construct.DialogPane;
+import org.jackhuang.hmcl.ui.construct.HintPane;
+import org.jackhuang.hmcl.ui.construct.JFXHyperlink;
+import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
+
+import java.util.function.Consumer;
+import java.util.logging.Level;
+
+import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+public class OAuthAccountLoginDialog extends DialogPane {
+    private final OAuthAccount account;
+    private final Consumer<AuthInfo> success;
+    private final Runnable failed;
+    private final ObjectProperty<OAuthServer.GrantDeviceCodeEvent> deviceCode = new SimpleObjectProperty<>();
+
+    private final WeakListenerHolder holder = new WeakListenerHolder();
+
+    public OAuthAccountLoginDialog(OAuthAccount account, Consumer<AuthInfo> success, Runnable failed) {
+        this.account = account;
+        this.success = success;
+        this.failed = failed;
+
+        setTitle(i18n("account.login.refresh"));
+
+        VBox vbox = new VBox(8);
+        Label usernameLabel = new Label(account.getUsername());
+
+        HintPane hintPane = new HintPane(MessageDialogPane.MessageType.INFO);
+        FXUtils.onChangeAndOperate(deviceCode, deviceCode -> {
+            if (deviceCode != null) {
+                FXUtils.copyText(deviceCode.getUserCode());
+                hintPane.setSegment(i18n("account.methods.microsoft.manual", deviceCode.getUserCode(), deviceCode.getVerificationUri()));
+            } else {
+                hintPane.setSegment(i18n("account.methods.microsoft.hint"));
+            }
+        });
+        hintPane.setOnMouseClicked(e -> {
+            if (deviceCode.get() != null) {
+                FXUtils.copyText(deviceCode.get().getUserCode());
+            }
+        });
+
+        HBox box = new HBox(8);
+        JFXHyperlink birthLink = new JFXHyperlink(i18n("account.methods.microsoft.birth"));
+        birthLink.setOnAction(e -> FXUtils.openLink("https://support.microsoft.com/zh-cn/account-billing/如何更改-microsoft-帐户上的出生日期-837badbc-999e-54d2-2617-d19206b9540a"));
+        JFXHyperlink profileLink = new JFXHyperlink(i18n("account.methods.microsoft.profile"));
+        profileLink.setOnAction(e -> FXUtils.openLink("https://account.live.com/editprof.aspx"));
+        JFXHyperlink purchaseLink = new JFXHyperlink(i18n("account.methods.yggdrasil.purchase"));
+        purchaseLink.setOnAction(e -> FXUtils.openLink(YggdrasilService.PURCHASE_URL));
+        box.getChildren().setAll(profileLink, birthLink, purchaseLink);
+        GridPane.setColumnSpan(box, 2);
+
+        vbox.getChildren().setAll(usernameLabel, hintPane, box);
+        setBody(vbox);
+
+        holder.add(Accounts.OAUTH_CALLBACK.onGrantDeviceCode.registerWeak(this::onGrantDeviceCode));
+    }
+
+    private void onGrantDeviceCode(OAuthServer.GrantDeviceCodeEvent event) {
+        FXUtils.runInFX(() -> {
+            deviceCode.set(event);
+        });
+    }
+
+    @Override
+    protected void onAccept() {
+        setLoading();
+        Task.supplyAsync(account::logInWhenCredentialsExpired)
+                .whenComplete(Schedulers.javafx(), (authInfo, exception) -> {
+                    if (exception == null) {
+                        success.accept(authInfo);
+                        onSuccess();
+                    } else {
+                        LOG.log(Level.INFO, "Failed to login when credentials expired: " + account, exception);
+                        onFailure(Accounts.localizeErrorMessage(exception));
+                    }
+                }).start();
+    }
+
+    @Override
+    protected void onCancel() {
+        failed.run();
+        super.onCancel();
+    }
+}

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

@@ -0,0 +1,211 @@
+/*
+ * 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.ui.account;
+
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXComboBox;
+import com.jfoenix.controls.JFXDialogLayout;
+import com.jfoenix.controls.JFXTextField;
+import javafx.application.Platform;
+import javafx.beans.InvalidationListener;
+import javafx.geometry.Insets;
+import javafx.scene.control.Label;
+import javafx.scene.image.Image;
+import javafx.scene.input.DragEvent;
+import javafx.scene.input.TransferMode;
+import javafx.scene.layout.*;
+import moe.mickey.minecraft.skin.fx.SkinCanvas;
+import moe.mickey.minecraft.skin.fx.animation.SkinAniRunning;
+import moe.mickey.minecraft.skin.fx.animation.SkinAniWavingArms;
+import org.jackhuang.hmcl.auth.offline.OfflineAccount;
+import org.jackhuang.hmcl.auth.offline.Skin;
+import org.jackhuang.hmcl.auth.yggdrasil.TextureModel;
+import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.ui.Controllers;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.construct.*;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.logging.Level;
+
+import static org.jackhuang.hmcl.ui.FXUtils.onEscPressed;
+import static org.jackhuang.hmcl.ui.FXUtils.stringConverter;
+import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+public class OfflineAccountSkinPane extends StackPane {
+    private final OfflineAccount account;
+
+    private final MultiFileItem<Skin.Type> skinItem = new MultiFileItem<>();
+    private final JFXTextField cslApiField = new JFXTextField();
+    private final JFXComboBox<TextureModel> modelCombobox = new JFXComboBox<>();
+    private final FileSelector skinSelector = new FileSelector();
+    private final FileSelector capeSelector = new FileSelector();
+
+    private final InvalidationListener skinBinding;
+
+    public OfflineAccountSkinPane(OfflineAccount account) {
+        this.account = account;
+
+        getStyleClass().add("skin-pane");
+
+        JFXDialogLayout layout = new JFXDialogLayout();
+        getChildren().setAll(layout);
+        layout.setHeading(new Label(i18n("account.skin")));
+
+        BorderPane pane = new BorderPane();
+
+        SkinCanvas canvas = new SkinCanvas(SkinCanvas.STEVE, 300, 300, true);
+        StackPane canvasPane = new StackPane(canvas);
+        canvasPane.setPrefWidth(300);
+        canvasPane.setPrefHeight(300);
+        pane.setCenter(canvas);
+        canvas.getAnimationplayer().addSkinAnimation(new SkinAniWavingArms(100, 2000, 7.5, canvas), new SkinAniRunning(100, 100, 30, canvas));
+        canvas.enableRotation(.5);
+
+        canvas.addEventHandler(DragEvent.DRAG_OVER, e -> {
+            if (e.getDragboard().hasFiles()) {
+                File file = e.getDragboard().getFiles().get(0);
+                if (file.getAbsolutePath().endsWith(".png"))
+                    e.acceptTransferModes(TransferMode.COPY);
+            }
+        });
+        canvas.addEventHandler(DragEvent.DRAG_DROPPED, e -> {
+            if (e.isAccepted()) {
+                File skin = e.getDragboard().getFiles().get(0);
+                Platform.runLater(() -> {
+                    skinSelector.setValue(skin.getAbsolutePath());
+                    skinItem.setSelectedData(Skin.Type.LOCAL_FILE);
+                });
+            }
+        });
+
+        StackPane skinOptionPane = new StackPane();
+        skinOptionPane.setMaxWidth(300);
+        VBox optionPane = new VBox(skinItem, skinOptionPane);
+        pane.setRight(optionPane);
+
+        layout.setBody(pane);
+
+        cslApiField.setPromptText(i18n("account.skin.type.csl_api.location.hint"));
+        cslApiField.setValidators(new URLValidator());
+
+        skinItem.loadChildren(Arrays.asList(
+                new MultiFileItem.Option<>(i18n("message.default"), Skin.Type.DEFAULT),
+                new MultiFileItem.Option<>("Steve", Skin.Type.STEVE),
+                new MultiFileItem.Option<>("Alex", Skin.Type.ALEX),
+                new MultiFileItem.Option<>(i18n("account.skin.type.local_file"), Skin.Type.LOCAL_FILE),
+                new MultiFileItem.Option<>("LittleSkin", Skin.Type.LITTLE_SKIN),
+                new MultiFileItem.Option<>(i18n("account.skin.type.csl_api"), Skin.Type.CUSTOM_SKIN_LOADER_API)
+        ));
+
+        modelCombobox.setConverter(stringConverter(model -> i18n("account.skin.model." + model.modelName)));
+        modelCombobox.getItems().setAll(TextureModel.STEVE, TextureModel.ALEX);
+
+        if (account.getSkin() == null) {
+            skinItem.setSelectedData(Skin.Type.DEFAULT);
+            modelCombobox.setValue(TextureModel.STEVE);
+        } else {
+            skinItem.setSelectedData(account.getSkin().getType());
+            cslApiField.setText(account.getSkin().getCslApi());
+            modelCombobox.setValue(account.getSkin().getTextureModel());
+            skinSelector.setValue(account.getSkin().getLocalSkinPath());
+            capeSelector.setValue(account.getSkin().getLocalCapePath());
+        }
+
+        skinBinding = FXUtils.observeWeak(() -> {
+            getSkin().load(account.getUsername())
+                    .whenComplete(Schedulers.javafx(), (result, exception) -> {
+                        if (exception != null) {
+                            LOG.log(Level.WARNING, "Failed to load skin", exception);
+                            Controllers.showToast(i18n("message.failed"));
+                        } else {
+                            if (result == null || result.getSkin() == null) {
+                                canvas.updateSkin(getDefaultTexture(), isDefaultSlim());
+                                return;
+                            }
+                            canvas.updateSkin(new Image(result.getSkin().getInputStream()), result.getModel() == TextureModel.ALEX);
+                        }
+                    }).start();
+        }, skinItem.selectedDataProperty(), cslApiField.textProperty(), skinSelector.valueProperty(), capeSelector.valueProperty());
+
+        FXUtils.onChangeAndOperate(skinItem.selectedDataProperty(), selectedData -> {
+            GridPane gridPane = new GridPane();
+            gridPane.setPadding(new Insets(0, 0, 0, 10));
+            gridPane.setHgap(16);
+            gridPane.setVgap(8);
+            gridPane.getColumnConstraints().setAll(new ColumnConstraints(), FXUtils.getColumnHgrowing());
+
+            switch (selectedData) {
+                case DEFAULT:
+                case STEVE:
+                case ALEX:
+                    break;
+                case LITTLE_SKIN:
+                    HintPane hint = new HintPane(MessageDialogPane.MessageType.INFO);
+                    hint.setText(i18n("account.skin.type.little_skin.hint"));
+                    gridPane.addRow(0, hint);
+                    break;
+                case LOCAL_FILE:
+                    gridPane.addRow(0, new Label(i18n("account.skin.model")), modelCombobox);
+                    gridPane.addRow(1, new Label(i18n("account.skin")), skinSelector);
+                    gridPane.addRow(2, new Label(i18n("account.cape")), capeSelector);
+                    break;
+                case CUSTOM_SKIN_LOADER_API:
+                    gridPane.addRow(0, new Label(i18n("account.skin.type.csl_api.location")), cslApiField);
+                    break;
+            }
+
+            skinOptionPane.getChildren().setAll(gridPane);
+        });
+
+        JFXButton acceptButton = new JFXButton(i18n("button.ok"));
+        acceptButton.getStyleClass().add("dialog-accept");
+        acceptButton.setOnAction(e -> {
+            account.setSkin(getSkin());
+            fireEvent(new DialogCloseEvent());
+        });
+
+        JFXHyperlink littleSkinLink = new JFXHyperlink(i18n("account.skin.type.little_skin"));
+        littleSkinLink.setOnAction(e -> FXUtils.openLink("https://mcskin.littleservice.cn/"));
+        JFXButton cancelButton = new JFXButton(i18n("button.cancel"));
+        cancelButton.getStyleClass().add("dialog-cancel");
+        cancelButton.setOnAction(e -> fireEvent(new DialogCloseEvent()));
+        onEscPressed(this, cancelButton::fire);
+
+        layout.setActions(littleSkinLink, acceptButton, cancelButton);
+    }
+
+    private Skin getSkin() {
+        return new Skin(skinItem.getSelectedData(), cslApiField.getText(), modelCombobox.getValue(), skinSelector.getValue(), capeSelector.getValue());
+    }
+
+    private boolean isDefaultSlim() {
+        return TextureModel.detectUUID(account.getUUID()) == TextureModel.ALEX;
+    }
+
+    private Image getDefaultTexture() {
+        if (isDefaultSlim()) {
+            return SkinCanvas.ALEX;
+        } else {
+            return SkinCanvas.STEVE;
+        }
+    }
+
+}

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -23,7 +23,10 @@ import javafx.util.Duration;
 
 public interface AnimationHandler {
     Duration getDuration();
+
     Pane getCurrentRoot();
+
     Node getPreviousNode();
+
     Node getCurrentNode();
 }

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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,6 +18,7 @@
 package org.jackhuang.hmcl.ui.animation;
 
 import javafx.animation.KeyFrame;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
@@ -25,4 +26,6 @@ public interface AnimationProducer {
     void init(AnimationHandler handler);
 
     List<KeyFrame> animate(AnimationHandler handler);
+
+    @Nullable AnimationProducer opposite();
 }

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -21,6 +21,8 @@ import javafx.animation.Interpolator;
 import javafx.animation.KeyFrame;
 import javafx.animation.KeyValue;
 import javafx.util.Duration;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -41,6 +43,7 @@ public enum ContainerAnimations {
         c.getCurrentNode().setScaleY(1);
         c.getCurrentNode().setOpacity(1);
     }, c -> Collections.emptyList()),
+
     /**
      * A fade between the old and new view
      */
@@ -62,6 +65,36 @@ public enum ContainerAnimations {
                     new KeyFrame(c.getDuration(),
                             new KeyValue(c.getPreviousNode().opacityProperty(), 0, Interpolator.EASE_BOTH),
                             new KeyValue(c.getCurrentNode().opacityProperty(), 1, Interpolator.EASE_BOTH)))),
+
+    /**
+     * A fade between the old and new view
+     */
+    FADE_IN(c -> {
+        c.getCurrentNode().setTranslateX(0);
+        c.getCurrentNode().setTranslateY(0);
+        c.getCurrentNode().setScaleX(1);
+        c.getCurrentNode().setScaleY(1);
+        c.getCurrentNode().setOpacity(0);
+    }, c ->
+            Arrays.asList(new KeyFrame(Duration.ZERO,
+                            new KeyValue(c.getCurrentNode().opacityProperty(), 0, FXUtils.SINE)),
+                    new KeyFrame(c.getDuration(),
+                            new KeyValue(c.getCurrentNode().opacityProperty(), 1, FXUtils.SINE)))),
+
+    /**
+     * A fade between the old and new view
+     */
+    FADE_OUT(c -> {
+        c.getCurrentNode().setTranslateX(0);
+        c.getCurrentNode().setTranslateY(0);
+        c.getCurrentNode().setScaleX(1);
+        c.getCurrentNode().setScaleY(1);
+        c.getCurrentNode().setOpacity(1);
+    }, c ->
+            Arrays.asList(new KeyFrame(Duration.ZERO,
+                            new KeyValue(c.getCurrentNode().opacityProperty(), 1, FXUtils.SINE)),
+                    new KeyFrame(c.getDuration(),
+                            new KeyValue(c.getCurrentNode().opacityProperty(), 0, FXUtils.SINE)))),
     /**
      * A zoom effect
      */
@@ -140,9 +173,52 @@ public enum ContainerAnimations {
                             new KeyValue(c.getPreviousNode().translateXProperty(), 0, Interpolator.EASE_BOTH)),
                     new KeyFrame(c.getDuration(),
                             new KeyValue(c.getCurrentNode().translateXProperty(), 0, Interpolator.EASE_BOTH),
-                            new KeyValue(c.getPreviousNode().translateXProperty(), c.getCurrentRoot().getWidth(), Interpolator.EASE_BOTH))));
+                            new KeyValue(c.getPreviousNode().translateXProperty(), c.getCurrentRoot().getWidth(), Interpolator.EASE_BOTH)))),
+
+    SWIPE_LEFT_FADE_SHORT(c -> {
+        c.getPreviousNode().setScaleX(1);
+        c.getPreviousNode().setScaleY(1);
+        c.getPreviousNode().setOpacity(0);
+        c.getPreviousNode().setTranslateX(0);
+        c.getCurrentNode().setScaleX(1);
+        c.getCurrentNode().setScaleY(1);
+        c.getCurrentNode().setOpacity(1);
+        c.getCurrentNode().setTranslateX(c.getCurrentRoot().getWidth());
+    }, c ->
+            Arrays.asList(new KeyFrame(Duration.ZERO,
+                            new KeyValue(c.getCurrentNode().translateXProperty(), 50, Interpolator.EASE_BOTH),
+                            new KeyValue(c.getPreviousNode().translateXProperty(), 0, Interpolator.EASE_BOTH),
+                            new KeyValue(c.getCurrentNode().opacityProperty(), 0, Interpolator.EASE_BOTH),
+                            new KeyValue(c.getPreviousNode().opacityProperty(), 1, Interpolator.EASE_BOTH)),
+                    new KeyFrame(c.getDuration(),
+                            new KeyValue(c.getCurrentNode().translateXProperty(), 0, Interpolator.EASE_BOTH),
+                            new KeyValue(c.getPreviousNode().translateXProperty(), -50, Interpolator.EASE_BOTH),
+                            new KeyValue(c.getCurrentNode().opacityProperty(), 1, Interpolator.EASE_BOTH),
+                            new KeyValue(c.getPreviousNode().opacityProperty(), 0, Interpolator.EASE_BOTH)))),
+
+    SWIPE_RIGHT_FADE_SHORT(c -> {
+        c.getPreviousNode().setScaleX(1);
+        c.getPreviousNode().setScaleY(1);
+        c.getPreviousNode().setOpacity(0);
+        c.getPreviousNode().setTranslateX(0);
+        c.getCurrentNode().setScaleX(1);
+        c.getCurrentNode().setScaleY(1);
+        c.getCurrentNode().setOpacity(1);
+        c.getCurrentNode().setTranslateX(c.getCurrentRoot().getWidth());
+    }, c ->
+            Arrays.asList(new KeyFrame(Duration.ZERO,
+                            new KeyValue(c.getCurrentNode().translateXProperty(), -50, Interpolator.EASE_BOTH),
+                            new KeyValue(c.getPreviousNode().translateXProperty(), 0, Interpolator.EASE_BOTH),
+                            new KeyValue(c.getCurrentNode().opacityProperty(), 0, Interpolator.EASE_BOTH),
+                            new KeyValue(c.getPreviousNode().opacityProperty(), 1, Interpolator.EASE_BOTH)),
+                    new KeyFrame(c.getDuration(),
+                            new KeyValue(c.getCurrentNode().translateXProperty(), 0, Interpolator.EASE_BOTH),
+                            new KeyValue(c.getPreviousNode().translateXProperty(), 50, Interpolator.EASE_BOTH),
+                            new KeyValue(c.getCurrentNode().opacityProperty(), 1, Interpolator.EASE_BOTH),
+                            new KeyValue(c.getPreviousNode().opacityProperty(), 0, Interpolator.EASE_BOTH))));
 
     private final AnimationProducer animationProducer;
+    private ContainerAnimations opposite;
 
     ContainerAnimations(Consumer<AnimationHandler> init, Function<AnimationHandler, List<KeyFrame>> animationProducer) {
         this.animationProducer = new AnimationProducer() {
@@ -155,10 +231,30 @@ public enum ContainerAnimations {
             public List<KeyFrame> animate(AnimationHandler handler) {
                 return animationProducer.apply(handler);
             }
+
+            @Override
+            public @Nullable AnimationProducer opposite() {
+                return opposite != null ? opposite.getAnimationProducer() : null;
+            }
         };
     }
 
     public AnimationProducer getAnimationProducer() {
         return animationProducer;
     }
+
+    public ContainerAnimations getOpposite() {
+        return opposite;
+    }
+
+    static {
+        NONE.opposite = NONE;
+        FADE.opposite = FADE;
+        SWIPE_LEFT.opposite = SWIPE_RIGHT;
+        SWIPE_RIGHT.opposite = SWIPE_LEFT;
+        FADE_IN.opposite = FADE_OUT;
+        FADE_OUT.opposite = FADE_IN;
+        ZOOM_IN.opposite = ZOOM_OUT;
+        ZOOM_OUT.opposite = ZOOM_IN;
+    }
 }

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -21,29 +21,17 @@ import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
 import javafx.application.Platform;
 import javafx.scene.Node;
-import javafx.scene.Parent;
 import javafx.scene.layout.StackPane;
-import javafx.scene.shape.Rectangle;
 import javafx.util.Duration;
+import org.jackhuang.hmcl.ui.FXUtils;
 
-public final class TransitionHandler implements AnimationHandler {
-    private final StackPane view;
-    private Timeline animation;
+public class TransitionPane extends StackPane implements AnimationHandler {
     private Duration duration;
     private Node previousNode, currentNode;
 
-    /**
-     * @param view A stack pane that contains another control that is {@link Parent}
-     */
-    public TransitionHandler(StackPane view) {
-        this.view = view;
-        currentNode = view.getChildren().stream().findFirst().orElse(null);
-
-        // prevent content overflow
-        Rectangle clip = new Rectangle();
-        clip.widthProperty().bind(view.widthProperty());
-        clip.heightProperty().bind(view.heightProperty());
-        view.setClip(clip);
+    {
+        currentNode = getChildren().stream().findFirst().orElse(null);
+        FXUtils.setOverflowHidden(this);
     }
 
     @Override
@@ -58,7 +46,7 @@ public final class TransitionHandler implements AnimationHandler {
 
     @Override
     public StackPane getCurrentRoot() {
-        return view;
+        return this;
     }
 
     @Override
@@ -67,35 +55,36 @@ public final class TransitionHandler implements AnimationHandler {
     }
 
     public void setContent(Node newView, AnimationProducer transition) {
-        setContent(newView, transition, Duration.millis(320));
+        setContent(newView, transition, Duration.millis(160));
     }
 
     public void setContent(Node newView, AnimationProducer transition, Duration duration) {
         this.duration = duration;
 
-        Timeline prev = animation;
-        if (prev != null)
-            prev.stop();
-
         updateContent(newView);
 
+        if (previousNode == EMPTY_PANE) {
+            setMouseTransparent(false);
+            getChildren().setAll(newView);
+            return;
+        }
+
         transition.init(this);
 
         // runLater or "init" will not work
         Platform.runLater(() -> {
-            Timeline nowAnimation = new Timeline();
-            nowAnimation.getKeyFrames().addAll(transition.animate(this));
-            nowAnimation.getKeyFrames().add(new KeyFrame(duration, e -> {
-                view.setMouseTransparent(false);
-                view.getChildren().remove(previousNode);
+            Timeline newAnimation = new Timeline();
+            newAnimation.getKeyFrames().addAll(transition.animate(this));
+            newAnimation.getKeyFrames().add(new KeyFrame(duration, e -> {
+                setMouseTransparent(false);
+                getChildren().remove(previousNode);
             }));
-            nowAnimation.play();
-            animation = nowAnimation;
+            FXUtils.playAnimation(this, "transition_pane", newAnimation);
         });
     }
 
     private void updateContent(Node newView) {
-        if (view.getWidth() > 0 && view.getHeight() > 0) {
+        if (getWidth() > 0 && getHeight() > 0) {
             previousNode = currentNode;
             if (previousNode == null)
                 previousNode = EMPTY_PANE;
@@ -105,12 +94,15 @@ public final class TransitionHandler implements AnimationHandler {
         if (previousNode == newView)
             previousNode = EMPTY_PANE;
 
-        view.setMouseTransparent(true);
+        setMouseTransparent(true);
 
         currentNode = newView;
 
-        view.getChildren().setAll(previousNode, currentNode);
+        getChildren().setAll(previousNode, currentNode);
     }
 
-    private final StackPane EMPTY_PANE = new StackPane();
+    private final EmptyPane EMPTY_PANE = new EmptyPane();
+
+    public static class EmptyPane extends StackPane {
+    }
 }

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -19,67 +19,76 @@ package org.jackhuang.hmcl.ui.construct;
 
 import javafx.collections.ObservableList;
 import javafx.scene.Node;
-import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
-import org.jackhuang.hmcl.ui.FXUtils;
 
-public class AdvancedListBox extends ScrollPane {
-    private final VBox container = new VBox();
+import java.util.function.Consumer;
+
+public class AdvancedListBox extends VBox {
 
     {
-        setContent(container);
-
-        FXUtils.smoothScrolling(this);
-
-        setFitToHeight(true);
-        setFitToWidth(true);
-        setHbarPolicy(ScrollBarPolicy.NEVER);
-
-        container.setSpacing(5);
-        container.getStyleClass().add("advanced-list-box-content");
+        getStyleClass().add("advanced-list-box-content");
     }
 
     public AdvancedListBox add(Node child) {
         if (child instanceof Pane || child instanceof AdvancedListItem)
-            container.getChildren().add(child);
+            getChildren().add(child);
         else {
             StackPane pane = new StackPane();
             pane.getStyleClass().add("advanced-list-box-item");
             pane.getChildren().setAll(child);
-            container.getChildren().add(pane);
+            getChildren().add(pane);
+        }
+        return this;
+    }
+
+    public AdvancedListBox addNavigationDrawerItem(Consumer<AdvancedListItem> fn) {
+        AdvancedListItem item = new AdvancedListItem();
+        item.getStyleClass().add("navigation-drawer-item");
+        item.setActionButtonVisible(false);
+        fn.accept(item);
+        return add(item);
+    }
+
+    public AdvancedListBox add(int index, Node child) {
+        if (child instanceof Pane || child instanceof AdvancedListItem)
+            getChildren().add(index, child);
+        else {
+            StackPane pane = new StackPane();
+            pane.getStyleClass().add("advanced-list-box-item");
+            pane.getChildren().setAll(child);
+            getChildren().add(index, pane);
         }
         return this;
     }
 
     public AdvancedListBox remove(Node child) {
-        if (child instanceof Pane)
-            container.getChildren().remove(child);
-        else {
-            StackPane pane = null;
-            for (Node node : container.getChildren())
+        getChildren().remove(indexOf(child));
+        return this;
+    }
+
+    public int indexOf(Node child) {
+        if (child instanceof Pane) {
+            return getChildren().indexOf(child);
+        } else {
+            for (int i = 0; i < getChildren().size(); ++i) {
+                Node node = getChildren().get(i);
                 if (node instanceof StackPane) {
                     ObservableList<Node> list = ((StackPane) node).getChildren();
                     if (list.size() == 1 && list.get(0) == child)
-                        pane = (StackPane) node;
+                        return i;
                 }
-            if (pane == null)
-                throw new Error();
-            container.getChildren().remove(pane);
+            }
+            return -1;
         }
-        return this;
     }
 
     public AdvancedListBox startCategory(String category) {
         return add(new ClassTitle(category));
     }
 
-    public void setSpacing(double spacing) {
-        container.setSpacing(spacing);
-    }
-
     public void clear() {
-        container.getChildren().clear();
+        getChildren().clear();
     }
 }

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -24,29 +24,37 @@ import javafx.scene.Node;
 import javafx.scene.control.Control;
 import javafx.scene.control.Skin;
 import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
 import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.StackPane;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.util.Pair;
+
+import static org.jackhuang.hmcl.util.Pair.pair;
 
 public class AdvancedListItem extends Control {
-    private final ObjectProperty<Image> image = new SimpleObjectProperty<>(this, "image");
+    private final ObjectProperty<Node> leftGraphic = new SimpleObjectProperty<>(this, "leftGraphic");
     private final ObjectProperty<Node> rightGraphic = new SimpleObjectProperty<>(this, "rightGraphic");
     private final StringProperty title = new SimpleStringProperty(this, "title");
+    private final BooleanProperty active = new SimpleBooleanProperty(this, "active");
     private final StringProperty subtitle = new SimpleStringProperty(this, "subtitle");
     private final BooleanProperty actionButtonVisible = new SimpleBooleanProperty(this, "actionButtonVisible", true);
 
     public AdvancedListItem() {
+        getStyleClass().add("advanced-list-item");
         addEventHandler(MouseEvent.MOUSE_CLICKED, e -> fireEvent(new ActionEvent()));
     }
 
-    public Image getImage() {
-        return image.get();
+    public Node getLeftGraphic() {
+        return leftGraphic.get();
     }
 
-    public ObjectProperty<Image> imageProperty() {
-        return image;
+    public ObjectProperty<Node> leftGraphicProperty() {
+        return leftGraphic;
     }
 
-    public void setImage(Image image) {
-        this.image.set(image);
+    public void setLeftGraphic(Node leftGraphic) {
+        this.leftGraphic.set(leftGraphic);
     }
 
     public Node getRightGraphic() {
@@ -73,6 +81,18 @@ public class AdvancedListItem extends Control {
         this.title.set(title);
     }
 
+    public boolean isActive() {
+        return active.get();
+    }
+
+    public BooleanProperty activeProperty() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active.set(active);
+    }
+
     public String getSubtitle() {
         return subtitle.get();
     }
@@ -120,4 +140,21 @@ public class AdvancedListItem extends Control {
     protected Skin<?> createDefaultSkin() {
         return new AdvancedListItemSkin(this);
     }
+
+    public static Pair<Node, ImageView> createImageView(Image image) {
+        return createImageView(image, 32, 32);
+    }
+
+    public static Pair<Node, ImageView> createImageView(Image image, double width, double height) {
+        StackPane imageViewContainer = new StackPane();
+        FXUtils.setLimitWidth(imageViewContainer, width);
+        FXUtils.setLimitHeight(imageViewContainer, height);
+
+        ImageView imageView = new ImageView();
+        FXUtils.limitSize(imageView, width, height);
+        imageView.setPreserveRatio(true);
+        imageView.setImage(image);
+        imageViewContainer.getChildren().setAll(imageView);
+        return pair(imageViewContainer, imageView);
+    }
 }

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2019  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
@@ -17,72 +17,50 @@
  */
 package org.jackhuang.hmcl.ui.construct;
 
-import javafx.geometry.Insets;
+import javafx.css.PseudoClass;
 import javafx.geometry.Pos;
-import javafx.scene.control.Label;
 import javafx.scene.control.SkinBase;
-import javafx.scene.image.ImageView;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
-import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
-import javafx.scene.text.TextAlignment;
 import org.jackhuang.hmcl.ui.FXUtils;
 
 public class AdvancedListItemSkin extends SkinBase<AdvancedListItem> {
+    private final PseudoClass SELECTED = PseudoClass.getPseudoClass("selected");
 
     public AdvancedListItemSkin(AdvancedListItem skinnable) {
         super(skinnable);
 
-        StackPane stackPane = new StackPane();
-        RipplerContainer container = new RipplerContainer(stackPane);
-
-        BorderPane root = new BorderPane();
-        root.setPickOnBounds(false);
-
-        HBox left = new HBox();
-        left.setAlignment(Pos.CENTER);
-        left.setMouseTransparent(true);
-
-        StackPane imageViewContainer = new StackPane();
-        FXUtils.setLimitWidth(imageViewContainer, 32);
-        FXUtils.setLimitHeight(imageViewContainer, 32);
-
-        ImageView imageView = new ImageView();
-        FXUtils.limitSize(imageView, 32, 32);
-        imageView.setPreserveRatio(true);
-        imageView.imageProperty().bind(skinnable.imageProperty());
-        imageViewContainer.getChildren().setAll(imageView);
-
-        VBox vbox = new VBox();
-        vbox.setAlignment(Pos.CENTER_LEFT);
-        vbox.setPadding(new Insets(0, 0, 0, 10));
-
-        Label title = new Label();
-        title.textProperty().bind(skinnable.titleProperty());
-        title.setMaxWidth(90);
-        title.setStyle("-fx-font-size: 15;");
-        title.setTextAlignment(TextAlignment.JUSTIFY);
-        vbox.getChildren().add(title);
-
-        Label subtitle = new Label();
-        subtitle.textProperty().bind(skinnable.subtitleProperty());
-        subtitle.setMaxWidth(90);
-        subtitle.setStyle("-fx-font-size: 10;");
-        subtitle.setTextAlignment(TextAlignment.JUSTIFY);
-        vbox.getChildren().add(subtitle);
-
-        FXUtils.onChangeAndOperate(skinnable.subtitleProperty(), subtitleString -> {
-            if (subtitleString == null) vbox.getChildren().setAll(title);
-            else vbox.getChildren().setAll(title, subtitle);
+        FXUtils.onChangeAndOperate(skinnable.activeProperty(), active -> {
+            skinnable.pseudoClassStateChanged(SELECTED, active);
         });
 
-        left.getChildren().setAll(imageViewContainer, vbox);
+        BorderPane root = new BorderPane();
+        root.getStyleClass().add("container");
+        root.setPickOnBounds(false);
+
+        RipplerContainer container = new RipplerContainer(root);
+
+        HBox left = new HBox();
+        left.setMouseTransparent(true);
+
+        TwoLineListItem item = new TwoLineListItem();
+        root.setCenter(item);
+        item.setMouseTransparent(true);
+        item.titleProperty().bind(skinnable.titleProperty());
+        item.subtitleProperty().bind(skinnable.subtitleProperty());
+
+        FXUtils.onChangeAndOperate(skinnable.leftGraphicProperty(),
+                newGraphic -> {
+                    if (newGraphic == null) {
+                        left.getChildren().clear();
+                    } else {
+                        left.getChildren().setAll(newGraphic);
+                    }
+                });
         root.setLeft(left);
 
         HBox right = new HBox();
         right.setAlignment(Pos.CENTER);
-        right.setMouseTransparent(true);
         right.getStyleClass().add("toggle-icon4");
         FXUtils.setLimitWidth(right, 40);
         FXUtils.onChangeAndOperate(skinnable.rightGraphicProperty(),
@@ -93,16 +71,10 @@ public class AdvancedListItemSkin extends SkinBase<AdvancedListItem> {
                         right.getChildren().setAll(newGraphic);
                     }
                 });
-        root.setRight(right);
 
         FXUtils.onChangeAndOperate(skinnable.actionButtonVisibleProperty(),
                 visible -> root.setRight(visible ? right : null));
 
-        stackPane.setStyle("-fx-padding: 10 16 10 16;");
-        stackPane.getStyleClass().add("transparent");
-        stackPane.setPickOnBounds(false);
-        stackPane.getChildren().setAll(root);
-
         getChildren().setAll(container);
     }
 }

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

@@ -0,0 +1,37 @@
+/*
+ * 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.ui.construct;
+
+import javafx.scene.control.Label;
+import javafx.scene.layout.VBox;
+import javafx.scene.text.TextFlow;
+import org.jackhuang.hmcl.ui.Controllers;
+import org.jackhuang.hmcl.ui.FXUtils;
+
+public class AnnouncementCard extends VBox {
+
+    public AnnouncementCard(String title, String content) {
+        TextFlow tf = FXUtils.segmentToTextFlow(content, Controllers::onHyperlinkAction);
+
+        Label label = new Label(title);
+        label.getStyleClass().add("title");
+        getChildren().setAll(label, tf);
+        setSpacing(14);
+        getStyleClass().addAll("card", "announcement");
+    }
+}