fix: test.

It seems that the current translation was largely done by Google Translation, so I did some work to improve it.

Some translations can definitely be improved, but I don't have much time at the moment so I will leave it for now.

Co-authored-by: Yuhui Huang <i@huangyuhui.net>

.github/ISSUE_TEMPLATE.md

@@ -1,29 +0,0 @@
-# 公告
-
-提交前请确保你的启动器版本是**最新的开发版**，可以在启动器设置中更换更新通道至开发版获取更新。
-
-**如果你在阅读完本公告后仍然希望在此处发布 issue，请将公告内容删去，并按照下面的模板填入相关信息。**
-
-
-
-我们发现，对于不经常检查邮箱的人来说，GitHub Issues 的反馈效率太低，时隔几个小时甚至一天的情况很多。
-为了改善反馈效率，并将积极为 HMCL 提供问题反馈和建议的人聚集起来，我们希望在这里反馈的人可以在 [Discord频道](https://discord.gg/jVvC7HfM6U)  [开黑啦频道](https://kaihei.co/Kx7n3t) 中反馈信息，**而不在 GitHub Issues 中反馈问题**。
-
-如果你希望在 QQ 群中反馈问题，请[赞助 HMCL](https://afdian.net/@huanghongxun) 后申请加入群聊，也请将下面的信息表填好直接发在群中，加快我们的沟通速度。
-
-
-
-# 问题提交
-
-*完整地填下面的问题提交表对我们很重要，这可以加快我们分析问题原因的速度。*
-
-* 启动器版本：
-* 操作系统：
-* Java 版本：
-* 错误截图（最好请将整个电脑屏幕的截图发上来）：
-* 游戏版本（如果是启动通过启动器自带的自动安装功能安装的游戏）：
-* 对游戏做的修改（是否自行通过安装器安装 Rift 等 API，以及 mod）：
-* 游戏崩溃报告（如果有）：
-* 启动器崩溃报告（如果有）：
-* 启动器日志文件（出现问题后点击启动器设置中的【导出启动器日志】按钮）：
-* 问题描述（如何触发问题）：

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -0,0 +1,69 @@
+name: Bug Feedback
+description: 
+  反馈一个 Bug。为了提高反馈效率，请优先在开黑啦或者或 Discord 频道中反馈。若确认是 HMCL 问题，请发布 issue。
+body:
+  - type: markdown
+    attributes:
+      value: |
+        提交前请确保你的启动器版本是**最新的开发版**，可以在启动器设置中更换更新通道至开发版获取更新。
+    
+        我们发现，对于不经常检查邮箱的人来说，GitHub Issues 的反馈效率太低，时隔几个小时甚至一天的情况很多。
+        为了改善反馈效率，并将积极为 HMCL 提供问题反馈和建议的人聚集起来，我们希望在这里反馈的人可以在 [开黑啦频道](https://kaihei.co/Kx7n3t)
+        或 [Discord 频道](https://discord.gg/jVvC7HfM6U)中反馈信息，**而不在 GitHub Issues 中反馈问题**。
+
+        如果你希望在 QQ 群中反馈问题，请[赞助 HMCL](https://afdian.net/@huanghongxun) 后申请加入群聊，也请将下面的信息表填好直接发在群中，加快我们的沟通速度。
+  - type: input
+    id: hmcl-version
+    attributes:
+      label: 启动器版本 Launcher Version
+      description: 请输入您所使用的的 HMCL 启动器版本。 Please enter the HMCL launcher version you are using. 
+      placeholder: e.g. 3.5.2.218
+    validations:
+      required: true
+  - type: input
+    id: platform
+    attributes:
+      label: 平台 Platform 
+      description: 请输入您遇到 BUG 的平台。 Please enter the platform on which you encountered the bug. 
+      placeholder: e.g. Windows 11
+    validations:
+      required: true
+  - type: input
+    id: java-version
+    attributes:
+      label: Java
+      description: 请输入您所使用的 Java 的名称与版本。 Please enter the name and version of Java you are using. 
+      placeholder: e.g. LibericaJDK Full JDK 17.0.1
+  - type: input
+    id: game-version
+    attributes:
+      label: 游戏版本 Game Version
+      description: 如果您是在启动通过 HMCL 启动器自动下载的游戏时遇到了问题，请输入您所启动的游戏版本。If you are having trouble launching a game that was automatically downloaded through the HMCL launcher, please enter the version of the game you are launching.
+      placeholder: e.g. 1.17.1 
+  - type: input
+    id: game-modify
+    attributes:
+      label: 对游戏所做的修改 Modifications Made to the Game 
+      description: 如果您为游戏安装了 OptiFine、Forge，或者是其他的 mod，请将您所做的修改填入下方。 If you have OptiFine, Forge, or other mods installed for the game, please enter your modifications below.
+      placeholder: e.g. OptiFine HD_U_G9, Rift
+  - type: textarea
+    id: game-crash-report
+    attributes:
+      label: 游戏崩溃报告 Game Crash Report
+      description: 如果有游戏崩溃报告的话，请填入（或将文件拖入）下方。 If there is a game crash report, please fill in (or drag the file into) below.
+  - type: textarea
+    id: hmcl-crash-report
+    attributes:
+      label: 启动器崩溃报告 Launcher Crash Report
+      description: 如果有启动器崩溃报告的话，请填入（或将文件拖入）下方。 If there is a launcher crash report, please fill it in (or drag the file in) below.
+  - type: textarea
+    id: hmcl-logs
+    attributes:
+      label: 启动器日志文件 Launcher Log File
+      description: 遇到问题后，请在启动器的【设置】>【通用】>【调试】一栏中点击“导出启动器日志”，并将导出的日志拖到下方的输入栏中。 After encountering a problem, please click "Export Launcher Log" in the [Settings] > [General] > [Debug] column of the launcher, and drag the exported log to the input field below.
+  - type: textarea
+    id: bug-report
+    attributes:
+      label: 问题描述 Problem Description
+      description: 请尽可能地详细描述问题，特别是您是怎么遇到这个 BUG 的。 Please describe the problem in as much detail as possible, especially how you encountered this bug.
+

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,14 @@
+blank_issues_enabled: true
+contact_links:
+  - name: 开黑啦频道
+    url: https://kaihei.co/Kx7n3t
+    about: Hello Minecraft! Launcher 的官方开黑啦频道。
+  - name: Discord 频道
+    url: https://discord.gg/jVvC7HfM6U
+    about: Hello Minecraft! Launcher 的官方 Discord 频道。
+  - name: 赞助通道
+    url: https://afdian.net/@huanghongxun
+    about: 前往爱发电赞助 HMCL。赞助后可以申请加入官方 QQ 群反馈问题。
+  - name: 其他反馈
+    url: https://github.com/huanghongxun/HMCL/issues/new
+    about: 通过 Issue 反馈其他问题。

.github/workflows/check-update.yml

@@ -0,0 +1,63 @@
+name: Check Update
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '30 * * * *'
+
+jobs:
+  check-update:
+    if: ${{ github.repository_owner == 'huanghongxun' }}
+    runs-on: ubuntu-latest
+    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_EXE_FILE_NAME=`cat ci.json | jq -M -r '.artifacts[] | select(.fileName | endswith(".exe")) | .fileName'`
+          if [ -z `echo $HMCL_EXE_FILE_NAME | grep -E "^HMCL-[0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+)?\.exe\$"` ]; then exit 1; fi
+          
+          export HMCL_VERSION=`echo "${HMCL_EXE_FILE_NAME%.exe}" | tail -c +6`
+          export HMCL_COMMIT_SHA=`cat ci.json | jq -M -r '.actions[] | select(._class == "hudson.plugins.git.util.BuildData") | .lastBuiltRevision.SHA1'`
+
+          if [ "${#HMCL_COMMIT_SHA}" != 40 ]; then exit 1; fi
+
+          echo "HMCL_VERSION=$HMCL_VERSION" >> $GITHUB_ENV
+          echo "HMCL_COMMIT_SHA=$HMCL_COMMIT_SHA" >> $GITHUB_ENV
+          echo "HMCL_TAG_NAME=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/lastSuccessfulBuild/artifact/HMCL/build/libs
+      - name: Generate release note
+        if: ${{ env.continue == 'true' }}
+        run: |
+          echo "HMCL v$HMCL_VERSION" >> RELEASE_NOTE
+          echo "" >> RELEASE_NOTE
+          echo "The full changelogs can be found on the website: https://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/gitee.yml

@@ -0,0 +1,21 @@
+name: Sync to Gitee
+
+on:
+  push
+
+jobs:
+  run:
+    if: ${{ github.repository_owner == 'huanghongxun' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Mirror Github to Gitee
+        uses: Yikun/hub-mirror-action@v1.1
+        with:
+          src: github/huanghongxun
+          dst: gitee/huanghongxun
+          static_list: 'HMCL'
+          force_update: true
+          debug: true
+          dst_key: ${{ secrets.GITEE_SYNC_BOT_PRIVATE_KEY }}
+          dst_token: ${{ secrets.GITEE_SYNC_BOT_TOKEN }}
+          cache_path: /github/workspace/hub-mirror-cache

.github/workflows/gradle.yml

@@ -12,15 +12,17 @@ jobs:
     - name: Checkout submodules
       run: git submodule update --init --recursive
     - name: Set up JDK 11
-      uses: actions/setup-java@v1
+      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
+        name: HMCL-${{ env.SHORT_SHA }}
         path: HMCL/build/libs

.github/workflows/release.yml

@@ -1,44 +0,0 @@
-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

@@ -18,19 +18,23 @@ NVIDIA
 /HMCL/build/
 /HMCLCore/build/
 /HMCLTransformerDiscoveryService/build/
+/minecraft/libraries/HMCLTransformerDiscoveryService/build/
+/minecraft/libraries/log4j-patch/build/
 
 # idea
 .idea
 /out/
 /HMCL/out/
 /HMCLCore/out/
-/HMCLTransformerDiscoveryService/out/
+/minecraft/libraries/HMCLTransformerDiscoveryService/out/
+/minecraft/libraries/log4j-patch/out/
 
 # eclipse
 /bin/
 /HMCL/bin/
 /HMCLCore/bin/
-/HMCLTransformerDiscoveryService/bin/
+/minecraft/libraries/HMCLTransformerDiscoveryService/bin/
+/minecraft/libraries/log4j-patch/bin/
 .classpath
 .project
 .settings

.gitmodules

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

HMCL/build.gradle

@@ -1,264 +0,0 @@
-buildscript {
-    repositories {
-        gradlePluginPortal()
-        maven { url 'https://jitpack.io' }
-    }
-    dependencies {
-        classpath 'org.tukaani:xz:1.8'
-        classpath 'org.glavo:pack200:0.3.0'
-
-        classpath 'com.guardsquare:proguard-gradle:7.1.0'  // The ProGuard Gradle plugin.
-    }
-}
-
-plugins {
-    id 'application'
-    id 'com.github.johnrengelman.shadow' version '7.0.0'
-}
-
-import java.nio.file.FileSystems
-import java.security.KeyFactory
-import java.security.MessageDigest
-import java.security.Signature
-import java.security.spec.PKCS8EncodedKeySpec
-import java.util.jar.JarFile
-import java.util.jar.JarOutputStream
-import java.util.zip.GZIPOutputStream
-import java.util.zip.ZipFile
-import java.nio.file.Files
-
-import org.tukaani.xz.LZMA2Options
-import org.tukaani.xz.XZOutputStream
-import org.glavo.pack200.Pack200
-
-def dev = null
-def shortcommit = System.getenv("GITHUB_SHA")?.toLowerCase()?.substring(0, 7) ?: null
-if (shortcommit != null && !shortcommit.isEmpty()) dev = "dev-" + shortcommit
-def buildnumber = System.getenv("BUILD_NUMBER") ?: dev ?: "SNAPSHOT"
-if (System.getenv("BUILD_NUMBER") != null && System.getenv("BUILD_NUMBER_OFFSET") != null)
-    buildnumber = (Integer.parseInt(System.getenv("BUILD_NUMBER")) - Integer.parseInt(System.getenv("BUILD_NUMBER_OFFSET"))).toString()
-def versionroot = System.getenv("VERSION_ROOT") ?: "3.4"
-def microsoftAuthId = System.getenv("MICROSOFT_AUTH_ID") ?: ""
-def microsoftAuthSecret = System.getenv("MICROSOFT_AUTH_SECRET") ?: ""
-def versionType = System.getenv("VERSION_TYPE") ?: "nightly"
-version = versionroot + '.' + buildnumber
-
-mainClassName = 'org.jackhuang.hmcl.Main'
-
-dependencies {
-    implementation project(":HMCLCore")
-    implementation project(":JSTUN")
-    implementation rootProject.files("lib/JFoenix.jar")
-}
-
-def digest(String algorithm, byte[] bytes) {
-    return MessageDigest.getInstance(algorithm).digest(bytes)
-}
-
-def createChecksum(File file) {
-    def algorithm = "SHA-1"
-    def suffix = "sha1"
-    new File(file.parentFile, file.name + "." + suffix).text = digest(algorithm, file.bytes).encodeHex().toString() + "\n"
-}
-
-def attachSignature(File jar) {
-    def keyLocation = System.getenv("HMCL_SIGNATURE_KEY");
-    if (keyLocation == null)
-        return
-    def privatekey = KeyFactory.getInstance("RSA").generatePrivate(new PKCS8EncodedKeySpec(new File(keyLocation).bytes))
-
-    def signer = Signature.getInstance("SHA512withRSA")
-    signer.initSign(privatekey)
-    new ZipFile(jar).withCloseable { zip ->
-        zip.stream()
-                .sorted(Comparator.comparing { it.name })
-                .filter { it.name != "META-INF/hmcl_signature" }
-                .forEach {
-                    signer.update(digest("SHA-512", it.name.getBytes("UTF-8")))
-                    signer.update(digest("SHA-512", zip.getInputStream(it).bytes))
-                }
-    }
-    def signature = signer.sign()
-
-    FileSystems.newFileSystem(URI.create("jar:" + jar.toURI()), [:]).withCloseable { zipfs ->
-        Files.newOutputStream(zipfs.getPath("META-INF/hmcl_signature")).withCloseable { it << signature }
-    }
-}
-
-ext.packer = Pack200.newPacker()
-packer.properties()["pack.effort"] = "9"
-ext.unpacker = Pack200.newUnpacker()
-
-// Pack200 does not guarantee that unpacked .class file is bit-wise same as the .class file before packing
-// because of shrinking. So we should pack .class files and unpack it to make sure that after unpacking
-// .class files remain the same.
-def repack(File file) {
-    def packed = new ByteArrayOutputStream()
-    new JarFile(file).withCloseable { packer.pack(it, packed) }
-    new JarOutputStream(file.newOutputStream()).withCloseable { unpacker.unpack(new ByteArrayInputStream(packed.toByteArray()), it) }
-}
-
-sourceSets {
-    java11 {
-        java {
-            srcDirs = ['src/main/java11']
-        }
-    }
-}
-
-compileJava11Java {
-    if(JavaVersion.current() < JavaVersion.VERSION_11) {
-        javaCompiler = javaToolchains.compilerFor {
-            languageVersion = JavaLanguageVersion.of(11)
-        }
-    }
-    options.compilerArgs.add('--add-exports=java.base/jdk.internal.loader=ALL-UNNAMED')
-    sourceCompatibility = 11
-    targetCompatibility = 11
-}
-
-jar {
-    enabled = false
-    dependsOn shadowJar
-}
-
-shadowJar {
-    classifier = null
-
-    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(" ")
-    }
-
-    doLast {
-        repack(jar.archivePath) // see repack()
-        attachSignature(jar.archivePath)
-        createChecksum(jar.archivePath)
-    }
-}
-
-task proguard(type: proguard.gradle.ProGuardTask) {
-    dependsOn shadowJar
-    injars shadowJar
-
-    outjars "${buildDir}/libs/${project.name}-${project.version}-proguard.jar"
-
-
-    dontobfuscate
-    dontoptimize
-    keep 'public class org.jackhuang.**'
-    keep 'public class org.slf4j.**'
-
-    dontwarn 'com.nqzero.**'
-    dontwarn 'org.slf4j.**'
-    dontwarn 'org.jackhuang.hmcl.util.Pack200Utils'
-
-    adaptclassstrings
-
-    // next block taken verbatim from Proguard's documentation examples:
-
-    libraryjars files(configurations.compileClasspath.collect())
-
-    keepattributes 'SourceFile,LineNumberTable'
-
-    // 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 "${System.getProperty('java.home')}/lib/rt.jar"
-        libraryjars "${System.getProperty('java.home')}/lib/ext/jfxrt.jar"
-//    } else {
-//        // As of Java 9, the runtime classes are packaged in modular jmod files.
-//        libraryjars "${System.getProperty('java.home')}/jmods/java.base.jmod", jarfilter: '!**.jar', filter: '!module-info.class'
-//    }
-}
-
-def createExecutable(String suffix, String header) {
-    def output = new File(jar.archivePath.parentFile, jar.archivePath.name[0..-4] + suffix)
-    output.bytes = new File(project.projectDir, header).bytes
-    output << jar.archivePath.bytes
-    createChecksum(output)
-}
-
-processResources {
-    ext.convertToBSS = { String resource ->
-        // exclude resource
-        doFirst {
-            def cssFile = new File(this.projectDir, "src/main/resources/" + resource)
-            def bssFile = new File(this.projectDir, "build/compiled-resources/" + resource[0..-4] + "bss")
-            bssFile.parentFile.mkdirs()
-            javaexec {
-                classpath = sourceSets.main.compileClasspath
-                mainClass = "com.sun.javafx.css.parser.Css2Bin"
-                args = [cssFile, bssFile]
-            }
-        }
-    }
-    from "build/compiled-resources"
-
-    convertToBSS "assets/css/root.css"
-    convertToBSS "assets/css/blue.css"
-
-    into('META-INF/versions/11') {
-        from sourceSets.java11.output
-    }
-    dependsOn java11Classes
-}
-
-task makePack(dependsOn: jar) {
-    ext.outputPath = new File(jar.archivePath.parentFile, jar.archivePath.name[0..-4] + "pack")
-    doLast {
-        outputPath.newOutputStream().withCloseable { out ->
-            new JarFile(jar.archivePath).withCloseable { jarFile -> packer.pack(jarFile, out) }
-        }
-        createChecksum(outputPath)
-    }
-}
-
-task makePackXz(dependsOn: makePack) doLast {
-    def packXz = new File(makePack.outputPath.parentFile, makePack.outputPath.name + ".xz")
-    // Our CI server does not have enough memory space to compress file at highest level.
-    new XZOutputStream(packXz.newOutputStream(), new LZMA2Options(5)).withCloseable { it << makePack.outputPath.bytes }
-    createChecksum(packXz)
-}
-
-task makePackGz(dependsOn: makePack) doLast {
-    def packGz = new File(makePack.outputPath.parentFile, makePack.outputPath.name + ".gz")
-    new GZIPOutputStream(packGz.newOutputStream()).withCloseable { it << makePack.outputPath.bytes }
-    createChecksum(packGz)
-}
-
-
-task makeExecutables(dependsOn: jar) doLast {
-    createExecutable("exe", "src/main/resources/assets/HMCLauncher.exe")
-}
-
-build.dependsOn makePackXz
-build.dependsOn makePackGz
-build.dependsOn makeExecutables

HMCL/build.gradle.kts

@@ -0,0 +1,283 @@
+import java.nio.file.FileSystems
+import java.nio.file.Files
+import java.security.KeyFactory
+import java.security.MessageDigest
+import java.security.Signature
+import java.security.spec.PKCS8EncodedKeySpec
+import java.util.jar.JarFile
+import java.util.jar.JarOutputStream
+import java.util.zip.ZipFile
+import java.util.zip.GZIPOutputStream
+import java.io.ByteArrayOutputStream
+import java.io.ByteArrayInputStream
+import java.net.URI
+
+import org.glavo.pack200.Pack200
+import org.tukaani.xz.LZMA2Options
+import org.tukaani.xz.XZOutputStream
+
+buildscript {
+    repositories {
+        gradlePluginPortal()
+        maven(url = "https://jitpack.io")
+    }
+    dependencies {
+        classpath("org.tukaani:xz:1.8")
+        classpath("org.glavo:pack200:0.3.0")
+    }
+}
+
+plugins {
+    id("com.github.johnrengelman.shadow") version "7.0.0"
+}
+
+val buildNumber = System.getenv("BUILD_NUMBER")?.toInt().let { number ->
+    val offset = System.getenv("BUILD_NUMBER_OFFSET")?.toInt() ?: 0
+    if (number != null) {
+        (number - offset).toString()
+    } else {
+        val shortCommit = System.getenv("GITHUB_SHA")?.toLowerCase()?.substring(0, 7)
+        if (!shortCommit.isNullOrEmpty()) "dev-$shortCommit" else "SNAPSHOT"
+    }
+}
+val versionRoot = System.getenv("VERSION_ROOT") ?: "3.5"
+val versionType = System.getenv("VERSION_TYPE") ?: "nightly"
+
+val microsoftAuthId = System.getenv("MICROSOFT_AUTH_ID") ?: ""
+val microsoftAuthSecret = System.getenv("MICROSOFT_AUTH_SECRET") ?: ""
+val curseForgeApiKey = System.getenv("CURSEFORGE_API_KEY") ?: ""
+
+version = "$versionRoot.$buildNumber"
+
+dependencies {
+    implementation(project(":HMCLCore"))
+    implementation("libs:JFoenix")
+
+    implementation("de.javawi.jstun:jstun:0.7.4")
+}
+
+fun digest(algorithm: String, bytes: ByteArray) = MessageDigest.getInstance(algorithm).digest(bytes)
+
+fun createChecksum(file: File) {
+    val algorithms = linkedMapOf(
+        "MD5" to "md5",
+        "SHA-1" to "sha1",
+        "SHA-256" to "sha256",
+        "SHA-512" to "sha512"
+    )
+
+    algorithms.forEach { (algorithm, ext) ->
+        File(file.parentFile, "${file.name}.$ext").writeText(
+            digest(algorithm, file.readBytes()).joinToString(separator = "", postfix = "\n") { "%02x".format(it) }
+        )
+    }
+}
+
+fun attachSignature(jar: File) {
+    val keyLocation = System.getenv("HMCL_SIGNATURE_KEY") ?: return
+    val privatekey = KeyFactory.getInstance("RSA").generatePrivate(PKCS8EncodedKeySpec(File(keyLocation).readBytes()))
+    val signer = Signature.getInstance("SHA512withRSA")
+    signer.initSign(privatekey)
+    ZipFile(jar).use { zip ->
+        zip.stream()
+            .sorted(Comparator.comparing { it.name })
+            .filter { it.name != "META-INF/hmcl_signature" }
+            .forEach {
+                signer.update(digest("SHA-512", it.name.toByteArray()))
+                signer.update(digest("SHA-512", zip.getInputStream(it).readBytes()))
+            }
+    }
+    val signature = signer.sign()
+    FileSystems.newFileSystem(URI.create("jar:" + jar.toURI()), emptyMap<String, Any>()).use { zipfs ->
+        Files.newOutputStream(zipfs.getPath("META-INF/hmcl_signature")).use { it.write(signature) }
+    }
+}
+
+val packer = Pack200.newPacker().apply {
+    properties()["pack.effort"] = "9"
+}
+
+val 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.
+fun repack(file: File) {
+    val packed = ByteArrayOutputStream()
+    JarFile(file).use { packer.pack(it, packed) }
+    JarOutputStream(file.outputStream()).use { unpacker.unpack(ByteArrayInputStream(packed.toByteArray()), it) }
+}
+
+val java11 = sourceSets.create("java11") {
+    java {
+        srcDir("src/main/java11")
+    }
+}
+
+tasks.getByName<JavaCompile>(java11.compileJavaTaskName) {
+    if (JavaVersion.current() < JavaVersion.VERSION_11) {
+        javaCompiler.set(javaToolchains.compilerFor {
+            languageVersion.set(JavaLanguageVersion.of(11))
+        })
+    }
+    options.compilerArgs.add("--add-exports=java.base/jdk.internal.loader=ALL-UNNAMED")
+    sourceCompatibility = "11"
+    targetCompatibility = "11"
+}
+
+tasks.jar {
+    enabled = false
+    dependsOn(tasks["shadowJar"])
+}
+
+val jarPath = tasks.jar.get().archiveFile.get().asFile
+
+tasks.getByName<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {
+    archiveClassifier.set(null as String?)
+
+    minimize {
+        exclude(dependency("com.google.code.gson:.*:.*"))
+        exclude(dependency("com.github.steveice10:.*:.*"))
+        exclude(dependency("libs:JFoenix:.*"))
+    }
+
+    manifest {
+        attributes(
+            "Created-By" to "Copyright(c) 2013-2021 huangyuhui.",
+            "Main-Class" to "org.jackhuang.hmcl.Main",
+            "Multi-Release" to "true",
+            "Implementation-Version" to project.version,
+            "Microsoft-Auth-Id" to microsoftAuthId,
+            "Microsoft-Auth-Secret" to microsoftAuthSecret,
+            "CurseForge-Api-Key" to curseForgeApiKey,
+            "Build-Channel" to versionType,
+            "Class-Path" to "pack200.jar",
+            "Add-Opens" to listOf(
+                "java.base/java.lang",
+                "java.base/java.lang.reflect",
+                "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"
+            ).joinToString(" "),
+            "Add-Exports" to listOf(
+                "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"
+            ).joinToString(" ")
+        )
+    }
+
+    doLast {
+        repack(jarPath) // see repack()
+        attachSignature(jarPath)
+        createChecksum(jarPath)
+    }
+}
+
+fun createExecutable(suffix: String, header: String) {
+    val output = File(jarPath.parentFile, jarPath.nameWithoutExtension + '.' + suffix)
+
+    output.outputStream().use {
+        it.write(File(project.projectDir, header).readBytes())
+        it.write(jarPath.readBytes())
+    }
+
+    createChecksum(output)
+}
+
+tasks.processResources {
+    fun convertToBSS(resource: String) {
+        doFirst {
+            val cssFile = File(projectDir, "src/main/resources/$resource")
+            val bssFile = File(projectDir, "build/compiled-resources/${resource.substring(0, resource.length - 4)}.bss")
+            bssFile.parentFile.mkdirs()
+            javaexec {
+                classpath = sourceSets["main"].compileClasspath
+                mainClass.set("com.sun.javafx.css.parser.Css2Bin")
+                args(cssFile, bssFile)
+            }
+        }
+    }
+
+    from("build/compiled-resources")
+
+    convertToBSS("assets/css/root.css")
+    convertToBSS("assets/css/blue.css")
+
+    into("META-INF/versions/11") {
+        from(sourceSets["java11"].output)
+    }
+    dependsOn(tasks["java11Classes"])
+
+    into("assets") {
+        from(project.buildDir.resolve("openjfx-dependencies.json"))
+    }
+    dependsOn(rootProject.tasks["generateOpenJFXDependencies"])
+}
+
+val packFile = File(jarPath.parentFile, jarPath.nameWithoutExtension + ".pack")
+
+val makePack = tasks.create("makePack") {
+    dependsOn(tasks.jar)
+
+    doLast {
+        packFile.outputStream().use { out ->
+            JarFile(jarPath).use { jarFile -> packer.pack(jarFile, out) }
+        }
+        createChecksum(packFile)
+    }
+}
+
+val makePackXz = tasks.create("makePackXz") {
+    dependsOn(makePack)
+
+    val packXz = File(packFile.parentFile, packFile.name + ".xz")
+
+    doLast {
+        // Our CI server does not have enough memory space to compress file at highest level.
+        XZOutputStream(packXz.outputStream(), LZMA2Options(5))
+            .use { it.write(packFile.readBytes()) }
+        createChecksum(packXz)
+    }
+}
+
+val makePackGz = tasks.create("makePackGz") {
+    dependsOn(makePack)
+
+    val packGz = File(packFile.parentFile, packFile.name + ".gz")
+
+    doLast {
+        GZIPOutputStream(packGz.outputStream()).use { it.write(packFile.readBytes()) }
+        createChecksum(packGz)
+    }
+}
+
+val makeExecutables = tasks.create("makeExecutables") {
+    dependsOn(makePack)
+
+    doLast {
+        createExecutable("exe", "src/main/resources/assets/HMCLauncher.exe")
+    }
+}
+
+tasks.build {
+    dependsOn(makePackXz, makePackGz, makeExecutables)
+}
+
+tasks.create<JavaExec>("run") {
+    dependsOn(tasks.jar)
+
+    group = "application"
+
+    classpath = files(jarPath)
+    workingDir = rootProject.rootDir
+}

HMCL/parse_mcmod_data.py

@@ -19,6 +19,7 @@
 import json
 import codecs
 import re
+import sys
 from urllib.parse import urlparse, parse_qs
 
 S = ';'
@@ -26,18 +27,21 @@ S = ';'
 MOD_SEPARATOR = ','
 
 CURSEFORGE_PATTERN1 = re.compile(
-    r'^/minecraft/(mc-mods|customization|mc-addons|customization/configuration)/(?P<modid>[\w-]+)(/(.*?))?$')
+    r'^/minecraft/(mc-mods|modpacks|customization|mc-addons|customization/configuration)/+(?P<modid>[\w-]+)(/(.*?))?$')
 CURSEFORGE_PATTERN2 = re.compile(
     r'^/projects/(?P<modid>[\w-]+)(/(.*?))?$')
 CURSEFORGE_PATTERN3 = re.compile(
     r'^/mc-mods/minecraft/(?P<modid>[\w-]+)(/(.*?))?$')
+CURSEFORGE_PATTERN4 = re.compile(
+    r'^/legacy/mc-mods/minecraft/(\d+)-(?P<modid>[\w-]+)'
+)
 
 
 def parseCurseforge(url):
     res = urlparse(url)
     if res.scheme not in ['http', 'https']:
         return ''
-    for pattern in [CURSEFORGE_PATTERN1, CURSEFORGE_PATTERN2, CURSEFORGE_PATTERN3]:
+    for pattern in [CURSEFORGE_PATTERN1, CURSEFORGE_PATTERN2, CURSEFORGE_PATTERN3, CURSEFORGE_PATTERN4]:
         match = pattern.match(res.path)
         if match:
             return match.group('modid')
@@ -45,7 +49,7 @@ def parseCurseforge(url):
 
 
 MCMOD_PATTERN = re.compile(
-    r'^http(s)?://www\.mcmod\.cn/class/(?P<modid>\d+)\.html$')
+    r'^http(s)?://www\.mcmod\.cn/(class|modpack)/(?P<modid>\d+)\.html$')
 
 
 def parseMcmod(url):
@@ -55,7 +59,7 @@ def parseMcmod(url):
     return ''
 
 
-MCBBS_HTML_PATTERN = re.compile(r'/thread-(?P<modid>\d+)-(\d+)-(\d+).html')
+MCBBS_HTML_PATTERN = re.compile(r'/+thread-(?P<modid>\d+)-(\d+)-(\d+).html')
 MCBBS_PHP_PATTERN = re.compile(r'')
 
 
@@ -78,8 +82,16 @@ def parseMcbbs(url):
     return ''
 
 
+skip = [
+    'Minecraft',
+    'The Building Game'
+]
+
+
 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:
+    json_name = sys.argv[1] or 'data.json'
+
+    with codecs.open(json_name, mode='r', encoding='utf-8-sig') as jsonfile, codecs.open('data.csv', mode='w', encoding='utf-8') as outfile:
         data = json.load(jsonfile)
 
         for mod in data:
@@ -87,6 +99,9 @@ if __name__ == '__main__':
             sub_name = mod['name']['sub']
             abbr = mod['name']['abbr']
 
+            if sub_name in skip:
+                continue
+
             if S in chinese_name:
                 print('Error! ' + chinese_name)
                 exit(1)
@@ -123,7 +138,7 @@ if __name__ == '__main__':
                     exit(1)
 
             mod_id = []
-            if 'list' in mod['modid']:
+            if 'modid' in mod and 'list' in mod['modid']:
                 for id in mod['modid']['list']:
                     if MOD_SEPARATOR in id:
                         print('Error mod id!' + id)

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

@@ -3,8 +3,8 @@ package moe.mickey.minecraft.skin.fx;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.LinkedList;
 import java.util.List;
 
 public class SkinAnimation {
@@ -12,9 +12,8 @@ public class SkinAnimation {
     protected int weight, left;
     protected List<SkinTransition> transitions;
 
-    @Deprecated
     public SkinAnimation() {
-        this.transitions = new LinkedList<>();
+        this.transitions = new ArrayList<>();
     }
 
     public SkinAnimation(int weight, SkinTransition... transitions) {

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

@@ -2,14 +2,15 @@ package moe.mickey.minecraft.skin.fx;
 
 import javafx.animation.AnimationTimer;
 
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.LinkedList;
+import java.util.List;
 import java.util.Random;
 
 public class SkinAnimationPlayer {
 
     protected final Random random = new Random();
-    protected LinkedList<SkinAnimation> animations = new LinkedList<>();
+    protected List<SkinAnimation> animations = new ArrayList<>();
     protected SkinAnimation playing;
     protected boolean running;
     protected int weightedSum = 0;
@@ -28,7 +29,7 @@ public class SkinAnimationPlayer {
                 }
                 playing = tmp;
                 if (playing == null && animations.size() > 0)
-                    playing = animations.getLast();
+                    playing = animations.get(animations.size() - 1);
                 if (playing != null) {
                     playing.playFromStart();
                     lastPlayTime = now;

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

@@ -4,6 +4,7 @@ import javafx.scene.*;
 import javafx.scene.image.Image;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.input.ScrollEvent;
+import javafx.scene.paint.Color;
 import javafx.scene.paint.Material;
 import javafx.scene.paint.PhongMaterial;
 import javafx.scene.shape.Shape3D;
@@ -11,6 +12,8 @@ import javafx.scene.transform.Rotate;
 import javafx.scene.transform.Scale;
 import javafx.scene.transform.Translate;
 
+import org.jetbrains.annotations.Nullable;
+
 public class SkinCanvas extends Group {
 
     public static final Image ALEX = new Image(SkinCanvas.class.getResourceAsStream("/assets/img/alex.png"));
@@ -22,7 +25,7 @@ public class SkinCanvas extends Group {
     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 Image srcSkin, skin, srcCape, cape;
     protected boolean isSlim;
 
     protected double preW, preH;
@@ -45,6 +48,8 @@ public class SkinCanvas extends Group {
     public final SkinCube llegInside = new SkinCube(4, 12, 4, 16F / 64F, 16F / 64F, 16F / 64F, 48F / 64F, 0F, false);
     public final SkinCube rlegInside = new SkinCube(4, 12, 4, 16F / 64F, 16F / 64F, 0F, 16F / 64F, 0F, false);
 
+    public final SkinCube capeCube = new SkinCube(10, 16, 1, 22F / 64F, 17F / 32F, 0F, 0F, 0F, false);
+
     public final SkinGroup head = new SkinGroup(
             new Rotate(0, 0, headInside.getHeight() / 2, 0, Rotate.X_AXIS),
             new Rotate(0, Rotate.Y_AXIS),
@@ -82,6 +87,13 @@ public class SkinCanvas extends Group {
             rlegOuter, rlegInside
     );
 
+    public final SkinGroup capeGroup = new SkinGroup(
+            new Rotate(0, 0, -capeCube.getHeight() / 2, 0, Rotate.X_AXIS),
+            new Rotate(0, Rotate.Y_AXIS),
+            new Rotate(0, Rotate.Z_AXIS),
+            capeCube
+    );
+
     protected PerspectiveCamera camera = new PerspectiveCamera(true);
 
     protected Rotate xRotate = new Rotate(0, Rotate.X_AXIS);
@@ -90,10 +102,10 @@ public class SkinCanvas extends Group {
     protected Translate translate = new Translate(0, 0, -80);
     protected Scale scale = new Scale(1, 1);
 
-    protected SkinAnimationPlayer animationplayer = new SkinAnimationPlayer();
+    protected SkinAnimationPlayer animationPlayer = new SkinAnimationPlayer();
 
-    public SkinAnimationPlayer getAnimationplayer() {
-        return animationplayer;
+    public SkinAnimationPlayer getAnimationPlayer() {
+        return animationPlayer;
     }
 
     public Image getSrcSkin() {
@@ -104,20 +116,21 @@ public class SkinCanvas extends Group {
         return skin;
     }
 
-    public void updateSkin(Image skin, boolean isSlim) {
+    public void updateSkin(Image skin, boolean isSlim, final @Nullable Image cape) {
         if (SkinHelper.isNoRequest(skin) && SkinHelper.isSkin(skin)) {
             this.srcSkin = skin;
             this.skin = SkinHelper.x32Tox64(skin);
+            this.srcCape = cape;
+            this.cape = cape == null ? null : cape.getWidth() < 256 ? SkinHelper.enlarge(cape, 4, 8) : cape;
             int multiple = Math.max((int) (1024 / skin.getWidth()), 1);
             if (multiple > 1)
-                this.skin = SkinHelper.enlarge(this.skin, multiple);
-            if (this.isSlim != isSlim)
-                updateSkinModel(isSlim);
+                this.skin = SkinHelper.enlarge(this.skin, multiple, multiple);
+            updateSkinModel(isSlim, cape != null);
             bindMaterial(root);
         }
     }
 
-    protected void updateSkinModel(boolean isSlim) {
+    protected void updateSkinModel(boolean isSlim, boolean hasCape) {
         this.isSlim = isSlim;
         FunctionHelper.alwaysB(SkinMultipleCubes::setWidth, isSlim ? 3 : 4, larmOuter, rarmOuter);
         FunctionHelper.alwaysB(SkinCube::setWidth, isSlim ? 3D : 4D, larmInside, rarmInside);
@@ -134,6 +147,8 @@ public class SkinCanvas extends Group {
 
         larm.getZRotate().setPivotX(-larmInside.getWidth() / 2);
         rarm.getZRotate().setPivotX(+rarmInside.getWidth() / 2);
+
+        capeGroup.setVisible(hasCape);
     }
 
     public SkinCanvas(double preW, double preH) {
@@ -149,17 +164,17 @@ public class SkinCanvas extends Group {
         init();
     }
 
-    protected Material createMaterial() {
+    protected Material createMaterial(final Image image) {
         PhongMaterial material = new PhongMaterial();
-        material.setDiffuseMap(skin);
+        material.setDiffuseMap(image);
         return material;
     }
 
     protected void bindMaterial(Group group) {
-        Material material = createMaterial();
+        Material material = createMaterial(skin);
         for (Node node : group.getChildren())
             if (node instanceof Shape3D)
-                ((Shape3D) node).setMaterial(material);
+                ((Shape3D) node).setMaterial(node == capeCube ? createMaterial(cape) : material);
             else if (node instanceof SkinMultipleCubes)
                 ((SkinMultipleCubes) node).updateSkin(skin);
             else if (node instanceof Group)
@@ -178,6 +193,11 @@ public class SkinCanvas extends Group {
         lleg.setTranslateY(+(bodyInside.getHeight() + llegInside.getHeight()) / 2);
         rleg.setTranslateY(+(bodyInside.getHeight() + rlegInside.getHeight()) / 2);
 
+        capeGroup.setTranslateY(+(capeCube.getHeight() - bodyOuter.getHeight()) / 2);
+        capeGroup.setTranslateZ(-(bodyInside.getDepth() + bodyOuter.getDepth()) / 2);
+
+        capeGroup.getTransforms().addAll(new Rotate(180, Rotate.Y_AXIS), new Rotate(10, Rotate.X_AXIS));
+
         root.getTransforms().addAll(xRotate);
 
         root.getChildren().addAll(
@@ -186,15 +206,20 @@ public class SkinCanvas extends Group {
                 larm,
                 rarm,
                 lleg,
-                rleg
+                rleg,
+                capeGroup
         );
-        updateSkin(skin, false);
+        updateSkin(skin, false, null);
 
         return root;
     }
 
     protected SubScene createSubScene() {
         Group group = new Group();
+
+        AmbientLight light = new AmbientLight(Color.WHITE);
+        group.getChildren().add(light);
+
         group.getChildren().add(createPlayerModel());
         group.getTransforms().add(zRotate);
 

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

@@ -1,10 +1,10 @@
 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.jackhuang.hmcl.util.ArrayUtils;
+
+import org.apache.commons.lang3.ArrayUtils;
 
 public class SkinCube extends MeshView {
 
@@ -20,61 +20,60 @@ public class SkinCube extends MeshView {
             width /= 2F;
             height /= 2F;
             depth /= 2F;
-
             return new float[]{
-                    -width, -height, depth,        // P0
-                    width, -height, depth,        // P1
-                    -width, height, depth,        // P2
-                    width, height, depth,        // P3
-                    -width, -height, -depth,    // P4
-                    width, -height, -depth,    // P5
-                    -width, height, -depth,    // P6
-                    width, height, -depth        // P7
+                    -width, -height, +depth, // P0
+                    +width, -height, +depth, // P1
+                    -width, +height, +depth, // P2
+                    +width, +height, +depth, // P3
+                    -width, -height, -depth, // P4
+                    +width, -height, -depth, // P5
+                    -width, +height, -depth, // P6
+                    +width, +height, -depth  // P7
             };
         }
 
         public static float[] createTexCoords(float width, float height, float depth, float scaleX, float scaleY,
-                                              float startX, float startY, boolean isSlim) {
+                float startX, float startY, boolean isSlim) {
             float x = (width + depth) * 2, y = height + depth, half_width = width / x * scaleX, half_depth = depth / x * scaleX,
                     top_x = depth / x * scaleX + startX, top_y = startY, arm4 = isSlim ? half_depth : half_width,
                     bottom_x = startX, middle_y = depth / y * scaleY + top_y, bottom_y = scaleY + top_y;
             return new float[]{
                     top_x, top_y,                                    // T0  ---
-                    top_x + half_width, top_y,                        // T1   |
-                    top_x + half_width * 2, top_y,                    // T2  ---
-                    bottom_x, middle_y,                                // T3  ---
-                    bottom_x + half_depth, middle_y,                // T4   |
+                    top_x + half_width, top_y,                       // T1   |
+                    top_x + half_width * 2, top_y,                   // T2  ---
+                    bottom_x, middle_y,                              // T3  ---
+                    bottom_x + half_depth, middle_y,                 // T4   |
                     bottom_x + half_depth + half_width, middle_y,    // T5   |
-                    bottom_x + scaleX - arm4, middle_y,                // T6   |
-                    bottom_x + scaleX, middle_y,                    // T7  ---
-                    bottom_x, bottom_y,                                // T8  ---
-                    bottom_x + half_depth, bottom_y,                // T9   |
+                    bottom_x + scaleX - arm4, middle_y,              // T6   |
+                    bottom_x + scaleX, middle_y,                     // T7  ---
+                    bottom_x, bottom_y,                              // T8  ---
+                    bottom_x + half_depth, bottom_y,                 // T9   |
                     bottom_x + half_depth + half_width, bottom_y,    // T10  |
-                    bottom_x + scaleX - arm4, bottom_y,                // T11  |
-                    bottom_x + scaleX, bottom_y                        // T12 ---
+                    bottom_x + scaleX - arm4, bottom_y,              // T11  |
+                    bottom_x + scaleX, bottom_y                      // T12 ---
             };
         }
 
         public static int[] createFaces() {
-            int[] faces = new int[]{
+            int[] faces = {
                     // TOP
                     5, 0, 4, 1, 0, 5,    //P5,T0, P4,T1, P0,T5
                     5, 0, 0, 5, 1, 4,    //P5,T0, P0,T5, P1,T4
                     // RIGHT
-                    0, 5, 4, 6, 6, 11,    //P0,T4 ,P4,T3, P6,T8
-                    0, 5, 6, 11, 2, 10,    //P0,T4 ,P6,T8, P2,T9
+                    0, 5, 4, 6, 6, 11,   //P0,T4 ,P4,T3, P6,T8
+                    0, 5, 6, 11, 2, 10,  //P0,T4 ,P6,T8, P2,T9
                     // FRONT
-                    1, 4, 0, 5, 2, 10,    //P1,T5, P0,T4, P2,T9
-                    1, 4, 2, 10, 3, 9,    //P1,T5, P2,T9, P3,T10
+                    1, 4, 0, 5, 2, 10,   //P1,T5, P0,T4, P2,T9
+                    1, 4, 2, 10, 3, 9,   //P1,T5, P2,T9, P3,T10
                     // LEFT
                     5, 3, 1, 4, 3, 9,    //P5,T6, P1,T5, P3,T10
                     5, 3, 3, 9, 7, 8,    //P5,T6, P3,T10,P7,T11
                     // BACK
-                    4, 6, 5, 7, 7, 12,    //P4,T6, P5,T7, P7,T12
-                    4, 6, 7, 12, 6, 11,    //P4,T6, P7,T12,P6,T11
+                    4, 6, 5, 7, 7, 12,   //P4,T6, P5,T7, P7,T12
+                    4, 6, 7, 12, 6, 11,  //P4,T6, P7,T12,P6,T11
                     // BOTTOM
                     3, 5, 2, 6, 6, 2,    //P3,T2, P2,T1, P6,T5
-                    3, 5, 6, 2, 7, 1    //P3,T2, P6,T5, P7,T6
+                    3, 5, 6, 2, 7, 1     //P3,T2, P6,T5, P7,T6
             };
 
             int[] copy = faces.clone();
@@ -91,7 +90,6 @@ public class SkinCube extends MeshView {
 
     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) {

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

@@ -10,12 +10,12 @@ public final class SkinHelper {
     private SkinHelper() {
     }
 
-    public static class PixelCopyer {
+    public static class PixelCopier {
 
         protected Image srcImage;
         protected WritableImage newImage;
 
-        public PixelCopyer(Image srcImage, WritableImage newImage) {
+        public PixelCopier(Image srcImage, WritableImage newImage) {
             this.srcImage = srcImage;
             this.newImage = newImage;
         }
@@ -70,53 +70,53 @@ public final class SkinHelper {
     }
 
     public static Image x32Tox64(Image srcSkin) {
-        if (srcSkin.getHeight() == 64)
+        if (srcSkin.getHeight() == srcSkin.getWidth())
             return srcSkin;
 
         WritableImage newSkin = new WritableImage((int) srcSkin.getWidth(), (int) srcSkin.getHeight() * 2);
-        PixelCopyer copyer = new PixelCopyer(srcSkin, newSkin);
+        PixelCopier copier = new PixelCopier(srcSkin, newSkin);
         // HEAD & HAT
-        copyer.copy(0 / 64F, 0 / 32F, 0 / 64F, 0 / 64F, 64 / 64F, 16 / 32F);
+        copier.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);
+        x32Tox64(copier, 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);
+        copier.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);
+        copier.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);
+        x32Tox64(copier, 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);
+        copier.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) {
+    static void x32Tox64(PixelCopier copier, 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);
+        copier.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);
+        copier.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);
+        copier.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);
+        copier.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);
+        copier.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);
+        copier.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);
+    public static Image enlarge(Image srcSkin, int multipleX, int multipleY) {
+        WritableImage newSkin = new WritableImage((int) srcSkin.getWidth() * multipleX, (int) srcSkin.getHeight() * multipleY);
         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++) {
+                for (int mx = 0; mx < multipleX; mx++)
+                    for (int my = 0; my < multipleY; my++) {
                         int argb = reader.getArgb(x, y);
-                        writer.setArgb(x * multiple + mx, y * multiple + my, argb);
+                        writer.setArgb(x * multipleX + mx, y * multipleY + my, argb);
                     }
 
         return newSkin;

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

@@ -21,6 +21,7 @@ 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;
@@ -30,18 +31,14 @@ 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.*;
 import java.nio.file.Paths;
-import java.util.LinkedList;
-import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 
@@ -61,11 +58,17 @@ public final class Launcher extends Application {
         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()));
             }
 
+            if (Metadata.HMCL_DIRECTORY.toAbsolutePath().toString().indexOf('=') >= 0) {
+                Main.showWarningAndContinue(i18n("fatal.illegal_char"));
+            }
+
             // runLater to ensure ConfigHolder.init() finished initialization
             Platform.runLater(() -> {
                 // When launcher visibility is set to "hide and reopen" without Platform.implicitExit = false,
@@ -106,7 +109,9 @@ public final class Launcher extends Application {
 
         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"));
@@ -116,7 +121,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);
         }
@@ -148,34 +153,5 @@ public final class Launcher extends Application {
         });
     }
 
-    public static List<File> getCurrentJarFiles() {
-        List<File> result = new LinkedList<>();
-        if (Launcher.class.getClassLoader() instanceof URLClassLoader) {
-            URL[] urls = ((URLClassLoader) Launcher.class.getClassLoader()).getURLs();
-            for (URL u : urls)
-                try {
-                    File f = new File(u.toURI());
-                    if (f.isFile() && (f.getName().endsWith(".exe") || f.getName().endsWith(".jar")))
-                        result.add(f);
-                } catch (URISyntaxException e) {
-                    return null;
-                }
-        } else {
-            try {
-                File jarFile = new File(URLDecoder.decode(Launcher.class.getProtectionDomain().getCodeSource().getLocation().getPath(), "UTF-8"));
-                String ext = FileUtils.getExtension(jarFile);
-                if ("jar".equals(ext) || "exe".equals(ext))
-                    result.add(jarFile);
-            } catch (UnsupportedEncodingException e) {
-                LOG.log(Level.WARNING, "Failed to decode jar path", e);
-                return null;
-            }
-        }
-        if (result.isEmpty())
-            return null;
-        else
-            return result;
-    }
-
     public static final CrashReporter CRASH_REPORTER = new CrashReporter(true);
 }

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

@@ -20,7 +20,9 @@ package org.jackhuang.hmcl;
 import org.jackhuang.hmcl.util.Logging;
 import org.jackhuang.hmcl.util.SelfDependencyPatcher;
 
-import javax.net.ssl.*;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManagerFactory;
 import javax.swing.*;
 import java.io.File;
 import java.io.IOException;
@@ -33,7 +35,6 @@ import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
 import java.util.Collections;
 import java.util.concurrent.CancellationException;
 import java.util.logging.Level;
@@ -60,10 +61,7 @@ public final class Main {
         checkDirectoryPath();
 
         // This environment check will take ~300ms
-        thread(() -> {
-            fixLetsEncrypt();
-            checkDSTRootCAX3();
-        }, "CA Certificate Check", true);
+        thread(Main::fixLetsEncrypt, "CA Certificate Check", true);
 
         Logging.start(Metadata.HMCL_DIRECTORY.resolve("logs"));
 
@@ -106,28 +104,6 @@ public final class Main {
         }
     }
 
-    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.
      */
@@ -157,8 +133,9 @@ public final class Main {
             }
 
             KeyStore letsEncryptKeyStore = KeyStore.getInstance(KeyStore.getDefaultType());
-            InputStream letsEncryptFile = Main.class.getResourceAsStream("/assets/lekeystore.jks");
-            letsEncryptKeyStore.load(letsEncryptFile, "supersecretpassword".toCharArray());
+            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]);

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

@@ -38,7 +38,7 @@ public final class Metadata {
     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 CONTACT_URL = "https://github.com/huanghongxun/HMCL/issues";
     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";

HMCL/src/main/java/org/jackhuang/hmcl/countly/Countly.java

@@ -0,0 +1,87 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.countly;
+
+import org.jackhuang.hmcl.util.io.HttpRequest;
+
+import java.io.IOException;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
+
+import static org.jackhuang.hmcl.util.Pair.pair;
+
+public class Countly {
+
+    private String deviceId;
+    private String endpoint;
+    private String serverURL;
+
+    public void sendMetric(String metrics) throws IOException {
+        HttpRequest.GET(serverURL + endpoint,
+                pair("begin_session", "1"),
+                pair("session_id", "1"),
+                pair("metrics", metrics),
+                pair("device_id", deviceId),
+                pair("timestamp", Long.toString(System.currentTimeMillis())),
+                pair("tz", Integer.toString(TimeZone.getDefault().getOffset(new Date().getTime()) / 60000)),
+                pair("hour", Integer.toString(currentHour())),
+                pair("dow", Integer.toString(currentDayOfWeek())),
+                pair("app_key", APP_KEY),
+                pair("sdk_name", "java-native"),
+                pair("sdk_version", "20.11.1"))
+                .getString();
+    }
+
+    private static int getTimezoneOffset() {
+        return TimeZone.getDefault().getOffset(new Date().getTime()) / 60000;
+    }
+
+    private static String getLocale() {
+        final Locale locale = Locale.getDefault();
+        return locale.getLanguage() + "_" + locale.getCountry();
+    }
+
+    private static int currentHour() {
+        return Calendar.getInstance().get(Calendar.HOUR_OF_DAY);
+    }
+
+    private int currentDayOfWeek() {
+        int day = Calendar.getInstance().get(Calendar.DAY_OF_WEEK);
+        switch (day) {
+            case Calendar.SUNDAY:
+                return 0;
+            case Calendar.MONDAY:
+                return 1;
+            case Calendar.TUESDAY:
+                return 2;
+            case Calendar.WEDNESDAY:
+                return 3;
+            case Calendar.THURSDAY:
+                return 4;
+            case Calendar.FRIDAY:
+                return 5;
+            case Calendar.SATURDAY:
+                return 6;
+        }
+        return 0;
+    }
+
+    private static final String APP_KEY = "";
+}

HMCL/src/main/java/org/jackhuang/hmcl/countly/CrashReport.java

@@ -0,0 +1,103 @@
+package org.jackhuang.hmcl.countly;
+
+import org.jackhuang.hmcl.Metadata;
+import org.jackhuang.hmcl.util.Logging;
+import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.platform.Architecture;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;
+
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Map;
+
+import static org.jackhuang.hmcl.util.Lang.mapOf;
+import static org.jackhuang.hmcl.util.Pair.pair;
+
+public class CrashReport {
+
+    private final Thread thread;
+    private final Throwable throwable;
+    private final String stackTrace;
+
+    private boolean nonFatal;
+
+    public CrashReport(Thread thread, Throwable throwable) {
+        this.thread = thread;
+        this.throwable = throwable;
+        stackTrace = StringUtils.getStackTrace(throwable);
+        nonFatal = false;
+    }
+
+    public CrashReport setNonFatal() {
+        nonFatal = true;
+        return this;
+    }
+
+    public boolean shouldBeReport() {
+        if (!stackTrace.contains("org.jackhuang"))
+            return false;
+
+        return true;
+    }
+
+    public Map<String, Object> getMetrics(long runningTime) {
+        return mapOf(
+                pair("_run", runningTime),
+                pair("_app_version", Metadata.VERSION),
+                pair("_os", OperatingSystem.SYSTEM_NAME),
+                pair("_os_version", OperatingSystem.SYSTEM_VERSION),
+                pair("_disk_current", getDiskAvailable()),
+                pair("_disk_total", getDiskTotal()),
+                pair("_ram_current", getMemoryAvailable()),
+                pair("_ram_total", Runtime.getRuntime().maxMemory() / BYTES_IN_MB),
+                pair("_error", stackTrace),
+                pair("_logs", Logging.getLogs()),
+                pair("_name", throwable.getLocalizedMessage()),
+                pair("_nonfatal", nonFatal)
+        );
+    }
+
+    public String getDisplayText() {
+        return "---- Hello Minecraft! Crash Report ----\n" +
+                "  Version: " + Metadata.VERSION + "\n" +
+                "  Time: " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "\n" +
+                "  Thread: " + thread + "\n" +
+                "\n  Content: \n    " +
+                stackTrace + "\n\n" +
+                "-- System Details --\n" +
+                "  Operating System: " + OperatingSystem.SYSTEM_NAME + ' ' + OperatingSystem.SYSTEM_VERSION + "\n" +
+                "  System Architecture: " + Architecture.SYSTEM_ARCH_NAME + "\n" +
+                "  Java Architecture: " + Architecture.CURRENT_ARCH_NAME + "\n" +
+                "  Java Version: " + System.getProperty("java.version") + ", " + System.getProperty("java.vendor") + "\n" +
+                "  Java VM Version: " + System.getProperty("java.vm.name") + " (" + System.getProperty("java.vm.info") + "), " + System.getProperty("java.vm.vendor") + "\n" +
+                "  JVM Max Memory: " + Runtime.getRuntime().maxMemory() + "\n" +
+                "  JVM Total Memory: " + Runtime.getRuntime().totalMemory() + "\n" +
+                "  JVM Free Memory: " + Runtime.getRuntime().freeMemory() + "\n";
+    }
+
+    private static final Long BYTES_IN_MB = 1024L * 1024;
+
+    private static long getMemoryAvailable() {
+        Long total = Runtime.getRuntime().totalMemory();
+        Long availMem = Runtime.getRuntime().freeMemory();
+        return (total - availMem) / BYTES_IN_MB;
+    }
+
+    private static long getDiskAvailable() {
+        long total = 0, free = 0;
+        for (File f : File.listRoots()) {
+            total += f.getTotalSpace();
+            free += f.getUsableSpace();
+        }
+        return (total - free) / BYTES_IN_MB;
+    }
+
+    private static long getDiskTotal() {
+        long total = 0;
+        for (File f : File.listRoots()) {
+            total += f.getTotalSpace();
+        }
+        return total / BYTES_IN_MB;
+    }
+}

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

@@ -20,16 +20,17 @@ package org.jackhuang.hmcl.game;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonParseException;
-import com.google.gson.reflect.TypeToken;
 import javafx.scene.image.Image;
 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.download.LibraryAnalyzer;
+import org.jackhuang.hmcl.event.Event;
+import org.jackhuang.hmcl.event.EventManager;
 import org.jackhuang.hmcl.mod.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.mod.ModpackProvider;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.ProxyManager;
+import org.jackhuang.hmcl.setting.VersionIconType;
 import org.jackhuang.hmcl.setting.VersionSetting;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.StringUtils;
@@ -38,10 +39,12 @@ 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 org.jetbrains.annotations.Nullable;
 
 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;
@@ -57,6 +60,8 @@ public class HMCLGameRepository extends DefaultGameRepository {
     private final Map<String, VersionSetting> localVersionSettings = new HashMap<>();
     private final Set<String> beingModpackVersions = new HashSet<>();
 
+    public final EventManager<Event> onVersionIconChanged = new EventManager<>();
+
     public HMCLGameRepository(Profile profile, File baseDirectory) {
         super(baseDirectory);
         this.profile = profile;
@@ -137,15 +142,26 @@ public class HMCLGameRepository extends DefaultGameRepository {
     }
 
     public void duplicateVersion(String srcId, String dstId, boolean copySaves) throws IOException {
-        File srcDir = getVersionRoot(srcId);
-        File dstDir = getVersionRoot(dstId);
+        Path srcDir = getVersionRoot(srcId).toPath();
+        Path dstDir = getVersionRoot(dstId).toPath();
 
-        if (dstDir.exists()) throw new IOException("Version exists");
-        FileUtils.copyDirectory(srcDir.toPath(), dstDir.toPath());
-        if (Files.exists(dstDir.toPath().resolve(srcId + ".jar"))) {
-            Files.move(dstDir.toPath().resolve(srcId + ".jar"), dstDir.toPath().resolve(dstId + ".jar"));
+        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(dstDir.toPath().resolve(srcId + ".json"), dstDir.toPath().resolve(dstId + ".json"));
+        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);
@@ -219,6 +235,7 @@ public class HMCLGameRepository extends DefaultGameRepository {
      *
      * @return corresponding version setting, null if the version has no its own version setting.
      */
+    @Nullable
     public VersionSetting getLocalVersionSetting(String id) {
         if (!localVersionSettings.containsKey(id))
             loadLocalVersionSetting(id);
@@ -228,6 +245,15 @@ public class HMCLGameRepository extends DefaultGameRepository {
         return setting;
     }
 
+    @Nullable
+    public VersionSetting getLocalVersionSettingOrCreate(String id) {
+        VersionSetting vs = getLocalVersionSetting(id);
+        if (vs == null) {
+            vs = createLocalVersionSetting(id);
+        }
+        return vs;
+    }
+
     public VersionSetting getVersionSetting(String id) {
         VersionSetting vs = getLocalVersionSetting(id);
         if (vs == null || vs.isUsesGlobal()) {
@@ -246,14 +272,21 @@ public class HMCLGameRepository extends DefaultGameRepository {
         if (id == null || !isLoaded())
             return newImage("/assets/img/grass.png");
 
-        Version version = getVersion(id).resolve(this);
-        File iconFile = getVersionIconFile(id);
-        if (iconFile.exists())
-            return new Image("file:" + iconFile.getAbsolutePath());
-        else if (LibraryAnalyzer.isModded(this, version))
-            return newImage("/assets/img/furnace.png");
-        else
-            return newImage("/assets/img/grass.png");
+        VersionSetting vs = getLocalVersionSettingOrCreate(id);
+        VersionIconType iconType = Optional.ofNullable(vs).map(VersionSetting::getVersionIcon).orElse(VersionIconType.DEFAULT);
+
+        if (iconType == VersionIconType.DEFAULT) {
+            Version version = getVersion(id).resolve(this);
+            File iconFile = getVersionIconFile(id);
+            if (iconFile.exists())
+                return new Image("file:" + iconFile.getAbsolutePath());
+            else if (LibraryAnalyzer.isModded(this, version))
+                return newImage("/assets/img/furnace.png");
+            else
+                return newImage("/assets/img/grass.png");
+        } else {
+            return newImage(iconType.getResourceUrl());
+        }
     }
 
     public boolean saveVersionSetting(String id) {
@@ -293,7 +326,7 @@ public class HMCLGameRepository extends DefaultGameRepository {
             vs.setUsesGlobal(true);
     }
 
-    public LaunchOptions getLaunchOptions(String version, JavaVersion javaVersion, File gameDir) {
+    public LaunchOptions getLaunchOptions(String version, JavaVersion javaVersion, File gameDir, List<String> javaAgents, boolean makeLaunchScript) {
         VersionSetting vs = getVersionSetting(version);
 
         LaunchOptions.Builder builder = new LaunchOptions.Builder()
@@ -323,7 +356,9 @@ public class HMCLGameRepository extends DefaultGameRepository {
                 .setNativesDir(vs.getNativesDir())
                 .setProcessPriority(vs.getProcessPriority())
                 .setUseNativeGLFW(vs.isUseNativeGLFW())
-                .setUseNativeOpenAL(vs.isUseNativeOpenAL());
+                .setUseNativeOpenAL(vs.isUseNativeOpenAL())
+                .setDaemon(!makeLaunchScript && vs.getLauncherVisibility().isDaemon())
+                .setJavaAgents(javaAgents);
         if (config().hasProxy()) {
             builder.setProxy(ProxyManager.getProxy());
             if (config().hasProxyAuth()) {
@@ -337,11 +372,8 @@ public class HMCLGameRepository extends DefaultGameRepository {
             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);
-                }
+                ModpackProvider provider = ModpackHelper.getProviderByType(modpackConfiguration.getType());
+                if (provider != null) provider.injectLaunchOptions(jsonText, builder);
             } catch (IOException | JsonParseException e) {
                 e.printStackTrace();
             }
@@ -417,6 +449,20 @@ public class HMCLGameRepository extends DefaultGameRepository {
     }
 
     public static long getAllocatedMemory(long minimum, long available, boolean auto) {
-        return auto ? Math.max(minimum, (long) (available * 0.8)) : minimum;
+        if (auto) {
+            available -= 256 * 1024 * 1024; // Reserve 256MB memory for off-heap memory and HMCL itself
+            if (available <= 0) {
+                return minimum;
+            }
+
+            final long threshold = 8L * 1024 * 1024 * 1024;
+            final long suggested = Math.min(available <= threshold
+                            ? (long) (available * 0.8)
+                            : (long) (threshold * 0.8 + (available - threshold) * 0.2),
+                    32736L * 1024 * 1024); // Limit the maximum suggested memory to ensure that compressed oops are available
+            return Math.max(minimum, suggested);
+        } else {
+            return minimum;
+        }
     }
 }

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

@@ -33,7 +33,8 @@ import org.jackhuang.hmcl.util.io.FileUtils;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.LinkedList;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public final class HMCLModpackInstallTask extends Task<Void> {
@@ -42,8 +43,8 @@ public final class HMCLModpackInstallTask extends Task<Void> {
     private final HMCLGameRepository repository;
     private final DefaultDependencyManager dependency;
     private final Modpack modpack;
-    private final List<Task<?>> dependencies = new LinkedList<>();
-    private final List<Task<?>> dependents = new LinkedList<>();
+    private final List<Task<?>> dependencies = new ArrayList<>(1);
+    private final List<Task<?>> dependents = new ArrayList<>(4);
 
     public HMCLModpackInstallTask(Profile profile, File zipFile, Modpack modpack, String name) {
         dependency = profile.getDependency();
@@ -69,13 +70,13 @@ public final class HMCLModpackInstallTask extends Task<Void> {
                 config = JsonUtils.GSON.fromJson(FileUtils.readText(json), new TypeToken<ModpackConfiguration<Modpack>>() {
                 }.getType());
 
-                if (!MODPACK_TYPE.equals(config.getType()))
+                if (!HMCLModpackProvider.INSTANCE.getName().equals(config.getType()))
                     throw new IllegalArgumentException("Version " + name + " is not a HMCL modpack. Cannot update this version.");
             }
         } catch (JsonParseException | IOException ignore) {
         }
-        dependents.add(new ModpackInstallTask<>(zipFile, run, modpack.getEncoding(), "/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"));
+        dependents.add(new ModpackInstallTask<>(zipFile, run, modpack.getEncoding(), Collections.singletonList("/minecraft"), it -> !"pack.json".equals(it), config));
+        dependents.add(new MinecraftInstanceTask<>(zipFile, modpack.getEncoding(), Collections.singletonList("/minecraft"), modpack, HMCLModpackProvider.INSTANCE, modpack.getName(), modpack.getVersion(), repository.getModpackConfiguration(name)).withStage("hmcl.modpack"));
     }
 
     @Override
@@ -104,6 +105,4 @@ public final class HMCLModpackInstallTask extends Task<Void> {
 
         dependencies.add(libraryTask.thenComposeAsync(repository::saveAsync));
     }
-
-    public static final String MODPACK_TYPE = "HMCL";
 }

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

@@ -17,8 +17,16 @@
  */
 package org.jackhuang.hmcl.game;
 
-public final class HMCLModpackManifest {
+import org.jackhuang.hmcl.mod.ModpackManifest;
+import org.jackhuang.hmcl.mod.ModpackProvider;
+
+public final class HMCLModpackManifest implements ModpackManifest {
     public static final HMCLModpackManifest INSTANCE = new HMCLModpackManifest();
 
     private HMCLModpackManifest() {}
+
+    @Override
+    public ModpackProvider getProvider() {
+        return HMCLModpackProvider.INSTANCE;
+    }
 }

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2022  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,8 +18,13 @@
 package org.jackhuang.hmcl.game;
 
 import com.google.gson.JsonParseException;
+import org.apache.commons.compress.archivers.zip.ZipFile;
 import org.jackhuang.hmcl.download.DefaultDependencyManager;
+import org.jackhuang.hmcl.mod.MismatchedModpackTypeException;
 import org.jackhuang.hmcl.mod.Modpack;
+import org.jackhuang.hmcl.mod.ModpackProvider;
+import org.jackhuang.hmcl.mod.ModpackUpdateTask;
+import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
@@ -30,26 +35,39 @@ import java.io.IOException;
 import java.nio.charset.Charset;
 import java.nio.file.Path;
 
-/**
- * @author huangyuhui
- */
-public final class HMCLModpackManager {
-    private HMCLModpackManager() {
+public final class HMCLModpackProvider implements ModpackProvider {
+    public static final HMCLModpackProvider INSTANCE = new HMCLModpackProvider();
+
+    @Override
+    public String getName() {
+        return "HMCL";
     }
 
-    /**
-     * Read the manifest in a HMCL modpack.
-     *
-     * @param file     a HMCL modpack file.
-     * @param encoding encoding of modpack zip file.
-     * @return the manifest of HMCL modpack.
-     * @throws IOException        if the file is not a valid zip file.
-     * @throws JsonParseException if the manifest.json is missing or malformed.
-     */
-    public static Modpack readHMCLModpackManifest(Path file, Charset encoding) throws IOException, JsonParseException {
-        String manifestJson = CompressingUtils.readTextZipEntry(file, "modpack.json", encoding);
+    @Override
+    public Task<?> createCompletionTask(DefaultDependencyManager dependencyManager, String version) {
+        return null;
+    }
+
+    @Override
+    public Task<?> createUpdateTask(DefaultDependencyManager dependencyManager, String name, File zipFile, Modpack modpack) throws MismatchedModpackTypeException {
+        if (!(modpack.getManifest() instanceof HMCLModpackManifest))
+            throw new MismatchedModpackTypeException(getName(), modpack.getManifest().getProvider().getName());
+
+        if (!(dependencyManager.getGameRepository() instanceof HMCLGameRepository)) {
+            throw new IllegalArgumentException("HMCLModpackProvider requires HMCLGameRepository");
+        }
+
+        HMCLGameRepository repository = (HMCLGameRepository) dependencyManager.getGameRepository();
+        Profile profile = repository.getProfile();
+
+        return new ModpackUpdateTask(dependencyManager.getGameRepository(), name, new HMCLModpackInstallTask(profile, zipFile, modpack, name));
+    }
+
+    @Override
+    public Modpack readManifest(ZipFile file, Path path, Charset encoding) throws IOException, JsonParseException {
+        String manifestJson = CompressingUtils.readTextZipEntry(file, "modpack.json");
         Modpack manifest = JsonUtils.fromNonNullJson(manifestJson, HMCLModpack.class).setEncoding(encoding);
-        String gameJson = CompressingUtils.readTextZipEntry(file, "minecraft/pack.json", encoding);
+        String gameJson = CompressingUtils.readTextZipEntry(file, "minecraft/pack.json");
         Version game = JsonUtils.fromNonNullJson(gameJson, Version.class);
         if (game.getJar() == null)
             if (StringUtils.isBlank(manifest.getVersion()))
@@ -67,4 +85,5 @@ public final class HMCLModpackManager {
             return new HMCLModpackInstallTask(((HMCLGameRepository) dependencyManager.getGameRepository()).getProfile(), zipFile, this, name);
         }
     }
+
 }

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

@@ -17,39 +17,31 @@
  */
 package org.jackhuang.hmcl.game;
 
-import com.jfoenix.controls.JFXButton;
 import javafx.application.Platform;
 import javafx.stage.Stage;
 import org.jackhuang.hmcl.Launcher;
+import org.jackhuang.hmcl.Metadata;
 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.NotDecompressingNativesException;
-import org.jackhuang.hmcl.launch.PermissionException;
-import org.jackhuang.hmcl.launch.ProcessCreationException;
-import org.jackhuang.hmcl.launch.ProcessListener;
+import org.jackhuang.hmcl.launch.*;
+import org.jackhuang.hmcl.mod.ModpackCompletionException;
 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.mod.ModpackProvider;
+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.*;
-import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
-import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
+import org.jackhuang.hmcl.ui.construct.*;
 import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
-import org.jackhuang.hmcl.ui.construct.TaskExecutorDialogPane;
 import org.jackhuang.hmcl.util.*;
 import org.jackhuang.hmcl.util.i18n.I18n;
 import org.jackhuang.hmcl.util.io.ResponseCodeException;
@@ -59,15 +51,23 @@ import org.jackhuang.hmcl.util.versioning.VersionNumber;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.SocketTimeoutException;
 import java.net.URL;
+import java.nio.file.AccessDeniedException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
 import java.util.*;
-import java.util.concurrent.*;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.CountDownLatch;
 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;
@@ -92,7 +92,7 @@ public final class LauncherHelper {
         this.launchingStepsPane.setTitle(i18n("version.launch"));
     }
 
-    private final TaskExecutorDialogPane launchingStepsPane = new TaskExecutorDialogPane(it -> {});
+    private final TaskExecutorDialogPane launchingStepsPane = new TaskExecutorDialogPane(TaskCancellationAction.NORMAL);
 
     public void setTestMode() {
         launcherVisibility = LauncherVisibility.KEEP;
@@ -125,9 +125,12 @@ public final class LauncherHelper {
         Optional<String> gameVersion = repository.getGameVersion(version);
         boolean integrityCheck = repository.unmarkVersionLaunchedAbnormally(selectedVersion);
         CountDownLatch launchingLatch = new CountDownLatch(1);
+        List<String> javaAgents = new ArrayList<>(0);
 
         AtomicReference<JavaVersion> javaVersionRef = new AtomicReference<>();
 
+        getLog4jPatch(version).ifPresent(javaAgents::add);
+
         TaskExecutor executor = checkGameState(profile, setting, version)
                 .thenComposeAsync(javaVersion -> {
                     javaVersionRef.set(Objects.requireNonNull(javaVersion));
@@ -145,14 +148,9 @@ public final class LauncherHelper {
                             } 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;
+                                    ModpackProvider provider = ModpackHelper.getProviderByType(configuration.getType());
+                                    if (provider == null) return null;
+                                    else return provider.createCompletionTask(dependencyManager, selectedVersion);
                                 } catch (IOException e) {
                                     return null;
                                 }
@@ -173,7 +171,7 @@ public final class LauncherHelper {
                     }
                 }).withStage("launch.state.logging_in"))
                 .thenComposeAsync(authInfo -> Task.supplyAsync(() -> {
-                    LaunchOptions launchOptions = repository.getLaunchOptions(selectedVersion, javaVersionRef.get(), profile.getGameDir());
+                    LaunchOptions launchOptions = repository.getLaunchOptions(selectedVersion, javaVersionRef.get(), profile.getGameDir(), javaAgents, scriptFile != null);
                     return new HMCLGameLauncher(
                             repository,
                             version,
@@ -198,10 +196,10 @@ public final class LauncherHelper {
                         if (launcherVisibility == LauncherVisibility.CLOSE)
                             Launcher.stopApplication();
                         else
-                            launchingStepsPane.setCancel(it -> {
+                            launchingStepsPane.setCancel(new TaskCancellationAction(it -> {
                                 process.stop();
                                 it.fireEvent(new DialogCloseEvent());
-                            });
+                            }));
                     } else {
                         Platform.runLater(() -> {
                             launchingStepsPane.fireEvent(new DialogCloseEvent());
@@ -231,7 +229,7 @@ public final class LauncherHelper {
                             Exception ex = executor.getException();
                             if (!(ex instanceof CancellationException)) {
                                 String message;
-                                if (ex instanceof CurseCompletionException) {
+                                if (ex instanceof ModpackCompletionException) {
                                     if (ex.getCause() instanceof FileNotFoundException)
                                         message = i18n("modpack.type.curse.not_found");
                                     else
@@ -283,6 +281,25 @@ public final class LauncherHelper {
                                         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);
                                 }
@@ -318,9 +335,43 @@ public final class LauncherHelper {
                 Runnable continueAction = () -> future.complete(JavaVersion.fromCurrentEnvironment());
 
                 if (setting.isJavaAutoSelected()) {
-//                    JavaVersionConstraint.VersionRange range = JavaVersionConstraint.findSuitableJavaVersionRange(gameVersion, version);
-                    // TODO: download java 16 if necessary!
-                    Controllers.dialog(i18n("launch.failed.no_accepted_java"), i18n("message.warning"), MessageType.WARNING, continueAction);
+                    JavaVersionConstraint.VersionRanges range = JavaVersionConstraint.findSuitableJavaVersionRange(gameVersion, version);
+                    GameJavaVersion targetJavaVersion;
+
+                    if (range.getMandatory().contains(VersionNumber.asVersion("17.0.1"))) {
+                        targetJavaVersion = GameJavaVersion.JAVA_17;
+                    } else if (range.getMandatory().contains(VersionNumber.asVersion("16.0.1"))) {
+                        targetJavaVersion = GameJavaVersion.JAVA_16;
+                    } else {
+                        String java8Version;
+
+                        if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
+                            java8Version = "1.8.0_51";
+                        } else if (OperatingSystem.CURRENT_OS == OperatingSystem.LINUX) {
+                            java8Version = "1.8.0_202";
+                        } else if (OperatingSystem.CURRENT_OS == OperatingSystem.OSX) {
+                            java8Version = "1.8.0_74";
+                        } else {
+                            java8Version = null;
+                        }
+
+                        if (java8Version != null && range.getMandatory().contains(VersionNumber.asVersion(java8Version)))
+                            targetJavaVersion = GameJavaVersion.JAVA_8;
+                        else
+                            targetJavaVersion = 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 {
                     Controllers.dialog(i18n("launch.wrong_javadir"), i18n("message.warning"), MessageType.WARNING, continueAction);
 
@@ -342,9 +393,9 @@ public final class LauncherHelper {
 
             JavaVersionConstraint violatedMandatoryConstraint = null;
             JavaVersionConstraint violatedSuggestedConstraint = null;
-            for (JavaVersionConstraint constraint : JavaVersionConstraint.values()) {
-                if (constraint.getGameVersion().contains(gameVersion) && constraint.appliesToVersion(gameVersion, version)) {
-                    if (!constraint.getJavaVersion(version).contains(javaVersion.getVersionNumber())) {
+            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) {
@@ -372,59 +423,51 @@ public final class LauncherHelper {
                 } else {
                     switch (violatedMandatoryConstraint) {
                         case GAME_JSON:
-                            MessageDialogPane dialog = new MessageDialogPane(
-                                    i18n("launch.advice.require_newer_java_version",
-                                            gameVersion.toString(),
-                                            version.getJavaVersion().getMajorVersion()),
-                                    i18n("message.warning"),
-                                    MessageType.QUESTION);
-
-                            JFXButton linkButton = new JFXButton(i18n("download.external_link"));
-                            linkButton.setOnAction(e -> FXUtils.openLink("https://adoptopenjdk.net/"));
-                            linkButton.getStyleClass().add("dialog-accept");
-                            dialog.addButton(linkButton);
-
-                            JFXButton yesButton = new JFXButton(i18n("button.ok"));
-                            yesButton.setOnAction(event -> {
-                                downloadJava(version.getJavaVersion(), profile)
-                                        .thenAcceptAsync(x -> {
-                                            try {
-                                                Optional<JavaVersion> newAcceptableJava = JavaVersion.getJavas().stream()
-                                                        .filter(newJava -> newJava.getParsedVersion() >= version.getJavaVersion().getMajorVersion())
-                                                        .max(Comparator.comparing(JavaVersion::getVersionNumber));
-                                                if (newAcceptableJava.isPresent()) {
-                                                    setting.setJavaVersion(newAcceptableJava.get());
-                                                    future.complete(newAcceptableJava.get());
-                                                    return;
-                                                }
-                                            } catch (InterruptedException e) {
-                                                LOG.log(Level.SEVERE, "Cannot list javas", e);
-                                            }
-                                            future.complete(javaVersion);
-                                        }, Platform::runLater)
-                                        .exceptionally(Lang.handleUncaught);
-                            });
-                            yesButton.getStyleClass().add("dialog-accept");
-                            dialog.addButton(yesButton);
-
-                            JFXButton noButton = new JFXButton(i18n("button.cancel"));
-                            noButton.getStyleClass().add("dialog-cancel");
-                            dialog.addButton(noButton);
-                            dialog.setCancelButton(noButton);
-
-                            Controllers.dialog(dialog);
+                            downloadJava(gameVersion.toString(), version.getJavaVersion(), profile)
+                                    .thenAcceptAsync(downloadedJavaVersion -> {
+                                        setting.setJavaVersion(downloadedJavaVersion);
+                                        future.complete(downloadedJavaVersion);
+                                    }, Schedulers.javafx())
+                                    .whenCompleteAsync((result, throwable) -> {
+                                        LOG.log(Level.WARNING, "Failed to download java", throwable);
+                                        breakAction.run();
+                                    }, Schedulers.javafx());
                             return Task.fromCompletableFuture(future);
                         case VANILLA_JAVA_16:
                             Controllers.confirm(i18n("launch.advice.require_newer_java_version", gameVersion.toString(), 16), i18n("message.warning"), () -> {
-                                FXUtils.openLink("https://adoptopenjdk.net/");
+                                FXUtils.openLink(OPENJDK_DOWNLOAD_LINK);
+                            }, breakAction);
+                            return null;
+                        case VANILLA_JAVA_17:
+                            Controllers.confirm(i18n("launch.advice.require_newer_java_version", gameVersion.toString(), 17), i18n("message.warning"), () -> {
+                                FXUtils.openLink(OPENJDK_DOWNLOAD_LINK);
                             }, 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:
-                            Controllers.dialog(i18n("launch.advice.vanilla_linux_java_8"), i18n("message.error"), MessageType.ERROR, breakAction);
-                            return null;
+                            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;
@@ -432,13 +475,14 @@ public final class LauncherHelper {
                 }
             }
 
-            if (javaVersion.getPlatform() != Architecture.SYSTEM.getPlatform()) {
+            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;
             }
 
             // 32-bit JVM cannot make use of too much memory.
-            if (javaVersion.getPlatform() == org.jackhuang.hmcl.util.platform.Platform.BIT_32 &&
+            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.
@@ -450,20 +494,26 @@ public final class LauncherHelper {
                 suggested = true;
                 switch (violatedSuggestedConstraint) {
                     case MODDED_JAVA_7:
-                        Controllers.dialog(i18n("launch.advice.java.modded_java_7"), i18n("message.error"), MessageType.ERROR, continueAction);
+                        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 MODDED_JAVA_16:
+                        Controllers.dialog(i18n("launch.advice.forge37_0_60"), 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;
+                    case MODLAUNCHER_8:
+                        Controllers.dialog(i18n("launch.advice.modlauncher8"), 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);
+                Controllers.confirm(i18n("launch.advice.not_enough_space", OperatingSystem.TOTAL_MEMORY), i18n("message.error"), continueAction, breakAction);
                 suggested = true;
             }
 
@@ -475,7 +525,7 @@ public final class LauncherHelper {
                                         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);
+                    Controllers.confirm(i18n("launch.advice.forge2760_liteloader"), i18n("message.error"), continueAction, breakAction);
                     suggested = true;
                 }
             }
@@ -487,12 +537,12 @@ public final class LauncherHelper {
                                 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);
+                    Controllers.confirm(i18n("launch.advice.forge28_2_2_optifine"), i18n("message.error"), continueAction, breakAction);
                     suggested = true;
                 }
             }
 
-            if (!suggested) {
+            if (!suggested && !future.isDone()) {
                 future.complete(javaVersion);
             }
 
@@ -500,36 +550,113 @@ public final class LauncherHelper {
         }).withStage("launch.state.java");
     }
 
-    private static CompletableFuture<Void> downloadJava(GameJavaVersion javaVersion, Profile profile) {
-        CompletableFuture<Void> future = new CompletableFuture<>();
+    private static CompletableFuture<JavaVersion> downloadJava(String gameVersion, GameJavaVersion javaVersion, Profile profile) {
+        CompletableFuture<JavaVersion> future = new CompletableFuture<>();
 
-        TaskExecutorDialogPane javaDownloadingPane = new TaskExecutorDialogPane(it -> {
+        JFXHyperlink link = new JFXHyperlink(i18n("download.external_link"));
+        link.setOnAction(e -> {
+            FXUtils.openLink(OPENJDK_DOWNLOAD_LINK);
+            future.completeExceptionally(new CancellationException());
         });
 
-        TaskExecutor executor = JavaRepository.downloadJava(javaVersion,
-                profile.getDependency().getDownloadProvider()).executor(false);
-        executor.addTaskListener(new TaskListener() {
-            @Override
-            public void onStop(boolean success, TaskExecutor executor) {
-                super.onStop(success, executor);
-                Platform.runLater(() -> {
-                    if (!success) {
-                        future.completeExceptionally(Optional.ofNullable(executor.getException()).orElseGet(InterruptedException::new));
+        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(TaskCancellationAction.NORMAL);
+
+        TaskExecutor executor = JavaRepository.downloadJava(javaVersion, downloadProvider)
+                .whenComplete(Schedulers.javafx(), (downloadedJava, exception) -> {
+                    if (exception != null) {
+                        future.completeExceptionally(exception);
                     } else {
-                        future.complete(null);
+                        future.complete(downloadedJava);
                     }
-                });
-            }
-        });
+                })
+                .executor(false);
 
         javaDownloadingPane.setExecutor(executor, true);
         Controllers.dialog(javaDownloadingPane);
         executor.start();
 
-
         return future;
     }
 
+    private static Optional<String> getLog4jPatch(Version version) {
+        Optional<String> log4jVersion = version.getLibraries().stream()
+                .filter(it -> it.is("org.apache.logging.log4j", "log4j-core")
+                        && (VersionNumber.VERSION_COMPARATOR.compare(it.getVersion(), "2.17") < 0 || "2.0-beta9".equals(it.getVersion())))
+                .map(Library::getVersion)
+                .findFirst();
+
+        if (log4jVersion.isPresent()) {
+            final String agentFileName = "log4j-patch-agent-1.0.jar";
+
+            Path agentFile = Metadata.HMCL_DIRECTORY.resolve(agentFileName).toAbsolutePath();
+            String agentFilePath = agentFile.toString();
+            if (agentFilePath.indexOf('=') >= 0) {
+                LOG.warning("Invalid character '=' in the HMCL directory path, unable to attach log4j-patch");
+                return Optional.empty();
+            }
+
+            if (Files.notExists(agentFile)) {
+                try (InputStream input = DefaultLauncher.class.getResourceAsStream("/assets/game/" + agentFileName)) {
+                    LOG.info("Extract log4j patch to " + agentFilePath);
+                    Files.createDirectories(agentFile.getParent());
+                    Files.copy(input, agentFile, StandardCopyOption.REPLACE_EXISTING);
+                } catch (IOException e) {
+                    LOG.log(Level.WARNING, "Failed to extract log4j patch");
+                    try {
+                        Files.deleteIfExists(agentFile);
+                    } catch (IOException ex) {
+                        LOG.log(Level.WARNING, "Failed to delete incomplete log4j patch", ex);
+                    }
+                    return Optional.empty();
+                }
+            }
+
+            boolean isBeta = log4jVersion.get().startsWith("2.0-beta");
+            return Optional.of(agentFilePath + "=" + isBeta);
+        } else {
+            LOG.info("No log4j with security vulnerabilities found");
+            return Optional.empty();
+        }
+    }
+
     private void checkExit() {
         switch (launcherVisibility) {
             case HIDE_AND_REOPEN:
@@ -563,7 +690,6 @@ public final class LauncherHelper {
 
         private final HMCLGameRepository repository;
         private final Version version;
-        private final Map<String, String> forbiddenTokens;
         private final LaunchOptions launchOptions;
         private ManagedProcess process;
         private boolean lwjgl;
@@ -580,13 +706,6 @@ public final class LauncherHelper {
             this.launchingLatch = launchingLatch;
             this.detectWindow = detectWindow;
 
-            if (authInfo == null)
-                forbiddenTokens = Collections.emptyMap();
-            else
-                forbiddenTokens = mapOf(
-                        pair(authInfo.getAccessToken(), "<access token>")
-                );
-
             logs = new LinkedList<>();
         }
 
@@ -595,11 +714,14 @@ public final class LauncherHelper {
             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();
@@ -643,10 +765,7 @@ public final class LauncherHelper {
 
         @Override
         public synchronized void onLog(String log, Log4jLevel level) {
-            String newLog = log;
-            for (Map.Entry<String, String> entry : forbiddenTokens.entrySet())
-                newLog = newLog.replace(entry.getKey(), entry.getValue());
-            String filteredLog = newLog;
+            String filteredLog = Logging.filterForbiddenToken(log);
 
             if (level.lessOrEqual(Log4jLevel.ERROR))
                 System.err.println(filteredLog);
@@ -694,7 +813,10 @@ public final class LauncherHelper {
 
     }
 
+    private static final String OPENJDK_DOWNLOAD_LINK = "https://docs.microsoft.com/zh-cn/java/openjdk/download";
+
     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/LocalizedRemoteModRepository.java

@@ -0,0 +1,88 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2022  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.game;
+
+import org.jackhuang.hmcl.mod.LocalModFile;
+import org.jackhuang.hmcl.mod.RemoteMod;
+import org.jackhuang.hmcl.mod.RemoteModRepository;
+import org.jackhuang.hmcl.ui.versions.ModTranslations;
+import org.jackhuang.hmcl.util.StringUtils;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+public abstract class LocalizedRemoteModRepository implements RemoteModRepository {
+
+    protected abstract RemoteModRepository getBackedRemoteModRepository();
+
+    @Override
+    public Stream<RemoteMod> search(String gameVersion, Category category, int pageOffset, int pageSize, String searchFilter, SortType sort, SortOrder sortOrder) throws IOException {
+        String newSearchFilter;
+        if (StringUtils.CHINESE_PATTERN.matcher(searchFilter).find()) {
+            ModTranslations modTranslations = ModTranslations.getTranslationsByRepositoryType(getType());
+            List<ModTranslations.Mod> mods = modTranslations.searchMod(searchFilter);
+            List<String> searchFilters = new ArrayList<>();
+            int count = 0;
+            for (ModTranslations.Mod mod : mods) {
+                String englishName = mod.getName();
+                if (StringUtils.isNotBlank(mod.getSubname())) {
+                    englishName = mod.getSubname();
+                }
+
+                searchFilters.add(englishName);
+
+                count++;
+                if (count >= 3) break;
+            }
+            newSearchFilter = String.join(" ", searchFilters);
+        } else {
+            newSearchFilter = searchFilter;
+        }
+
+        return getBackedRemoteModRepository().search(gameVersion, category, pageOffset, pageSize, newSearchFilter, sort, sortOrder);
+    }
+
+    @Override
+    public Stream<Category> getCategories() throws IOException {
+        return getBackedRemoteModRepository().getCategories();
+    }
+
+    @Override
+    public Optional<RemoteMod.Version> getRemoteVersionByLocalFile(LocalModFile localModFile, Path file) throws IOException {
+        return getBackedRemoteModRepository().getRemoteVersionByLocalFile(localModFile, file);
+    }
+
+    @Override
+    public RemoteMod getModById(String id) throws IOException {
+        return getBackedRemoteModRepository().getModById(id);
+    }
+
+    @Override
+    public RemoteMod.File getModFile(String modId, String fileId) throws IOException {
+        return getBackedRemoteModRepository().getModFile(modId, fileId);
+    }
+
+    @Override
+    public Stream<RemoteMod.Version> getRemoteVersionsById(String id) throws IOException {
+        return getBackedRemoteModRepository().getRemoteVersionsById(id);
+    }
+}

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

@@ -17,7 +17,6 @@
  */
 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;
@@ -66,7 +65,7 @@ public final class LogExporter {
                 }
                 zipper.putTextFile(Logging.getLogs(), "hmcl.log");
                 zipper.putTextFile(logs, "minecraft.log");
-                zipper.putTextFile(launchScript, OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS ? "launch.bat" : "launch.sh");
+                zipper.putTextFile(Logging.filterForbiddenToken(launchScript), OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS ? "launch.bat" : "launch.sh");
 
                 for (String id : versions) {
                     Path versionJson = baseDirectory.resolve("versions").resolve(id).resolve(id + ".json");
@@ -77,6 +76,6 @@ public final class LogExporter {
             } catch (IOException e) {
                 throw new UncheckedIOException(e);
             }
-        }, Schedulers.io());
+        });
     }
 }

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

@@ -19,16 +19,16 @@ package org.jackhuang.hmcl.game;
 
 import com.google.gson.JsonParseException;
 import com.google.gson.reflect.TypeToken;
+import org.apache.commons.compress.archivers.zip.ZipFile;
 import org.jackhuang.hmcl.mod.*;
-import org.jackhuang.hmcl.mod.curse.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.curse.CurseModpackProvider;
 import org.jackhuang.hmcl.mod.mcbbs.McbbsModpackManifest;
+import org.jackhuang.hmcl.mod.mcbbs.McbbsModpackProvider;
+import org.jackhuang.hmcl.mod.modrinth.ModrinthModpackProvider;
 import org.jackhuang.hmcl.mod.multimc.MultiMCInstanceConfiguration;
-import org.jackhuang.hmcl.mod.multimc.MultiMCModpackInstallTask;
-import org.jackhuang.hmcl.mod.server.ServerModpackLocalInstallTask;
+import org.jackhuang.hmcl.mod.multimc.MultiMCModpackProvider;
 import org.jackhuang.hmcl.mod.server.ServerModpackManifest;
+import org.jackhuang.hmcl.mod.server.ServerModpackProvider;
 import org.jackhuang.hmcl.mod.server.ServerModpackRemoteInstallTask;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Profiles;
@@ -41,6 +41,7 @@ import org.jackhuang.hmcl.util.function.ExceptionalRunnable;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.io.CompressingUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -51,44 +52,54 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Stream;
 
+import static org.jackhuang.hmcl.util.Lang.mapOf;
 import static org.jackhuang.hmcl.util.Lang.toIterable;
+import static org.jackhuang.hmcl.util.Pair.pair;
 
 public final class ModpackHelper {
     private ModpackHelper() {}
 
+    private static final Map<String, ModpackProvider> providers = mapOf(
+            pair(CurseModpackProvider.INSTANCE.getName(), CurseModpackProvider.INSTANCE),
+            pair(McbbsModpackProvider.INSTANCE.getName(), McbbsModpackProvider.INSTANCE),
+            pair(ModrinthModpackProvider.INSTANCE.getName(), ModrinthModpackProvider.INSTANCE),
+            pair(MultiMCModpackProvider.INSTANCE.getName(), MultiMCModpackProvider.INSTANCE),
+            pair(ServerModpackProvider.INSTANCE.getName(), ServerModpackProvider.INSTANCE),
+            pair(HMCLModpackProvider.INSTANCE.getName(), HMCLModpackProvider.INSTANCE)
+    );
+
+    @Nullable
+    public static ModpackProvider getProviderByType(String type) {
+        return providers.get(type);
+    }
+
+    public static boolean isFileModpackByExtension(File file) {
+        String ext = FileUtils.getExtension(file);
+        return "zip".equals(ext) || "mrpack".equals(ext);
+    }
+
     public static Modpack readModpackManifest(Path file, Charset charset) throws UnsupportedModpackException, ManuallyCreatedModpackException {
-        try {
-            return McbbsModpackManifest.readManifest(file, charset);
-        } catch (Exception ignored) {
-            // ignore it, not a valid MCBBS modpack.
-        }
-
-        try {
-            return CurseManifest.readCurseForgeModpackManifest(file, charset);
-        } catch (Exception e) {
-            // ignore it, not a valid CurseForge modpack.
-        }
-
-        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 {
-            return ServerModpackManifest.readManifest(file, charset);
-        } catch (Exception e) {
-            // ignore it, not a valid Server modpack.
+        try (ZipFile zipFile = CompressingUtils.openZipFile(file, charset)) {
+            // Order for trying detecting manifest is necessary here.
+            // Do not change to iterating providers.
+            for (ModpackProvider provider : new ModpackProvider[]{
+                    McbbsModpackProvider.INSTANCE,
+                    CurseModpackProvider.INSTANCE,
+                    ModrinthModpackProvider.INSTANCE,
+                    HMCLModpackProvider.INSTANCE,
+                    MultiMCModpackProvider.INSTANCE,
+                    ServerModpackProvider.INSTANCE}) {
+                try {
+                    return provider.readManifest(zipFile, file, charset);
+                } catch (Exception ignored) {
+                }
+            }
+        } catch (IOException ignored) {
         }
 
         try (FileSystem fs = CompressingUtils.createReadOnlyZipFileSystem(file, charset)) {
@@ -137,17 +148,6 @@ public final class ModpackHelper {
             }
     }
 
-    private static String getManifestType(Object manifest) throws UnsupportedModpackException {
-        if (manifest instanceof HMCLModpackManifest)
-            return HMCLModpackInstallTask.MODPACK_TYPE;
-        else if (manifest instanceof MultiMCInstanceConfiguration)
-            return MultiMCModpackInstallTask.MODPACK_TYPE;
-        else if (manifest instanceof CurseManifest)
-            return CurseInstallTask.MODPACK_TYPE;
-        else
-            throw new UnsupportedModpackException();
-    }
-
     public static Task<?> getInstallTask(Profile profile, ServerModpackManifest manifest, String name, Modpack modpack) {
         profile.getRepository().markVersionAsModpack(name);
 
@@ -161,7 +161,7 @@ public final class ModpackHelper {
         };
 
         ExceptionalConsumer<Exception, ?> failure = ex -> {
-            if (ex instanceof CurseCompletionException && !(ex.getCause() instanceof FileNotFoundException)) {
+            if (ex instanceof ModpackCompletionException && !(ex.getCause() instanceof FileNotFoundException)) {
                 success.run();
                 // This is tolerable and we will not delete the game
             }
@@ -203,7 +203,7 @@ public final class ModpackHelper {
         };
 
         ExceptionalConsumer<Exception, ?> failure = ex -> {
-            if (ex instanceof CurseCompletionException && !(ex.getCause() instanceof FileNotFoundException)) {
+            if (ex instanceof ModpackCompletionException && !(ex.getCause() instanceof FileNotFoundException)) {
                 success.run();
                 // This is tolerable and we will not delete the game
             }
@@ -232,38 +232,13 @@ public final class ModpackHelper {
         }
     }
 
-    public static Task<Void> getUpdateTask(Profile profile, File zipFile, Charset charset, String name, ModpackConfiguration<?> configuration) throws UnsupportedModpackException, ManuallyCreatedModpackException, MismatchedModpackTypeException {
+    public static Task<?> 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()) {
-            case CurseInstallTask.MODPACK_TYPE:
-                if (!(modpack.getManifest() instanceof CurseManifest))
-                    throw new MismatchedModpackTypeException(CurseInstallTask.MODPACK_TYPE, getManifestType(modpack.getManifest()));
-
-                return new ModpackUpdateTask(profile.getRepository(), name, new CurseInstallTask(profile.getDependency(), zipFile, modpack, (CurseManifest) modpack.getManifest(), name));
-            case MultiMCModpackInstallTask.MODPACK_TYPE:
-                if (!(modpack.getManifest() instanceof MultiMCInstanceConfiguration))
-                    throw new MismatchedModpackTypeException(MultiMCModpackInstallTask.MODPACK_TYPE, getManifestType(modpack.getManifest()));
-
-                return new ModpackUpdateTask(profile.getRepository(), name, new MultiMCModpackInstallTask(profile.getDependency(), zipFile, modpack, (MultiMCInstanceConfiguration) modpack.getManifest(), name));
-            case HMCLModpackInstallTask.MODPACK_TYPE:
-                if (!(modpack.getManifest() instanceof HMCLModpackManifest))
-                    throw new MismatchedModpackTypeException(HMCLModpackInstallTask.MODPACK_TYPE, getManifestType(modpack.getManifest()));
-
-                return new ModpackUpdateTask(profile.getRepository(), name, new HMCLModpackInstallTask(profile, zipFile, modpack, name));
-            case McbbsModpackLocalInstallTask.MODPACK_TYPE:
-                if (!(modpack.getManifest() instanceof McbbsModpackManifest))
-                    throw new MismatchedModpackTypeException(McbbsModpackLocalInstallTask.MODPACK_TYPE, getManifestType(modpack.getManifest()));
-
-                return new ModpackUpdateTask(profile.getRepository(), name, new McbbsModpackLocalInstallTask(profile.getDependency(), zipFile, modpack, (McbbsModpackManifest) modpack.getManifest(), name));
-            case ServerModpackLocalInstallTask.MODPACK_TYPE:
-                if (!(modpack.getManifest() instanceof ServerModpackManifest))
-                    throw new MismatchedModpackTypeException(ServerModpackLocalInstallTask.MODPACK_TYPE, getManifestType(modpack.getManifest()));
-
-                return new ModpackUpdateTask(profile.getRepository(), name, new ServerModpackLocalInstallTask(profile.getDependency(), zipFile, modpack, (ServerModpackManifest) modpack.getManifest(), name));
-            default:
-                throw new UnsupportedModpackException();
+        ModpackProvider provider = getProviderByType(configuration.getType());
+        if (provider == null) {
+            throw new UnsupportedModpackException();
         }
+        return provider.createUpdateTask(profile.getDependency(), name, zipFile, modpack);
     }
 
     public static void toVersionSetting(MultiMCInstanceConfiguration c, VersionSetting vs) {

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

@@ -19,7 +19,9 @@ package org.jackhuang.hmcl.game;
 
 import fi.iki.elonen.NanoHTTPD;
 import org.jackhuang.hmcl.auth.AuthenticationException;
-import org.jackhuang.hmcl.auth.microsoft.MicrosoftService;
+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;
@@ -39,7 +41,7 @@ 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 MicrosoftAuthenticationServer extends NanoHTTPD implements MicrosoftService.OAuthSession {
+public final class OAuthServer extends NanoHTTPD implements OAuth.Session {
     private final int port;
     private final CompletableFuture<String> future = new CompletableFuture<>();
 
@@ -47,7 +49,7 @@ public final class MicrosoftAuthenticationServer extends NanoHTTPD implements Mi
 
     private String idToken;
 
-    private MicrosoftAuthenticationServer(int port) {
+    private OAuthServer(int port) {
         super(port);
 
         this.port = port;
@@ -102,7 +104,7 @@ public final class MicrosoftAuthenticationServer extends NanoHTTPD implements Mi
 
         String html;
         try {
-            html = IOUtils.readFullyAsString(MicrosoftAuthenticationServer.class.getResourceAsStream("/assets/microsoft_auth.html"), StandardCharsets.UTF_8)
+            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");
@@ -119,10 +121,12 @@ public final class MicrosoftAuthenticationServer extends NanoHTTPD implements Mi
         return newFixedLengthResponse(Response.Status.OK, "text/html; charset=UTF-8", html);
     }
 
-    public static class Factory implements MicrosoftService.OAuthCallback {
+    public static class Factory implements OAuth.Callback {
+        public final EventManager<GrantDeviceCodeEvent> onGrantDeviceCode = new EventManager<>();
+        public final EventManager<OpenBrowserEvent> onOpenBrowser = new EventManager<>();
 
         @Override
-        public MicrosoftService.OAuthSession startServer() throws IOException, AuthenticationException {
+        public OAuth.Session startServer() throws IOException, AuthenticationException {
             if (StringUtils.isBlank(getClientId())) {
                 throw new MicrosoftAuthenticationNotSupportedException();
             }
@@ -130,7 +134,7 @@ public final class MicrosoftAuthenticationServer extends NanoHTTPD implements Mi
             IOException exception = null;
             for (int port : new int[]{29111, 29112, 29113, 29114, 29115}) {
                 try {
-                    MicrosoftAuthenticationServer server = new MicrosoftAuthenticationServer(port);
+                    OAuthServer server = new OAuthServer(port);
                     server.start(NanoHTTPD.SOCKET_READ_TIMEOUT, true);
                     return server;
                 } catch (IOException e) {
@@ -140,10 +144,17 @@ public final class MicrosoftAuthenticationServer extends NanoHTTPD implements Mi
             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
@@ -158,6 +169,42 @@ public final class MicrosoftAuthenticationServer extends NanoHTTPD implements Mi
                     JarUtils.thisJar().flatMap(JarUtils::getManifest).map(manifest -> manifest.getMainAttributes().getValue("Microsoft-Auth-Secret")).orElse(""));
         }
 
+        @Override
+        public boolean isPublicClient() {
+            return true; // We have turned on the device auth flow.
+        }
+    }
+
+    public static class GrantDeviceCodeEvent extends Event {
+        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/setting/Accounts.java

@@ -34,7 +34,7 @@ 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.MicrosoftAuthenticationServer;
+import org.jackhuang.hmcl.game.OAuthServer;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.util.skin.InvalidSkinException;
 
@@ -75,12 +75,12 @@ public final class Accounts {
         }
     }
 
-    public static final MicrosoftService.OAuthCallback MICROSOFT_OAUTH_CALLBACK = new MicrosoftAuthenticationServer.Factory();
+    public static final OAuthServer.Factory OAUTH_CALLBACK = new OAuthServer.Factory();
 
     public static final OfflineAccountFactory FACTORY_OFFLINE = new OfflineAccountFactory(AUTHLIB_INJECTOR_DOWNLOADER);
     public static final YggdrasilAccountFactory FACTORY_MOJANG = YggdrasilAccountFactory.MOJANG;
     public static final AuthlibInjectorAccountFactory FACTORY_AUTHLIB_INJECTOR = new AuthlibInjectorAccountFactory(AUTHLIB_INJECTOR_DOWNLOADER, Accounts::getOrCreateAuthlibInjectorServer);
-    public static final MicrosoftAccountFactory FACTORY_MICROSOFT = new MicrosoftAccountFactory(new MicrosoftService(MICROSOFT_OAUTH_CALLBACK));
+    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 ====
@@ -374,7 +374,7 @@ public final class Accounts {
             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 MicrosoftAuthenticationServer.MicrosoftAuthenticationNotSupportedException) {
+        } else if (exception instanceof OAuthServer.MicrosoftAuthenticationNotSupportedException) {
             return i18n("account.methods.microsoft.snapshot");
         } else if (exception instanceof OAuthAccount.WrongAccountException) {
             return i18n("account.failed.wrong_account");

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

@@ -40,6 +40,7 @@ import org.jackhuang.hmcl.util.i18n.Locales;
 import org.jackhuang.hmcl.util.i18n.Locales.SupportedLocale;
 import org.jackhuang.hmcl.util.javafx.ObservableHelper;
 import org.jackhuang.hmcl.util.javafx.PropertyUtils;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
@@ -146,7 +147,7 @@ public final class Config implements Cloneable, Observable {
     private ObservableList<Map<Object, Object>> accountStorages = FXCollections.observableArrayList();
 
     @SerializedName("fontFamily")
-    private StringProperty fontFamily = new SimpleStringProperty("Consolas");
+    private StringProperty fontFamily = new SimpleStringProperty(OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS ? "Consolas" : "Monospace");
 
     @SerializedName("fontSize")
     private DoubleProperty fontSize = new SimpleDoubleProperty(12);
@@ -163,6 +164,9 @@ public final class Config implements Cloneable, Observable {
     @SerializedName("authlibInjectorServers")
     private ObservableList<AuthlibInjectorServer> authlibInjectorServers = FXCollections.observableArrayList(server -> new Observable[] { server });
 
+    @SerializedName("promptedVersion")
+    private StringProperty promptedVersion = new SimpleStringProperty();
+
     @SerializedName("_version")
     private IntegerProperty configVersion = new SimpleIntegerProperty(0);
 
@@ -579,4 +583,16 @@ public final class Config implements Cloneable, Observable {
     public void setTitleTransparent(boolean titleTransparent) {
         this.titleTransparent.set(titleTransparent);
     }
+
+    public String getPromptedVersion() {
+        return promptedVersion.get();
+    }
+
+    public StringProperty promptedVersionProperty() {
+        return promptedVersion;
+    }
+
+    public void setPromptedVersion(String promptedVersion) {
+        this.promptedVersion.set(promptedVersion);
+    }
 }

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

@@ -26,18 +26,16 @@ 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;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
 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";
@@ -97,9 +95,16 @@ 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");
+            }
         }
     }
 
@@ -169,7 +174,7 @@ public final class ConfigHolder {
     private static void writeToConfig(String content) throws IOException {
         LOG.info("Saving config");
         synchronized (configLocation) {
-            Files.write(configLocation, content.getBytes(UTF_8));
+            FileUtils.saveSafely(configLocation, content);
         }
     }
 
@@ -213,7 +218,7 @@ public final class ConfigHolder {
     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));
+            FileUtils.saveSafely(GLOBAL_CONFIG_PATH, content);
         }
     }
 

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

@@ -26,6 +26,7 @@ import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.i18n.I18n;
 import org.jackhuang.hmcl.util.io.ResponseCodeException;
 
+import javax.net.ssl.SSLHandshakeException;
 import java.io.FileNotFoundException;
 import java.net.SocketTimeoutException;
 import java.net.URL;
@@ -33,6 +34,7 @@ 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;
 
@@ -137,7 +139,7 @@ public final class DownloadProviders {
         return config().isAutoChooseDownloadType() ? currentDownloadProvider : fileDownloadProvider;
     }
 
-    public static String localizeErrorMessage(Exception exception) {
+    public static String localizeErrorMessage(Throwable exception) {
         if (exception instanceof DownloadException) {
             URL url = ((DownloadException) exception).getUrl();
             if (exception.getCause() instanceof SocketTimeoutException) {
@@ -152,10 +154,18 @@ public final class DownloadProviders {
             } else if (exception.getCause() instanceof FileNotFoundException) {
                 return i18n("download.code.404", url);
             } else if (exception.getCause() instanceof AccessDeniedException) {
-                return i18n("install.failed.downloading.access_denied", url, ((AccessDeniedException) exception.getCause()).getFile());
+                return i18n("install.failed.downloading.detail", url) + "\n" + i18n("exception.access_denied", ((AccessDeniedException) exception.getCause()).getFile());
+            } else if (exception.getCause() instanceof ArtifactMalformedException) {
+                return i18n("install.failed.downloading.detail", url) + "\n" + i18n("exception.artifact_malformed");
+            } else if (exception.getCause() instanceof SSLHandshakeException) {
+                return i18n("install.failed.downloading.detail", url) + "\n" + i18n("exception.ssl_handshake");
             } else {
                 return i18n("install.failed.downloading.detail", url) + "\n" + StringUtils.getStackTrace(exception.getCause());
             }
+        } 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

@@ -21,5 +21,6 @@ public enum EnumBackgroundImage {
     DEFAULT,
     CUSTOM,
     CLASSIC,
-    NETWORK
+    NETWORK,
+    TRANSLUCENT
 }

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

@@ -20,7 +20,7 @@ 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.microsoft.MicrosoftService;
+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;
@@ -57,11 +57,11 @@ public final class HMCLAccounts {
         String scope = "openid offline_access";
 
         return Task.supplyAsync(() -> {
-            MicrosoftService.OAuthSession session = Accounts.MICROSOFT_OAUTH_CALLBACK.startServer();
-            Accounts.MICROSOFT_OAUTH_CALLBACK.openBrowser(NetworkUtils.withQuery(
+            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.MICROSOFT_OAUTH_CALLBACK.getClientId()),
+                            pair("client_id", Accounts.OAUTH_CALLBACK.getClientId()),
                             pair("response_type", "id_token code"),
                             pair("response_mode", "form_post"),
                             pair("scope", scope),
@@ -72,12 +72,12 @@ public final class HMCLAccounts {
 
             // Authorization Code -> Token
             String responseText = HttpRequest.POST("https://login.microsoftonline.com/common/oauth2/v2.0/token")
-                    .form(mapOf(pair("client_id", Accounts.MICROSOFT_OAUTH_CALLBACK.getClientId()), pair("code", code),
-                            pair("grant_type", "authorization_code"), pair("client_secret", Accounts.MICROSOFT_OAUTH_CALLBACK.getClientSecret()),
+                    .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();
-            MicrosoftService.LiveAuthorizationResponse response = JsonUtils.fromNonNullJson(responseText,
-                    MicrosoftService.LiveAuthorizationResponse.class);
+            OAuth.AuthorizationResponse response = JsonUtils.fromNonNullJson(responseText,
+                    OAuth.AuthorizationResponse.class);
 
             HMCLAccountProfile profile = HttpRequest.GET("https://hmcl.huangyuhui.net/api/user")
                     .header("Token-Type", response.tokenType)

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

@@ -43,5 +43,9 @@ public enum LauncherVisibility {
     /**
      * Hide the launcher and reopen it when game closes.
      */
-    HIDE_AND_REOPEN
+    HIDE_AND_REOPEN;
+
+    public boolean isDaemon() {
+        return this != CLOSE;
+    }
 }

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

@@ -26,8 +26,8 @@ import org.jackhuang.hmcl.event.EventBus;
 import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
@@ -204,7 +204,7 @@ public final class Profiles {
         return selectedVersion.get();
     }
 
-    private static final List<Consumer<Profile>> versionsListeners = new LinkedList<>();
+    private static final List<Consumer<Profile>> versionsListeners = new ArrayList<>(4);
 
     public static void registerVersionsListener(Consumer<Profile> listener) {
         Profile profile = getSelectedProfile();

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/Theme.java

@@ -31,6 +31,7 @@ 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;
 
@@ -55,7 +56,7 @@ public class Theme {
 
     Theme(String name, String color) {
         this.name = name;
-        this.color = color;
+        this.color = Objects.requireNonNull(color);
         this.paint = Color.web(color);
     }
 
@@ -82,14 +83,7 @@ public class Theme {
     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 fontFamily = System.getProperty("hmcl.font.override", overrideFontFamily);
 
         String css;
         try {
@@ -103,6 +97,7 @@ public class Theme {
                     .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("")));
+            temp.deleteOnExit();
             css = temp.toURI().toString();
         } catch (IOException | NullPointerException e) {
             Logging.LOG.log(Level.SEVERE, "Unable to create theme stylesheet. Fallback to blue theme.", e);

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

@@ -0,0 +1,43 @@
+/*
+ * 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;
+
+public enum VersionIconType {
+    DEFAULT("/assets/img/grass.png"),
+
+    GRASS("/assets/img/grass.png"),
+    CHEST("/assets/img/chest.png"),
+    CHICKEN("/assets/img/chicken.png"),
+    COMMAND("/assets/img/command.png"),
+    CRAFT_TABLE("/assets/img/craft_table.png"),
+    FABRIC("/assets/img/fabric.png"),
+    FORGE("/assets/img/forge.png"),
+    FURNACE("/assets/img/furnace.png");
+
+    // Please append new items at last
+
+    private final String resourceUrl;
+
+    VersionIconType(String resourceUrl) {
+        this.resourceUrl = resourceUrl;
+    }
+
+    public String getResourceUrl() {
+        return resourceUrl;
+    }
+}

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2020  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,6 +29,7 @@ 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.IOException;
@@ -59,7 +60,7 @@ public final class VersionSetting implements Cloneable {
         this.global = global;
     }
 
-    private final BooleanProperty usesGlobalProperty = new SimpleBooleanProperty(this, "usesGlobal", false);
+    private final BooleanProperty usesGlobalProperty = new SimpleBooleanProperty(this, "usesGlobal", true);
 
     public BooleanProperty usesGlobalProperty() {
         return usesGlobalProperty;
@@ -567,6 +568,20 @@ public final class VersionSetting implements Cloneable {
         this.useNativeOpenAL.set(useNativeOpenAL);
     }
 
+    private final ObjectProperty<VersionIconType> versionIcon = new SimpleObjectProperty<>(this, "versionIcon", VersionIconType.DEFAULT);
+
+    public VersionIconType getVersionIcon() {
+        return versionIcon.get();
+    }
+
+    public ObjectProperty<VersionIconType> versionIconProperty() {
+        return versionIcon;
+    }
+
+    public void setVersionIcon(VersionIconType versionIcon) {
+        this.versionIcon.set(versionIcon);
+    }
+
     // launcher settings
 
     /**
@@ -595,7 +610,7 @@ public final class VersionSetting implements Cloneable {
     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");
+                setJava(StringUtils.isBlank(getJavaDir()) ? "Auto" : "Custom");
             }
         }).thenSupplyAsync(() -> {
             try {
@@ -608,7 +623,7 @@ public final class VersionSetting implements Cloneable {
                         if (checkJava)
                             return JavaVersion.fromExecutable(Paths.get(getJavaDir()));
                         else
-                            return new JavaVersion(Paths.get(getJavaDir()), "", Architecture.SYSTEM.getPlatform());
+                            return new JavaVersion(Paths.get(getJavaDir()), "", Platform.getPlatform(OperatingSystem.CURRENT_OS, Architecture.UNKNOWN));
                     } catch (IOException | InvalidPathException e) {
                         return null; // Custom Java Directory not found,
                     }
@@ -618,7 +633,7 @@ public final class VersionSetting implements Cloneable {
                             .collect(Collectors.toList());
                     if (matchedJava.isEmpty()) {
                         runInFX(() -> {
-                            setJava("Default");
+                            setJava("Auto");
                         });
                         return JavaVersion.fromCurrentEnvironment();
                     } else {
@@ -669,6 +684,7 @@ public final class VersionSetting implements Cloneable {
         defaultJavaPathProperty.addListener(listener);
         nativesDirProperty.addListener(listener);
         nativesDirTypeProperty.addListener(listener);
+        versionIcon.addListener(listener);
     }
 
     @Override
@@ -702,6 +718,7 @@ public final class VersionSetting implements Cloneable {
         versionSetting.setUseNativeOpenAL(isUseNativeOpenAL());
         versionSetting.setLauncherVisibility(getLauncherVisibility());
         versionSetting.setNativesDir(getNativesDir());
+        versionSetting.setVersionIcon(getVersionIcon());
         return versionSetting;
     }
 
@@ -740,6 +757,7 @@ public final class VersionSetting implements Cloneable {
             obj.addProperty("defaultJavaPath", src.getDefaultJavaPath());
             obj.addProperty("nativesDir", src.getNativesDir());
             obj.addProperty("nativesDirType", src.getNativesDirType().ordinal());
+            obj.addProperty("versionIcon", src.getVersionIcon().ordinal());
 
             return obj;
         }
@@ -783,6 +801,7 @@ public final class VersionSetting implements Cloneable {
             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)]);
+            vs.setVersionIcon(VersionIconType.values()[Optional.ofNullable(obj.get("versionIcon")).map(JsonElement::getAsInt).orElse(0)]);
 
             return vs;
         }

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

@@ -31,7 +31,7 @@ import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.Metadata;
-import org.jackhuang.hmcl.download.java.JavaRepository;
+import org.jackhuang.hmcl.game.ModpackHelper;
 import org.jackhuang.hmcl.setting.Accounts;
 import org.jackhuang.hmcl.setting.EnumCommonDirectory;
 import org.jackhuang.hmcl.setting.Profiles;
@@ -51,13 +51,13 @@ import org.jackhuang.hmcl.ui.versions.VersionPage;
 import org.jackhuang.hmcl.util.FutureCallback;
 import org.jackhuang.hmcl.util.Lazy;
 import org.jackhuang.hmcl.util.Logging;
+import org.jackhuang.hmcl.util.TaskCancellationAction;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.platform.JavaVersion;
 
 import java.io.File;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
-import java.util.function.Consumer;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 import static org.jackhuang.hmcl.setting.ConfigHolder.globalConfig;
@@ -75,7 +75,7 @@ public final class Controllers {
         GameListPage gameListPage = new GameListPage();
         gameListPage.selectedProfileProperty().bindBidirectional(Profiles.selectedProfileProperty());
         gameListPage.profilesProperty().bindContent(Profiles.profilesProperty());
-        FXUtils.applyDragListener(gameListPage, it -> "zip".equals(FileUtils.getExtension(it)), modpacks -> {
+        FXUtils.applyDragListener(gameListPage, ModpackHelper::isFileModpackByExtension, modpacks -> {
             File modpack = modpacks.get(0);
             Controllers.getDecorator().startWizard(new ModpackInstallWizardProvider(Profiles.getSelectedProfile(), modpack), i18n("install.modpack"));
         });
@@ -172,7 +172,7 @@ public final class Controllers {
             dialog(i18n("launcher.cache_directory.invalid"));
         }
 
-        Task.runAsync(JavaVersion::initialize).thenRunAsync(JavaRepository::initialize).start();
+        Task.runAsync(JavaVersion::initialize).start();
 
         scene = new Scene(decorator.getDecorator());
         scene.setFill(Color.TRANSPARENT);
@@ -262,11 +262,7 @@ public final class Controllers {
         return pane.getCompletableFuture();
     }
 
-    public static TaskExecutorDialogPane taskDialog(TaskExecutor executor, String title) {
-        return taskDialog(executor, title, null);
-    }
-
-    public static TaskExecutorDialogPane taskDialog(TaskExecutor executor, String title, Consumer<Region> onCancel) {
+    public static TaskExecutorDialogPane taskDialog(TaskExecutor executor, String title, TaskCancellationAction onCancel) {
         TaskExecutorDialogPane pane = new TaskExecutorDialogPane(onCancel);
         pane.setTitle(title);
         pane.setExecutor(executor);
@@ -274,7 +270,7 @@ public final class Controllers {
         return pane;
     }
 
-    public static TaskExecutorDialogPane taskDialog(Task<?> task, String title, Consumer<Region> onCancel) {
+    public static TaskExecutorDialogPane taskDialog(Task<?> task, String title, TaskCancellationAction onCancel) {
         TaskExecutor executor = task.executor();
         TaskExecutorDialogPane pane = new TaskExecutorDialogPane(onCancel);
         pane.setTitle(title);

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

@@ -77,6 +77,7 @@ 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.Objects;
 import java.util.function.BooleanSupplier;
@@ -333,7 +334,7 @@ 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 (oldTimeline instanceof Timeline) ((Timeline) oldTimeline).stop();
         if (timeline != null) timeline.play();
         node.getProperties().put(animationKey, timeline);
     }
@@ -389,11 +390,19 @@ public final class FXUtils {
                 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);
+                    Logging.LOG.log(Level.SEVERE, "Unable to open " + file + " by executing explorer /select," + file, e);
+                }
+                break;
+            case OSX:
+                try {
+                    Runtime.getRuntime().exec(new String[]{"/usr/bin/open", "-R", file.toAbsolutePath().toString()});
+                } catch (IOException e) {
+                    Logging.LOG.log(Level.SEVERE, "Unable to open " + file + " by executing /usr/bin/open -R " + file, e);
                 }
                 break;
             default:
-                // Currently unsupported.
+                // We do not have an universal method to show file in file manager.
+                openFolder(file.getParent().toFile());
                 break;
         }
     }
@@ -700,7 +709,7 @@ public final class FXUtils {
         Controllers.showToast(i18n("message.copied"));
     }
 
-    public static TextFlow segmentToTextFlow(final String segment, Consumer<String> hyperlinkAction) {
+    public static List<Node> parseSegment(String segment, Consumer<String> hyperlinkAction) {
         try {
             DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
             DocumentBuilder builder = factory.newDocumentBuilder();
@@ -719,6 +728,10 @@ public final class FXUtils {
                         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 {
@@ -728,12 +741,17 @@ public final class FXUtils {
                     texts.add(new Text(node.getTextContent()));
                 }
             }
-            final TextFlow tf = new TextFlow(texts.toArray(new javafx.scene.Node[0]));
-            return tf;
+            return texts;
         } catch (SAXException | ParserConfigurationException | IOException e) {
             LOG.log(Level.WARNING, "Failed to parse xml", e);
-            return new TextFlow(new Text(segment));
+            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

@@ -24,13 +24,17 @@ import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
+import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Label;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.VBox;
+import javafx.scene.text.Text;
+import javafx.scene.text.TextFlow;
 import javafx.stage.Stage;
+import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.download.LibraryAnalyzer;
 import org.jackhuang.hmcl.game.*;
 import org.jackhuang.hmcl.launch.ProcessListener;
@@ -69,9 +73,9 @@ public class GameCrashWindow extends Stage {
     private final String memory;
     private final String java;
     private final LibraryAnalyzer analyzer;
-    private final StringProperty os = new SimpleStringProperty(System.getProperty("os.name"));
-    private final StringProperty arch = new SimpleStringProperty(Architecture.SYSTEM_ARCHITECTURE);
-    private final StringProperty reason = new SimpleStringProperty(i18n("game.crash.reason.unknown"));
+    private final StringProperty os = new SimpleStringProperty(OperatingSystem.SYSTEM_NAME);
+    private final StringProperty arch = new SimpleStringProperty(Architecture.SYSTEM_ARCH.getDisplayName());
+    private final TextFlow reasonTextFlow = new TextFlow(new Text(i18n("game.crash.reason.unknown")));
     private final BooleanProperty loading = new SimpleBooleanProperty();
     private final Label feedbackLabel = new Label(i18n("game.crash.feedback"));
 
@@ -81,9 +85,9 @@ public class GameCrashWindow extends Stage {
     private final LaunchOptions launchOptions;
     private final View view;
 
-    private final LinkedList<Pair<String, Log4jLevel>> logs;
+    private final List<Pair<String, Log4jLevel>> logs;
 
-    public GameCrashWindow(ManagedProcess managedProcess, ProcessListener.ExitType exitType, DefaultGameRepository repository, Version version, LaunchOptions launchOptions, LinkedList<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;
@@ -93,7 +97,10 @@ public class GameCrashWindow extends Stage {
         this.analyzer = LibraryAnalyzer.analyze(version);
 
         memory = Optional.ofNullable(launchOptions.getMaxMemory()).map(i -> i + " MB").orElse("-");
-        java = launchOptions.getJava().getVersion();
+
+        this.java = launchOptions.getJava().getArchitecture() == Architecture.SYSTEM_ARCH
+                ? launchOptions.getJava().getVersion()
+                : launchOptions.getJava().getVersion() + " (" + launchOptions.getJava().getArchitecture().getDisplayName() + ")";
 
         this.view = new View();
 
@@ -110,14 +117,18 @@ public class GameCrashWindow extends Stage {
         CompletableFuture.supplyAsync(() -> {
             String rawLog = logs.stream().map(Pair::getKey).collect(Collectors.joining("\n"));
             Set<String> keywords = Collections.emptySet();
+            String crashReport = null;
             try {
-                String crashReport = CrashReportAnalyzer.findCrashReport(rawLog);
-                if (crashReport != null) {
-                    keywords = CrashReportAnalyzer.findKeywordsFromCrashReport(crashReport);
-                }
+                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);
@@ -126,49 +137,53 @@ public class GameCrashWindow extends Stage {
 
             if (exception != null) {
                 LOG.log(Level.WARNING, "Failed to analyze crash report", exception);
-                reason.set(i18n("game.crash.reason.unknown"));
+                reasonTextFlow.getChildren().setAll(new Text(i18n("game.crash.reason.unknown")));
             } else {
                 List<CrashReportAnalyzer.Result> results = pair.getKey();
                 Set<String> keywords = pair.getValue();
-                StringBuilder reasonText = new StringBuilder();
+
+                List<Node> segments = new ArrayList<>();
                 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");
+                            segments.addAll(FXUtils.parseSegment(i18n("game.crash.reason.too_old_java",
+                                    CrashReportAnalyzer.getJavaVersionFromMajorVersion(Integer.parseInt(result.getMatcher().group("expected")))), Controllers::onHyperlinkAction));
                             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),
+                            segments.addAll(FXUtils.parseSegment(i18n("game.crash.reason." + result.getRule().name().toLowerCase(Locale.ROOT),
                                     translateFabricModId(result.getMatcher().group("sourcemod")),
                                     parseFabricModId(result.getMatcher().group("destmod")),
-                                    parseFabricModId(result.getMatcher().group("destmod"))));
+                                    parseFabricModId(result.getMatcher().group("destmod"))), Controllers::onHyperlinkAction));
                             break;
                         case MOD_RESOLUTION_MISSING_MINECRAFT:
-                            reasonText.append(i18n("game.crash.reason." + result.getRule().name().toLowerCase(Locale.ROOT),
+                            segments.addAll(FXUtils.parseSegment(i18n("game.crash.reason." + result.getRule().name().toLowerCase(Locale.ROOT),
                                     translateFabricModId(result.getMatcher().group("mod")),
-                                    result.getMatcher().group("version")));
+                                    result.getMatcher().group("version")), Controllers::onHyperlinkAction));
+                            break;
+                        case TWILIGHT_FOREST_OPTIFINE:
+                            segments.addAll(FXUtils.parseSegment(i18n("game.crash.reason.mod", "OptiFine"), Controllers::onHyperlinkAction));
                             break;
                         default:
-                            reasonText.append(i18n("game.crash.reason." + result.getRule().name().toLowerCase(Locale.ROOT),
+                            segments.addAll(FXUtils.parseSegment(i18n("game.crash.reason." + result.getRule().name().toLowerCase(Locale.ROOT),
                                     Arrays.stream(result.getRule().getGroupNames()).map(groupName -> result.getMatcher().group(groupName))
-                                            .toArray()))
-                                    .append("\n");
+                                            .toArray()), Controllers::onHyperlinkAction));
                             break;
                     }
+                    segments.add(new Text("\n"));
                 }
                 if (results.isEmpty()) {
                     if (!keywords.isEmpty()) {
-                        reason.set(i18n("game.crash.reason.stacktrace", String.join(", ", keywords)));
+                        reasonTextFlow.getChildren().setAll(new Text(i18n("game.crash.reason.stacktrace", String.join(", ", keywords))));
                     } else {
-                        reason.set(i18n("game.crash.reason.unknown"));
+                        reasonTextFlow.getChildren().setAll(new Text(i18n("game.crash.reason.unknown")));
                     }
 
                     feedbackLabel.setVisible(true);
                 } else {
-                    reason.set(reasonText.toString());
+                    feedbackLabel.setVisible(false);
+                    reasonTextFlow.getChildren().setAll(segments);
                 }
             }
         }, Schedulers.javafx()).exceptionally(Lang::handleUncaughtException);
@@ -207,6 +222,7 @@ public class GameCrashWindow extends Stage {
         LogWindow logWindow = new LogWindow();
 
         logWindow.logLine("Command: " + new CommandBuilder().addAll(managedProcess.getCommands()).toString(), Log4jLevel.INFO);
+        if (managedProcess.getClasspath() != null) logWindow.logLine("ClassPath: " + managedProcess.getClasspath(), Log4jLevel.INFO);
         for (Map.Entry<String, Log4jLevel> entry : logs)
             logWindow.logLine(entry.getKey(), entry.getValue());
 
@@ -266,6 +282,11 @@ public class GameCrashWindow extends Stage {
                 infoPane.setPadding(new Insets(8));
                 infoPane.setAlignment(Pos.CENTER_LEFT);
 
+                TwoLineListItem launcher = new TwoLineListItem();
+                launcher.getStyleClass().setAll("two-line-item-second-large");
+                launcher.setTitle(i18n("launcher"));
+                launcher.setSubtitle(Metadata.VERSION);
+
                 TwoLineListItem version = new TwoLineListItem();
                 version.getStyleClass().setAll("two-line-item-second-large");
                 version.setTitle(i18n("archive.game_version"));
@@ -291,7 +312,7 @@ public class GameCrashWindow extends Stage {
                 arch.setTitle(i18n("system.architecture"));
                 arch.subtitleProperty().bind(GameCrashWindow.this.arch);
 
-                infoPane.getChildren().setAll(version, memory, java, os, arch);
+                infoPane.getChildren().setAll(launcher, version, memory, java, os, arch);
             }
 
             HBox moddedPane = new HBox(8);
@@ -300,13 +321,15 @@ public class GameCrashWindow extends Stage {
                 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);
-                    });
+                    if (!type.getPatchId().isEmpty()) {
+                        analyzer.getVersion(type).ifPresent(ver -> {
+                            TwoLineListItem item = new TwoLineListItem();
+                            item.getStyleClass().setAll("two-line-item-second-large");
+                            item.setTitle(i18n("install.installer." + type.getPatchId()));
+                            item.setSubtitle(ver);
+                            moddedPane.getChildren().add(item);
+                        });
+                    }
                 }
             }
 
@@ -322,14 +345,12 @@ public class GameCrashWindow extends Stage {
                 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);
+                Label reasonTitle = new Label(i18n("game.crash.reason"));
+                reasonTitle.getStyleClass().add("two-line-item-second-large-title");
 
                 gameDirPane.setPadding(new Insets(8));
                 VBox.setVgrow(gameDirPane, Priority.ALWAYS);
-                gameDirPane.getChildren().setAll(gameDir, javaDir, reason);
+                gameDirPane.getChildren().setAll(gameDir, javaDir, new VBox(reasonTitle, reasonTextFlow));
             }
 
             HBox toolBar = new HBox();

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

@@ -19,6 +19,7 @@ package org.jackhuang.hmcl.ui;
 
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXDialogLayout;
+import javafx.concurrent.Worker;
 import javafx.scene.control.Label;
 import javafx.scene.web.WebEngine;
 import javafx.scene.web.WebView;
@@ -41,23 +42,23 @@ public class UpgradeDialog extends JFXDialogLayout {
 
         {
             String url = CHANGELOG_URL + remoteVersion.getChannel().channelName + ".html";
-            WebView webView = new WebView();
-            webView.getEngine().setUserDataDirectory(Metadata.HMCL_DIRECTORY.toFile());
             try {
+                WebView webView = new WebView();
+                webView.getEngine().setUserDataDirectory(Metadata.HMCL_DIRECTORY.toFile());
                 WebEngine engine = webView.getEngine();
-                engine.load(CHANGELOG_URL + remoteVersion.getChannel().channelName);
+                engine.load(url);
                 engine.getLoadWorker().stateProperty().addListener((observable, oldValue, newValue) -> {
-                    String viewURL = engine.getLoadWorker().getMessage().trim();
-                    if (!viewURL.startsWith(CHANGELOG_URL)) {
-                        engine.getLoadWorker().cancel();
-                        FXUtils.openLink(viewURL);
+                    if (newValue == Worker.State.FAILED) {
+                        LOG.warning("Failed to load update log, trying to open it in browser");
+                        FXUtils.openLink(url);
+                        setBody();
                     }
                 });
+                setBody(webView);
             } catch (NoClassDefFoundError | UnsatisfiedLinkError e) {
                 LOG.log(Level.WARNING, "WebView is missing or initialization failed", e);
                 FXUtils.openLink(url);
             }
-            setBody(webView);
         }
 
         {

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

@@ -34,6 +34,7 @@ import org.jackhuang.hmcl.auth.AuthenticationException;
 import org.jackhuang.hmcl.auth.CredentialExpiredException;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
+import org.jackhuang.hmcl.auth.microsoft.MicrosoftAccount;
 import org.jackhuang.hmcl.auth.offline.OfflineAccount;
 import org.jackhuang.hmcl.auth.yggdrasil.CompleteGameProfile;
 import org.jackhuang.hmcl.auth.yggdrasil.TextureType;
@@ -44,6 +45,7 @@ import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.DialogController;
+import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
 import org.jackhuang.hmcl.util.skin.InvalidSkinException;
 import org.jackhuang.hmcl.util.skin.NormalizedSkin;
@@ -137,7 +139,7 @@ public class AccountListItem extends RadioButton {
             } else {
                 return createBooleanBinding(() -> true);
             }
-        } else if (account instanceof OfflineAccount) {
+        } else if (account instanceof OfflineAccount || account instanceof MicrosoftAccount) {
             return createBooleanBinding(() -> true);
         } else {
             return createBooleanBinding(() -> false);
@@ -153,6 +155,10 @@ public class AccountListItem extends RadioButton {
             Controllers.dialog(new OfflineAccountSkinPane((OfflineAccount) account));
             return null;
         }
+        if (account instanceof MicrosoftAccount) {
+            FXUtils.openLink("https://www.minecraft.net/msaprofile/mygames/editskin");
+            return null;
+        }
         if (!(account instanceof YggdrasilAccount)) {
             return null;
         }

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

@@ -23,7 +23,9 @@ 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;
@@ -43,7 +45,7 @@ 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.MicrosoftAuthenticationServer;
+import org.jackhuang.hmcl.game.OAuthServer;
 import org.jackhuang.hmcl.game.TexturesLoader;
 import org.jackhuang.hmcl.setting.Accounts;
 import org.jackhuang.hmcl.setting.Theme;
@@ -53,6 +55,7 @@ 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;
@@ -88,6 +91,8 @@ public class CreateAccountPane extends JFXDialogLayout implements DialogAware {
     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;
 
@@ -217,6 +222,7 @@ public class CreateAccountPane extends JFXDialogLayout implements DialogAware {
         }
 
         logging.set(true);
+        deviceCode.set(null);
 
         loginTask = Task.supplyAsync(() -> factory.create(new DialogCharacterSelector(), username, password, null, additionalData))
                 .whenComplete(Schedulers.javafx(), account -> {
@@ -262,30 +268,57 @@ public class CreateAccountPane extends JFXDialogLayout implements DialogAware {
         if (factory == Accounts.FACTORY_MICROSOFT) {
             VBox vbox = new VBox(8);
             HintPane hintPane = new HintPane(MessageDialogPane.MessageType.INFO);
-            hintPane.textProperty().bind(BindingMapping.of(logging).map(logging ->
-                    logging
-                            ? i18n("account.methods.microsoft.manual")
-                            : i18n("account.methods.microsoft.hint")));
+            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 (logging.get() && MicrosoftAuthenticationServer.lastlyOpenedURL != null) {
-                    FXUtils.copyText(MicrosoftAuthenticationServer.lastlyOpenedURL);
+                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"));
+            birthLink.setOnAction(e -> FXUtils.openLink("https://support.microsoft.com/account-billing/837badbc-999e-54d2-2617-d19206b9540a"));
             JFXHyperlink profileLink = new JFXHyperlink(i18n("account.methods.microsoft.profile"));
             profileLink.setOnAction(e -> FXUtils.openLink("https://account.live.com/editprof.aspx"));
             JFXHyperlink purchaseLink = new JFXHyperlink(i18n("account.methods.yggdrasil.purchase"));
+            JFXHyperlink deauthorizeLink = new JFXHyperlink(i18n("account.methods.microsoft.deauthorize"));
+            deauthorizeLink.setOnAction(e -> FXUtils.openLink("https://account.live.com/consent/Edit?client_id=000000004C794E0A"));
             purchaseLink.setOnAction(e -> FXUtils.openLink(YggdrasilService.PURCHASE_URL));
-            box.getChildren().setAll(profileLink, birthLink, purchaseLink);
+            box.getChildren().setAll(profileLink, birthLink, purchaseLink, deauthorizeLink);
             GridPane.setColumnSpan(box, 2);
 
             vbox.getChildren().setAll(hintPane, box);
 
             detailsPane = vbox;
             btnAccept.setDisable(false);
+        } else if (factory == Accounts.FACTORY_MOJANG) {
+            VBox vbox = new VBox(8);
+            HintPane hintPane = new HintPane(MessageDialogPane.MessageType.WARNING);
+            hintPane.setText(i18n("account.methods.yggdrasil.migration.hint"));
+
+            HBox linkPane = new HBox(8);
+
+            JFXHyperlink migrationLink = new JFXHyperlink(i18n("account.methods.yggdrasil.migration"));
+            migrationLink.setOnAction(e -> FXUtils.openLink(YggdrasilService.PROFILE_URL));
+
+            JFXHyperlink migrationHowLink = new JFXHyperlink(i18n("account.methods.yggdrasil.migration.how"));
+            migrationHowLink.setOnAction(e -> FXUtils.openLink(YggdrasilService.MIGRATION_FAQ_URL));
+
+            linkPane.getChildren().setAll(migrationLink, migrationHowLink);
+
+            vbox.getChildren().setAll(hintPane, linkPane);
+            detailsPane = vbox;
+            btnAccept.setDisable(true);
         } else {
             detailsPane = new AccountDetailsInputPane(factory, btnAccept::fire);
             btnAccept.disableProperty().bind(((AccountDetailsInputPane) detailsPane).validProperty().not());
@@ -421,10 +454,10 @@ public class CreateAccountPane extends JFXDialogLayout implements DialogAware {
                 GridPane.setColumnSpan(box, 2);
 
                 JFXHyperlink migrationLink = new JFXHyperlink(i18n("account.methods.yggdrasil.migration"));
-                migrationLink.setOnAction(e -> FXUtils.openLink(YggdrasilService.PROFILE_URL));
+                migrationLink.setOnAction(e -> FXUtils.openLink("https://aka.ms/MinecraftMigration"));
 
                 JFXHyperlink migrationHowLink = new JFXHyperlink(i18n("account.methods.yggdrasil.migration.how"));
-                migrationHowLink.setOnAction(e -> FXUtils.openLink(YggdrasilService.MIGRATION_FAQ_URL));
+                migrationHowLink.setOnAction(e -> FXUtils.openLink("https://help.minecraft.net/hc/articles/4411173197709"));
 
                 JFXHyperlink purchaseLink = new JFXHyperlink(i18n("account.methods.yggdrasil.purchase"));
                 purchaseLink.setOnAction(e -> FXUtils.openLink(YggdrasilService.PURCHASE_URL));
@@ -657,5 +690,5 @@ public class CreateAccountPane extends JFXDialogLayout implements DialogAware {
         }
     }
 
-    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";
+    private static final String MICROSOFT_ACCOUNT_EDIT_PROFILE_URL = "https://support.microsoft.com/account-billing/837badbc-999e-54d2-2617-d19206b9540a";
 }

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

@@ -1,7 +1,7 @@
 package org.jackhuang.hmcl.ui.account;
 
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.SimpleBooleanProperty;
+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;
@@ -9,13 +9,16 @@ 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.MicrosoftAuthenticationServer;
+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.construct.*;
-import org.jackhuang.hmcl.util.javafx.BindingMapping;
+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;
@@ -27,7 +30,9 @@ public class OAuthAccountLoginDialog extends DialogPane {
     private final OAuthAccount account;
     private final Consumer<AuthInfo> success;
     private final Runnable failed;
-    private final BooleanProperty logging = new SimpleBooleanProperty();
+    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;
@@ -40,13 +45,17 @@ public class OAuthAccountLoginDialog extends DialogPane {
         Label usernameLabel = new Label(account.getUsername());
 
         HintPane hintPane = new HintPane(MessageDialogPane.MessageType.INFO);
-        hintPane.textProperty().bind(BindingMapping.of(logging).map(logging ->
-                logging
-                        ? i18n("account.methods.microsoft.manual")
-                        : i18n("account.methods.microsoft.hint")));
+        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 (logging.get() && MicrosoftAuthenticationServer.lastlyOpenedURL != null) {
-                FXUtils.copyText(MicrosoftAuthenticationServer.lastlyOpenedURL);
+            if (deviceCode.get() != null) {
+                FXUtils.copyText(deviceCode.get().getUserCode());
             }
         });
 
@@ -62,15 +71,21 @@ public class OAuthAccountLoginDialog extends DialogPane {
 
         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();
-        logging.set(true);
         Task.supplyAsync(account::logInWhenCredentialsExpired)
                 .whenComplete(Schedulers.javafx(), (authInfo, exception) -> {
-                    logging.set(false);
                     if (exception == null) {
                         success.accept(authInfo);
                         onSuccess();

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

@@ -76,7 +76,7 @@ public class OfflineAccountSkinPane extends StackPane {
         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.getAnimationPlayer().addSkinAnimation(new SkinAniWavingArms(100, 2000, 7.5, canvas), new SkinAniRunning(100, 100, 30, canvas));
         canvas.enableRotation(.5);
 
         canvas.addEventHandler(DragEvent.DRAG_OVER, e -> {
@@ -136,11 +136,14 @@ public class OfflineAccountSkinPane extends StackPane {
                             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());
+                            if (result == null || result.getSkin() == null && result.getCape() == null) {
+                                canvas.updateSkin(getDefaultTexture(), isDefaultSlim(), null);
                                 return;
                             }
-                            canvas.updateSkin(new Image(result.getSkin().getInputStream()), result.getModel() == TextureModel.ALEX);
+                            canvas.updateSkin(
+                                    result.getSkin() != null ? new Image(result.getSkin().getInputStream()) : getDefaultTexture(),
+                                    result.getModel() == TextureModel.ALEX,
+                                    result.getCape() != null ? new Image(result.getCape().getInputStream()) : null);
                         }
                     }).start();
         }, skinItem.selectedDataProperty(), cslApiField.textProperty(), skinSelector.valueProperty(), capeSelector.valueProperty());
@@ -183,7 +186,7 @@ public class OfflineAccountSkinPane extends StackPane {
         });
 
         JFXHyperlink littleSkinLink = new JFXHyperlink(i18n("account.skin.type.little_skin"));
-        littleSkinLink.setOnAction(e -> FXUtils.openLink("https://mcskin.littleservice.cn/"));
+        littleSkinLink.setOnAction(e -> FXUtils.openLink("https://littleskin.cn/"));
         JFXButton cancelButton = new JFXButton(i18n("button.cancel"));
         cancelButton.getStyleClass().add("dialog-cancel");
         cancelButton.setOnAction(e -> fireEvent(new DialogCloseEvent()));

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

@@ -63,6 +63,12 @@ public class TransitionPane extends StackPane implements AnimationHandler {
 
         updateContent(newView);
 
+        if (previousNode == EMPTY_PANE) {
+            setMouseTransparent(false);
+            getChildren().setAll(newView);
+            return;
+        }
+
         transition.init(this);
 
         // runLater or "init" will not work

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

@@ -19,37 +19,26 @@ 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;
 
 import java.util.function.Consumer;
 
-public class AdvancedListBox extends ScrollPane {
-    private final VBox container = new VBox();
+public class AdvancedListBox extends VBox {
 
     {
-        setContent(container);
-
-        FXUtils.smoothScrolling(this);
-
-        setFitToHeight(true);
-        setFitToWidth(true);
-        setHbarPolicy(ScrollBarPolicy.NEVER);
-
-        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;
     }
@@ -64,27 +53,27 @@ public class AdvancedListBox extends ScrollPane {
 
     public AdvancedListBox add(int index, Node child) {
         if (child instanceof Pane || child instanceof AdvancedListItem)
-            container.getChildren().add(index, child);
+            getChildren().add(index, child);
         else {
             StackPane pane = new StackPane();
             pane.getStyleClass().add("advanced-list-box-item");
             pane.getChildren().setAll(child);
-            container.getChildren().add(index, pane);
+            getChildren().add(index, pane);
         }
         return this;
     }
 
     public AdvancedListBox remove(Node child) {
-        container.getChildren().remove(indexOf(child));
+        getChildren().remove(indexOf(child));
         return this;
     }
 
     public int indexOf(Node child) {
         if (child instanceof Pane) {
-            return container.getChildren().indexOf(child);
+            return getChildren().indexOf(child);
         } else {
-            for (int i = 0; i < container.getChildren().size(); ++i) {
-                Node node = container.getChildren().get(i);
+            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)
@@ -99,11 +88,7 @@ public class AdvancedListBox extends ScrollPane {
         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/HintPane.java

@@ -27,6 +27,8 @@ import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
 import javafx.scene.text.TextFlow;
 import org.jackhuang.hmcl.setting.Theme;
+import org.jackhuang.hmcl.ui.Controllers;
+import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
 
 public class HintPane extends VBox {
@@ -84,6 +86,10 @@ public class HintPane extends VBox {
         this.text.set(text);
     }
 
+    public void setSegment(String segment) {
+        flow.getChildren().setAll(FXUtils.parseSegment(segment, Controllers::onHyperlinkAction));
+    }
+
     public void setChildren(Node... children) {
         flow.getChildren().setAll(children);
     }

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

@@ -20,11 +20,13 @@ package org.jackhuang.hmcl.ui.construct;
 import com.jfoenix.controls.JFXButton;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
+import javafx.scene.Node;
 import javafx.scene.control.ButtonBase;
 import javafx.scene.control.Label;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
 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.util.Lang;
@@ -54,7 +56,7 @@ public final class MessageDialogPane extends StackPane {
     }
 
     @FXML
-    private Label content;
+    private StackPane content;
     @FXML
     private Label graphic;
     @FXML
@@ -67,7 +69,7 @@ public final class MessageDialogPane extends StackPane {
     public MessageDialogPane(@NotNull String text, @Nullable String title, @NotNull MessageType type) {
         FXUtils.loadFXML(this, "/assets/fxml/message-dialog.fxml");
 
-        content.setText(text);
+        content.getChildren().setAll(FXUtils.segmentToTextFlow(text, Controllers::onHyperlinkAction));
 
         if (title != null)
             this.title.setText(title);
@@ -99,7 +101,7 @@ public final class MessageDialogPane extends StackPane {
         });
     }
 
-    public void addButton(ButtonBase btn) {
+    public void addButton(Node btn) {
         btn.addEventHandler(ActionEvent.ACTION, e -> fireEvent(new DialogCloseEvent()));
         actions.getChildren().add(btn);
     }
@@ -119,6 +121,11 @@ public final class MessageDialogPane extends StackPane {
             this.dialog = new MessageDialogPane(text, title, type);
         }
 
+        public Builder addAction(Node actionNode) {
+            dialog.addButton(actionNode);
+            return this;
+        }
+
         public Builder ok(Runnable ok) {
             JFXButton btnOk = new JFXButton(i18n("button.ok"));
             btnOk.getStyleClass().add("dialog-accept");

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

@@ -36,6 +36,7 @@ import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.util.StringUtils;
 
 import java.util.Collection;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
@@ -61,7 +62,7 @@ public class MultiFileItem<T> extends VBox {
         });
         selectedData.addListener((a, b, newValue) -> {
             Optional<Toggle> selecting = group.getToggles().stream()
-                    .filter(it -> it.getUserData() == newValue)
+                    .filter(it -> Objects.equals(it.getUserData(), newValue))
                     .findFirst();
             if (!selecting.isPresent()) {
                 selecting = group.getToggles().stream()
@@ -226,6 +227,11 @@ public class MultiFileItem<T> extends VBox {
 
             BorderPane.setAlignment(customField, Pos.CENTER_RIGHT);
             customField.disableProperty().bind(left.selectedProperty().not());
+
+            if (!customField.getValidators().isEmpty()) {
+                FXUtils.setValidateWhileTextChanged(customField, true);
+            }
+
             pane.setRight(customField);
 
             return pane;

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

@@ -22,12 +22,13 @@ import javafx.application.Platform;
 import javafx.beans.property.StringProperty;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
-import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.task.FileDownloadTask;
 import org.jackhuang.hmcl.task.TaskExecutor;
 import org.jackhuang.hmcl.task.TaskListener;
 import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.util.TaskCancellationAction;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;
 import java.util.function.Consumer;
@@ -37,7 +38,7 @@ import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 
 public class TaskExecutorDialogPane extends StackPane {
     private TaskExecutor executor;
-    private Consumer<Region> onCancel;
+    private TaskCancellationAction onCancel;
     private final Consumer<FileDownloadTask.SpeedEvent> speedEventHandler;
 
     @FXML
@@ -49,14 +50,14 @@ public class TaskExecutorDialogPane extends StackPane {
     @FXML
     private TaskListPane taskListPane;
 
-    public TaskExecutorDialogPane(Consumer<Region> cancel) {
+    public TaskExecutorDialogPane(@NotNull TaskCancellationAction cancel) {
         FXUtils.loadFXML(this, "/assets/fxml/task-dialog.fxml");
 
         setCancel(cancel);
 
         btnCancel.setOnAction(e -> {
             Optional.ofNullable(executor).ifPresent(TaskExecutor::cancel);
-            onCancel.accept(this);
+            onCancel.getCancellationAction().accept(this);
         });
 
         speedEventHandler = speedEvent -> {
@@ -113,7 +114,7 @@ public class TaskExecutorDialogPane extends StackPane {
         lblTitle.setText(currentState);
     }
 
-    public void setCancel(Consumer<Region> onCancel) {
+    public void setCancel(TaskCancellationAction onCancel) {
         this.onCancel = onCancel;
 
         runInFX(() -> btnCancel.setDisable(onCancel == null));

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

@@ -42,10 +42,15 @@ import org.jackhuang.hmcl.mod.ModpackInstallTask;
 import org.jackhuang.hmcl.mod.ModpackUpdateTask;
 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.McbbsModpackExportTask;
+import org.jackhuang.hmcl.mod.modrinth.ModrinthCompletionTask;
+import org.jackhuang.hmcl.mod.modrinth.ModrinthInstallTask;
 import org.jackhuang.hmcl.mod.multimc.MultiMCModpackExportTask;
 import org.jackhuang.hmcl.mod.multimc.MultiMCModpackInstallTask;
+import org.jackhuang.hmcl.mod.server.ServerModpackCompletionTask;
 import org.jackhuang.hmcl.mod.server.ServerModpackExportTask;
+import org.jackhuang.hmcl.mod.server.ServerModpackLocalInstallTask;
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskExecutor;
@@ -123,8 +128,8 @@ public final class TaskListPane extends StackPane {
                     task.setName(i18n("install.installer.install", i18n("install.installer.fabric")));
                 } else if (task instanceof FabricAPIInstallTask) {
                     task.setName(i18n("install.installer.install", i18n("install.installer.fabric-api")));
-                } else if (task instanceof CurseCompletionTask) {
-                    task.setName(i18n("modpack.type.curse.completion"));
+                } else if (task instanceof CurseCompletionTask || task instanceof ModrinthCompletionTask || task instanceof ServerModpackCompletionTask || task instanceof McbbsModpackCompletionTask) {
+                    task.setName(i18n("modpack.completion"));
                 } else if (task instanceof ModpackInstallTask) {
                     task.setName(i18n("modpack.installing"));
                 } else if (task instanceof ModpackUpdateTask) {
@@ -133,6 +138,10 @@ public final class TaskListPane extends StackPane {
                     task.setName(i18n("modpack.install", i18n("modpack.type.curse")));
                 } else if (task instanceof MultiMCModpackInstallTask) {
                     task.setName(i18n("modpack.install", i18n("modpack.type.multimc")));
+                } else if (task instanceof ModrinthInstallTask) {
+                    task.setName(i18n("modpack.install", i18n("modpack.type.modrinth")));
+                } else if (task instanceof ServerModpackLocalInstallTask) {
+                    task.setName(i18n("modpack.install", i18n("modpack.type.server")));
                 } else if (task instanceof HMCLModpackInstallTask) {
                     task.setName(i18n("modpack.install", i18n("modpack.type.hmcl")));
                 } else if (task instanceof McbbsModpackExportTask || task instanceof MultiMCModpackExportTask || task instanceof ServerModpackExportTask) {
@@ -186,7 +195,7 @@ public final class TaskListPane extends StackPane {
                 if (task instanceof Task.CountTask) {
                     runInFX(() -> {
                         stageNodes.stream()
-                                .filter(x -> x.stage.equals(((Task.CountTask) task).getCountStage()))
+                                .filter(x -> x.stage.equals(((Task<?>.CountTask) task).getCountStage()))
                                 .findAny()
                                 .ifPresent(StageNode::count);
                     });

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

@@ -25,7 +25,6 @@ import javafx.collections.ObservableList;
 import javafx.geometry.Insets;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
-import javafx.scene.layout.FlowPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import org.jackhuang.hmcl.ui.FXUtils;
@@ -52,8 +51,8 @@ public class TwoLineListItem extends VBox {
     public TwoLineListItem() {
         setMouseTransparent(true);
 
-        FlowPane firstLine = new FlowPane();
-        firstLine.setMaxWidth(Double.MAX_VALUE);
+        HBox firstLine = new HBox();
+        firstLine.getStyleClass().add("first-line");
 
         Label lblTitle = new Label();
         lblTitle.getStyleClass().add("title");
@@ -63,7 +62,7 @@ public class TwoLineListItem extends VBox {
             Label tagLabel = new Label();
             tagLabel.getStyleClass().add("tag");
             tagLabel.setText(tag);
-            FlowPane.setMargin(tagLabel, new Insets(0, 8, 0, 0));
+            HBox.setMargin(tagLabel, new Insets(0, 8, 0, 0));
             return tagLabel;
         });
         firstLineChildren = new AggregatedObservableList<>();

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

@@ -24,11 +24,13 @@ import javafx.beans.binding.Bindings;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.event.EventHandler;
+import javafx.geometry.Insets;
 import javafx.scene.Node;
 import javafx.scene.image.Image;
 import javafx.scene.input.DragEvent;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.*;
+import javafx.scene.paint.Color;
 import javafx.stage.Stage;
 import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorDnD;
@@ -43,6 +45,7 @@ import org.jackhuang.hmcl.ui.construct.Navigator;
 import org.jackhuang.hmcl.ui.construct.StackContainerPane;
 import org.jackhuang.hmcl.ui.wizard.Refreshable;
 import org.jackhuang.hmcl.ui.wizard.WizardProvider;
+import org.jackhuang.hmcl.util.io.NetworkUtils;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -140,9 +143,15 @@ public class DecoratorController {
                                         .orElse(null);
                             }
                             if (config().getBackgroundImageType() == EnumBackgroundImage.NETWORK) {
-                                image = new Image(config().getBackgroundImageUrl(), true);
+                                if (!NetworkUtils.isURL(config().getBackgroundImageUrl())) {
+                                    image = loadDefaultBackgroundImage();
+                                } else {
+                                    image = new Image(config().getBackgroundImageUrl(), true);
+                                }
                             } else if (config().getBackgroundImageType() == EnumBackgroundImage.CLASSIC) {
                                 image = newImage("/assets/img/background-classic.jpg");
+                            } else if (config().getBackgroundImageType() == EnumBackgroundImage.TRANSLUCENT) {
+                                return new Background(new BackgroundFill(new Color(1, 1, 1, 0.5), CornerRadii.EMPTY, Insets.EMPTY));
                             }
                             if (image == null) {
                                 image = loadDefaultBackgroundImage();

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

@@ -37,7 +37,6 @@ import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
-import javafx.util.Duration;
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
@@ -56,7 +55,6 @@ public class DecoratorSkin extends SkinBase<Decorator> {
     private final StackPane titleContainer;
     private final Stage primaryStage;
     private final TransitionPane navBarPane;
-    private final StackPane leftPane;
 
     private double xOffset, yOffset, newX, newY, initX, initY;
     private boolean titleBarTransparent = true;
@@ -109,15 +107,6 @@ public class DecoratorSkin extends SkinBase<Decorator> {
         StackPane container = new StackPane();
         FXUtils.setOverflowHidden(container);
 
-        // animation layer at bottom
-        HBox drawerPane = new HBox();
-        {
-            leftPane = new StackPane();
-            leftPane.setPrefWidth(0);
-            leftPane.getStyleClass().add("jfx-decorator-drawer");
-            drawerPane.getChildren().setAll(leftPane);
-        }
-
         // content layer at middle
         {
             StackPane contentPlaceHolder = new StackPane();
@@ -159,16 +148,12 @@ public class DecoratorSkin extends SkinBase<Decorator> {
                 container.setBackground(null);
                 titleContainer.getStyleClass().remove("background");
                 titleContainer.getStyleClass().add("gray-background");
-                container.getChildren().remove(drawerPane);
-                wrapper.getChildren().add(0, drawerPane);
             } else {
                 container.backgroundProperty().bind(skinnable.contentBackgroundProperty());
                 wrapper.backgroundProperty().unbind();
                 wrapper.setBackground(null);
                 titleContainer.getStyleClass().add("background");
                 titleContainer.getStyleClass().remove("gray-background");
-                wrapper.getChildren().remove(drawerPane);
-                container.getChildren().add(0, drawerPane);
             }
         });
 
@@ -180,6 +165,7 @@ public class DecoratorSkin extends SkinBase<Decorator> {
         Rectangle buttonsContainerPlaceHolder = new Rectangle();
         {
             navBarPane = new TransitionPane();
+            navBarPane.setId("decoratorTitleTransitionPane");
             FXUtils.onChangeAndOperate(skinnable.stateProperty(), s -> {
                 if (s == null) return;
                 Node node = createNavBar(skinnable, s.getLeftPaneWidth(), s.isBackable(), skinnable.canCloseProperty().get(), skinnable.showCloseAsHomeProperty().get(), s.isRefreshable(), s.getTitle(), s.getTitleNode());
@@ -197,9 +183,6 @@ public class DecoratorSkin extends SkinBase<Decorator> {
                 } else {
                     navBarPane.getChildren().setAll(node);
                 }
-
-                FXUtils.playAnimation(leftPane, "animation",
-                        s.isAnimate() ? Duration.millis(160) : null, leftPane.prefWidthProperty(), null, s.getLeftPaneWidth(), FXUtils.SINE);
             });
             titleBar.setCenter(navBarPane);
             titleBar.setRight(buttonsContainerPlaceHolder);

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

@@ -31,7 +31,6 @@ import org.jackhuang.hmcl.setting.Profiles;
 import org.jackhuang.hmcl.task.FileDownloadTask;
 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;
@@ -41,17 +40,15 @@ import org.jackhuang.hmcl.ui.animation.TransitionPane;
 import org.jackhuang.hmcl.ui.construct.AdvancedListBox;
 import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
 import org.jackhuang.hmcl.ui.construct.TabHeader;
-import org.jackhuang.hmcl.ui.construct.TaskExecutorDialogPane;
 import org.jackhuang.hmcl.ui.decorator.DecoratorAnimatedPage;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
-import org.jackhuang.hmcl.ui.versions.DownloadListPage;
-import org.jackhuang.hmcl.ui.versions.ModDownloadListPage;
-import org.jackhuang.hmcl.ui.versions.VersionPage;
-import org.jackhuang.hmcl.ui.versions.Versions;
+import org.jackhuang.hmcl.ui.versions.*;
 import org.jackhuang.hmcl.ui.wizard.Navigation;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
 import org.jackhuang.hmcl.ui.wizard.WizardProvider;
+import org.jackhuang.hmcl.util.TaskCancellationAction;
 import org.jackhuang.hmcl.util.io.NetworkUtils;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;
 import org.jetbrains.annotations.Nullable;
 
 import java.nio.file.Path;
@@ -82,7 +79,7 @@ public class DownloadPage extends DecoratorAnimatedPage implements DecoratorPage
         newGameTab.setNodeSupplier(loadVersionFor(() -> new VersionsPage(versionPageNavigator, i18n("install.installer.choose", i18n("install.installer.game")), "", DownloadProviders.getDownloadProvider(),
                 "game", versionPageNavigator::onGameSelected)));
         modpackTab.setNodeSupplier(loadVersionFor(() -> {
-            DownloadListPage page = new DownloadListPage(CurseForgeRemoteModRepository.MODPACKS, Versions::downloadModpackImpl);
+            ModpackDownloadListPage page = new ModpackDownloadListPage(Versions::downloadModpackImpl, false);
 
             JFXButton installLocalModpackButton = new JFXButton(i18n("install.modpack"));
             installLocalModpackButton.setButtonType(JFXButton.ButtonType.RAISED);
@@ -166,30 +163,33 @@ public class DownloadPage extends DecoratorAnimatedPage implements DecoratorPage
         if (version == null) version = profile.getSelectedVersion();
 
         Path runDirectory = profile.getRepository().hasVersion(version) ? profile.getRepository().getRunDirectory(version).toPath() : profile.getRepository().getBaseDirectory().toPath();
-        Path dest = runDirectory.resolve(subdirectoryName).resolve(file.getFile().getFilename());
 
-        TaskExecutorDialogPane downloadingPane = new TaskExecutorDialogPane(it -> {
-        });
-
-        TaskExecutor executor = Task.composeAsync(() -> {
-            FileDownloadTask task = new FileDownloadTask(NetworkUtils.toURL(file.getFile().getUrl()), dest.toFile());
-            task.setName(file.getName());
-            return task;
-        }).whenComplete(Schedulers.javafx(), exception -> {
-            if (exception != null) {
-                if (exception instanceof CancellationException) {
-                    Controllers.showToast(i18n("message.cancelled"));
-                } else {
-                    Controllers.dialog(DownloadProviders.localizeErrorMessage(exception), i18n("install.failed.downloading"), MessageDialogPane.MessageType.ERROR);
-                }
-            } else {
-                Controllers.showToast(i18n("install.success"));
+        Controllers.prompt(i18n("archive.name"), (result, resolve, reject) -> {
+            if (!OperatingSystem.isNameValid(result)) {
+                reject.accept(i18n("install.new_game.malformed"));
+                return;
             }
-        }).executor(false);
+            Path dest = runDirectory.resolve(subdirectoryName).resolve(result);
+
+            Controllers.taskDialog(Task.composeAsync(() -> {
+                FileDownloadTask task = new FileDownloadTask(NetworkUtils.toURL(file.getFile().getUrl()), dest.toFile());
+                task.setName(file.getName());
+                return task;
+            }).whenComplete(Schedulers.javafx(), exception -> {
+                if (exception != null) {
+                    if (exception instanceof CancellationException) {
+                        Controllers.showToast(i18n("message.cancelled"));
+                    } else {
+                        Controllers.dialog(DownloadProviders.localizeErrorMessage(exception), i18n("install.failed.downloading"), MessageDialogPane.MessageType.ERROR);
+                    }
+                } else {
+                    Controllers.showToast(i18n("install.success"));
+                }
+            }), i18n("message.downloading"), TaskCancellationAction.NORMAL);
+
+            resolve.run();
+        }, file.getFile().getFilename());
 
-        downloadingPane.setExecutor(executor, true);
-        Controllers.dialog(downloadingPane);
-        executor.start();
     }
 
     private void loadVersions(Profile profile) {

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

@@ -20,7 +20,7 @@ package org.jackhuang.hmcl.ui.download;
 import javafx.scene.Node;
 import org.jackhuang.hmcl.game.ModpackHelper;
 import org.jackhuang.hmcl.game.ManuallyCreatedModpackException;
-import org.jackhuang.hmcl.mod.curse.CurseCompletionException;
+import org.jackhuang.hmcl.mod.ModpackCompletionException;
 import org.jackhuang.hmcl.mod.MismatchedModpackTypeException;
 import org.jackhuang.hmcl.mod.Modpack;
 import org.jackhuang.hmcl.mod.UnsupportedModpackException;
@@ -125,7 +125,7 @@ public class ModpackInstallWizardProvider implements WizardProvider {
         settings.put("failure_callback", new FailureCallback() {
             @Override
             public void onFail(Map<String, Object> settings, Exception exception, Runnable next) {
-                if (exception instanceof CurseCompletionException) {
+                if (exception instanceof ModpackCompletionException) {
                     if (exception.getCause() instanceof FileNotFoundException) {
                         Controllers.dialog(i18n("modpack.type.curse.not_found"), i18n("install.failed"), MessageType.ERROR, next);
                     } else {

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

@@ -23,6 +23,7 @@ import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.scene.layout.StackPane;
 import javafx.stage.FileChooser;
+import org.jackhuang.hmcl.game.ModpackHelper;
 import org.jackhuang.hmcl.mod.server.ServerModpackManifest;
 import org.jackhuang.hmcl.task.FileDownloadTask;
 import org.jackhuang.hmcl.task.GetTask;
@@ -31,8 +32,8 @@ import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
 import org.jackhuang.hmcl.ui.wizard.WizardPage;
+import org.jackhuang.hmcl.util.TaskCancellationAction;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
-import org.jackhuang.hmcl.util.io.FileUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -66,7 +67,7 @@ public final class ModpackSelectionPage extends StackPane implements WizardPage
             Platform.runLater(controller::onNext);
         }
 
-        FXUtils.applyDragListener(this, it -> "zip".equals(FileUtils.getExtension(it)), modpacks -> {
+        FXUtils.applyDragListener(this, ModpackHelper::isFileModpackByExtension, modpacks -> {
             File modpack = modpacks.get(0);
             controller.getSettings().put(MODPACK_FILE, modpack);
             controller.onNext();
@@ -77,7 +78,7 @@ public final class ModpackSelectionPage extends StackPane implements WizardPage
     private void onChooseLocalFile() {
         FileChooser chooser = new FileChooser();
         chooser.setTitle(i18n("modpack.choose"));
-        chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(i18n("modpack"), "*.zip"));
+        chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(i18n("modpack"), "*.zip", "*.mrpack"));
         File selectedFile = chooser.showOpenDialog(Controllers.getStage());
         if (selectedFile == null) {
             Platform.runLater(controller::onEnd);
@@ -106,7 +107,7 @@ public final class ModpackSelectionPage extends StackPane implements WizardPage
                         } else {
                             reject.accept(e.getMessage());
                         }
-                    }).executor(true), i18n("message.downloading"));
+                    }).executor(true), i18n("message.downloading"), TaskCancellationAction.NORMAL);
                 } else {
                     // otherwise we still consider the file as modpack zip file
                     // since casually the url may not ends with ".zip"
@@ -124,7 +125,8 @@ public final class ModpackSelectionPage extends StackPane implements WizardPage
                                             reject.accept(e.getMessage());
                                         }
                                     }).executor(true),
-                            i18n("message.downloading")
+                            i18n("message.downloading"),
+                            TaskCancellationAction.NORMAL
                     );
                 }
             } catch (IOException e) {

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

@@ -41,6 +41,7 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CancellationException;
 import java.util.zip.ZipException;
 
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
@@ -173,6 +174,8 @@ public final class UpdateInstallerWizardProvider implements WizardProvider {
         } else if (exception instanceof VersionMismatchException) {
             VersionMismatchException e = ((VersionMismatchException) exception);
             Controllers.dialog(i18n("install.failed.version_mismatch", e.getExpect(), e.getActual()), i18n("install.failed"), MessageDialogPane.MessageType.ERROR, next);
+        } else if (exception instanceof CancellationException) {
+            // Ignore cancel
         } else {
             Controllers.dialog(StringUtils.getStackTrace(exception), i18n("install.failed"), MessageDialogPane.MessageType.ERROR, next);
         }

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

@@ -17,6 +17,7 @@
  */
 package org.jackhuang.hmcl.ui.download;
 
+import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXCheckBox;
 import com.jfoenix.controls.JFXListView;
 import com.jfoenix.controls.JFXSpinner;
@@ -39,7 +40,9 @@ import org.jackhuang.hmcl.download.forge.ForgeRemoteVersion;
 import org.jackhuang.hmcl.download.game.GameRemoteVersion;
 import org.jackhuang.hmcl.download.liteloader.LiteLoaderRemoteVersion;
 import org.jackhuang.hmcl.download.optifine.OptiFineRemoteVersion;
+import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.SVG;
 import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
 import org.jackhuang.hmcl.ui.animation.TransitionPane;
 import org.jackhuang.hmcl.ui.construct.ComponentList;
@@ -48,6 +51,7 @@ import org.jackhuang.hmcl.ui.construct.RipplerContainer;
 import org.jackhuang.hmcl.ui.wizard.Navigation;
 import org.jackhuang.hmcl.ui.wizard.Refreshable;
 import org.jackhuang.hmcl.ui.wizard.WizardPage;
+import org.jackhuang.hmcl.util.HMCLService;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.i18n.Locales;
 
@@ -57,6 +61,7 @@ import java.util.concurrent.CompletableFuture;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 
+import static org.jackhuang.hmcl.ui.ToolbarListPageSkin.wrap;
 import static org.jackhuang.hmcl.util.Logging.LOG;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
@@ -83,13 +88,15 @@ public final class VersionsPage extends BorderPane implements WizardPage, Refres
     @FXML
     private JFXCheckBox chkOld;
     @FXML
+    private JFXButton btnRefresh;
+    @FXML
     private HBox checkPane;
     @FXML
     private ComponentList centrePane;
     @FXML
     private StackPane center;
 
-    private VersionList<?> versionList;
+    private final VersionList<?> versionList;
     private CompletableFuture<?> executor;
 
     public VersionsPage(Navigation navigation, String title, String gameVersion, DownloadProvider downloadProvider, String libraryId, Runnable callback) {
@@ -113,6 +120,8 @@ public final class VersionsPage extends BorderPane implements WizardPage, Refres
         chkSnapshot.selectedProperty().addListener(listener);
         chkOld.selectedProperty().addListener(listener);
 
+        btnRefresh.setGraphic(wrap(SVG.refresh(Theme.blackFillBinding(), -1, -1)));
+
         list.setCellFactory(listView -> new ListCell<RemoteVersion>() {
             IconedTwoLineListItem content = new IconedTwoLineListItem();
             RipplerContainer ripplerContainer = new RipplerContainer(content);
@@ -135,7 +144,7 @@ public final class VersionsPage extends BorderPane implements WizardPage, Refres
 
                 content.setTitle(remoteVersion.getSelfVersion());
                 if (remoteVersion.getReleaseDate() != null) {
-                    content.setSubtitle(Locales.DATE_TIME_FORMATTER.get().format(remoteVersion.getReleaseDate()));
+                    content.setSubtitle(Locales.DATE_TIME_FORMATTER.get().format(remoteVersion.getReleaseDate().toInstant()));
                 } else {
                     content.setSubtitle("");
                 }
@@ -279,6 +288,6 @@ public final class VersionsPage extends BorderPane implements WizardPage, Refres
 
     @FXML
     private void onSponsor() {
-        FXUtils.openLink("https://hmcl.huangyuhui.net/api/redirect/bmclapi_sponsor");
+        HMCLService.openRedirectLink("bmclapi_sponsor");
     }
 }

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

@@ -18,7 +18,6 @@
 package org.jackhuang.hmcl.ui.export;
 
 import javafx.scene.Node;
-import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.mod.ModAdviser;
 import org.jackhuang.hmcl.mod.ModpackExportInfo;
 import org.jackhuang.hmcl.mod.mcbbs.McbbsModpackExportTask;
@@ -33,14 +32,13 @@ import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
 import org.jackhuang.hmcl.ui.wizard.WizardProvider;
 import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.io.JarUtils;
 import org.jackhuang.hmcl.util.io.Zipper;
 
 import java.io.File;
 import java.nio.file.Files;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.nio.file.Path;
+import java.util.*;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 
@@ -70,8 +68,8 @@ public final class ExportWizardProvider implements WizardProvider {
     }
 
     private Task<?> exportWithLauncher(String modpackType, ModpackExportInfo exportInfo, File modpackFile) {
-        List<File> launcherJar = Launcher.getCurrentJarFiles();
-        boolean packWithLauncher = exportInfo.isPackWithLauncher() && launcherJar != null;
+        Optional<Path> launcherJar = JarUtils.thisJar();
+        boolean packWithLauncher = exportInfo.isPackWithLauncher() && launcherJar.isPresent();
         return new Task<Object>() {
             File tempModpack;
             Task<?> exportTask;
@@ -139,8 +137,7 @@ public final class ExportWizardProvider implements WizardProvider {
                     if (background_jpg.isFile())
                         zip.putFile(background_jpg, "background.jpg");
 
-                    for (File jar : launcherJar)
-                        zip.putFile(jar, jar.getName());
+                    zip.putFile(launcherJar.get(), launcherJar.get().getFileName().toString());
                 }
             }
         };

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

@@ -35,7 +35,7 @@ import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
 
 import java.io.File;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -147,7 +147,7 @@ public final class ModpackFileSelectionPage extends StackPane implements WizardP
 
     @FXML
     private void onNext() {
-        LinkedList<String> list = new LinkedList<>();
+        ArrayList<String> list = new ArrayList<>();
         getFilesNeeded(rootNode, "minecraft", list);
         controller.getSettings().put(MODPACK_FILE_SELECTION, list);
         controller.onFinish();

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

@@ -29,7 +29,6 @@ import javafx.scene.control.*;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.*;
 import javafx.stage.FileChooser;
-import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.game.HMCLGameRepository;
@@ -43,6 +42,7 @@ import org.jackhuang.hmcl.ui.construct.*;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
 import org.jackhuang.hmcl.ui.wizard.WizardPage;
 import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.io.JarUtils;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
 
 import java.io.File;
@@ -96,8 +96,7 @@ public final class ModpackInfoPage extends Control implements WizardPage {
         launchArguments.set(versionSetting.getMinecraftArgs());
         javaArguments.set(versionSetting.getJavaArgs());
 
-        List<File> launcherJar = Launcher.getCurrentJarFiles();
-        canIncludeLauncher = launcherJar != null;
+        canIncludeLauncher = JarUtils.thisJar().isPresent();
 
         next.set(e -> onNext());
     }

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

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2021  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2022  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -62,7 +62,13 @@ public class AboutPage extends StackPane {
             bangbang93.setTitle("bangbang93");
             bangbang93.setSubtitle(i18n("about.thanks_to.bangbang93.statement"));
             bangbang93.setExternalLink("https://bmclapi2.bangbang93.com/");
-
+            
+            IconedTwoLineListItem glavo = new IconedTwoLineListItem();
+            glavo.setImage(new Image("/assets/img/glavo.jpg", 32, 32, false, true));
+            glavo.setTitle("Glavo");
+            glavo.setSubtitle(i18n("about.thanks_to.glavo.statement"));
+            glavo.setExternalLink("https://github.com/Glavo");
+            
             IconedTwoLineListItem gamerteam = new IconedTwoLineListItem();
             gamerteam.setTitle("gamerteam");
             gamerteam.setImage(new Image("/assets/img/gamerteam.jpg", 32, 32, false, true));
@@ -90,7 +96,7 @@ public class AboutPage extends StackPane {
             noin.setImage(new Image("/assets/img/noin.png", 32, 32, false, true));
             noin.setTitle(i18n("about.thanks_to.noin"));
             noin.setSubtitle(i18n("about.thanks_to.noin.statement"));
-            noin.setExternalLink("https://noin.cn/");
+            noin.setExternalLink("https://mcer.cn/cato");
 
             IconedTwoLineListItem contributors = new IconedTwoLineListItem();
             contributors.setImage(new Image("/assets/img/github.png", 32, 32, false, true));
@@ -98,7 +104,7 @@ public class AboutPage extends StackPane {
             contributors.setSubtitle(i18n("about.thanks_to.contributors.statement"));
             contributors.setExternalLink("https://github.com/huanghongxun/HMCL/graphs/contributors");
 
-            thanks.getContent().setAll(yushijinhun, bangbang93, mcbbs, mcmod, noin, gamerteam, redLnn, contributors);
+            thanks.getContent().setAll(yushijinhun, bangbang93, glavo, mcbbs, mcmod, noin, gamerteam, redLnn, contributors);
         }
 
         ComponentList community = new ComponentList();
@@ -167,9 +173,9 @@ public class AboutPage extends StackPane {
             jstun.setExternalLink("https://github.com/tking/JSTUN");
 
             IconedTwoLineListItem minecraftJFXSkin = new IconedTwoLineListItem();
-            jstun.setTitle("minecraft-jfx-skin");
-            jstun.setSubtitle("Copyright (c) 2016 InfinityStudio.\nLicensed under the GPL 3.");
-            jstun.setExternalLink("https://github.com/InfinityStudio/minecraft-jfx-skin");
+            minecraftJFXSkin.setTitle("minecraft-jfx-skin");
+            minecraftJFXSkin.setSubtitle("Copyright (c) 2016 InfinityStudio.\nLicensed under the GPL 3.");
+            minecraftJFXSkin.setExternalLink("https://github.com/InfinityStudio/minecraft-jfx-skin");
 
             dep.getContent().setAll(javafx, jfoenix, gson, xz, fxgson, constantPoolScanner, openNBT, jstun, minecraftJFXSkin);
         }

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

@@ -31,7 +31,7 @@ import javafx.geometry.Pos;
 import javafx.scene.control.Label;
 import javafx.scene.layout.*;
 import org.jackhuang.hmcl.Metadata;
-import org.jackhuang.hmcl.game.MicrosoftAuthenticationServer;
+import org.jackhuang.hmcl.game.OAuthServer;
 import org.jackhuang.hmcl.setting.Accounts;
 import org.jackhuang.hmcl.setting.HMCLAccounts;
 import org.jackhuang.hmcl.setting.Theme;
@@ -128,7 +128,7 @@ public class FeedbackPage extends VBox implements PageAware {
                     container.setPickOnBounds(false);
                     container.setAlignment(Pos.CENTER_LEFT);
                     HBox.setHgrow(content, Priority.ALWAYS);
-                    content.setMouseTransparent(true);
+                    content.setMouseTransparent(false);
                     setSelectable();
 
                     likeButton.getStyleClass().add("toggle-icon4");
@@ -152,7 +152,7 @@ public class FeedbackPage extends VBox implements PageAware {
                             "#" + feedback.getId(),
                             i18n("feedback.state." + feedback.getState().name().toLowerCase(Locale.US)),
                             i18n("feedback.type." + feedback.getType().name().toLowerCase(Locale.US)));
-                    container.setOnMouseClicked(e -> {
+                    content.setOnMouseClicked(e -> {
                         getFeedback(feedback.getId())
                                 .thenAcceptAsync(Schedulers.javafx(), f -> {
                                     Controllers.dialog(new ViewFeedbackDialog(f));
@@ -243,11 +243,11 @@ public class FeedbackPage extends VBox implements PageAware {
             HintPane hintPane = new HintPane(MessageDialogPane.MessageType.INFO);
             hintPane.textProperty().bind(BindingMapping.of(logging).map(logging ->
                     logging
-                            ? i18n("account.methods.microsoft.manual")
-                            : i18n("account.methods.microsoft.hint")));
+                            ? i18n("account.hmcl.hint")
+                            : i18n("account.hmcl.hint")));
             hintPane.setOnMouseClicked(e -> {
-                if (logging.get() && MicrosoftAuthenticationServer.lastlyOpenedURL != null) {
-                    FXUtils.copyText(MicrosoftAuthenticationServer.lastlyOpenedURL);
+                if (logging.get() && OAuthServer.lastlyOpenedURL != null) {
+                    FXUtils.copyText(OAuthServer.lastlyOpenedURL);
                 }
             });
             vbox.getChildren().setAll(hintPane);

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

@@ -42,9 +42,11 @@ import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Profiles;
 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.AnnouncementCard;
+import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
 import org.jackhuang.hmcl.ui.construct.PopupMenu;
 import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
@@ -53,11 +55,14 @@ import org.jackhuang.hmcl.ui.versions.Versions;
 import org.jackhuang.hmcl.upgrade.RemoteVersion;
 import org.jackhuang.hmcl.upgrade.UpdateChecker;
 import org.jackhuang.hmcl.upgrade.UpdateHandler;
+import org.jackhuang.hmcl.util.javafx.BindingMapping;
 import org.jackhuang.hmcl.util.javafx.MappedObservableList;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.IntStream;
 
+import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 import static org.jackhuang.hmcl.ui.FXUtils.SINE;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
@@ -69,7 +74,7 @@ public final class MainPage extends StackPane implements DecoratorPage {
 
     private final StringProperty currentGame = new SimpleStringProperty(this, "currentGame");
     private final BooleanProperty showUpdate = new SimpleBooleanProperty(this, "showUpdate");
-    private final StringProperty latestVersion = new SimpleStringProperty(this, "latestVersion");
+    private final ObjectProperty<RemoteVersion> latestVersion = new SimpleObjectProperty<>(this, "latestVersion");
     private final ObservableList<Version> versions = FXCollections.observableArrayList();
     private final ObservableList<Node> versionNodes;
     private Profile profile;
@@ -103,7 +108,7 @@ public final class MainPage extends StackPane implements DecoratorPage {
         FXUtils.setLimitHeight(updatePane, 55);
         StackPane.setAlignment(updatePane, Pos.TOP_RIGHT);
         updatePane.setOnMouseClicked(e -> onUpgrade());
-        FXUtils.onChange(showUpdateProperty(), this::doAnimation);
+        FXUtils.onChange(showUpdateProperty(), this::showUpdate);
 
         {
             HBox hBox = new HBox();
@@ -118,7 +123,8 @@ public final class MainPage extends StackPane implements DecoratorPage {
                 TwoLineListItem prompt = new TwoLineListItem();
                 prompt.setSubtitle(i18n("update.bubble.subtitle"));
                 prompt.setPickOnBounds(false);
-                prompt.titleProperty().bind(latestVersionProperty());
+                prompt.titleProperty().bind(BindingMapping.of(latestVersionProperty()).map(latestVersion ->
+                        latestVersion == null ? "" : i18n("update.bubble.title", latestVersion.getVersion())));
 
                 hBox.getChildren().setAll(lblIcon, prompt);
             }
@@ -224,6 +230,17 @@ public final class MainPage extends StackPane implements DecoratorPage {
         }
     }
 
+    private void showUpdate(boolean show) {
+        doAnimation(show);
+
+        if (show && getLatestVersion() != null && !Objects.equals(config().getPromptedVersion(), getLatestVersion().getVersion())) {
+            Controllers.dialog("", i18n("update.bubble.title", getLatestVersion().getVersion()), MessageDialogPane.MessageType.INFO, () -> {
+                config().setPromptedVersion(getLatestVersion().getVersion());
+                onUpgrade();
+            });
+        }
+    }
+
     private void doAnimation(boolean show) {
         Duration duration = Duration.millis(320);
         Timeline nowAnimation = new Timeline();
@@ -289,15 +306,15 @@ public final class MainPage extends StackPane implements DecoratorPage {
         this.showUpdate.set(showUpdate);
     }
 
-    public String getLatestVersion() {
+    public RemoteVersion getLatestVersion() {
         return latestVersion.get();
     }
 
-    public StringProperty latestVersionProperty() {
+    public ObjectProperty<RemoteVersion> latestVersionProperty() {
         return latestVersion;
     }
 
-    public void setLatestVersion(String latestVersion) {
+    public void setLatestVersion(RemoteVersion latestVersion) {
         this.latestVersion.set(latestVersion);
     }
 

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

@@ -102,10 +102,12 @@ public class PersonalizationPage extends StackPane {
             backgroundItem.loadChildren(Arrays.asList(
                     new MultiFileItem.Option<>(i18n("launcher.background.default"), EnumBackgroundImage.DEFAULT),
                     new MultiFileItem.Option<>(i18n("launcher.background.classic"), EnumBackgroundImage.CLASSIC),
+                    new MultiFileItem.Option<>(i18n("launcher.background.translucent"), EnumBackgroundImage.TRANSLUCENT),
                     new MultiFileItem.FileOption<>(i18n("settings.custom"), EnumBackgroundImage.CUSTOM)
                             .setChooserTitle(i18n("launcher.background.choose"))
                             .bindBidirectional(config().backgroundImageProperty()),
                     new MultiFileItem.StringOption<>(i18n("launcher.background.network"), EnumBackgroundImage.NETWORK)
+                            .setValidators(new URLValidator(true))
                             .bindBidirectional(config().backgroundImageUrlProperty())
             ));
             backgroundItem.selectedDataProperty().bindBidirectional(config().backgroundImageTypeProperty());

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

@@ -40,9 +40,8 @@ import org.jackhuang.hmcl.ui.download.ModpackInstallWizardProvider;
 import org.jackhuang.hmcl.ui.versions.GameAdvancedListItem;
 import org.jackhuang.hmcl.ui.versions.Versions;
 import org.jackhuang.hmcl.upgrade.UpdateChecker;
+import org.jackhuang.hmcl.util.TaskCancellationAction;
 import org.jackhuang.hmcl.util.io.CompressingUtils;
-import org.jackhuang.hmcl.util.io.FileUtils;
-import org.jackhuang.hmcl.util.javafx.BindingMapping;
 import org.jackhuang.hmcl.util.versioning.VersionNumber;
 
 import java.io.File;
@@ -83,7 +82,7 @@ public class RootPage extends DecoratorAnimatedPage implements DecoratorPage {
     private MainPage getMainPage() {
         if (mainPage == null) {
             MainPage mainPage = new MainPage();
-            FXUtils.applyDragListener(mainPage, it -> "zip".equals(FileUtils.getExtension(it)), modpacks -> {
+            FXUtils.applyDragListener(mainPage, ModpackHelper::isFileModpackByExtension, modpacks -> {
                 File modpack = modpacks.get(0);
                 Controllers.getDecorator().startWizard(
                         new ModpackInstallWizardProvider(Profiles.getSelectedProfile(), modpack),
@@ -92,8 +91,7 @@ public class RootPage extends DecoratorAnimatedPage implements DecoratorPage {
 
             FXUtils.onChangeAndOperate(Profiles.selectedVersionProperty(), mainPage::setCurrentGame);
             mainPage.showUpdateProperty().bind(UpdateChecker.outdatedProperty());
-            mainPage.latestVersionProperty().bind(BindingMapping.of(UpdateChecker.latestVersionProperty())
-                    .map(version -> version == null ? "" : i18n("update.bubble.title", version.getVersion())));
+            mainPage.latestVersionProperty().bind(UpdateChecker.latestVersionProperty());
 
             Profiles.registerVersionsListener(profile -> {
                 HMCLGameRepository repository = profile.getRepository();
@@ -201,7 +199,7 @@ public class RootPage extends DecoratorAnimatedPage implements DecoratorPage {
                                                 modpack)
                                         .executor())
                                 .thenAcceptAsync(Schedulers.javafx(), executor -> {
-                                    Controllers.taskDialog(executor, i18n("modpack.installing"));
+                                    Controllers.taskDialog(executor, i18n("modpack.installing"), TaskCancellationAction.NO_CANCEL);
                                     executor.start();
                                 }).start();
                     }

HMCL/src/main/java/org/jackhuang/hmcl/ui/multiplayer/CreateMultiplayerRoomDialog.java

@@ -1,6 +1,6 @@
 /*
  * Hello Minecraft! Launcher
- * Copyright (C) 2021  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2022  huangyuhui <huanghongxun2008@126.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -82,8 +82,8 @@ public class CreateMultiplayerRoomDialog extends DialogPane implements DialogAwa
         setValid(false);
 
         JFXHyperlink noinLink = new JFXHyperlink();
-        noinLink.setText("noin.cn");
-        noinLink.setOnAction(e -> FXUtils.openLink("https://noin.cn"));
+        noinLink.setText("mcer.cn");
+        noinLink.setOnAction(e -> FXUtils.openLink("https://mcer.cn/circle/cato"));
 
         setActions(warningLabel, noinLink, acceptPane, cancelButton);
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/multiplayer/MultiplayerChannel.java

@@ -87,12 +87,18 @@ public final class MultiplayerChannel {
     }
 
     public static class JoinResponse extends Response {
+        private final String sessionName;
         private final int port;
 
-        public JoinResponse(int port) {
+        public JoinResponse(String sessionName, int port) {
+            this.sessionName = sessionName;
             this.port = port;
         }
 
+        public String getSessionName() {
+            return sessionName;
+        }
+
         public int getPort() {
             return port;
         }
@@ -120,6 +126,10 @@ public final class MultiplayerChannel {
         public String getMsg() {
             return msg;
         }
+
+        public static final String VERSION_NOT_MATCHED = "version_not_matched";
+        public static final String KICKED = "kicked";
+        public static final String JOIN_ACEEPTANCE_TIMEOUT = "join_acceptance_timeout";
     }
 
     public static class CatoClient extends Event {

HMCL/src/main/java/org/jackhuang/hmcl/ui/multiplayer/MultiplayerClient.java

@@ -27,6 +27,7 @@ import java.io.*;
 import java.net.ConnectException;
 import java.net.InetAddress;
 import java.net.Socket;
+import java.nio.charset.StandardCharsets;
 import java.util.TimerTask;
 import java.util.logging.Level;
 
@@ -42,7 +43,7 @@ public class MultiplayerClient extends Thread {
 
     private final EventManager<ConnectedEvent> onConnected = new EventManager<>();
     private final EventManager<Event> onDisconnected = new EventManager<>();
-    private final EventManager<Event> onKicked = new EventManager<>();
+    private final EventManager<KickEvent> onKicked = new EventManager<>();
     private final EventManager<Event> onHandshake = new EventManager<>();
 
     public MultiplayerClient(String id, int port) {
@@ -53,11 +54,11 @@ public class MultiplayerClient extends Thread {
         setDaemon(true);
     }
 
-    public void setGamePort(int gamePort) {
+    public synchronized void setGamePort(int gamePort) {
         this.gamePort = gamePort;
     }
 
-    public int getGamePort() {
+    public synchronized int getGamePort() {
         return gamePort;
     }
 
@@ -69,7 +70,7 @@ public class MultiplayerClient extends Thread {
         return onDisconnected;
     }
 
-    public EventManager<Event> onKicked() {
+    public EventManager<KickEvent> onKicked() {
         return onKicked;
     }
 
@@ -83,9 +84,10 @@ public class MultiplayerClient extends Thread {
         for (int i = 0; i < 5; i++) {
             KeepAliveThread keepAliveThread = null;
             try (Socket socket = new Socket(InetAddress.getLoopbackAddress(), port);
-                 BufferedReader reader = new BufferedReader(new InputStreamReader(socket.getInputStream()));
-                 BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(socket.getOutputStream()))) {
+                 BufferedReader reader = new BufferedReader(new InputStreamReader(socket.getInputStream(), StandardCharsets.UTF_8));
+                 BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(socket.getOutputStream(), StandardCharsets.UTF_8))) {
                 MultiplayerServer.Endpoint endpoint = new MultiplayerServer.Endpoint(socket, writer);
+                socket.setSoTimeout(30000);
                 LOG.info("Connected to 127.0.0.1:" + port);
 
                 endpoint.write(new HandshakeRequest());
@@ -106,7 +108,7 @@ public class MultiplayerClient extends Thread {
                     } catch (IOException e) {
                         LOG.log(Level.WARNING, "Failed to close socket", e);
                     }
-                }, 15 * 1000);
+                }, 25 * 1000);
 
                 String line;
                 while ((line = reader.readLine()) != null) {
@@ -124,12 +126,12 @@ public class MultiplayerClient extends Thread {
 
                         connected = true;
 
-                        onConnected.fireEvent(new ConnectedEvent(this, joinResponse.getPort()));
+                        onConnected.fireEvent(new ConnectedEvent(this, joinResponse.getSessionName(), joinResponse.getPort()));
 
                         LOG.fine("Received join response with port " + joinResponse.getPort());
                     } else if (response instanceof KickResponse) {
                         LOG.fine("Kicked by the server");
-                        onKicked.fireEvent(new Event(this));
+                        onKicked.fireEvent(new KickEvent(this, ((KickResponse) response).getMsg()));
                         return;
                     } else if (response instanceof KeepAliveResponse) {
                     } else if (response instanceof HandshakeResponse) {
@@ -192,15 +194,34 @@ public class MultiplayerClient extends Thread {
     }
 
     public static class ConnectedEvent extends Event {
+        private final String sessionName;
         private final int port;
 
-        public ConnectedEvent(Object source, int port) {
+        public ConnectedEvent(Object source, String sessionName, int port) {
             super(source);
+            this.sessionName = sessionName;
             this.port = port;
         }
 
+        public String getSessionName() {
+            return sessionName;
+        }
+
         public int getPort() {
             return port;
         }
     }
+
+    public static class KickEvent extends Event {
+        private final String reason;
+
+        public KickEvent(Object source, String reason) {
+            super(source);
+            this.reason = reason;
+        }
+
+        public String getReason() {
+            return reason;
+        }
+    }
 }

HMCL/src/main/java/org/jackhuang/hmcl/ui/multiplayer/MultiplayerManager.java

@@ -19,15 +19,17 @@ package org.jackhuang.hmcl.ui.multiplayer;
 
 import com.google.gson.JsonParseException;
 import com.google.gson.annotations.SerializedName;
+import javafx.application.Platform;
 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.event.Event;
 import org.jackhuang.hmcl.event.EventManager;
-import org.jackhuang.hmcl.launch.StreamPump;
 import org.jackhuang.hmcl.task.FileDownloadTask;
 import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.StringUtils;
-import org.jackhuang.hmcl.util.gson.JsonUtils;
+import org.jackhuang.hmcl.util.io.ChecksumMismatchException;
+import org.jackhuang.hmcl.util.io.HttpRequest;
 import org.jackhuang.hmcl.util.io.NetworkUtils;
 import org.jackhuang.hmcl.util.platform.Architecture;
 import org.jackhuang.hmcl.util.platform.CommandBuilder;
@@ -35,61 +37,82 @@ import org.jackhuang.hmcl.util.platform.ManagedProcess;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.*;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
 import java.net.ServerSocket;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.attribute.PosixFilePermission;
 import java.util.*;
-import java.util.concurrent.CancellationException;
 import java.util.concurrent.CompletableFuture;
+import java.util.function.Consumer;
 import java.util.logging.Level;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static org.jackhuang.hmcl.util.Lang.wrap;
 import static org.jackhuang.hmcl.util.Logging.LOG;
 
 /**
  * Cato Management.
  */
 public final class MultiplayerManager {
-    private static final String CATO_DOWNLOAD_URL = "https://files.huangyuhui.net/maven/";
-    static final String CATO_VERSION = "1.0.c";
+    static final String CATO_VERSION = "1.2.2";
+    private static final String CATO_DOWNLOAD_URL = "https://gitcode.net/to/cato/-/raw/master/client/";
+    private static final String CATO_HASH_URL = CATO_DOWNLOAD_URL + "cato-all-files.sha1";
     private static final String CATO_PATH = getCatoPath();
     public static final int CATO_AGREEMENT_VERSION = 2;
-
     private static final String REMOTE_ADDRESS = "127.0.0.1";
     private static final String LOCAL_ADDRESS = "0.0.0.0";
 
+    private static CompletableFuture<Map<String, String>> HASH;
+
     private MultiplayerManager() {
     }
 
+    private static CompletableFuture<Map<String, String>> getCatoHash() {
+        FXUtils.checkFxUserThread();
+        if (HASH == null) {
+            HASH = CompletableFuture.supplyAsync(wrap(() -> {
+                String hashList = HttpRequest.GET(CATO_HASH_URL).getString();
+                Map<String, String> hashes = new HashMap<>();
+                for (String line : hashList.split("\n")) {
+                    String[] items = line.trim().split("  ");
+                    if (items.length == 2 && items[0].length() == 40) {
+                        hashes.put(items[1], items[0]);
+                    } else {
+                        LOG.warning("Failed to parse cato hash file, hash line " + line);
+                    }
+                }
+                return hashes;
+            }));
+        }
+        return HASH;
+    }
+
     public static Task<Void> downloadCato() {
-        return new FileDownloadTask(
-                NetworkUtils.toURL(CATO_DOWNLOAD_URL + CATO_PATH),
-                getCatoExecutable().toFile()
-        ).thenRunAsync(() -> {
-            if (OperatingSystem.CURRENT_OS == OperatingSystem.LINUX || OperatingSystem.CURRENT_OS == OperatingSystem.OSX) {
-                Set<PosixFilePermission> perm = Files.getPosixFilePermissions(getCatoExecutable());
-                perm.add(PosixFilePermission.OWNER_EXECUTE);
-                Files.setPosixFilePermissions(getCatoExecutable(), perm);
-            }
-        });
+        return Task.fromCompletableFuture(getCatoHash()).thenComposeAsync(catoHashes ->
+                new FileDownloadTask(
+                        NetworkUtils.toURL(CATO_DOWNLOAD_URL + getCatoFileName()),
+                        getCatoExecutable().toFile(),
+                        catoHashes.get(getCatoFileName()) == null ? null : new FileDownloadTask.IntegrityCheck("SHA-1", catoHashes.get(getCatoFileName()))
+                ).thenRunAsync(() -> {
+                    if (OperatingSystem.CURRENT_OS == OperatingSystem.LINUX || OperatingSystem.CURRENT_OS == OperatingSystem.OSX) {
+                        Set<PosixFilePermission> perm = Files.getPosixFilePermissions(getCatoExecutable());
+                        perm.add(PosixFilePermission.OWNER_EXECUTE);
+                        Files.setPosixFilePermissions(getCatoExecutable(), perm);
+                    }
+                }));
     }
 
     public static Path getCatoExecutable() {
         return Metadata.HMCL_DIRECTORY.resolve("libraries").resolve(CATO_PATH);
     }
 
-    public static CompletableFuture<CatoSession> joinSession(String token, String version, String sessionName, String peer, Mode mode, int remotePort, int localPort, JoinSessionHandler handler) throws IncompatibleCatoVersionException {
-        if (!CATO_VERSION.equals(version)) {
-            throw new IncompatibleCatoVersionException(version, CATO_VERSION);
-        }
-
-        LOG.info(String.format("Joining session (token=%s,version=%s,sessionName=%s,peer=%s,mode=%s,remotePort=%d,localPort=%d)", token, version, sessionName, peer, mode, remotePort, localPort));
-
-        return CompletableFuture.completedFuture(null).thenComposeAsync(unused -> {
+    private static CompletableFuture<CatoSession> startCato(String token, State state) {
+        return getCatoHash().thenApplyAsync(wrap(catoHashes -> {
             Path exe = getCatoExecutable();
             if (!Files.isRegularFile(exe)) {
                 throw new CatoNotExistsException(exe);
@@ -99,72 +122,96 @@ public final class MultiplayerManager {
                 throw new CatoAlreadyStartedException();
             }
 
-            String[] commands = new String[]{exe.toString(),
-                    "--token", StringUtils.isBlank(token) ? "new" : token,
-                    "--id", peer,
-                    "--local", String.format("%s:%d", LOCAL_ADDRESS, localPort),
-                    "--remote", String.format("%s:%d", REMOTE_ADDRESS, remotePort),
-                    "--mode", mode.getName()};
-            Process process;
             try {
-                process = new ProcessBuilder()
-                        .command(commands)
-                        .start();
+                String hash = catoHashes.get(getCatoFileName());
+                if (hash != null) {
+                    ChecksumMismatchException.verifyChecksum(exe, "SHA-1", hash);
+                }
             } catch (IOException e) {
-                throw new UncheckedIOException(e);
+                Files.deleteIfExists(exe);
+                throw e;
             }
 
-            CatoSession session = new CatoSession(sessionName, State.SLAVE, process, Arrays.asList(commands));
+            String[] commands = StringUtils.isBlank(token)
+                    ? new String[]{exe.toString()}
+                    : new String[]{exe.toString(), "-auth.token", token};
+            Process process = new ProcessBuilder()
+                    .command(commands)
+                    .start();
 
+            return new CatoSession(state, process, Arrays.asList(commands));
+        }));
+    }
+
+    public static CompletableFuture<CatoSession> joinSession(String token, String peer, Mode mode, int remotePort, int localPort, JoinSessionHandler handler) throws IncompatibleCatoVersionException {
+        LOG.info(String.format("Joining session (token=%s,peer=%s,mode=%s,remotePort=%d,localPort=%d)", token, peer, mode, remotePort, localPort));
+
+        return startCato(token, State.SLAVE).thenComposeAsync(wrap(session -> {
             CompletableFuture<CatoSession> future = new CompletableFuture<>();
 
-            BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(process.getOutputStream()));
+            session.forwardPort(peer, LOCAL_ADDRESS, localPort, REMOTE_ADDRESS, remotePort, mode);
 
-            session.onExit().register(() -> {
-                try {
-                    writer.close();
-                } catch (IOException e) {
-                    LOG.log(Level.WARNING, "Failed to close cato session stdin writer", e);
+            Consumer<CatoExitEvent> onExit = event -> {
+                boolean ready = session.isReady();
+                switch (event.getExitCode()) {
+                    case 1:
+                        if (!ready) {
+                            future.completeExceptionally(new CatoExitTimeoutException());
+                        }
+                        break;
                 }
-            });
+                future.completeExceptionally(new CatoExitException(event.getExitCode(), ready));
+            };
+            session.onExit.register(onExit);
+
+            TimerTask peerConnectionTimeoutTask = Lang.setTimeout(() -> {
+                future.completeExceptionally(new PeerConnectionTimeoutException());
+                session.stop();
+            }, 15 * 1000);
 
             session.onPeerConnected.register(event -> {
+                peerConnectionTimeoutTask.cancel();
+
                 MultiplayerClient client = new MultiplayerClient(session.getId(), localPort);
                 session.addRelatedThread(client);
                 session.setClient(client);
 
                 TimerTask task = Lang.setTimeout(() -> {
-                    future.completeExceptionally(new JoinRequestTimeoutException());
+                    Platform.runLater(() -> future.completeExceptionally(new JoinRequestTimeoutException()));
                     session.stop();
                 }, 30 * 1000);
 
                 client.onConnected().register(connectedEvent -> {
                     try {
                         int port = findAvailablePort();
-                        String command = String.format("net add %s %s:%d %s:%d %s", peer, LOCAL_ADDRESS, port, REMOTE_ADDRESS, connectedEvent.getPort(), mode.getName());
-                        LOG.info("Invoking cato: " + command);
+                        session.forwardPort(peer, LOCAL_ADDRESS, port, REMOTE_ADDRESS, connectedEvent.getPort(), mode);
                         session.addRelatedThread(Lang.thread(new LocalServerBroadcaster(port, session), "LocalServerBroadcaster", true));
+                        session.setName(connectedEvent.getSessionName());
                         client.setGamePort(port);
-                        writer.write(command);
-                        writer.newLine();
-                        writer.flush();
-                        future.complete(session);
+                        Platform.runLater(() -> {
+                            session.onExit.unregister(onExit);
+                            future.complete(session);
+                        });
                     } catch (IOException e) {
-                        future.completeExceptionally(e);
                         session.stop();
+                        Platform.runLater(() -> future.completeExceptionally(e));
                     }
                     task.cancel();
                 });
                 client.onKicked().register(kickedEvent -> {
-                    future.completeExceptionally(new CancellationException());
                     session.stop();
                     task.cancel();
+                    Platform.runLater(() -> {
+                        future.completeExceptionally(new KickedException(kickedEvent.getReason()));
+                    });
                 });
                 client.onDisconnected().register(disconnectedEvent -> {
-                    if (!client.isConnected()) {
-                        // We fail to establish connection with server
-                        future.completeExceptionally(new ConnectionErrorException());
-                    }
+                    Platform.runLater(() -> {
+                        if (!client.isConnected()) {
+                            // We fail to establish connection with server
+                            future.completeExceptionally(new ConnectionErrorException());
+                        }
+                    });
                 });
                 client.onHandshake().register(handshakeEvent -> {
                     if (handler != null) {
@@ -175,40 +222,62 @@ public final class MultiplayerManager {
             });
 
             return future;
-        });
+        }));
     }
 
-    public static CatoSession createSession(String token, String sessionName, int gamePort, boolean allowAllJoinRequests) throws IOException {
-        Path exe = getCatoExecutable();
-        if (!Files.isRegularFile(exe)) {
-            throw new FileNotFoundException("Cato file not found");
-        }
-
-        if (!isPortAvailable(3478)) {
-            throw new CatoAlreadyStartedException();
-        }
-
+    public static CompletableFuture<CatoSession> createSession(String token, String sessionName, int gamePort, boolean allowAllJoinRequests) {
         LOG.info(String.format("Creating session (token=%s,sessionName=%s,gamePort=%d)", token, sessionName, gamePort));
 
-        MultiplayerServer server = new MultiplayerServer(gamePort, allowAllJoinRequests);
-        server.startServer();
+        return startCato(token, State.MASTER).thenComposeAsync(wrap(session -> {
+            CompletableFuture<CatoSession> future = new CompletableFuture<>();
 
-        String[] commands = new String[]{exe.toString(),
-                "--token", StringUtils.isBlank(token) ? "new" : token,
-                "--allows", String.format("%s:%d/%s:%d", REMOTE_ADDRESS, server.getPort(), REMOTE_ADDRESS, gamePort)};
-        Process process = new ProcessBuilder()
-                .command(commands)
-                .start();
+            MultiplayerServer server = new MultiplayerServer(sessionName, gamePort, allowAllJoinRequests);
+            server.startServer();
 
-        CatoSession session = new CatoSession(sessionName, State.MASTER, process, Arrays.asList(commands));
-        session.setServer(server);
-        session.addRelatedThread(server);
-        return session;
+            session.setName(sessionName);
+            session.allowForwardingAddress(REMOTE_ADDRESS, server.getPort());
+            session.allowForwardingAddress(REMOTE_ADDRESS, gamePort);
+            session.showAllowedAddress();
+
+            Consumer<CatoExitEvent> onExit = event -> {
+                boolean ready = session.isReady();
+                switch (event.getExitCode()) {
+                    case 1:
+                        if (!ready) {
+                            future.completeExceptionally(new CatoExitTimeoutException());
+                        }
+                        break;
+                }
+                future.completeExceptionally(new CatoExitException(event.getExitCode(), ready));
+            };
+
+            session.onExit.register(onExit);
+            session.setServer(server);
+            session.addRelatedThread(server);
+
+            TimerTask peerConnectionTimeoutTask = Lang.setTimeout(() -> {
+                future.completeExceptionally(new PeerConnectionTimeoutException());
+                session.stop();
+            }, 15 * 1000);
+
+            session.onPeerConnected.register(event -> {
+                peerConnectionTimeoutTask.cancel();
+                Platform.runLater(() -> {
+                    session.onExit.unregister(onExit);
+                    future.complete(session);
+                });
+            });
+
+            return future;
+        }));
     }
 
+    public static final Pattern INVITATION_CODE_PATTERN = Pattern.compile("^(?<id>.*?)#(?<port>\\d{2,5})$");
+
     public static Invitation parseInvitationCode(String invitationCode) throws JsonParseException {
-        String json = new String(Base64.getDecoder().decode(invitationCode.getBytes(StandardCharsets.UTF_8)), StandardCharsets.UTF_8);
-        return JsonUtils.fromNonNullJson(json, Invitation.class);
+        Matcher matcher = INVITATION_CODE_PATTERN.matcher(invitationCode);
+        if (!matcher.find()) throw new IllegalArgumentException("Invalid invitation code");
+        return new Invitation(matcher.group("id"), Integer.parseInt(matcher.group("port")));
     }
 
     public static int findAvailablePort() throws IOException {
@@ -225,27 +294,33 @@ public final class MultiplayerManager {
         }
     }
 
-    public static String getCatoPath() {
+    private static String getCatoFileName() {
         switch (OperatingSystem.CURRENT_OS) {
             case WINDOWS:
-                if (Architecture.SYSTEM == Architecture.X86_64) {
-                    return "cato/cato/" + MultiplayerManager.CATO_VERSION + "/cato-windows-amd64.exe";
+                if (Architecture.SYSTEM_ARCH == Architecture.X86_64) {
+                    return "cato-client-windows-amd64.exe";
+                } else if (Architecture.SYSTEM_ARCH == Architecture.ARM64) {
+                    return "cato-client-windows-arm64.exe";
+                } else if (Architecture.SYSTEM_ARCH == Architecture.X86) {
+                    return "cato-client-windows-i386.exe";
                 } else {
                     return "";
                 }
             case OSX:
-                if (Architecture.SYSTEM == Architecture.X86_64) {
-                    return "cato/cato/" + MultiplayerManager.CATO_VERSION + "/cato-darwin-amd64";
-                } else if (Architecture.SYSTEM == Architecture.ARM64) {
-                    return "cato/cato/" + MultiplayerManager.CATO_VERSION + "/cato-darwin-arm64";
+                if (Architecture.SYSTEM_ARCH == Architecture.X86_64) {
+                    return "cato-client-darwin-amd64";
+                } else if (Architecture.SYSTEM_ARCH == Architecture.ARM64) {
+                    return "cato-client-darwin-arm64";
                 } else {
                     return "";
                 }
             case LINUX:
-                if (Architecture.SYSTEM == Architecture.X86_64) {
-                    return "cato/cato/" + MultiplayerManager.CATO_VERSION + "/cato-linux-amd64";
-                } else if (Architecture.SYSTEM == Architecture.ARM || Architecture.SYSTEM == Architecture.ARM64) {
-                    return "cato/cato/" + MultiplayerManager.CATO_VERSION + "/cato-linux-arm7";
+                if (Architecture.SYSTEM_ARCH == Architecture.X86_64) {
+                    return "cato-client-linux-amd64";
+                } else if (Architecture.SYSTEM_ARCH == Architecture.ARM32) {
+                    return "cato-client-linux-arm7";
+                } else if (Architecture.SYSTEM_ARCH == Architecture.ARM64) {
+                    return "cato-client-linux-arm64";
                 } else {
                     return "";
                 }
@@ -254,37 +329,45 @@ public final class MultiplayerManager {
         }
     }
 
+    public static String getCatoPath() {
+        String name = getCatoFileName();
+        if (StringUtils.isBlank(name)) return "";
+        return "cato/cato/" + MultiplayerManager.CATO_VERSION + "/" + name;
+    }
+
     public static class CatoSession extends ManagedProcess {
         private final EventManager<CatoExitEvent> onExit = new EventManager<>();
         private final EventManager<CatoIdEvent> onIdGenerated = new EventManager<>();
         private final EventManager<Event> onPeerConnected = new EventManager<>();
 
-        private final String name;
+        private String name;
         private final State type;
         private String id;
         private boolean peerConnected = false;
         private MultiplayerClient client;
         private MultiplayerServer server;
+        private final BufferedWriter writer;
 
-        CatoSession(String name, State type, Process process, List<String> commands) {
+        CatoSession(State type, Process process, List<String> commands) {
             super(process, commands);
 
             Runtime.getRuntime().addShutdownHook(new Thread(this::stop));
 
-            LOG.info("Started cato with command: " + new CommandBuilder().addAll(commands).toString());
+            LOG.info("Started cato with command: " + new CommandBuilder().addAll(commands));
 
-            this.name = name;
             this.type = type;
             addRelatedThread(Lang.thread(this::waitFor, "CatoExitWaiter", true));
-            addRelatedThread(Lang.thread(new StreamPump(process.getInputStream(), this::checkCatoLog), "CatoInputStreamPump", true));
-            addRelatedThread(Lang.thread(new StreamPump(process.getErrorStream(), this::checkCatoLog), "CatoErrorStreamPump", true));
+            pumpInputStream(this::checkCatoLog);
+            pumpErrorStream(this::checkCatoLog);
+
+            writer = new BufferedWriter(new OutputStreamWriter(process.getOutputStream(), StandardCharsets.UTF_8));
         }
 
-        public MultiplayerClient getClient() {
+        public synchronized MultiplayerClient getClient() {
             return client;
         }
 
-        public CatoSession setClient(MultiplayerClient client) {
+        public synchronized CatoSession setClient(MultiplayerClient client) {
             this.client = client;
             return this;
         }
@@ -324,6 +407,13 @@ public final class MultiplayerManager {
                 onExit.fireEvent(new CatoExitEvent(this, exitCode));
             } catch (InterruptedException e) {
                 onExit.fireEvent(new CatoExitEvent(this, CatoExitEvent.EXIT_CODE_INTERRUPTED));
+            } finally {
+                try {
+                    if (writer != null)
+                        writer.close();
+                } catch (IOException e) {
+                    LOG.log(Level.WARNING, "Failed to close cato stdin writer", e);
+                }
             }
             destroyRelatedThreads();
         }
@@ -332,10 +422,14 @@ public final class MultiplayerManager {
             return id != null;
         }
 
-        public String getName() {
+        public synchronized String getName() {
             return name;
         }
 
+        public synchronized void setName(String name) {
+            this.name = name;
+        }
+
         public State getType() {
             return type;
         }
@@ -349,8 +443,26 @@ public final class MultiplayerManager {
             if (id == null) {
                 throw new IllegalStateException("id not generated");
             }
-            String json = JsonUtils.GSON.toJson(new Invitation(CATO_VERSION, id, name, serverPort));
-            return new String(Base64.getEncoder().encode(json.getBytes(StandardCharsets.UTF_8)), StandardCharsets.UTF_8);
+            return id + "#" + serverPort;
+        }
+
+        public synchronized void invokeCommand(String command) throws IOException {
+            LOG.info("Invoking cato: " + command);
+            writer.write(command);
+            writer.newLine();
+            writer.flush();
+        }
+
+        public void forwardPort(String peerId, String localAddress, int localPort, String remoteAddress, int remotePort, Mode mode) throws IOException {
+            invokeCommand(String.format("net add %s %s:%d %s:%d %s", peerId, localAddress, localPort, remoteAddress, remotePort, mode.getName()));
+        }
+
+        public void allowForwardingAddress(String address, int port) throws IOException {
+            invokeCommand(String.format("ufw net open %s:%d", address, port));
+        }
+
+        public void showAllowedAddress() throws IOException {
+            invokeCommand("ufw net whitelist");
         }
 
         public EventManager<CatoExitEvent> onExit() {
@@ -407,33 +519,19 @@ public final class MultiplayerManager {
     }
 
     public static class Invitation {
-        @SerializedName("v")
-        private final String version;
         private final String id;
-        @SerializedName("n")
-        private final String sessionName;
         @SerializedName("p")
         private final int channelPort;
 
-        public Invitation(String version, String id, String sessionName, int channelPort) {
-            this.version = version;
+        public Invitation(String id, int channelPort) {
             this.id = id;
-            this.sessionName = sessionName;
             this.channelPort = channelPort;
         }
 
-        public String getVersion() {
-            return version;
-        }
-
         public String getId() {
             return id;
         }
 
-        public String getSessionName() {
-            return sessionName;
-        }
-
         public int getChannelPort() {
             return channelPort;
         }
@@ -463,22 +561,61 @@ public final class MultiplayerManager {
 
     public enum Mode {
         P2P,
-        RELAY;
+        BRIDGE;
 
         String getName() {
             return name().toLowerCase(Locale.ROOT);
         }
     }
 
+    public static class CatoExitException extends RuntimeException {
+        private final int exitCode;
+        private final boolean ready;
+
+        public CatoExitException(int exitCode, boolean ready) {
+            this.exitCode = exitCode;
+            this.ready = ready;
+        }
+
+        public int getExitCode() {
+            return exitCode;
+        }
+
+        public boolean isReady() {
+            return ready;
+        }
+    }
+
+    public static class CatoExitTimeoutException extends RuntimeException {
+    }
+
+    public static class CatoSessionExpiredException extends RuntimeException {
+    }
+
     public static class CatoAlreadyStartedException extends RuntimeException {
     }
 
     public static class JoinRequestTimeoutException extends RuntimeException {
     }
 
+    public static class PeerConnectionTimeoutException extends RuntimeException {
+    }
+
     public static class ConnectionErrorException extends RuntimeException {
     }
-    
+
+    public static class KickedException extends RuntimeException {
+        private final String reason;
+
+        public KickedException(String reason) {
+            this.reason = reason;
+        }
+
+        public String getReason() {
+            return reason;
+        }
+    }
+
     public static class CatoNotExistsException extends RuntimeException {
         private final Path file;
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/multiplayer/MultiplayerPage.java

@@ -37,15 +37,22 @@ import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.construct.*;
 import org.jackhuang.hmcl.ui.decorator.DecoratorAnimatedPage;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
+import org.jackhuang.hmcl.util.HMCLService;
+import org.jackhuang.hmcl.util.Result;
 import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.TaskCancellationAction;
+import org.jackhuang.hmcl.util.io.ChecksumMismatchException;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.logging.Level;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.globalConfig;
 import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
+import static org.jackhuang.hmcl.ui.multiplayer.MultiplayerChannel.KickResponse.*;
 import static org.jackhuang.hmcl.util.Lang.resolveException;
 import static org.jackhuang.hmcl.util.Logging.LOG;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
@@ -55,7 +62,7 @@ public class MultiplayerPage extends DecoratorAnimatedPage implements DecoratorP
 
     private final ObjectProperty<MultiplayerManager.State> multiplayerState = new SimpleObjectProperty<>(MultiplayerManager.State.DISCONNECTED);
     private final ReadOnlyStringWrapper token = new ReadOnlyStringWrapper();
-    private final ReadOnlyObjectWrapper<DiscoveryInfo> natState = new ReadOnlyObjectWrapper<>();
+    private final ReadOnlyObjectWrapper<@Nullable Result<DiscoveryInfo>> natState = new ReadOnlyObjectWrapper<>();
     private final ReadOnlyIntegerWrapper gamePort = new ReadOnlyIntegerWrapper(-1);
     private final ReadOnlyObjectWrapper<MultiplayerManager.CatoSession> session = new ReadOnlyObjectWrapper<>();
     private final ObservableList<MultiplayerChannel.CatoClient> clients = FXCollections.observableArrayList();
@@ -94,11 +101,11 @@ public class MultiplayerPage extends DecoratorAnimatedPage implements DecoratorP
         this.multiplayerState.set(multiplayerState);
     }
 
-    public DiscoveryInfo getNatState() {
+    public Result<DiscoveryInfo> getNatState() {
         return natState.get();
     }
 
-    public ReadOnlyObjectProperty<DiscoveryInfo> natStateProperty() {
+    public ReadOnlyObjectProperty<Result<DiscoveryInfo>> natStateProperty() {
         return natState.getReadOnlyProperty();
     }
 
@@ -128,15 +135,15 @@ public class MultiplayerPage extends DecoratorAnimatedPage implements DecoratorP
 
     private void testNAT() {
         Task.supplyAsync(() -> {
-            DiscoveryTest tester = new DiscoveryTest(null, 0, "stun.stunprotocol.org", 3478);
+            DiscoveryTest tester = new DiscoveryTest(null, 0, "stun.miwifi.com", 3478);
             return tester.test();
         }).whenComplete(Schedulers.javafx(), (info, exception) -> {
-            LOG.log(Level.INFO, "Nat test result " + MultiplayerPageSkin.getNATType(info), exception);
             if (exception == null) {
-                natState.set(info);
+                natState.set(Result.ok(info));
             } else {
-                natState.set(null);
+                natState.set(Result.error());
             }
+            LOG.log(Level.INFO, "Nat test result " + MultiplayerPageSkin.getNATType(natState.get()), exception);
         }).start();
     }
 
@@ -146,7 +153,7 @@ public class MultiplayerPage extends DecoratorAnimatedPage implements DecoratorP
             agreementPane.setHeading(new Label(i18n("launcher.agreement")));
             agreementPane.setBody(new Label(i18n("multiplayer.agreement.prompt")));
             JFXHyperlink agreementLink = new JFXHyperlink(i18n("launcher.agreement"));
-            agreementLink.setOnAction(e -> FXUtils.openLink("https://noin.cn/agreement"));
+            agreementLink.setOnAction(e -> HMCLService.openRedirectLink("multiplayer-agreement"));
             JFXButton yesButton = new JFXButton(i18n("launcher.agreement.accept"));
             yesButton.getStyleClass().add("dialog-accept");
             yesButton.setOnAction(e -> {
@@ -190,7 +197,7 @@ public class MultiplayerPage extends DecoratorAnimatedPage implements DecoratorP
                             Controllers.showToast(i18n("multiplayer.download.success"));
                         }
                     }).executor();
-            Controllers.taskDialog(executor, i18n("multiplayer.download"));
+            Controllers.taskDialog(executor, i18n("multiplayer.download"), TaskCancellationAction.NORMAL);
             executor.start();
         } else {
             setDisabled(false);
@@ -213,48 +220,36 @@ public class MultiplayerPage extends DecoratorAnimatedPage implements DecoratorP
         Controllers.dialog(new CreateMultiplayerRoomDialog((result, resolve, reject) -> {
             int gamePort = result.getServer().getAd();
             boolean isStaticToken = StringUtils.isNotBlank(globalConfig().getMultiplayerToken());
-            try {
-                MultiplayerManager.CatoSession session = MultiplayerManager.createSession(globalConfig().getMultiplayerToken(), result.getServer().getMotd(), gamePort, result.isAllowAllJoinRequests());
-                session.getServer().setOnClientAdding((client, resolveClient, rejectClient) -> {
-                    runInFX(() -> {
-                        Controllers.dialog(new MessageDialogPane.Builder(i18n("multiplayer.session.create.join.prompt", client.getUsername()), i18n("multiplayer.session.create.join"), MessageDialogPane.MessageType.INFO)
-                                .yesOrNo(resolveClient, () -> rejectClient.accept(i18n("multiplayer.session.join.wait_timeout")))
-                                .cancelOnTimeout(30 * 1000)
-                                .build());
-                    });
-                });
-                session.getServer().onClientAdded().register(event -> {
-                    runInFX(() -> {
-                        clients.add(event);
-                    });
-                });
-                session.getServer().onClientDisconnected().register(event -> {
-                    runInFX(() -> {
-                        clients.remove(event);
-                    });
-                });
-                initCatoSession(session);
-            } catch (MultiplayerManager.CatoAlreadyStartedException e) {
-                LOG.log(Level.WARNING, "Cato already started", e);
-                reject.accept(i18n("multiplayer.session.error.already_started"));
-                return;
-            } catch (MultiplayerManager.CatoNotExistsException e) {
-                LOG.log(Level.WARNING, "Cato not found " + e.getFile(), e);
-                reject.accept(i18n("multiplayer.session.error.file_not_found"));
-                return;
-            } catch (Exception e) {
-                LOG.log(Level.WARNING, "Failed to create session", e);
-                if (isStaticToken) {
-                    reject.accept(i18n("multiplayer.session.create.error.static_token") + e.getLocalizedMessage());
-                } else {
-                    reject.accept(i18n("multiplayer.session.create.error.dynamic_token") + e.getLocalizedMessage());
-                }
-                return;
-            }
+            MultiplayerManager.createSession(globalConfig().getMultiplayerToken(), result.getServer().getMotd(), gamePort, result.isAllowAllJoinRequests())
+                    .thenAcceptAsync(session -> {
+                        session.getServer().setOnClientAdding((client, resolveClient, rejectClient) -> {
+                            runInFX(() -> {
+                                Controllers.dialog(new MessageDialogPane.Builder(i18n("multiplayer.session.create.join.prompt", client.getUsername()), i18n("multiplayer.session.create.join"), MessageDialogPane.MessageType.INFO)
+                                        .yesOrNo(resolveClient, () -> rejectClient.accept(MultiplayerChannel.KickResponse.JOIN_ACEEPTANCE_TIMEOUT))
+                                        .cancelOnTimeout(30 * 1000)
+                                        .build());
+                            });
+                        });
+                        session.getServer().onClientAdded().register(event -> {
+                            runInFX(() -> {
+                                clients.add(event);
+                            });
+                        });
+                        session.getServer().onClientDisconnected().register(event -> {
+                            runInFX(() -> {
+                                clients.remove(event);
+                            });
+                        });
+                        initCatoSession(session);
 
-            this.gamePort.set(gamePort);
-            setMultiplayerState(MultiplayerManager.State.CONNECTING);
-            resolve.run();
+                        this.gamePort.set(gamePort);
+                        setMultiplayerState(MultiplayerManager.State.MASTER);
+                        resolve.run();
+                    }, Platform::runLater)
+                    .exceptionally(throwable -> {
+                        reject.accept(localizeCreateErrorMessage(throwable, isStaticToken));
+                        return null;
+                    });
         }));
     }
 
@@ -265,6 +260,7 @@ public class MultiplayerPage extends DecoratorAnimatedPage implements DecoratorP
 
         Controllers.prompt(new PromptDialogPane.Builder(i18n("multiplayer.session.join"), (result, resolve, reject) -> {
             PromptDialogPane.Builder.HintQuestion hintQuestion = (PromptDialogPane.Builder.HintQuestion) result.get(0);
+            boolean isStaticToken = StringUtils.isNotBlank(globalConfig().getMultiplayerToken());
 
             String invitationCode = ((PromptDialogPane.Builder.StringQuestion) result.get(1)).getValue();
             MultiplayerManager.Invitation invitation;
@@ -287,11 +283,9 @@ public class MultiplayerPage extends DecoratorAnimatedPage implements DecoratorP
             try {
                 MultiplayerManager.joinSession(
                                 globalConfig().getMultiplayerToken(),
-                                invitation.getVersion(),
-                                invitation.getSessionName(),
                                 invitation.getId(),
-                                globalConfig().isMultiplayerRelay() && StringUtils.isNotBlank(globalConfig().getMultiplayerToken())
-                                        ? MultiplayerManager.Mode.RELAY
+                                globalConfig().isMultiplayerRelay() && (StringUtils.isNotBlank(globalConfig().getMultiplayerToken()) || StringUtils.isNotBlank(System.getProperty("hmcl.multiplayer.relay")))
+                                        ? MultiplayerManager.Mode.BRIDGE
                                         : MultiplayerManager.Mode.P2P,
                                 invitation.getChannelPort(),
                                 localPort, new MultiplayerManager.JoinSessionHandler() {
@@ -316,10 +310,10 @@ public class MultiplayerPage extends DecoratorAnimatedPage implements DecoratorP
                                 });
                             });
 
-                            session.getClient().onKicked().register(() -> {
+                            session.getClient().onKicked().register(kickedEvent -> {
                                 runInFX(() -> {
                                     kicked.set(true);
-                                    Controllers.dialog(i18n("multiplayer.session.join.kicked"));
+                                    Controllers.dialog(i18n("multiplayer.session.join.kicked", localizeKickMessage(kickedEvent.getReason())));
                                 });
                             });
 
@@ -328,31 +322,7 @@ public class MultiplayerPage extends DecoratorAnimatedPage implements DecoratorP
                             resolve.run();
                         }, Platform::runLater)
                         .exceptionally(throwable -> {
-                            Throwable resolved = resolveException(throwable);
-                            if (resolved instanceof CancellationException) {
-                                LOG.info("Connection rejected by the server");
-                                reject.accept(i18n("multiplayer.session.join.rejected"));
-                                return null;
-                            } else if (resolved instanceof MultiplayerManager.CatoAlreadyStartedException) {
-                                LOG.info("Cato already started");
-                                reject.accept(i18n("multiplayer.session.error.already_started"));
-                                return null;
-                            } else if (throwable instanceof MultiplayerManager.CatoNotExistsException) {
-                                LOG.log(Level.WARNING, "Cato not found " + ((MultiplayerManager.CatoNotExistsException) throwable).getFile(), throwable);
-                                reject.accept(i18n("multiplayer.session.error.file_not_found"));
-                                return null;
-                            } else if (resolved instanceof MultiplayerManager.JoinRequestTimeoutException) {
-                                LOG.info("Cato already started");
-                                reject.accept(i18n("multiplayer.session.join.wait_timeout"));
-                                return null;
-                            } else if (resolved instanceof MultiplayerManager.ConnectionErrorException) {
-                                LOG.info("Failed to establish connection with server");
-                                reject.accept(i18n("multiplayer.session.join.error.connection"));
-                                return null;
-                            } else {
-                                LOG.log(Level.WARNING, "Failed to join session", resolved);
-                                reject.accept(i18n("multiplayer.session.join.error"));
-                            }
+                            reject.accept(localizeJoinErrorMessage(throwable, isStaticToken));
                             return null;
                         });
             } catch (MultiplayerManager.IncompatibleCatoVersionException e) {
@@ -363,6 +333,78 @@ public class MultiplayerPage extends DecoratorAnimatedPage implements DecoratorP
                 .addQuestion(new PromptDialogPane.Builder.StringQuestion(i18n("multiplayer.session.join.invitation_code"), "", new RequiredValidator())));
     }
 
+    private String localizeKickMessage(String message) {
+        if (VERSION_NOT_MATCHED.equals(message)) {
+            return i18n("multiplayer.session.join.kicked.version_not_matched");
+        } else if (KICKED.equals(message)) {
+            return i18n("multiplayer.session.join.kicked.kicked");
+        } else if (JOIN_ACEEPTANCE_TIMEOUT.equals(message)) {
+            return i18n("multiplayer.session.join.kicked.join_acceptance_timeout");
+        } else {
+            return message;
+        }
+    }
+
+    private String localizeErrorMessage(Throwable t, boolean isStaticToken, Function<Throwable, String> fallback) {
+        Throwable e = resolveException(t);
+        if (e instanceof CancellationException) {
+            LOG.info("Connection rejected by the server");
+            return i18n("message.cancelled");
+        } else if (e instanceof MultiplayerManager.KickedException) {
+            LOG.info("Kicked by server");
+            return i18n("multiplayer.session.join.kicked", localizeKickMessage(((MultiplayerManager.KickedException) e).getReason()));
+        } else if (e instanceof MultiplayerManager.CatoAlreadyStartedException) {
+            LOG.info("Cato already started");
+            return i18n("multiplayer.session.error.already_started");
+        } else if (e instanceof MultiplayerManager.CatoNotExistsException) {
+            LOG.log(Level.WARNING, "Cato not found " + ((MultiplayerManager.CatoNotExistsException) e).getFile(), e);
+            return i18n("multiplayer.session.error.file_not_found");
+        } else if (e instanceof MultiplayerManager.JoinRequestTimeoutException) {
+            LOG.info("Cato already started");
+            return i18n("multiplayer.session.join.wait_timeout");
+        } else if (e instanceof MultiplayerManager.ConnectionErrorException) {
+            LOG.info("Failed to establish connection with server");
+            return i18n("multiplayer.session.join.error.connection");
+        } else if (e instanceof MultiplayerManager.CatoExitTimeoutException) {
+            LOG.info("Cato failed to connect to main net");
+            if (isStaticToken) {
+                return i18n("multiplayer.exit.timeout.static_token");
+            } else {
+                return i18n("multiplayer.exit.timeout.dynamic_token");
+            }
+        } else if (e instanceof MultiplayerManager.CatoExitException) {
+            LOG.info("Cato exited accidentally");
+            int exitCode = ((MultiplayerManager.CatoExitException) e).getExitCode();
+            if (!((MultiplayerManager.CatoExitException) e).isReady()) {
+                return i18n("multiplayer.exit.before_ready", exitCode);
+            } else {
+                return i18n("multiplayer.exit.after_ready", exitCode);
+            }
+        } else if (e instanceof ChecksumMismatchException) {
+            return i18n("exception.artifact_malformed");
+        } else {
+            return fallback.apply(e);
+        }
+    }
+
+    private String localizeCreateErrorMessage(Throwable t, boolean isStaticToken) {
+        return localizeErrorMessage(t, isStaticToken, e -> {
+            LOG.log(Level.WARNING, "Failed to create session", e);
+            if (isStaticToken) {
+                return i18n("multiplayer.session.create.error.static_token") + e.getLocalizedMessage();
+            } else {
+                return i18n("multiplayer.session.create.error.dynamic_token") + e.getLocalizedMessage();
+            }
+        });
+    }
+
+    private String localizeJoinErrorMessage(Throwable t, boolean isStaticToken) {
+        return localizeErrorMessage(t, isStaticToken, e -> {
+            LOG.log(Level.WARNING, "Failed to join session", e);
+            return i18n("multiplayer.session.join.error");
+        });
+    }
+
     public void kickPlayer(MultiplayerChannel.CatoClient client) {
         if (getSession() == null || !getSession().isReady() || getMultiplayerState() != MultiplayerManager.State.MASTER) {
             throw new IllegalStateException("CatoSession not ready");
@@ -471,4 +513,5 @@ public class MultiplayerPage extends DecoratorAnimatedPage implements DecoratorP
     public ReadOnlyObjectProperty<State> stateProperty() {
         return state;
     }
+
 }

HMCL/src/main/java/org/jackhuang/hmcl/ui/multiplayer/MultiplayerPageSkin.java

@@ -28,7 +28,6 @@ import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.*;
-import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.game.LauncherHelper;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Profiles;
@@ -41,8 +40,11 @@ import org.jackhuang.hmcl.ui.animation.TransitionPane;
 import org.jackhuang.hmcl.ui.construct.*;
 import org.jackhuang.hmcl.ui.decorator.DecoratorAnimatedPage;
 import org.jackhuang.hmcl.ui.versions.Versions;
+import org.jackhuang.hmcl.util.HMCLService;
+import org.jackhuang.hmcl.util.Result;
 import org.jackhuang.hmcl.util.javafx.BindingMapping;
 import org.jackhuang.hmcl.util.javafx.MappedObservableList;
+import org.jetbrains.annotations.Nullable;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.globalConfig;
 import static org.jackhuang.hmcl.ui.versions.VersionPage.wrap;
@@ -126,13 +128,13 @@ public class MultiplayerPageSkin extends DecoratorAnimatedPage.DecoratorAnimated
                     .startCategory(i18n("help"))
                     .addNavigationDrawerItem(item -> {
                         item.setTitle(i18n("help"));
-                        item.setLeftGraphic(wrap(SVG::gamepad));
-                        item.setOnAction(e -> FXUtils.openLink("https://hmcl.huangyuhui.net/help/launcher/multiplayer.html"));
+                        item.setLeftGraphic(wrap(SVG::helpCircleOutline));
+                        item.setOnAction(e -> FXUtils.openLink("https://docs.hmcl.net/multiplayer"));
                     })
                     .addNavigationDrawerItem(report -> {
-                        report.setTitle(i18n("multiplayer.report"));
-                        report.setLeftGraphic(wrap(SVG::bug));
-                        report.setOnAction(e -> FXUtils.openLink(Metadata.EULA_URL));
+                        report.setTitle(i18n("feedback"));
+                        report.setLeftGraphic(wrap(SVG::messageAlertOutline));
+                        report.setOnAction(e -> HMCLService.openRedirectLink("multiplayer-feedback"));
                     });
             FXUtils.setLimitWidth(sideBar, 200);
             setLeft(sideBar);
@@ -256,7 +258,7 @@ public class MultiplayerPageSkin extends DecoratorAnimatedPage.DecoratorAnimated
                 tokenField.setPromptText(i18n("multiplayer.session.create.token.prompt"));
 
                 JFXHyperlink applyLink = new JFXHyperlink(i18n("multiplayer.session.create.token.apply"));
-                applyLink.setOnAction(e -> FXUtils.openLink("https://noin.cn/circle/386.html"));
+                applyLink.setOnAction(e -> HMCLService.openRedirectLink("multiplayer-static-token"));
 
                 gridPane.addRow(0, new Label(i18n("multiplayer.session.create.token")), tokenField, applyLink);
 
@@ -270,13 +272,13 @@ public class MultiplayerPageSkin extends DecoratorAnimatedPage.DecoratorAnimated
                 pane.setAlignment(Pos.CENTER_LEFT);
 
                 JFXHyperlink aboutLink = new JFXHyperlink(i18n("about"));
-                aboutLink.setOnAction(e -> FXUtils.openLink("https://noin.cn/71.html"));
+                aboutLink.setOnAction(e -> HMCLService.openRedirectLink("multiplayer-about"));
 
                 HBox placeholder = new HBox();
                 HBox.setHgrow(placeholder, Priority.ALWAYS);
 
                 pane.getChildren().setAll(
-                        new Label("cato " + MultiplayerManager.CATO_VERSION),
+                        new Label("Based on Cato"),
                         aboutLink,
                         placeholder,
                         FXUtils.segmentToTextFlow(i18n("multiplayer.powered_by"), Controllers::onHyperlinkAction));
@@ -295,22 +297,24 @@ public class MultiplayerPageSkin extends DecoratorAnimatedPage.DecoratorAnimated
         }
     }
 
-    public static String getNATType(DiscoveryInfo info) {
+    public static String getNATType(@Nullable Result<DiscoveryInfo> info) {
         if (info == null) {
             return i18n("multiplayer.nat.testing");
-        } else if (info.isBlockedUDP()) {
+        } else if (info.isError()) {
+            return i18n("multiplayer.nat.failed");
+        } else if (info.get().isBlockedUDP()) {
             return i18n("multiplayer.nat.type.blocked_udp");
-        } else if (info.isFullCone()) {
+        } else if (info.get().isFullCone()) {
             return i18n("multiplayer.nat.type.full_cone");
-        } else if (info.isOpenAccess()) {
+        } else if (info.get().isOpenAccess()) {
             return i18n("multiplayer.nat.type.open_access");
-        } else if (info.isPortRestrictedCone()) {
+        } else if (info.get().isPortRestrictedCone()) {
             return i18n("multiplayer.nat.type.port_restricted_cone");
-        } else if (info.isRestrictedCone()) {
+        } else if (info.get().isRestrictedCone()) {
             return i18n("multiplayer.nat.type.restricted_cone");
-        } else if (info.isSymmetric()) {
+        } else if (info.get().isSymmetric()) {
             return i18n("multiplayer.nat.type.symmetric");
-        } else if (info.isSymmetricUDPFirewall()) {
+        } else if (info.get().isSymmetricUDPFirewall()) {
             return i18n("multiplayer.nat.type.symmetric_udp_firewall");
         } else {
             return i18n("multiplayer.nat.type.unknown");

HMCL/src/main/java/org/jackhuang/hmcl/ui/multiplayer/MultiplayerServer.java

@@ -27,7 +27,9 @@ import org.jackhuang.hmcl.util.gson.JsonUtils;
 import java.io.*;
 import java.net.ServerSocket;
 import java.net.Socket;
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 
@@ -36,6 +38,7 @@ import static org.jackhuang.hmcl.util.Logging.LOG;
 
 public class MultiplayerServer extends Thread {
     private ServerSocket socket;
+    private final String sessionName;
     private final int gamePort;
     private final boolean allowAllJoinRequests;
 
@@ -48,7 +51,8 @@ public class MultiplayerServer extends Thread {
     private final Map<String, Endpoint> clients = new ConcurrentHashMap<>();
     private final Map<String, Endpoint> nameClientMap = new ConcurrentHashMap<>();
 
-    public MultiplayerServer(int gamePort, boolean allowAllJoinRequests) {
+    public MultiplayerServer(String sessionName, int gamePort, boolean allowAllJoinRequests) {
+        this.sessionName = sessionName;
         this.gamePort = gamePort;
         this.allowAllJoinRequests = allowAllJoinRequests;
 
@@ -116,7 +120,7 @@ public class MultiplayerServer extends Thread {
 
         try {
             if (client.socket.isConnected()) {
-                client.write(new KickResponse(""));
+                client.write(new KickResponse(KickResponse.KICKED));
                 client.socket.close();
             }
         } catch (IOException e) {
@@ -129,8 +133,8 @@ public class MultiplayerServer extends Thread {
         String clientName = null;
         LOG.info("Accepted client " + address);
         try (Socket clientSocket = targetSocket;
-             BufferedReader reader = new BufferedReader(new InputStreamReader(clientSocket.getInputStream()));
-             BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(clientSocket.getOutputStream()))) {
+             BufferedReader reader = new BufferedReader(new InputStreamReader(clientSocket.getInputStream(), StandardCharsets.UTF_8));
+             BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(clientSocket.getOutputStream(), StandardCharsets.UTF_8))) {
             clientSocket.setKeepAlive(true);
             Endpoint endpoint = new Endpoint(clientSocket, writer);
             clients.put(address, endpoint);
@@ -149,6 +153,17 @@ public class MultiplayerServer extends Thread {
                     LOG.info("Received join request with clientVersion=" + joinRequest.getClientVersion() + ", id=" + joinRequest.getUsername());
                     clientName = joinRequest.getUsername();
 
+                    if (!Objects.equals(MultiplayerManager.CATO_VERSION, joinRequest.getClientVersion())) {
+                        try {
+                            endpoint.write(new KickResponse(KickResponse.VERSION_NOT_MATCHED));
+                            LOG.info("Rejected join request from id=" + joinRequest.getUsername());
+                            socket.close();
+                        } catch (IOException e) {
+                            LOG.log(Level.WARNING, "Failed to send kick response.", e);
+                            return;
+                        }
+                    }
+
                     CatoClient catoClient = new CatoClient(this, clientName);
                     nameClientMap.put(clientName, endpoint);
                     onClientAdded.fireEvent(catoClient);
@@ -156,7 +171,7 @@ public class MultiplayerServer extends Thread {
                     if (onClientAdding != null && !allowAllJoinRequests) {
                         onClientAdding.call(catoClient, () -> {
                             try {
-                                endpoint.write(new JoinResponse(gamePort));
+                                endpoint.write(new JoinResponse(sessionName, gamePort));
                             } catch (IOException e) {
                                 LOG.log(Level.WARNING, "Failed to send join response.", e);
                                 try {
@@ -177,7 +192,7 @@ public class MultiplayerServer extends Thread {
                         });
                     } else {
                         // Allow all join requests.
-                        endpoint.write(new JoinResponse(gamePort));
+                        endpoint.write(new JoinResponse(sessionName, gamePort));
                     }
                 } else if (request instanceof KeepAliveRequest) {
                     endpoint.write(new KeepAliveResponse(System.currentTimeMillis()));

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

@@ -82,7 +82,6 @@ class DatapackListPageSkin extends SkinBase<DatapackListPage> {
 
                 {
                     Region clippedContainer = (Region)listView.lookup(".clipped-container");
-                    setPrefWidth(0);
                     HBox container = new HBox(8);
                     container.setPadding(new Insets(0, 0, 0, 6));
                     container.setAlignment(Pos.CENTER_LEFT);

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

@@ -62,6 +62,7 @@ import org.jackhuang.hmcl.util.javafx.BindingMapping;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -88,6 +89,8 @@ public class DownloadListPage extends Control implements DecoratorPage, VersionP
     private TaskExecutor executor;
     protected RemoteModRepository repository;
 
+    private Runnable retrySearch;
+
     public DownloadListPage(RemoteModRepository repository) {
         this(repository, null);
     }
@@ -115,7 +118,7 @@ public class DownloadListPage extends Control implements DecoratorPage, VersionP
 
         if (!searchInitialized) {
             searchInitialized = true;
-            search("", null, 0, "", 0);
+            search("", null, 0, "", RemoteModRepository.SortType.DATE_CREATED);
         }
 
         if (versionSelection) {
@@ -150,7 +153,8 @@ public class DownloadListPage extends Control implements DecoratorPage, VersionP
         this.loading.set(loading);
     }
 
-    public void search(String userGameVersion, RemoteModRepository.Category category, int pageOffset, String searchFilter, int sort) {
+    public void search(String userGameVersion, RemoteModRepository.Category category, int pageOffset, String searchFilter, RemoteModRepository.SortType sort) {
+        retrySearch = null;
         setLoading(true);
         setFailed(false);
         File versionJar = StringUtils.isNotBlank(version.get().getVersion())
@@ -169,7 +173,7 @@ public class DownloadListPage extends Control implements DecoratorPage, VersionP
             }
             return gameVersion;
         }).thenApplyAsync(gameVersion -> {
-            return repository.search(gameVersion, category, pageOffset, 50, searchFilter, sort);
+            return repository.search(gameVersion, category, pageOffset, 50, searchFilter, sort, RemoteModRepository.SortOrder.DESC);
         }).whenComplete(Schedulers.javafx(), (result, exception) -> {
             setLoading(false);
             if (exception == null) {
@@ -177,6 +181,7 @@ public class DownloadListPage extends Control implements DecoratorPage, VersionP
                 failed.set(false);
             } else {
                 failed.set(true);
+                retrySearch = () -> search(userGameVersion, category, pageOffset, searchFilter, sort);
             }
         }).executor(true);
     }
@@ -186,7 +191,10 @@ public class DownloadListPage extends Control implements DecoratorPage, VersionP
     }
 
     protected String getLocalizedCategoryIndent(ModDownloadListPageSkin.CategoryIndented category) {
-        return StringUtils.repeats(' ', category.indent * 4) + getLocalizedCategory(category.getCategory() == null ? "0" : category.getCategory().getId());
+        return StringUtils.repeats(' ', category.indent * 4) +
+                (category.getCategory() == null
+                        ? i18n("curse.category.0")
+                        : getLocalizedCategory(category.getCategory().getId()));
     }
 
     protected String getLocalizedOfficialPage() {
@@ -238,13 +246,19 @@ public class DownloadListPage extends Control implements DecoratorPage, VersionP
             {
                 int rowIndex = 0;
 
-                if (control.versionSelection) {
-                    JFXComboBox<String> versionsComboBox = new JFXComboBox<>();
-                    versionsComboBox.setMaxWidth(Double.MAX_VALUE);
-                    Bindings.bindContent(versionsComboBox.getItems(), control.versions);
-                    selectedItemPropertyFor(versionsComboBox).bindBidirectional(control.selectedVersion);
+                if (control.versionSelection || !control.downloadSources.isEmpty()) {
+                    searchPane.addRow(rowIndex);
+                    int columns = 0;
+                    Node lastNode = null;
+                    if (control.versionSelection) {
+                        JFXComboBox<String> versionsComboBox = new JFXComboBox<>();
+                        versionsComboBox.setMaxWidth(Double.MAX_VALUE);
+                        Bindings.bindContent(versionsComboBox.getItems(), control.versions);
+                        selectedItemPropertyFor(versionsComboBox).bindBidirectional(control.selectedVersion);
 
-                    searchPane.addRow(rowIndex, new Label(i18n("version")), versionsComboBox);
+                        searchPane.add(new Label(i18n("version")), columns++, rowIndex);
+                        searchPane.add(lastNode = versionsComboBox, columns++, rowIndex);
+                    }
 
                     if (control.downloadSources.getSize() > 1) {
                         JFXComboBox<String> downloadSourceComboBox = new JFXComboBox<>();
@@ -253,10 +267,12 @@ public class DownloadListPage extends Control implements DecoratorPage, VersionP
                         downloadSourceComboBox.setConverter(stringConverter(I18n::i18n));
                         selectedItemPropertyFor(downloadSourceComboBox).bindBidirectional(control.downloadSource);
 
-                        searchPane.add(new Label(i18n("settings.launcher.download_source")), 2, rowIndex);
-                        searchPane.add(downloadSourceComboBox, 3, rowIndex);
-                    } else {
-                        GridPane.setColumnSpan(versionsComboBox, 3);
+                        searchPane.add(new Label(i18n("settings.launcher.download_source")), columns++, rowIndex);
+                        searchPane.add(lastNode = downloadSourceComboBox, columns++, rowIndex);
+                    }
+
+                    if (columns == 2) {
+                        GridPane.setColumnSpan(lastNode, 3);
                     }
 
                     rowIndex++;
@@ -296,28 +312,25 @@ public class DownloadListPage extends Control implements DecoratorPage, VersionP
                 categoryComboBox.setPromptText(i18n("mods.category"));
                 categoryComboBox.getSelectionModel().select(0);
                 categoryComboBox.setConverter(stringConverter(getSkinnable()::getLocalizedCategoryIndent));
-                Task.supplyAsync(() -> getSkinnable().repository.getCategories())
-                        .thenAcceptAsync(Schedulers.javafx(), categories -> {
-                            List<CategoryIndented> result = new ArrayList<>();
-                            result.add(new CategoryIndented(0, null));
-                            for (RemoteModRepository.Category category : Lang.toIterable(categories)) {
-                                resolveCategory(category, 0, result);
-                            }
-                            categoryComboBox.getItems().setAll(result);
-                        }).start();
+                FXUtils.onChangeAndOperate(getSkinnable().downloadSource, downloadSource -> {
+                    Task.supplyAsync(() -> getSkinnable().repository.getCategories())
+                            .thenAcceptAsync(Schedulers.javafx(), categories -> {
+                                List<CategoryIndented> result = new ArrayList<>();
+                                result.add(new CategoryIndented(0, null));
+                                for (RemoteModRepository.Category category : Lang.toIterable(categories)) {
+                                    resolveCategory(category, 0, result);
+                                }
+                                categoryComboBox.getItems().setAll(result);
+                            }).start();
+                });
 
                 StackPane sortStackPane = new StackPane();
-                JFXComboBox<String> sortComboBox = new JFXComboBox<>();
+                JFXComboBox<RemoteModRepository.SortType> sortComboBox = new JFXComboBox<>();
                 sortStackPane.getChildren().setAll(sortComboBox);
                 sortComboBox.prefWidthProperty().bind(sortStackPane.widthProperty());
                 sortComboBox.getStyleClass().add("fit-width");
-                sortComboBox.getItems().setAll(
-                        i18n("curse.sort.date_created"),
-                        i18n("curse.sort.popularity"),
-                        i18n("curse.sort.last_updated"),
-                        i18n("curse.sort.name"),
-                        i18n("curse.sort.author"),
-                        i18n("curse.sort.total_downloads"));
+                sortComboBox.setConverter(stringConverter(sortType -> i18n("curse.sort." + sortType.name().toLowerCase(Locale.ROOT))));
+                sortComboBox.getItems().setAll(RemoteModRepository.SortType.values());
                 sortComboBox.getSelectionModel().select(0);
                 searchPane.addRow(rowIndex++, new Label(i18n("mods.category")), categoryStackPane, new Label(i18n("search.sort")), sortStackPane);
 
@@ -341,7 +354,7 @@ public class DownloadListPage extends Control implements DecoratorPage, VersionP
                                         .orElse(null),
                                 0,
                                 nameField.getText(),
-                                sortComboBox.getSelectionModel().getSelectedIndex());
+                                sortComboBox.getSelectionModel().getSelectedItem());
                 searchButton.setOnAction(searchAction);
                 nameField.setOnAction(searchAction);
                 gameVersionField.setOnAction(searchAction);
@@ -360,6 +373,11 @@ public class DownloadListPage extends Control implements DecoratorPage, VersionP
                         return null;
                     }
                 }, getSkinnable().failedProperty()));
+                spinnerPane.setOnFailedAction(e -> {
+                    if (getSkinnable().retrySearch != null) {
+                        getSkinnable().retrySearch.run();
+                    }
+                });
 
                 JFXListView<RemoteMod> listView = new JFXListView<>();
                 spinnerPane.setContent(listView);
@@ -385,8 +403,8 @@ public class DownloadListPage extends Control implements DecoratorPage, VersionP
                     @Override
                     protected void updateControl(RemoteMod dataItem, boolean empty) {
                         if (empty) return;
-                        ModTranslations.Mod mod = ModTranslations.getModByCurseForgeId(dataItem.getSlug());
-                        content.setTitle(mod != null ? mod.getDisplayName() : dataItem.getTitle());
+                        ModTranslations.Mod mod = ModTranslations.getTranslationsByRepositoryType(getSkinnable().repository.getType()).getModByCurseForgeId(dataItem.getSlug());
+                        content.setTitle(mod != null && I18n.getCurrentLocale().getLocale() == Locale.CHINA ? mod.getDisplayName() : dataItem.getTitle());
                         content.setSubtitle(dataItem.getDescription());
                         content.getTags().setAll(dataItem.getCategories().stream()
                                 .map(category -> getSkinnable().getLocalizedCategory(category))

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

@@ -38,6 +38,7 @@ import javafx.scene.layout.*;
 import javafx.stage.FileChooser;
 import org.jackhuang.hmcl.mod.ModManager;
 import org.jackhuang.hmcl.mod.RemoteMod;
+import org.jackhuang.hmcl.mod.RemoteModRepository;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.task.FileDownloadTask;
@@ -50,6 +51,8 @@ import org.jackhuang.hmcl.ui.construct.*;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
 import org.jackhuang.hmcl.util.SimpleMultimap;
 import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.TaskCancellationAction;
+import org.jackhuang.hmcl.util.i18n.I18n;
 import org.jackhuang.hmcl.util.io.NetworkUtils;
 import org.jackhuang.hmcl.util.versioning.VersionNumber;
 import org.jetbrains.annotations.Nullable;
@@ -69,6 +72,8 @@ public class DownloadPage extends Control implements DecoratorPage {
     private final BooleanProperty loaded = new SimpleBooleanProperty(false);
     private final BooleanProperty loading = new SimpleBooleanProperty(false);
     private final BooleanProperty failed = new SimpleBooleanProperty(false);
+    private final RemoteModRepository repository;
+    private final ModTranslations translations;
     private final RemoteMod addon;
     private final ModTranslations.Mod mod;
     private final Profile.ProfileVersion version;
@@ -80,11 +85,18 @@ public class DownloadPage extends Control implements DecoratorPage {
 
     public DownloadPage(DownloadListPage page, RemoteMod addon, Profile.ProfileVersion version, @Nullable DownloadCallback callback) {
         this.page = page;
+        this.repository = page.repository;
         this.addon = addon;
-        this.mod = ModTranslations.getModByCurseForgeId(addon.getSlug());
+        this.translations = ModTranslations.getTranslationsByRepositoryType(repository.getType());
+        this.mod = translations.getModByCurseForgeId(addon.getSlug());
         this.version = version;
         this.callback = callback;
+        loadModVersions();
 
+        this.state.set(State.fromTitle(addon.getTitle()));
+    }
+
+    private void loadModVersions() {
         File versionJar = StringUtils.isNotBlank(version.getVersion())
                 ? version.getProfile().getRepository().getVersionJar(version.getVersion())
                 : null;
@@ -93,9 +105,9 @@ public class DownloadPage extends Control implements DecoratorPage {
         setFailed(false);
 
         Task.allOf(
-                        Task.supplyAsync(() -> addon.getData().loadDependencies()),
-                        Task.supplyAsync(() -> {
-                            Stream<RemoteMod.Version> versions = addon.getData().loadVersions();
+                Task.supplyAsync(() -> addon.getData().loadDependencies(repository)),
+                Task.supplyAsync(() -> {
+                    Stream<RemoteMod.Version> versions = addon.getData().loadVersions(repository);
 //                            if (StringUtils.isNotBlank(version.getVersion())) {
 //                                Optional<String> gameVersion = GameVersion.minecraftVersion(versionJar);
 //                                if (gameVersion.isPresent()) {
@@ -103,8 +115,8 @@ public class DownloadPage extends Control implements DecoratorPage {
 //                                            .filter(file -> file.getGameVersions().contains(gameVersion.get())));
 //                                }
 //                            }
-                            return sortVersions(versions);
-                        }))
+                    return sortVersions(versions);
+                }))
                 .whenComplete(Schedulers.javafx(), (result, exception) -> {
                     if (exception == null) {
                         @SuppressWarnings("unchecked")
@@ -122,8 +134,6 @@ public class DownloadPage extends Control implements DecoratorPage {
                     }
                     setLoading(false);
                 }).start();
-
-        this.state.set(State.fromTitle(addon.getTitle()));
     }
 
     private SimpleMultimap<String, RemoteMod.Version> sortVersions(Stream<RemoteMod.Version> versions) {
@@ -195,9 +205,13 @@ public class DownloadPage extends Control implements DecoratorPage {
         }
 
         Controllers.taskDialog(
-                new FileDownloadTask(NetworkUtils.toURL(file.getFile().getUrl()), dest).executor(true),
-                i18n("message.downloading")
-        );
+                Task.composeAsync(() -> {
+                    FileDownloadTask task = new FileDownloadTask(NetworkUtils.toURL(file.getFile().getUrl()), dest, file.getFile().getIntegrityCheck());
+                    task.setName(file.getName());
+                    return task;
+                }),
+                i18n("message.downloading"),
+                TaskCancellationAction.NORMAL);
     }
 
     @Override
@@ -237,8 +251,8 @@ public class DownloadPage extends Control implements DecoratorPage {
 
                 TwoLineListItem content = new TwoLineListItem();
                 HBox.setHgrow(content, Priority.ALWAYS);
-                ModTranslations.Mod mod = ModTranslations.getModByCurseForgeId(getSkinnable().addon.getSlug());
-                content.setTitle(mod != null ? mod.getDisplayName() : getSkinnable().addon.getTitle());
+                ModTranslations.Mod mod = getSkinnable().translations.getModByCurseForgeId(getSkinnable().addon.getSlug());
+                content.setTitle(mod != null && I18n.getCurrentLocale().getLocale() == Locale.CHINA ? mod.getDisplayName() : getSkinnable().addon.getTitle());
                 content.setSubtitle(getSkinnable().addon.getDescription());
                 content.getTags().setAll(getSkinnable().addon.getCategories().stream()
                         .map(category -> getSkinnable().page.getLocalizedCategory(category))
@@ -247,7 +261,7 @@ public class DownloadPage extends Control implements DecoratorPage {
 
                 if (getSkinnable().mod != null) {
                     JFXHyperlink openMcmodButton = new JFXHyperlink(i18n("mods.mcmod"));
-                    openMcmodButton.setOnAction(e -> FXUtils.openLink(ModManager.getMcmodUrl(getSkinnable().mod.getMcmod())));
+                    openMcmodButton.setOnAction(e -> FXUtils.openLink(getSkinnable().translations.getMcmodUrl(getSkinnable().mod)));
                     descriptionPane.getChildren().add(openMcmodButton);
 
                     if (StringUtils.isNotBlank(getSkinnable().mod.getMcbbs())) {
@@ -276,7 +290,7 @@ public class DownloadPage extends Control implements DecoratorPage {
 
                 Node title = ComponentList.createComponentListTitle(i18n("mods.dependencies"));
 
-                BooleanBinding show = Bindings.createBooleanBinding(() -> !control.dependencies.isEmpty(), control.loaded);
+                BooleanBinding show = Bindings.createBooleanBinding(() -> control.loaded.get() && !control.dependencies.isEmpty(), control.loaded);
                 title.managedProperty().bind(show);
                 title.visibleProperty().bind(show);
                 dependencyPane.managedProperty().bind(show);
@@ -297,6 +311,7 @@ public class DownloadPage extends Control implements DecoratorPage {
                         return null;
                     }
                 }, getSkinnable().failedProperty()));
+                spinnerPane.setOnFailedAction(e -> getSkinnable().loadModVersions());
 
                 ComponentList list = new ComponentList();
                 StackPane.setAlignment(list, Pos.TOP_CENTER);
@@ -341,8 +356,8 @@ public class DownloadPage extends Control implements DecoratorPage {
             container.setOnMouseClicked(e -> Controllers.navigate(new DownloadPage(page, addon, version, callback)));
             getChildren().setAll(container);
 
-            ModTranslations.Mod mod = ModTranslations.getModByCurseForgeId(addon.getSlug());
-            content.setTitle(mod != null ? mod.getDisplayName() : addon.getTitle());
+            ModTranslations.Mod mod = ModTranslations.getTranslationsByRepositoryType(page.repository.getType()).getModByCurseForgeId(addon.getSlug());
+            content.setTitle(mod != null && I18n.getCurrentLocale().getLocale() == Locale.CHINA ? mod.getDisplayName() : addon.getTitle());
             content.setSubtitle(addon.getDescription());
             content.getTags().setAll(addon.getCategories().stream()
                     .map(page::getLocalizedCategory)
@@ -376,7 +391,7 @@ public class DownloadPage extends Control implements DecoratorPage {
             pane.getChildren().setAll(graphicPane, content, saveAsButton);
 
             content.setTitle(dataItem.getName());
-            content.setSubtitle(FORMATTER.format(dataItem.getDatePublished()));
+            content.setSubtitle(FORMATTER.format(dataItem.getDatePublished().toInstant()));
             saveAsButton.setOnMouseClicked(e -> selfPage.saveAs(dataItem));
 
             switch (dataItem.getVersionType()) {

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

@@ -20,17 +20,25 @@ package org.jackhuang.hmcl.ui.versions;
 import javafx.scene.Node;
 import javafx.scene.control.Tooltip;
 import javafx.scene.image.ImageView;
+import org.jackhuang.hmcl.event.Event;
+import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Profiles;
 import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.WeakListenerHolder;
 import org.jackhuang.hmcl.ui.construct.AdvancedListItem;
 import org.jackhuang.hmcl.util.Pair;
 
+import java.util.function.Consumer;
+
 import static org.jackhuang.hmcl.ui.FXUtils.newImage;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public class GameAdvancedListItem extends AdvancedListItem {
     private final Tooltip tooltip;
     private final ImageView imageView;
+    private final WeakListenerHolder holder = new WeakListenerHolder();
+    private Profile profile;
+    private Consumer<Event> onVersionIconChangedListener;
 
     public GameAdvancedListItem() {
         tooltip = new Tooltip();
@@ -39,23 +47,33 @@ public class GameAdvancedListItem extends AdvancedListItem {
         setLeftGraphic(view.getKey());
         imageView = view.getValue();
 
-        FXUtils.onChangeAndOperate(Profiles.selectedVersionProperty(), version -> {
-            if (version != null && Profiles.getSelectedProfile() != null &&
-                    Profiles.getSelectedProfile().getRepository().hasVersion(version)) {
-                FXUtils.installFastTooltip(this, tooltip);
-                setTitle(version);
-                setSubtitle(null);
-                imageView.setImage(Profiles.getSelectedProfile().getRepository().getVersionIconImage(version));
-                tooltip.setText(version);
-            } else {
-                Tooltip.uninstall(this,tooltip);
-                setTitle(i18n("version.empty"));
-                setSubtitle(i18n("version.empty.add"));
-                imageView.setImage(newImage("/assets/img/grass.png"));
-                tooltip.setText("");
-            }
-        });
+        holder.add(FXUtils.onWeakChangeAndOperate(Profiles.selectedVersionProperty(), this::loadVersion));
 
         setActionButtonVisible(false);
     }
+
+    private void loadVersion(String version) {
+        if (Profiles.getSelectedProfile() != profile) {
+            profile = Profiles.getSelectedProfile();
+            if (profile != null) {
+                onVersionIconChangedListener = profile.getRepository().onVersionIconChanged.registerWeak(event -> {
+                    this.loadVersion(Profiles.getSelectedVersion());
+                });
+            }
+        }
+        if (version != null && Profiles.getSelectedProfile() != null &&
+                Profiles.getSelectedProfile().getRepository().hasVersion(version)) {
+            FXUtils.installFastTooltip(this, tooltip);
+            setTitle(version);
+            setSubtitle(null);
+            imageView.setImage(Profiles.getSelectedProfile().getRepository().getVersionIconImage(version));
+            tooltip.setText(version);
+        } else {
+            Tooltip.uninstall(this,tooltip);
+            setTitle(i18n("version.empty"));
+            setSubtitle(i18n("version.empty.add"));
+            imageView.setImage(newImage("/assets/img/grass.png"));
+            tooltip.setText("");
+        }
+    }
 }

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

@@ -31,6 +31,7 @@ import org.jackhuang.hmcl.task.TaskListener;
 import org.jackhuang.hmcl.ui.*;
 import org.jackhuang.hmcl.ui.download.UpdateInstallerWizardProvider;
 import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.TaskCancellationAction;
 import org.jackhuang.hmcl.util.io.FileUtils;
 
 import java.io.File;
@@ -161,7 +162,7 @@ public class InstallerListPage extends ListPageBase<InstallerItem> implements Ve
                 });
             }
         });
-        Controllers.taskDialog(executor, i18n("install.installer.install_offline"));
+        Controllers.taskDialog(executor, i18n("install.installer.install_offline"), TaskCancellationAction.NO_CANCEL);
         executor.start();
     }
 

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

@@ -17,19 +17,10 @@
  */
 package org.jackhuang.hmcl.ui.versions;
 
-import org.jackhuang.hmcl.mod.LocalModFile;
-import org.jackhuang.hmcl.mod.RemoteMod;
+import org.jackhuang.hmcl.game.LocalizedRemoteModRepository;
 import org.jackhuang.hmcl.mod.RemoteModRepository;
 import org.jackhuang.hmcl.mod.curse.CurseForgeRemoteModRepository;
 import org.jackhuang.hmcl.mod.modrinth.ModrinthRemoteModRepository;
-import org.jackhuang.hmcl.util.StringUtils;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Stream;
 
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
@@ -39,66 +30,25 @@ public class ModDownloadListPage extends DownloadListPage {
 
         repository = new Repository();
 
-
         supportChinese.set(true);
         downloadSources.get().setAll("mods.curseforge", "mods.modrinth");
         downloadSource.set("mods.curseforge");
     }
 
-    private class Repository implements RemoteModRepository {
+    private class Repository extends LocalizedRemoteModRepository {
 
         @Override
-        public Stream<RemoteMod> search(String gameVersion, Category category, int pageOffset, int pageSize, String searchFilter, int sort) throws IOException {
-            String newSearchFilter;
-            if (StringUtils.CHINESE_PATTERN.matcher(searchFilter).find()) {
-                List<ModTranslations.Mod> mods = ModTranslations.searchMod(searchFilter);
-                List<String> searchFilters = new ArrayList<>();
-                int count = 0;
-                for (ModTranslations.Mod mod : mods) {
-                    String englishName = mod.getName();
-                    if (StringUtils.isNotBlank(mod.getSubname())) {
-                        englishName = mod.getSubname();
-                    }
-
-                    searchFilters.add(englishName);
-
-                    count++;
-                    if (count >= 3) break;
-                }
-                newSearchFilter = String.join(" ", searchFilters);
-            } else {
-                newSearchFilter = searchFilter;
-            }
-
+        protected RemoteModRepository getBackedRemoteModRepository() {
             if ("mods.modrinth".equals(downloadSource.get())) {
-                return ModrinthRemoteModRepository.INSTANCE.search(gameVersion, category, pageOffset, pageSize, newSearchFilter, sort);
+                return ModrinthRemoteModRepository.MODS;
             } else {
-                return CurseForgeRemoteModRepository.MODS.search(gameVersion, category, pageOffset, pageSize, newSearchFilter, sort);
+                return CurseForgeRemoteModRepository.MODS;
             }
         }
 
         @Override
-        public Stream<Category> getCategories() throws IOException {
-            if ("mods.modrinth".equals(downloadSource.get())) {
-                return ModrinthRemoteModRepository.INSTANCE.getCategories();
-            } else {
-                return CurseForgeRemoteModRepository.MODS.getCategories();
-            }
-        }
-
-        @Override
-        public Optional<RemoteMod.Version> getRemoteVersionByLocalFile(LocalModFile localModFile, Path file) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public RemoteMod getModById(String id) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public Stream<RemoteMod.Version> getRemoteVersionsById(String id) throws IOException {
-            throw new UnsupportedOperationException();
+        public Type getType() {
+            return Type.MOD;
         }
     }
 

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

@@ -35,6 +35,7 @@ import org.jackhuang.hmcl.ui.ListPageBase;
 import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
 import org.jackhuang.hmcl.ui.construct.PageAware;
 import org.jackhuang.hmcl.util.Logging;
+import org.jackhuang.hmcl.util.TaskCancellationAction;
 import org.jackhuang.hmcl.util.io.FileUtils;
 
 import java.io.File;
@@ -95,7 +96,7 @@ public final class ModListPage extends ListPageBase<ModListPageSkin.ModInfoObjec
                 synchronized (ModListPage.this) {
                     runInFX(() -> loadingProperty().set(true));
                     modManager.refreshMods();
-                    return new LinkedList<>(modManager.getMods());
+                    return new ArrayList<>(modManager.getMods());
                 }
             } catch (IOException e) {
                 throw new UncheckedIOException(e);
@@ -118,10 +119,12 @@ public final class ModListPage extends ListPageBase<ModListPageSkin.ModInfoObjec
         chooser.getExtensionFilters().setAll(new FileChooser.ExtensionFilter(i18n("extension.mod"), "*.jar", "*.zip", "*.litemod"));
         List<File> res = chooser.showOpenMultipleDialog(Controllers.getStage());
 
-        // It's guaranteed that succeeded and failed are thread safe here.
-        List<String> succeeded = new LinkedList<>();
-        List<String> failed = new LinkedList<>();
         if (res == null) return;
+
+        // It's guaranteed that succeeded and failed are thread safe here.
+        List<String> succeeded = new ArrayList<>(res.size());
+        List<String> failed = new ArrayList<>();
+
         Task.runAsync(() -> {
             for (File file : res) {
                 try {
@@ -135,7 +138,7 @@ public final class ModListPage extends ListPageBase<ModListPageSkin.ModInfoObjec
                 }
             }
         }).withRunAsync(Schedulers.javafx(), () -> {
-            List<String> prompt = new LinkedList<>();
+            List<String> prompt = new ArrayList<>(1);
             if (!succeeded.isEmpty())
                 prompt.add(i18n("mods.add.success", String.join(", ", succeeded)));
             if (!failed.isEmpty())
@@ -192,8 +195,7 @@ public final class ModListPage extends ListPageBase<ModListPageSkin.ModInfoObjec
                             }
                         })
                         .withStagesHint(Collections.singletonList("mods.check_updates")),
-                i18n("update.checking"), pane -> {
-                });
+                i18n("update.checking"), TaskCancellationAction.NORMAL);
     }
 
     public void download() {

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

@@ -158,7 +158,7 @@ class ModListPageSkin extends SkinBase<ModListPage> {
             if (isNotBlank(localModFile.getAuthors()))
                 message.append(", ").append(i18n("archive.author")).append(": ").append(localModFile.getAuthors());
             this.message = message.toString();
-            this.mod = ModTranslations.getModById(localModFile.getId());
+            this.mod = ModTranslations.MOD.getModById(localModFile.getId());
         }
 
         String getTitle() {
@@ -261,7 +261,7 @@ class ModListPageSkin extends SkinBase<ModListPage> {
                 mcmodButton.setText(i18n("mods.mcmod.page"));
                 mcmodButton.setOnAction(e -> {
                     fireEvent(new DialogCloseEvent());
-                    FXUtils.openLink(ModManager.getMcmodUrl(modInfo.getMod().getMcmod()));
+                    FXUtils.openLink(ModTranslations.MOD.getMcmodUrl(modInfo.getMod()));
                 });
                 getActions().add(mcmodButton);
             }

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

@@ -17,9 +17,11 @@
  */
 package org.jackhuang.hmcl.ui.versions;
 
+import org.jackhuang.hmcl.mod.RemoteModRepository;
 import org.jackhuang.hmcl.util.Pair;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.io.IOUtils;
+import org.jetbrains.annotations.Nullable;
 
 import java.nio.charset.StandardCharsets;
 import java.util.*;
@@ -34,28 +36,65 @@ import static org.jackhuang.hmcl.util.Pair.pair;
  *
  * @see <a href="https://www.mcmod.cn">mcmod.cn</a>
  */
-public final class ModTranslations {
-    private static List<Mod> mods;
-    private static Map<String, Mod> modIdMap; // mod id -> mod
-    private static Map<String, Mod> curseForgeMap; // curseforge id -> mod
-    private static List<Pair<String, Mod>> keywords;
-    private static int maxKeywordLength = -1;
+public enum ModTranslations {
+    MOD("/assets/mod_data.txt") {
+        @Override
+        public String getMcmodUrl(Mod mod) {
+            return String.format("https://www.mcmod.cn/class/%s.html", mod.getMcmod());
+        }
+    },
+    MODPACK("/assets/modpack_data.txt") {
+        @Override
+        public String getMcmodUrl(Mod mod) {
+            return String.format("https://www.mcmod.cn/modpack/%s.html", mod.getMcmod());
+        }
+    },
+    EMPTY("") {
+        @Override
+        public String getMcmodUrl(Mod mod) {
+            return "";
+        }
+    };
 
-    private ModTranslations(){}
+    public static ModTranslations getTranslationsByRepositoryType(RemoteModRepository.Type type) {
+        switch (type) {
+            case MOD:
+                return MOD;
+            case MODPACK:
+                return MODPACK;
+            default:
+                return EMPTY;
+        }
+    }
 
-    public static Mod getModByCurseForgeId(String id) {
+    private final String resourceName;
+    private List<Mod> mods;
+    private Map<String, Mod> modIdMap; // mod id -> mod
+    private Map<String, Mod> curseForgeMap; // curseforge id -> mod
+    private List<Pair<String, Mod>> keywords;
+    private int maxKeywordLength = -1;
+
+    ModTranslations(String resourceName) {
+        this.resourceName = resourceName;
+    }
+
+    @Nullable
+    public Mod getModByCurseForgeId(String id) {
         if (StringUtils.isBlank(id) || !loadCurseForgeMap()) return null;
 
         return curseForgeMap.get(id);
     }
 
-    public static Mod getModById(String id) {
+    @Nullable
+    public Mod getModById(String id) {
         if (StringUtils.isBlank(id) || !loadModIdMap()) return null;
 
         return modIdMap.get(id);
     }
 
-    public static List<Mod> searchMod(String query) {
+    public abstract String getMcmodUrl(Mod mod);
+
+    public List<Mod> searchMod(String query) {
         if (!loadKeywords()) return Collections.emptyList();
 
         StringBuilder newQuery = query.chars()
@@ -77,19 +116,23 @@ public final class ModTranslations {
                 .collect(Collectors.toList());
     }
 
-    private static boolean loadFromResource() {
+    private boolean loadFromResource() {
         if (mods != null) return true;
+        if (StringUtils.isBlank(resourceName)) {
+            mods = Collections.emptyList();
+            return true;
+        }
         try {
-            String modData = IOUtils.readFullyAsString(ModTranslations.class.getResourceAsStream("/assets/mod_data.txt"), StandardCharsets.UTF_8);
+            String modData = IOUtils.readFullyAsString(ModTranslations.class.getResourceAsStream(resourceName), StandardCharsets.UTF_8);
             mods = Arrays.stream(modData.split("\n")).filter(line -> !line.startsWith("#")).map(Mod::new).collect(Collectors.toList());
             return true;
         } catch (Exception e) {
-            LOG.log(Level.WARNING, "Failed to load /assets/mod_data.txt", e);
+            LOG.log(Level.WARNING, "Failed to load " + resourceName, e);
             return false;
         }
     }
 
-    private static boolean loadCurseForgeMap() {
+    private boolean loadCurseForgeMap() {
         if (curseForgeMap != null) {
             return true;
         }
@@ -107,7 +150,7 @@ public final class ModTranslations {
         return true;
     }
 
-    private static boolean loadModIdMap() {
+    private boolean loadModIdMap() {
         if (modIdMap != null) {
             return true;
         }
@@ -119,13 +162,15 @@ public final class ModTranslations {
         modIdMap = new HashMap<>();
         for (Mod mod : mods) {
             for (String id : mod.getModIds()) {
-                modIdMap.put(id, mod);
+                if (StringUtils.isNotBlank(id) && !"examplemod".equals(id)) {
+                    modIdMap.put(id, mod);
+                }
             }
         }
         return true;
     }
 
-    private static boolean loadKeywords() {
+    private boolean loadKeywords() {
         if (keywords != null) {
             return true;
         }

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

@@ -39,11 +39,14 @@ import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.construct.*;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
 import org.jackhuang.hmcl.util.Pair;
+import org.jackhuang.hmcl.util.TaskCancellationAction;
+import org.jackhuang.hmcl.util.i18n.I18n;
 
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Locale;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -144,8 +147,7 @@ public class ModUpdatesPage extends BorderPane implements DecoratorPage {
                     }
                 }),
                 i18n("mods.check_updates.update"),
-                t -> {
-                });
+                TaskCancellationAction.NORMAL);
     }
 
     @Override
@@ -165,14 +167,14 @@ public class ModUpdatesPage extends BorderPane implements DecoratorPage {
         @Override
         protected void updateControl(LocalModFile.ModUpdate item, boolean empty) {
             if (empty) return;
-            ModTranslations.Mod mod = ModTranslations.getModById(item.getLocalMod().getId());
-            content.setTitle(mod != null ? mod.getDisplayName() : item.getCurrentVersion().getName());
+            ModTranslations.Mod mod = ModTranslations.MOD.getModById(item.getLocalMod().getId());
+            content.setTitle(mod != null && I18n.getCurrentLocale().getLocale() == Locale.CHINA ? mod.getDisplayName() : item.getCurrentVersion().getName());
             content.setSubtitle(item.getLocalMod().getFileName());
             content.getTags().setAll();
 
             if (item.getCurrentVersion().getSelf() instanceof CurseAddon.LatestFile) {
                 content.getTags().add("Curseforge");
-            } else if (item.getCurrentVersion().getSelf() instanceof ModrinthRemoteModRepository.ModVersion) {
+            } else if (item.getCurrentVersion().getSelf() instanceof ModrinthRemoteModRepository.ProjectVersion) {
                 content.getTags().add("Modrinth");
             }
         }

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

@@ -0,0 +1,72 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2022  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.versions;
+
+import org.jackhuang.hmcl.game.LocalizedRemoteModRepository;
+import org.jackhuang.hmcl.mod.RemoteModRepository;
+import org.jackhuang.hmcl.mod.curse.CurseForgeRemoteModRepository;
+import org.jackhuang.hmcl.mod.modrinth.ModrinthRemoteModRepository;
+
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+public class ModpackDownloadListPage extends DownloadListPage {
+    public ModpackDownloadListPage(DownloadPage.DownloadCallback callback, boolean versionSelection) {
+        super(null, callback, versionSelection);
+
+        repository = new Repository();
+
+        supportChinese.set(true);
+        downloadSources.get().setAll("mods.curseforge", "mods.modrinth");
+        downloadSource.set("mods.curseforge");
+    }
+
+    private class Repository extends LocalizedRemoteModRepository {
+
+        @Override
+        protected RemoteModRepository getBackedRemoteModRepository() {
+            if ("mods.modrinth".equals(downloadSource.get())) {
+                return ModrinthRemoteModRepository.MODPACKS;
+            } else {
+                return CurseForgeRemoteModRepository.MODPACKS;
+            }
+        }
+
+        @Override
+        public Type getType() {
+            return Type.MODPACK;
+        }
+    }
+
+    @Override
+    protected String getLocalizedCategory(String category) {
+        if ("mods.modrinth".equals(downloadSource.get())) {
+            return i18n("modrinth.category." + category);
+        } else {
+            return i18n("curse.category." + category);
+        }
+    }
+
+    @Override
+    protected String getLocalizedOfficialPage() {
+        if ("mods.modrinth".equals(downloadSource.get())) {
+            return i18n("mods.modrinth");
+        } else {
+            return i18n("mods.curseforge");
+        }
+    }
+}

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

@@ -0,0 +1,126 @@
+/*
+ * 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.versions;
+
+import javafx.scene.Node;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.FlowPane;
+import javafx.stage.FileChooser;
+import org.jackhuang.hmcl.event.Event;
+import org.jackhuang.hmcl.setting.Profile;
+import org.jackhuang.hmcl.setting.Theme;
+import org.jackhuang.hmcl.setting.VersionIconType;
+import org.jackhuang.hmcl.setting.VersionSetting;
+import org.jackhuang.hmcl.ui.Controllers;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.SVG;
+import org.jackhuang.hmcl.ui.construct.DialogPane;
+import org.jackhuang.hmcl.ui.construct.RipplerContainer;
+import org.jackhuang.hmcl.util.Logging;
+import org.jackhuang.hmcl.util.io.FileUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.logging.Level;
+
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+public class VersionIconDialog extends DialogPane {
+    private final Profile profile;
+    private final String versionId;
+    private final Runnable onFinish;
+    private final VersionSetting vs;
+
+    public VersionIconDialog(Profile profile, String versionId, Runnable onFinish) {
+        this.profile = profile;
+        this.versionId = versionId;
+        this.onFinish = onFinish;
+        this.vs = profile.getRepository().getLocalVersionSettingOrCreate(versionId);
+
+        setTitle(i18n("settings.icon"));
+        FlowPane pane = new FlowPane();
+        setBody(pane);
+
+        pane.getChildren().setAll(
+                createCustomIcon(),
+                createIcon(VersionIconType.GRASS),
+                createIcon(VersionIconType.CHEST),
+                createIcon(VersionIconType.CHICKEN),
+                createIcon(VersionIconType.COMMAND),
+                createIcon(VersionIconType.CRAFT_TABLE),
+                createIcon(VersionIconType.FABRIC),
+                createIcon(VersionIconType.FORGE),
+                createIcon(VersionIconType.FURNACE)
+        );
+    }
+
+    private void exploreIcon() {
+        FileChooser chooser = new FileChooser();
+        chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(i18n("extension.png"), "*.png"));
+        File selectedFile = chooser.showOpenDialog(Controllers.getStage());
+        if (selectedFile != null) {
+            File iconFile = profile.getRepository().getVersionIconFile(versionId);
+            try {
+                FileUtils.copyFile(selectedFile, iconFile);
+
+                if (vs != null) {
+                    vs.setVersionIcon(VersionIconType.DEFAULT);
+                }
+
+                onAccept();
+            } catch (IOException e) {
+                Logging.LOG.log(Level.SEVERE, "Failed to copy icon file from " + selectedFile + " to " + iconFile, e);
+            }
+        }
+    }
+
+    private Node createCustomIcon() {
+        Node shape = SVG.plusCircleOutline(Theme.blackFillBinding(), 32, 32);
+        shape.setMouseTransparent(true);
+        RipplerContainer container = new RipplerContainer(shape);
+        FXUtils.setLimitWidth(container, 36);
+        FXUtils.setLimitHeight(container, 36);
+        container.setOnMouseClicked(e -> {
+            exploreIcon();
+        });
+        return container;
+    }
+
+    private Node createIcon(VersionIconType type) {
+        ImageView imageView = new ImageView(new Image(type.getResourceUrl(), 32, 32, true, true));
+        imageView.setMouseTransparent(true);
+        RipplerContainer container = new RipplerContainer(imageView);
+        FXUtils.setLimitWidth(container, 36);
+        FXUtils.setLimitHeight(container, 36);
+        container.setOnMouseClicked(e -> {
+            if (vs != null) {
+                vs.setVersionIcon(type);
+                onAccept();
+            }
+        });
+        return container;
+    }
+
+    @Override
+    protected void onAccept() {
+        profile.getRepository().onVersionIconChanged.fireEvent(new Event(this));
+        onFinish.run();
+        super.onAccept();
+    }
+}

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

@@ -28,10 +28,15 @@ import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
+import org.jackhuang.hmcl.event.EventBus;
+import org.jackhuang.hmcl.event.EventPriority;
+import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
+import org.jackhuang.hmcl.game.GameRepository;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
+import org.jackhuang.hmcl.ui.WeakListenerHolder;
 import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
 import org.jackhuang.hmcl.ui.animation.TransitionPane;
 import org.jackhuang.hmcl.ui.construct.*;
@@ -43,6 +48,7 @@ import java.io.File;
 import java.util.Optional;
 import java.util.function.Supplier;
 
+import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public class VersionPage extends DecoratorAnimatedPage implements DecoratorPage {
@@ -55,6 +61,7 @@ public class VersionPage extends DecoratorAnimatedPage implements DecoratorPage
     private final TransitionPane transitionPane = new TransitionPane();
     private final BooleanProperty currentVersionUpgradable = new SimpleBooleanProperty();
     private final ObjectProperty<Profile.ProfileVersion> version = new SimpleObjectProperty<>();
+    private final WeakListenerHolder listenerHolder = new WeakListenerHolder();
 
     private String preferredVersionName = null;
 
@@ -72,6 +79,22 @@ public class VersionPage extends DecoratorAnimatedPage implements DecoratorPage
         FXUtils.onChangeAndOperate(tab.getSelectionModel().selectedItemProperty(), newValue -> {
             transitionPane.setContent(newValue.getNode(), ContainerAnimations.FADE.getAnimationProducer());
         });
+
+        listenerHolder.add(EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).registerWeak(event -> checkSelectedVersion(), EventPriority.HIGHEST));
+    }
+
+    private void checkSelectedVersion() {
+        runInFX(() -> {
+            if (this.version.get() == null) return;
+            GameRepository repository = this.version.get().getProfile().getRepository();
+            if (!repository.hasVersion(this.version.get().getVersion())) {
+                if (preferredVersionName != null) {
+                    loadVersion(preferredVersionName, this.version.get().getProfile());
+                } else {
+                    fireEvent(new PageCloseEvent());
+                }
+            }
+        });
     }
 
     private <T extends Node> Supplier<T> loadVersionFor(Supplier<T> nodeSupplier) {

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

@@ -32,10 +32,7 @@ import javafx.scene.layout.*;
 import javafx.scene.text.Text;
 import javafx.stage.FileChooser;
 import org.jackhuang.hmcl.game.*;
-import org.jackhuang.hmcl.setting.LauncherVisibility;
-import org.jackhuang.hmcl.setting.Profile;
-import org.jackhuang.hmcl.setting.Profiles;
-import org.jackhuang.hmcl.setting.VersionSetting;
+import org.jackhuang.hmcl.setting.*;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.Controllers;
@@ -44,27 +41,25 @@ import org.jackhuang.hmcl.ui.WeakListenerHolder;
 import org.jackhuang.hmcl.ui.construct.*;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
 import org.jackhuang.hmcl.util.Lang;
-import org.jackhuang.hmcl.util.Logging;
-import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.util.Pair;
 import org.jackhuang.hmcl.util.javafx.BindingMapping;
 import org.jackhuang.hmcl.util.javafx.SafeStringConverter;
+import org.jackhuang.hmcl.util.platform.Architecture;
 import org.jackhuang.hmcl.util.platform.JavaVersion;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
 import org.jackhuang.hmcl.util.versioning.VersionNumber;
 
 import java.io.File;
-import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.logging.Level;
 import java.util.stream.Collectors;
 
-import static org.jackhuang.hmcl.ui.FXUtils.newImage;
 import static org.jackhuang.hmcl.ui.FXUtils.stringConverter;
+import static org.jackhuang.hmcl.util.Pair.pair;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class VersionSettingsPage extends StackPane implements DecoratorPage, VersionPage.VersionLoadable, PageAware {
@@ -98,9 +93,9 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
     private final OptionToggleButton useNativeGLFWPane;
     private final OptionToggleButton useNativeOpenALPane;
     private final ComponentSublist javaSublist;
-    private final MultiFileItem<JavaVersion> javaItem;
-    private final MultiFileItem.Option<JavaVersion> javaAutoDeterminedOption;
-    private final MultiFileItem.FileOption<JavaVersion> javaCustomOption;
+    private final MultiFileItem<Pair<JavaVersionType, JavaVersion>> javaItem;
+    private final MultiFileItem.Option<Pair<JavaVersionType, JavaVersion>> javaAutoDeterminedOption;
+    private final MultiFileItem.FileOption<Pair<JavaVersionType, JavaVersion>> javaCustomOption;
     private final ComponentSublist gameDirSublist;
     private final MultiFileItem<GameDirectoryType> gameDirItem;
     private final MultiFileItem.FileOption<GameDirectoryType> gameDirCustomOption;
@@ -115,10 +110,9 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
 
     private final InvalidationListener javaListener = any -> initJavaSubtitle();
 
-    private boolean uiVisible = false;
     private final StringProperty selectedVersion = new SimpleStringProperty();
     private final BooleanProperty navigateToSpecificSettings = new SimpleBooleanProperty(false);
-    private final BooleanProperty enableSpecificSettings = new SimpleBooleanProperty(true);
+    private final BooleanProperty enableSpecificSettings = new SimpleBooleanProperty(false);
     private final IntegerProperty maxMemory = new SimpleIntegerProperty();
     private final ObjectProperty<OperatingSystem.PhysicalMemoryStatus> memoryStatus = new SimpleObjectProperty<>(OperatingSystem.PhysicalMemoryStatus.INVALID);
     private final BooleanProperty modpack = new SimpleBooleanProperty();
@@ -160,6 +154,10 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
         }
 
         if (!globalSetting) {
+            HintPane gameDirHint = new HintPane(MessageDialogPane.MessageType.INFO);
+            gameDirHint.setText(i18n("settings.game.working_directory.hint"));
+            rootPane.getChildren().add(gameDirHint);
+
             ComponentList iconPickerItemWrapper = new ComponentList();
             rootPane.getChildren().add(iconPickerItemWrapper);
 
@@ -200,8 +198,8 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
             javaSublist.getContent().add(javaItem);
             javaSublist.setTitle(i18n("settings.game.java_directory"));
             javaSublist.setHasSubtitle(true);
-            javaAutoDeterminedOption = new MultiFileItem.Option<>(i18n("settings.game.java_directory.auto"), null);
-            javaCustomOption = new MultiFileItem.FileOption<JavaVersion>(i18n("settings.custom"), null)
+            javaAutoDeterminedOption = new MultiFileItem.Option<>(i18n("settings.game.java_directory.auto"), pair(JavaVersionType.AUTO, null));
+            javaCustomOption = new MultiFileItem.FileOption<Pair<JavaVersionType, JavaVersion>>(i18n("settings.custom"), pair(JavaVersionType.CUSTOM, null))
                     .setChooserTitle(i18n("settings.game.java_directory.choose"));
 
             gameDirItem = new MultiFileItem<>();
@@ -211,8 +209,8 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
             gameDirSublist.setHasSubtitle(true);
             gameDirItem.disableProperty().bind(modpack);
             gameDirCustomOption = new MultiFileItem.FileOption<>(i18n("settings.custom"), GameDirectoryType.CUSTOM)
-                            .setChooserTitle(i18n("settings.game.working_directory.choose"))
-                            .setDirectory(true);
+                    .setChooserTitle(i18n("settings.game.working_directory.choose"))
+                    .setDirectory(true);
 
             gameDirItem.loadChildren(Arrays.asList(
                     new MultiFileItem.Option<>(i18n("settings.advanced.game_dir.default"), GameDirectoryType.ROOT_FOLDER),
@@ -399,7 +397,6 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
 
                 txtServerIP = new JFXTextField();
                 txtServerIP.setPromptText(i18n("settings.advanced.server_ip.prompt"));
-                txtServerIP.getStyleClass().add("fit-width");
                 FXUtils.setLimitWidth(txtServerIP, 300);
                 serverPane.addRow(0, new Label(i18n("settings.advanced.server_ip")), txtServerIP);
             }
@@ -545,9 +542,15 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
         memoryStatus.set(OperatingSystem.getPhysicalMemoryStatus().orElse(OperatingSystem.PhysicalMemoryStatus.INVALID));
 
         Task.supplyAsync(JavaVersion::getJavas).thenAcceptAsync(Schedulers.javafx(), list -> {
-            List<MultiFileItem.Option<JavaVersion>> options = list.stream()
-                    .map(javaVersion -> new MultiFileItem.Option<>(javaVersion.getVersion() + i18n("settings.game.java_directory.bit",
-                            javaVersion.getPlatform().getBit()), javaVersion)
+            boolean isX86 = Architecture.SYSTEM_ARCH.isX86() && list.stream().allMatch(java -> java.getArchitecture().isX86());
+
+            List<MultiFileItem.Option<Pair<JavaVersionType, JavaVersion>>> options = list.stream()
+                    .map(javaVersion -> new MultiFileItem.Option<>(
+                            i18n("settings.game.java_directory.template",
+                                    javaVersion.getVersion(),
+                                    isX86 ? i18n("settings.game.java_directory.bit", javaVersion.getBits().getBit())
+                                            : javaVersion.getPlatform().getArchitecture().getDisplayName()),
+                            pair(JavaVersionType.DETECTED, javaVersion))
                             .setSubtitle(javaVersion.getBinary().toString()))
                     .collect(Collectors.toList());
             options.add(0, javaAutoDeterminedOption);
@@ -558,7 +561,6 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
         }).start();
 
         javaItem.setSelectedData(null);
-        javaItem.setFallbackData(JavaVersion.fromCurrentEnvironment());
         if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS)
             javaCustomOption.getExtensionFilters().add(new FileChooser.ExtensionFilter("Java", "java.exe", "javaw.exe"));
 
@@ -684,7 +686,8 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
             } else if (javaAutoDeterminedOption.isSelected()) {
                 versionSetting.setJavaAutoSelected();
             } else {
-                versionSetting.setJavaVersion((JavaVersion) newValue.getUserData());
+                //noinspection unchecked
+                versionSetting.setJavaVersion(((Pair<JavaVersionType, JavaVersion>) newValue.getUserData()).getValue());
             }
         });
 
@@ -695,7 +698,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
         gameDirItem.selectedDataProperty().bindBidirectional(versionSetting.gameDirTypeProperty());
         gameDirSublist.subtitleProperty().bind(Bindings.createStringBinding(() -> Paths.get(profile.getRepository().getRunDirectory(versionId).getAbsolutePath()).normalize().toString(),
                 versionSetting.gameDirProperty(), versionSetting.gameDirTypeProperty()));
-        
+
         nativesDirItem.selectedDataProperty().bindBidirectional(versionSetting.nativesDirTypeProperty());
         nativesDirSublist.subtitleProperty().bind(Bindings.createStringBinding(() -> Paths.get(profile.getRepository().getRunDirectory(versionId).getAbsolutePath() + "/natives").normalize().toString(),
                 versionSetting.nativesDirProperty(), versionSetting.nativesDirTypeProperty()));
@@ -721,7 +724,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
 //            javaLoading.set(true);
             lastVersionSetting.getJavaVersion(null, null)
                     .thenAcceptAsync(Schedulers.javafx(), javaVersion -> {
-                        javaItem.setSelectedData(javaVersion);
+                        javaItem.setSelectedData(pair(JavaVersionType.DETECTED, javaVersion));
 //                        javaLoading.set(false);
                     }).start();
         }
@@ -751,7 +754,8 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
                         profile.getRepository().getVersion(versionId));
             }
         }).thenAcceptAsync(Schedulers.javafx(), javaVersion -> javaSublist.setSubtitle(Optional.ofNullable(javaVersion)
-                .map(JavaVersion::getBinary).map(Path::toString).orElse("Invalid Java Path")))
+                        .map(JavaVersion::getBinary).map(Path::toString).orElseGet(() ->
+                                autoSelected ? i18n("settings.game.java_directory.auto.not_found") : i18n("settings.game.java_directory.invalid"))))
                 .start();
     }
 
@@ -767,18 +771,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
         if (versionId == null)
             return;
 
-        FileChooser chooser = new FileChooser();
-        chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(i18n("extension.png"), "*.png"));
-        File selectedFile = chooser.showOpenDialog(Controllers.getStage());
-        if (selectedFile != null) {
-            File iconFile = profile.getRepository().getVersionIconFile(versionId);
-            try {
-                FileUtils.copyFile(selectedFile, iconFile);
-                loadIcon();
-            } catch (IOException e) {
-                Logging.LOG.log(Level.SEVERE, "Failed to copy icon file from " + selectedFile + " to " + iconFile, e);
-            }
-        }
+        Controllers.dialog(new VersionIconDialog(profile, versionId, this::loadIcon));
     }
 
     private void onDeleteIcon() {
@@ -788,6 +781,10 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
         File iconFile = profile.getRepository().getVersionIconFile(versionId);
         if (iconFile.exists())
             iconFile.delete();
+        VersionSetting localVersionSetting = profile.getRepository().getLocalVersionSettingOrCreate(versionId);
+        if (localVersionSetting != null) {
+            localVersionSetting.setVersionIcon(VersionIconType.DEFAULT);
+        }
         loadIcon();
     }
 
@@ -796,11 +793,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
             return;
         }
 
-        File iconFile = profile.getRepository().getVersionIconFile(versionId);
-        if (iconFile.exists())
-            iconPickerItem.setImage(new Image("file:" + iconFile.getAbsolutePath()));
-        else
-            iconPickerItem.setImage(newImage("/assets/img/grass.png"));
+        iconPickerItem.setImage(profile.getRepository().getVersionIconImage(versionId));
         FXUtils.limitSize(iconPickerItem.getImageView(), 32, 32);
     }
 
@@ -808,4 +801,10 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
     public ReadOnlyObjectProperty<State> stateProperty() {
         return state.getReadOnlyProperty();
     }
+
+    private enum JavaVersionType {
+        DETECTED,
+        CUSTOM,
+        AUTO,
+    }
 }

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

@@ -44,6 +44,7 @@ import org.jackhuang.hmcl.ui.download.ModpackInstallWizardProvider;
 import org.jackhuang.hmcl.ui.export.ExportWizardProvider;
 import org.jackhuang.hmcl.util.Logging;
 import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.TaskCancellationAction;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
 
@@ -52,6 +53,7 @@ import java.io.IOException;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.concurrent.CancellationException;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 import java.util.logging.Level;
@@ -91,13 +93,16 @@ public final class Versions {
                         .whenComplete(Schedulers.javafx(), e -> {
                             if (e == null) {
                                 Controllers.getDecorator().startWizard(new ModpackInstallWizardProvider(profile, modpack.toFile()));
+                            } else if (e instanceof CancellationException) {
+                                Controllers.showToast(i18n("message.cancelled"));
                             } else {
                                 Controllers.dialog(
                                         i18n("install.failed.downloading.detail", file.getFile().getUrl()) + "\n" + StringUtils.getStackTrace(e),
                                         i18n("download.failed"), MessageDialogPane.MessageType.ERROR);
                             }
                         }).executor(true),
-                i18n("message.downloading")
+                i18n("message.downloading"),
+                TaskCancellationAction.NORMAL
         );
     }
 
@@ -122,8 +127,13 @@ public final class Versions {
                 return;
             }
             if (profile.getRepository().renameVersion(version, newName)) {
-                profile.getRepository().refreshVersionsAsync().start();
                 resolve.run();
+                profile.getRepository().refreshVersionsAsync()
+                        .thenRunAsync(Schedulers.javafx(), () -> {
+                            if (profile.getRepository().hasVersion(newName)) {
+                                profile.setSelectedVersion(newName);
+                            }
+                        }).start();
             } else {
                 reject.accept(i18n("version.manage.rename.fail"));
             }
@@ -167,7 +177,7 @@ public final class Versions {
     public static void updateGameAssets(Profile profile, String version) {
         TaskExecutor executor = new GameAssetDownloadTask(profile.getDependency(), profile.getRepository().getVersion(version), GameAssetDownloadTask.DOWNLOAD_INDEX_FORCIBLY, true)
                 .executor();
-        Controllers.taskDialog(executor, i18n("version.manage.redownload_assets_index"));
+        Controllers.taskDialog(executor, i18n("version.manage.redownload_assets_index"), TaskCancellationAction.NO_CANCEL);
         executor.start();
     }
 
@@ -191,6 +201,7 @@ public final class Versions {
             chooser.getExtensionFilters().add(OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS
                     ? new FileChooser.ExtensionFilter(i18n("extension.bat"), "*.bat")
                     : new FileChooser.ExtensionFilter(i18n("extension.sh"), "*.sh"));
+            chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(i18n("extension.ps1"), "*.ps1"));
             File file = chooser.showSaveDialog(Controllers.getStage());
             if (file != null)
                 new LauncherHelper(profile, account, id).makeLaunchScript(file);

HMCL/src/main/java/org/jackhuang/hmcl/ui/wizard/TaskExecutorDialogWizardDisplayer.java

@@ -26,6 +26,7 @@ import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
 import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
 import org.jackhuang.hmcl.ui.construct.TaskExecutorDialogPane;
 import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.TaskCancellationAction;
 
 import java.util.Map;
 import java.util.Queue;
@@ -41,10 +42,10 @@ public abstract class TaskExecutorDialogWizardDisplayer extends AbstractWizardDi
 
     @Override
     public void handleTask(Map<String, Object> settings, Task<?> task) {
-        TaskExecutorDialogPane pane = new TaskExecutorDialogPane(it -> {
+        TaskExecutorDialogPane pane = new TaskExecutorDialogPane(new TaskCancellationAction(it -> {
             it.fireEvent(new DialogCloseEvent());
             onEnd();
-        });
+        }));
 
         pane.setTitle(i18n("message.doing"));
         if (settings.containsKey("title")) {

HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateHandler.java

@@ -29,6 +29,7 @@ import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.UpgradeDialog;
 import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
 import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.TaskCancellationAction;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.io.JarUtils;
 import org.jackhuang.hmcl.util.platform.JavaVersion;
@@ -39,6 +40,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.*;
+import java.util.concurrent.CancellationException;
 import java.util.logging.Level;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -100,8 +102,9 @@ public final class UpdateHandler {
 
             Task<?> task = new HMCLDownloadTask(version, downloaded);
 
-            TaskExecutor executor = task.executor();
-            Controllers.taskDialog(executor, i18n("message.downloading"));
+            TaskExecutor executor = task.executor(false);
+            Controllers.taskDialog(executor, i18n("message.downloading"), TaskCancellationAction.NORMAL);
+            executor.start();
             thread(() -> {
                 boolean success = executor.test();
 
@@ -121,7 +124,11 @@ public final class UpdateHandler {
                 } else {
                     Exception e = executor.getException();
                     LOG.log(Level.WARNING, "Failed to update to " + version, e);
-                    Platform.runLater(() -> Controllers.dialog(e.toString(), i18n("update.failed"), MessageType.ERROR));
+                    if (e instanceof CancellationException) {
+                        Platform.runLater(() -> Controllers.showToast(i18n("message.cancelled")));
+                    } else {
+                        Platform.runLater(() -> Controllers.dialog(e.toString(), i18n("update.failed"), MessageType.ERROR));
+                    }
                 }
             });
         }));

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

@@ -21,23 +21,18 @@ import javafx.application.Platform;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
 import org.jackhuang.hmcl.Metadata;
+import org.jackhuang.hmcl.countly.CrashReport;
 import org.jackhuang.hmcl.ui.CrashWindow;
 import org.jackhuang.hmcl.upgrade.IntegrityChecker;
 import org.jackhuang.hmcl.upgrade.UpdateChecker;
 import org.jackhuang.hmcl.util.io.NetworkUtils;
-import org.jackhuang.hmcl.util.platform.OperatingSystem;
 
 import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 
-import static java.util.Collections.newSetFromMap;
 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;
 
 /**
@@ -45,28 +40,31 @@ import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
  */
 public class CrashReporter implements Thread.UncaughtExceptionHandler {
 
-    private static final Map<String, String> SOURCE = new HashMap<String, String>() {
-        {
-            put("javafx.fxml.LoadException", i18n("crash.NoClassDefFound"));
-            put("Location is not set", i18n("crash.NoClassDefFound"));
-            put("UnsatisfiedLinkError", i18n("crash.user_fault"));
-            put("java.lang.NoClassDefFoundError", i18n("crash.NoClassDefFound"));
-            put("org.jackhuang.hmcl.util.ResourceNotFoundError", i18n("crash.NoClassDefFound"));
-            put("java.lang.VerifyError", i18n("crash.NoClassDefFound"));
-            put("java.lang.NoSuchMethodError", i18n("crash.NoClassDefFound"));
-            put("java.lang.NoSuchFieldError", i18n("crash.NoClassDefFound"));
-            put("javax.imageio.IIOException", i18n("crash.NoClassDefFound"));
-            put("netscape.javascript.JSException", i18n("crash.NoClassDefFound"));
-            put("java.lang.IncompatibleClassChangeError", i18n("crash.NoClassDefFound"));
-            put("java.lang.ClassFormatError", i18n("crash.NoClassDefFound"));
-            put("com.sun.javafx.css.StyleManager.findMatchingStyles", i18n("launcher.update_java"));
-            put("NoSuchAlgorithmException", "Has your operating system been installed completely or is a ghost system?");
-        }
-    };
+    // Lazy initialization resources
+    private static final class Hole {
+        @SuppressWarnings("unchecked")
+        static final Pair<String, String>[] SOURCE = (Pair<String, String>[]) new Pair<?, ?>[]{
+                pair("javafx.fxml.LoadException", i18n("crash.NoClassDefFound")),
+                pair("Location is not set", i18n("crash.NoClassDefFound")),
+                pair("UnsatisfiedLinkError", i18n("crash.user_fault")),
+                pair("java.time.zone.ZoneRulesException: Unable to load TZDB time-zone rules", i18n("crash.user_fault")),
+                pair("java.lang.NoClassDefFoundError", i18n("crash.NoClassDefFound")),
+                pair("org.jackhuang.hmcl.util.ResourceNotFoundError", i18n("crash.NoClassDefFound")),
+                pair("java.lang.VerifyError", i18n("crash.NoClassDefFound")),
+                pair("java.lang.NoSuchMethodError", i18n("crash.NoClassDefFound")),
+                pair("java.lang.NoSuchFieldError", i18n("crash.NoClassDefFound")),
+                pair("javax.imageio.IIOException", i18n("crash.NoClassDefFound")),
+                pair("netscape.javascript.JSException", i18n("crash.NoClassDefFound")),
+                pair("java.lang.IncompatibleClassChangeError", i18n("crash.NoClassDefFound")),
+                pair("java.lang.ClassFormatError", i18n("crash.NoClassDefFound")),
+                pair("com.sun.javafx.css.StyleManager.findMatchingStyles", i18n("launcher.update_java")),
+                pair("NoSuchAlgorithmException", "Has your operating system been installed completely or is a ghost system?")
+        };
+    }
 
     private boolean checkThrowable(Throwable e) {
         String s = StringUtils.getStackTrace(e);
-        for (HashMap.Entry<String, String> entry : SOURCE.entrySet())
+        for (Pair<String, String> entry : Hole.SOURCE)
             if (s.contains(entry.getKey())) {
                 if (StringUtils.isNotBlank(entry.getValue())) {
                     String info = entry.getValue();
@@ -85,8 +83,6 @@ public class CrashReporter implements Thread.UncaughtExceptionHandler {
         return true;
     }
 
-    private static Set<String> CAUGHT_EXCEPTIONS = newSetFromMap(new ConcurrentHashMap<>());
-
     private final boolean showCrashWindow;
 
     public CrashReporter(boolean showCrashWindow) {
@@ -98,27 +94,11 @@ public class CrashReporter implements Thread.UncaughtExceptionHandler {
         LOG.log(Level.SEVERE, "Uncaught exception in thread " + t.getName(), e);
 
         try {
-            String stackTrace = StringUtils.getStackTrace(e);
-            if (!stackTrace.contains("org.jackhuang"))
+            CrashReport report = new CrashReport(t, e);
+            if (!report.shouldBeReport())
                 return;
 
-            if (CAUGHT_EXCEPTIONS.contains(stackTrace))
-                return;
-            CAUGHT_EXCEPTIONS.add(stackTrace);
-
-            String text = "---- Hello Minecraft! Crash Report ----\n" +
-                    "  Version: " + Metadata.VERSION + "\n" +
-                    "  Time: " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "\n" +
-                    "  Thread: " + t.toString() + "\n" +
-                    "\n  Content: \n    " +
-                    stackTrace + "\n\n" +
-                    "-- System Details --\n" +
-                    "  Operating System: " + System.getProperty("os.name") + ' ' + OperatingSystem.SYSTEM_VERSION + "\n" +
-                    "  Java Version: " + System.getProperty("java.version") + ", " + System.getProperty("java.vendor") + "\n" +
-                    "  Java VM Version: " + System.getProperty("java.vm.name") + " (" + System.getProperty("java.vm.info") + "), " + System.getProperty("java.vm.vendor") + "\n" +
-                    "  JVM Max Memory: " + Runtime.getRuntime().maxMemory() + "\n" +
-                    "  JVM Total Memory: " + Runtime.getRuntime().totalMemory() + "\n" +
-                    "  JVM Free Memory: " + Runtime.getRuntime().freeMemory() + "\n";
+            String text = report.getDisplayText();
 
             LOG.log(Level.SEVERE, text);
             Platform.runLater(() -> {
@@ -127,7 +107,7 @@ public class CrashReporter implements Thread.UncaughtExceptionHandler {
                         new CrashWindow(text).show();
                     }
                     if (!UpdateChecker.isOutdated() && IntegrityChecker.isSelfVerified()) {
-                        reportToServer(text);
+                        reportToServer(report);
                     }
                 }
             });
@@ -136,10 +116,10 @@ public class CrashReporter implements Thread.UncaughtExceptionHandler {
         }
     }
 
-    private void reportToServer(final String text) {
+    private void reportToServer(CrashReport crashReport) {
         Thread t = new Thread(() -> {
             HashMap<String, String> map = new HashMap<>();
-            map.put("crash_report", text);
+            map.put("crash_report", crashReport.getDisplayText());
             map.put("version", Metadata.VERSION);
             map.put("log", Logging.getLogs());
             try {