fix(skin): when texture file is lost, continue launching game instead of failing.

将＂室＂改成＂是＂

.github/workflows/check-update.yml

@@ -20,18 +20,13 @@ jobs:
           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 "^HMCL-[0-9]\.[0-9]\.[0-9]\{3\}\.exe\$"` ]; then exit 1; fi
+          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_BASE_VERSION=${HMCL_EXE_FILE_NAME:5:3}
-          export HMCL_BUILD_NUMBER=`cat ci.json | jq -M -r '.id'`
-          export HMCL_VERSION="$HMCL_BASE_VERSION.$HMCL_BUILD_NUMBER"
+          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_BUILD_NUMBER}" != 3 ]; then exit 1; fi
           if [ "${#HMCL_COMMIT_SHA}" != 40 ]; then exit 1; fi
 
-          echo "HMCL_BASE_VERSION=$HMCL_BASE_VERSION" >> $GITHUB_ENV
-          echo "HMCL_BUILD_NUMBER=$HMCL_BUILD_NUMBER" >> $GITHUB_ENV
           echo "HMCL_VERSION=$HMCL_VERSION" >> $GITHUB_ENV
           echo "HMCL_COMMIT_SHA=$HMCL_COMMIT_SHA" >> $GITHUB_ENV
           echo "HMCL_TAG_NAME=v$HMCL_VERSION" >> $GITHUB_ENV
@@ -45,7 +40,7 @@ jobs:
           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
+          DOWNLOAD_BASE_URL: https://ci.huangyuhui.net/job/HMCL/lastSuccessfulBuild/artifact/HMCL/build/libs
       - name: Generate release note
         if: ${{ env.continue == 'true' }}
         run: |

.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

.gitignore

@@ -17,20 +17,23 @@ NVIDIA
 /build/
 /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

HMCL/build.gradle

@@ -1,236 +0,0 @@
-buildscript {
-    repositories {
-        gradlePluginPortal()
-        maven { url 'https://jitpack.io' }
-    }
-    dependencies {
-        classpath 'org.tukaani:xz:1.8'
-        classpath 'org.glavo:pack200:0.3.0'
-    }
-}
-
-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 'libs:JFoenix'
-
-    implementation group: 'de.javawi.jstun', name: 'jstun', version: '0.7.4'
-}
-
-def digest(String algorithm, byte[] bytes) {
-    return MessageDigest.getInstance(algorithm).digest(bytes)
-}
-
-def createChecksum(File file) {
-    def algorithm = "SHA-1"
-    def suffix = "sha1"
-    new File(file.parentFile, file.name + "." + suffix).text = digest(algorithm, file.bytes).encodeHex().toString() + "\n"
-}
-
-def attachSignature(File jar) {
-    def keyLocation = System.getenv("HMCL_SIGNATURE_KEY");
-    if (keyLocation == null)
-        return
-    def privatekey = KeyFactory.getInstance("RSA").generatePrivate(new PKCS8EncodedKeySpec(new File(keyLocation).bytes))
-
-    def signer = Signature.getInstance("SHA512withRSA")
-    signer.initSign(privatekey)
-    new ZipFile(jar).withCloseable { zip ->
-        zip.stream()
-                .sorted(Comparator.comparing { it.name })
-                .filter { it.name != "META-INF/hmcl_signature" }
-                .forEach {
-                    signer.update(digest("SHA-512", it.name.getBytes("UTF-8")))
-                    signer.update(digest("SHA-512", zip.getInputStream(it).bytes))
-                }
-    }
-    def signature = signer.sign()
-
-    FileSystems.newFileSystem(URI.create("jar:" + jar.toURI()), [:]).withCloseable { zipfs ->
-        Files.newOutputStream(zipfs.getPath("META-INF/hmcl_signature")).withCloseable { it << signature }
-    }
-}
-
-ext.packer = Pack200.newPacker()
-packer.properties()["pack.effort"] = "9"
-ext.unpacker = Pack200.newUnpacker()
-
-// Pack200 does not guarantee that unpacked .class file is bit-wise same as the .class file before packing
-// because of shrinking. So we should pack .class files and unpack it to make sure that after unpacking
-// .class files remain the same.
-def repack(File file) {
-    def packed = new ByteArrayOutputStream()
-    new JarFile(file).withCloseable { packer.pack(it, packed) }
-    new JarOutputStream(file.newOutputStream()).withCloseable { unpacker.unpack(new ByteArrayInputStream(packed.toByteArray()), it) }
-}
-
-sourceSets {
-    java11 {
-        java {
-            srcDirs = ['src/main/java11']
-        }
-    }
-}
-
-compileJava11Java {
-    if(JavaVersion.current() < JavaVersion.VERSION_11) {
-        javaCompiler = javaToolchains.compilerFor {
-            languageVersion = JavaLanguageVersion.of(11)
-        }
-    }
-    options.compilerArgs.add('--add-exports=java.base/jdk.internal.loader=ALL-UNNAMED')
-    sourceCompatibility = 11
-    targetCompatibility = 11
-}
-
-jar {
-    enabled = false
-    dependsOn shadowJar
-}
-
-shadowJar {
-    classifier = null
-
-
-    minimize {
-        exclude(dependency('com.google.code.gson:.*:.*'))
-        exclude(dependency('com.github.steveice10:.*:.*'))
-        exclude(dependency('libs:JFoenix:.*'))
-        exclude(project(":HMCLTransformerDiscoveryService"))
-    }
-
-    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)
-    }
-}
-
-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,273 @@
+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 {
+    application
+    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 microsoftAuthId = System.getenv("MICROSOFT_AUTH_ID") ?: ""
+val microsoftAuthSecret = System.getenv("MICROSOFT_AUTH_SECRET") ?: ""
+val versionType = System.getenv("VERSION_TYPE") ?: "nightly"
+
+version = "$versionRoot.$buildNumber"
+
+application {
+    mainClass.set("org.jackhuang.hmcl.Main")
+}
+
+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 application.mainClass.get(),
+            "Multi-Release" to "true",
+            "Implementation-Version" to project.version,
+            "Microsoft-Auth-Id" to microsoftAuthId,
+            "Microsoft-Auth-Secret" to microsoftAuthSecret,
+            "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"])
+}
+
+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)
+}

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 {
@@ -14,7 +14,7 @@ public class SkinAnimation {
 
     @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/org/jackhuang/hmcl/Launcher.java

@@ -70,6 +70,10 @@ public final class Launcher extends Application {
                 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,

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

@@ -328,7 +328,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()
@@ -358,7 +358,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()) {

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

@@ -33,7 +33,7 @@ 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.List;
 
 public final class HMCLModpackInstallTask extends Task<Void> {
@@ -42,8 +42,8 @@ public final class HMCLModpackInstallTask extends Task<Void> {
     private final HMCLGameRepository repository;
     private final DefaultDependencyManager dependency;
     private final Modpack modpack;
-    private final List<Task<?>> dependencies = new 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();

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

@@ -20,6 +20,7 @@ package org.jackhuang.hmcl.game;
 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;
@@ -55,9 +56,13 @@ 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.atomic.AtomicReference;
@@ -124,9 +129,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));
@@ -172,7 +180,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,
@@ -413,12 +421,11 @@ public final class LauncherHelper {
                                     .thenAcceptAsync(downloadedJavaVersion -> {
                                         setting.setJavaVersion(downloadedJavaVersion);
                                         future.complete(downloadedJavaVersion);
-                                    })
-                                    .exceptionally(throwable -> {
+                                    }, Schedulers.javafx())
+                                    .whenCompleteAsync((result, throwable) -> {
                                         LOG.log(Level.WARNING, "Failed to download java", throwable);
                                         breakAction.run();
-                                        return null;
-                                    });
+                                    }, 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"), () -> {
@@ -598,6 +605,47 @@ public final class LauncherHelper {
         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:

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

@@ -30,7 +30,6 @@ 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 {
@@ -175,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);
         }
     }
 
@@ -219,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/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/VersionSetting.java

@@ -60,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;

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

@@ -221,7 +221,7 @@ public class GameCrashWindow extends Stage {
         LogWindow logWindow = new LogWindow();
 
         logWindow.logLine("Command: " + new CommandBuilder().addAll(managedProcess.getCommands()).toString(), Log4jLevel.INFO);
-        logWindow.logLine("ClassPath: " + managedProcess.getClasspath(), 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());
 
@@ -315,13 +315,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);
+                        });
+                    }
                 }
             }
 

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/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;
@@ -58,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;
 
@@ -84,6 +88,8 @@ 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;
@@ -114,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);

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/main/AboutPage.java

@@ -167,9 +167,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

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

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

@@ -54,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;
     }
 

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

@@ -19,15 +19,18 @@ 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.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;
@@ -50,65 +53,59 @@ import java.util.logging.Level;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static org.jackhuang.hmcl.util.Lang.mapOf;
 import static org.jackhuang.hmcl.util.Lang.wrap;
 import static org.jackhuang.hmcl.util.Logging.LOG;
-import static org.jackhuang.hmcl.util.Pair.pair;
 
 /**
  * Cato Management.
  */
 public final class MultiplayerManager {
-    static final String CATO_VERSION = "1.1.1-3f36a56";
-    //    private static final String CATO_DOWNLOAD_URL = "https://files.huangyuhui.net/maven/cato/cato/" + MultiplayerManager.CATO_VERSION;
-    private static final String CATO_DOWNLOAD_URL = "https://codechina.csdn.net/huanghongxun1/ioi_bin/-/raw/3f36a567d9381e5fa404b96bcecd6d6a555f235c/client/";
+    static final String CATO_VERSION = "1.2.0-202112171527";
+    private static final String CATO_DOWNLOAD_URL = "https://gitcode.net/huanghongxun1/ioi_bin/-/raw/3.5.3/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 final Map<String, String> HASH = mapOf(
-            pair("cato-client-darwin-amd64", "e733fa4b72be24b99026249c31c4ae8b52ad3906"),
-            pair("cato-client-darwin-arm64", "19ab41b7f78263cad81009ae1a391b0d0367d95f"),
-            pair("cato-client-freebsd-amd64", "6de8439ab9267e444d45bb9f02394023ce0bfe5e"),
-            pair("cato-client-freebsd-arm64", "5cd8930e7cd17d72386b085950e63467e4ce72ef"),
-            pair("cato-client-freebsd-arm7", "d0e54a4a1b0f8c2f769d74a6a600eec4a9c4e0da"),
-            pair("cato-client-freebsd-i386", "d9d22faf85e01e77b18f28f1609e87623ac9b1a4"),
-            pair("cato-client-js.wasm", "acb366a4d6a3c6cd464ef5919ce7d2d58a52964e"),
-            pair("cato-client-linux-amd64", "04e94a3adff1e4d865dead2c6c5da584b74bff0a"),
-            pair("cato-client-linux-arm64", "ba662bc461995dae5e78d21b9fea35c2db81b652"),
-            pair("cato-client-linux-arm7", "28021eff56e1e273c051853808e70e7ab3af80d9"),
-            pair("cato-client-linux-i386", "4f524a9cfbcea560bdf07d3468b883f946c431ed"),
-            pair("cato-client-linux-mips", "91c3108b046511c2aafbe88f82b38a06c03d88e1"),
-            pair("cato-client-linux-mips64", "04d1b66494dbdb0443eaae85bda6b61408e300ed"),
-            pair("cato-client-linux-mips64le", "d838ac71052f7873b28f4b4a2f23470b918ef85d"),
-            pair("cato-client-linux-mipsle", "54918ed9cdbe48f7adf11680947281f5fc7c5a7d"),
-            pair("cato-client-linux-ppc64", "f2679259516b0db0422f85afcce35bfa6f7b3192"),
-            pair("cato-client-linux-ppc64le", "463d9b86316dfc83e668ddfae96e51181a9e3ffa"),
-            pair("cato-client-openbsd-amd64", "b776155e955340485faf62c3b2aad3a788c57e2b"),
-            pair("cato-client-openbsd-arm64", "fd6ec21248fd9c8be3d9d2876faf65b95c63b3a9"),
-            pair("cato-client-openbsd-arm7", "19eabe71530bb4eac7a32f6b8aeef72f6f9382e9"),
-            pair("cato-client-openbsd-i386", "3e755798628a379997dbc43dfd71765d62263ebe"),
-            pair("cato-client-windows-amd64.exe", "21a862f455c909c9fb786cd308e969629eb3c8d9"),
-            pair("cato-client-windows-arm64.exe", "7f2fe5d054ebc3265edb046badafdd6ac94bf7eb"),
-            pair("cato-client-windows-i386.exe", "4e03e640c6cabfd7e1ddf60bba1726353bc3afee")
-    );
+    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 + getCatoFileName()),
-                getCatoExecutable().toFile(),
-                new FileDownloadTask.IntegrityCheck("SHA-1", HASH.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);
-            }
-        });
+        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() {
@@ -116,7 +113,7 @@ public final class MultiplayerManager {
     }
 
     private static CompletableFuture<CatoSession> startCato(String token, State state) {
-        return CompletableFuture.completedFuture(null).thenApplyAsync(wrap(unused -> {
+        return getCatoHash().thenApplyAsync(wrap(catoHashes -> {
             Path exe = getCatoExecutable();
             if (!Files.isRegularFile(exe)) {
                 throw new CatoNotExistsException(exe);
@@ -127,13 +124,16 @@ public final class MultiplayerManager {
             }
 
             try {
-                ChecksumMismatchException.verifyChecksum(exe, "SHA-1", HASH.get(getCatoFileName()));
+                String hash = catoHashes.get(getCatoFileName());
+                if (hash != null) {
+                    ChecksumMismatchException.verifyChecksum(exe, "SHA-1", hash);
+                }
             } catch (IOException e) {
                 Files.deleteIfExists(exe);
                 throw e;
             }
 
-            String[] commands = new String[]{exe.toString(), "--token", StringUtils.isBlank(token) ? "new" : token};
+            String[] commands = new String[]{exe.toString(), "-client.token", StringUtils.isBlank(token) ? "new" : token};
             Process process = new ProcessBuilder()
                     .command(commands)
                     .start();
@@ -176,7 +176,7 @@ public final class MultiplayerManager {
                 session.setClient(client);
 
                 TimerTask task = Lang.setTimeout(() -> {
-                    future.completeExceptionally(new JoinRequestTimeoutException());
+                    Platform.runLater(() -> future.completeExceptionally(new JoinRequestTimeoutException()));
                     session.stop();
                 }, 30 * 1000);
 
@@ -187,24 +187,30 @@ public final class MultiplayerManager {
                         session.addRelatedThread(Lang.thread(new LocalServerBroadcaster(port, session), "LocalServerBroadcaster", true));
                         session.setName(connectedEvent.getSessionName());
                         client.setGamePort(port);
-                        session.onExit.unregister(onExit);
-                        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 KickedException(kickedEvent.getReason()));
                     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) {
@@ -254,9 +260,11 @@ public final class MultiplayerManager {
             }, 15 * 1000);
 
             session.onPeerConnected.register(event -> {
-                session.onExit.unregister(onExit);
-                future.complete(session);
                 peerConnectionTimeoutTask.cancel();
+                Platform.runLater(() -> {
+                    session.onExit.unregister(onExit);
+                    future.complete(session);
+                });
             });
 
             return future;
@@ -354,11 +362,11 @@ public final class MultiplayerManager {
             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;
         }
@@ -400,7 +408,8 @@ public final class MultiplayerManager {
                 onExit.fireEvent(new CatoExitEvent(this, CatoExitEvent.EXIT_CODE_INTERRUPTED));
             } finally {
                 try {
-                    writer.close();
+                    if (writer != null)
+                        writer.close();
                 } catch (IOException e) {
                     LOG.log(Level.WARNING, "Failed to close cato stdin writer", e);
                 }
@@ -412,11 +421,11 @@ public final class MultiplayerManager {
             return id != null;
         }
 
-        public String getName() {
+        public synchronized String getName() {
             return name;
         }
 
-        public void setName(String name) {
+        public synchronized void setName(String name) {
             this.name = name;
         }
 

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

@@ -134,7 +134,7 @@ 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) -> {
             if (exception == null) {

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())
@@ -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);
     }
@@ -307,17 +312,11 @@ public class DownloadListPage extends Control implements DecoratorPage, VersionP
                         }).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.getSelectionModel().select(0);
                 searchPane.addRow(rowIndex++, new Label(i18n("mods.category")), categoryStackPane, new Label(i18n("search.sort")), sortStackPane);
 
@@ -341,7 +340,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 +359,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);

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

@@ -84,7 +84,12 @@ public class DownloadPage extends Control implements DecoratorPage {
         this.mod = ModTranslations.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 +98,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()),
+                Task.supplyAsync(() -> {
+                    Stream<RemoteMod.Version> versions = addon.getData().loadVersions();
 //                            if (StringUtils.isNotBlank(version.getVersion())) {
 //                                Optional<String> gameVersion = GameVersion.minecraftVersion(versionJar);
 //                                if (gameVersion.isPresent()) {
@@ -103,8 +108,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 +127,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,7 +198,7 @@ public class DownloadPage extends Control implements DecoratorPage {
         }
 
         Controllers.taskDialog(
-                new FileDownloadTask(NetworkUtils.toURL(file.getFile().getUrl()), dest).executor(true),
+                new FileDownloadTask(NetworkUtils.toURL(file.getFile().getUrl()), dest, file.getFile().getIntegrityCheck()).executor(true),
                 i18n("message.downloading")
         );
     }
@@ -297,6 +300,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);

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

@@ -48,7 +48,7 @@ public class ModDownloadListPage extends DownloadListPage {
     private class Repository implements RemoteModRepository {
 
         @Override
-        public Stream<RemoteMod> search(String gameVersion, Category category, int pageOffset, int pageSize, String searchFilter, int sort) throws IOException {
+        public Stream<RemoteMod> search(String gameVersion, Category category, int pageOffset, int pageSize, String searchFilter, SortType sort) throws IOException {
             String newSearchFilter;
             if (StringUtils.CHINESE_PATTERN.matcher(searchFilter).find()) {
                 List<ModTranslations.Mod> mods = ModTranslations.searchMod(searchFilter);

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

@@ -95,7 +95,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 +118,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 +137,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())

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

@@ -112,7 +112,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
 
     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();

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

@@ -123,7 +123,12 @@ public final class Versions {
             }
             if (profile.getRepository().renameVersion(version, newName)) {
                 resolve.run();
-                profile.getRepository().refreshVersionsAsync().start();
+                profile.getRepository().refreshVersionsAsync()
+                        .thenRunAsync(Schedulers.javafx(), () -> {
+                            if (profile.getRepository().hasVersion(newName)) {
+                                profile.setSelectedVersion(newName);
+                            }
+                        }).start();
             } else {
                 reject.accept(i18n("version.manage.rename.fail"));
             }

HMCL/src/main/resources/assets/fxml/download/versions.fxml

@@ -23,10 +23,26 @@
             <JFXSpinner fx:id="spinner" styleClass="first-spinner" />
             <StackPane fx:id="center" style="-fx-padding: 10;">
                 <ComponentList fx:id="centrePane" styleClass="no-padding">
-                    <HBox fx:id="checkPane" spacing="10" style="-fx-padding: 10;">
-                        <JFXCheckBox fx:id="chkRelease" text="%version.game.releases" selected="true" />
-                        <JFXCheckBox fx:id="chkSnapshot" text="%version.game.snapshots" />
-                        <JFXCheckBox fx:id="chkOld" text="%version.game.old" />
+                    <HBox fx:id="checkPane" spacing="10">
+                        <JFXCheckBox fx:id="chkRelease" text="%version.game.releases" selected="true">
+                            <HBox.margin>
+                                <Insets top="10" bottom="10" />
+                            </HBox.margin>
+                        </JFXCheckBox>
+                        <JFXCheckBox fx:id="chkSnapshot" text="%version.game.snapshots">
+                            <HBox.margin>
+                                <Insets top="10" bottom="10" />
+                            </HBox.margin>
+                        </JFXCheckBox>
+                        <JFXCheckBox fx:id="chkOld" text="%version.game.old">
+                            <HBox.margin>
+                                <Insets top="10" bottom="10" />
+                            </HBox.margin>
+                        </JFXCheckBox>
+
+                        <HBox HBox.hgrow="ALWAYS" />
+
+                        <JFXButton fx:id="btnRefresh" styleClass="jfx-tool-bar-button" onMouseClicked="#onRefresh" text="%button.refresh" />
                     </HBox>
                     <JFXListView fx:id="list" styleClass="jfx-list-view-float" VBox.vgrow="ALWAYS">
                     </JFXListView>

HMCL/src/main/resources/assets/lang/I18N.properties

@@ -182,6 +182,11 @@ curse.category.4472=Tech
 curse.category.4473=Magic
 
 # https://addons-ecs.forgesvc.net/api/v2/category/section/6
+curse.category.5129=Vanilla+
+curse.category.5189=Utility & QOL
+curse.category.5190=QoL
+curse.category.5191=Utility & QoL
+curse.category.5192=FancyMenu
 curse.category.423=Map and Information
 curse.category.426=Addons
 curse.category.434=Armor, Tools, and Weapons
@@ -223,7 +228,8 @@ curse.category.4558=Redstone
 curse.category.4843=Automation
 curse.category.4906=MCreator
 
-# https://addons-ecs.forgesvc.net/api/v2/category/section/6
+# https://addons-ecs.forgesvc.net/api/v2/category/section/12
+curse.category.5193=Data Packs
 curse.category.399=Steampunk
 curse.category.396=128x
 curse.category.398=512x and Higher
@@ -308,6 +314,7 @@ fatal.config_loading_failure=The configuration is not accessible.\nPlease ensure
 fatal.migration_requires_manual_reboot=The update is complete. Please reopen Hello Minecraft! Launcher.
 fatal.apply_update_failure=We're sorry, Hello Minecraft! Launcher couldn't finish the update because something went wrong.\nBut you can still manually finish the update by downloading Hello Minecraft! Launcher from %s.\nPlease consider reporting this issue to us.
 fatal.samba=If you are trying to run HMCL in a shared folder by Samba, HMCL may not working, please try updating your Java or running HMCL in a local folder.
+fatal.illegal_char=Illegal character '=' in your user folder path. HMCL can work, but some features don't work.\nYou will not be able to use the authlib-injector account or changing skin of offline account, and there may be greater security risks in multiplayer games.
 
 feedback=Feedback
 feedback.add=Add Feedback
@@ -943,7 +950,7 @@ update.found=Update Available!
 update.newest_version=Latest version: %s
 update.bubble.title=Update Available: %s
 update.bubble.subtitle=Click here to update
-update.note=Warning: Beta versions may have more functionality and bug fixes but also more possible errors.
+update.note=Warning: Beta versions and nightly versions may have more functionality and bug fixes but also more possible errors.
 update.latest=This is the latest version.
 update.no_browser=Cannot open a browser. The link has been copied to the clipboard. Paste it into the address bar of browser to update.
 update.tooltip=Update

HMCL/src/main/resources/assets/lang/I18N_ja.properties

@@ -148,7 +148,7 @@ button.install=インストール
 button.export=エクスポート
 button.no=いいえ
 button.ok=OK
-button.refresh=リフレッシュ
+button.refresh=更新
 button.remove=削除
 button.remove.confirm=削除してもよろしいですか？この操作をロールバックすることはできません！
 button.save=保存
@@ -182,6 +182,11 @@ curse.category.4472=Tech
 curse.category.4473=魔法
 
 # https://addons-ecs.forgesvc.net/api/v2/category/section/6
+curse.category.5129=Vanilla+
+curse.category.5189=Utility & QOL
+curse.category.5190=QoL
+curse.category.5191=Utility & QoL
+curse.category.5192=FancyMenu
 curse.category.423=地図と情報
 curse.category.426=Addons
 curse.category.434=武器、道具、武器
@@ -289,6 +294,12 @@ download.javafx.notes=ネットワークを介したHMCLに必要なコンポー
 download.javafx.component=モジュール%sをダウンロードしています
 download.javafx.prepare=ダウンロードする準備ができました
 
+exception.access_denied=It's denied by operating system to access file %s. Maybe we don't have permission to access this file, or this file has already been opened by other program.\n\
+  Please check if current operating system user has permission to access that file.\n\
+  For Windows users, you can also try the Resource Monitor, find if some programs is holding the file, try to close related program, or restart your computer.
+exception.artifact_malformed=The file cannot pass verification.
+exception.ssl_handshake=Cannot establish SSL connection because of missing SSL certifcate in current Java installation. Try to start HMCL on another Java VM.
+
 extension.bat=WindowsBatファイル
 extension.mod=Modファイル
 extension.png=画像ファイル
@@ -300,7 +311,8 @@ fatal.javafx.missing=JavaFXがありません。\nJava11以降を使用してい
 fatal.missing_dst_root_ca_x3=現在のJavaプラットフォームにDSTルートCAX3証明書がありません。\n引き続きHelloMinecraftを使用できます。ランチャーですが、一部のサイト（Let's Encryptによって発行された証明書を使用するサイトなど）に接続できず、ランチャーが正しく機能しない可能性があります。\n問題を解決するには、Javaランタイムを8u101以降に更新してください。
 fatal.config_loading_failure=構成にアクセスできません。\nHelloMinecraftを確認してください。 Launcherには、「%s」とその中のファイルへの読み取りおよび書き込みアクセス権があります。
 fatal.migration_requires_manual_reboot=更新が完了しました。 Hello Minecraftを再開してください！ランチャー。
-fatal.apply_update_failure=ごめんなさい、こんにちはMinecraft！何か問題が発生したため、ランチャーは更新を完了できませんでした。\nただし、Hello Minecraftをダウンロードすることで、手動で更新を終了できます。 %sからのランチャー。\nこの問題を報告することを検討してください。
+fatal.apply_update_failure=ごめんなさい、Hello Minecraft! Launcher 何か問題が発生したため、ランチャーは更新を完了できませんでした。\nただし、Hello Minecraftをダウンロードすることで、手動で更新を終了できます。 %sからのランチャー。\nこの問題を報告することを検討してください。
+fatal.samba=If you are trying to run HMCL in a shared folder by Samba, HMCL may not working, please try updating your Java or running HMCL in a local folder.
 
 feedback=フィードバック
 Feedback.add=フィードバックを追加
@@ -392,12 +404,11 @@ input.number=数値である必要があります。
 input.not_empty=必須フィールド
 input.url=有効なURLである必要があります。
 
-install=新しい構成を作成
+install=新規作成
 install.change_version=バージョンの変更
 install.change_version.confirm=%sをバージョン%sから%sに更新してもよろしいですか？
 install.failed=バージョンのインストールに失敗しました
 install.failed.downloading=一部のファイルが正常にダウンロードされなかったため、インストールに失敗しました
-install.failed.downloading.access_denied=ファイルのダウンロードに失敗しました：%1$s。これは、オペレーティングシステムによってファイル%2 $ sへのアクセスが拒否されているためです。このファイルにアクセスする権限がないか、このファイルが他のプログラムによって既に開かれている可能性があります。関連するプログラムを閉じるか、コンピュータを再起動してみてください。
 install.failed.downloading.detail=ファイルのダウンロードに失敗しました：%s
 install.failed.downloading.timeout=ファイルのダウンロード中にタイムアウトしました：%s
 install.failed.install_online=提供されたインストーラーファイルを認識できません。 modをインストールする場合は、「Mods」ページに移動します。
@@ -425,7 +436,7 @@ install.installer.not_installed=インストールされていません
 install.installer.optifine=OptiFine
 install.installer.version=%s
 install.modpack=modpackを導入
-install.new_game=新しいゲームをインストールする
+install.new_game=新規作成
 install.new_game.already_exists=このバージョンはすでに存在します。
 install.new_game.current_game_version=現在のゲームバージョン
 install.new_game.malformed=無効な名前
@@ -482,6 +493,7 @@ launcher.background.classic=クラシック
 launcher.background.choose=背景画像ファイルを選択してください
 launcher.background.default=標準
 launcher.background.network=ネットワーク
+launcher.background.translucent=半透明
 launcher.cache_directory=キャッシュ用のディレクトリ
 launcher.cache_directory.clean=Clear
 launcher.cache_directory.choose=キャッシュするディレクトリを選択します
@@ -641,8 +653,10 @@ multiplayer.download.unsupported=現在のオペレーティングシステム
 multiplayer.exit.after_ready=マルチプレイヤーセッションが壊れています。 cato exitcode%d
 multiplayer.exit.before_ready=マルチプレイヤーセッションの作成に失敗しました。 cato exitcode%d
 multiplayer.exit.timeout=マルチプレイヤーサーバーへの接続に失敗しました。
+multiplayer.exit.timeout.dynamic_token=マルチプレイヤーサーバーへの接続に失敗しました。
 multiplayer.hint=マルチプレイヤー機能は実験的なものです。フィードバックをお願いします。
 multiplayer.nat=ネットワークタイプの検出
+multiplayer.nat.failed=ネットワークタイプの検出に失敗しました。
 multiplayer.nat.hint=ネットワークタイプの検出により、ネットワークがマルチプレイヤーモードの要件を満たしているかどうかが明確になります。
 multiplayer.nat.latency=レイテンシー
 multiplayer.nat.not_yet_tested=まだテストされていません
@@ -750,7 +764,7 @@ profile.instance_directory=ゲームディレクトリ
 profile.instance_directory.choose=ゲームディレクトリを選択してください
 profile.manage=ゲームディレクトリリスト
 profile.name=名前
-profile.new=新しい構成
+profile.new=新規作成
 profile.title=ゲームディレクトリ
 profile.selected=選択済み
 profile.use_relative_path=可能であれば、ゲームディレクトリの相対パスを使用します
@@ -799,7 +813,7 @@ settings.advanced.launcher_visibility.close=ゲームの起動時にランチャ
 settings.advanced.launcher_visibility.hide=ゲームの起動時にランチャーを非表示にします。
 settings.advanced.launcher_visibility.hide_and_reopen=ランチャーを非表示にし、ゲームが終了したら再度開きます。
 settings.advanced.launcher_visibility.keep=ランチャーを表示したままにします。
-settings.advanced.launcher_visible=ランチャーの可視性
+settings.advanced.launcher_visible=ランチャーの設定
 settings.advanced.minecraft_arguments=Minecraftの引数
 settings.advanced.minecraft_arguments.prompt=デフォルト
 settings.advanced.natives_directory=ネイティブライブラリパス（例： LWJGL）
@@ -883,7 +897,7 @@ settings.memory.allocate.auto=最小%1 $ .1f GB /実際の%2 $ .1f GB
 settings.memory.allocate.auto.exceeded=最小%1 $ .1f GB /実際の%2 $ .1f GB（%3 $ .1f GB使用可能）
 settings.memory.allocate.manual=割り当て%1 $ .1f GB
 settings.memory.allocate.manual.exceeded=割り当て%1 $ .1f GB（%3 $ .1f GB使用可能）
-settings.memory.auto_allocate=メモリサイズは自動的に決定されます
+settings.memory.auto_allocate=メモリサイズの自動割り当て
 settings.memory.lower_bound=最小メモリ
 settings.memory.used_per_total=%1 $ .1f GB使用済み/%2 $ .1fGB合計
 settings.physical_memory=物理メモリサイズ
@@ -969,9 +983,9 @@ version.manage.rename=このバージョンの名前を変更します
 version.manage.rename.message=このバージョンの新しい名前を入力してください
 version.manage.rename.fail=バージョンの名前を変更できませんでした。
 version.settings=設定
-version.update=modpackを更新します
+version.update=modpackを更新する
 
-wizard.prev=<前へ
+wizard.prev=< 前へ
 wizard.failed=失敗
 wizard.finish=終了
-wizard.next=次へ>
+wizard.next=次へ >

HMCL/src/main/resources/assets/lang/I18N_zh.properties

@@ -182,6 +182,11 @@ curse.category.4472=科技
 curse.category.4473=魔法
 
 # https://addons-ecs.forgesvc.net/api/v2/category/section/6
+curse.category.5129=原版增強
+curse.category.5189=實用與QOL
+curse.category.5190=QoL
+curse.category.5191=實用與QoL
+curse.category.5192=夢幻菜單
 curse.category.423=訊息展示
 curse.category.426=模組擴展
 curse.category.434=裝備武器
@@ -224,6 +229,7 @@ curse.category.4843=自動化
 curse.category.4906=MCreator
 
 # https://addons-ecs.forgesvc.net/api/v2/category/section/6
+curse.category.5193=封包
 curse.category.399=蒸汽朋克
 curse.category.396=128x
 curse.category.398=512x 及更高
@@ -308,6 +314,7 @@ fatal.config_loading_failure=Hello Minecraft! Launcher 無法載入設定檔案
 fatal.migration_requires_manual_reboot=Hello Minecraft! Launcher 即將升級完成，請重新開啟 Hello Minecraft! Launcher。
 fatal.apply_update_failure=我們很抱歉 Hello Minecraft! Launcher 無法自動完成升級程式，因為出現了一些問題。\n但你依然可以從 %s 處手動下載 Hello Minecraft! Launcher 來完成升級。\n請考慮向我們回報該問題。
 fatal.samba=如果您正在通過 Samba 共亯的資料夾中運行 HMCL，HMCL 可能無法正常工作，請嘗試更新您的 Java 或在本地資料夾內運行 HMCL。
+fatal.illegal_char=您的用戶資料夾路徑中存在非法字元‘=’。HMCL 能够運行，但一些功能無法正常使用。 \n您將無法使用外置登入帳戶以及離線登入更換皮膚功能，並且在進行多人遊戲時可能存在更大的安全隱患。
 
 feedback=回饋
 feedback.add=新增回饋
@@ -943,7 +950,7 @@ update.found=發現到更新
 update.newest_version=最新版本為: %s
 update.bubble.title=發現更新: %s
 update.bubble.subtitle=點選此處進行升級
-update.note=開發版包含更多的功能以及錯誤修復，但也可能會包含其他的問題。
+update.note=測試版與開發版包含更多的功能以及錯誤修復，但也可能會包含其他的問題。
 update.latest=目前版本為最新版本
 update.no_browser=無法開啟瀏覽器，網址已經複製到剪貼簿了，您可以手動複製網址開啟頁面
 update.tooltip=更新

HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties

@@ -182,6 +182,11 @@ curse.category.4472=科技
 curse.category.4473=魔法
 
 # https://addons-ecs.forgesvc.net/api/v2/category/section/6
+curse.category.5129=原版增强
+curse.category.5189=实用与QOL
+curse.category.5190=QoL
+curse.category.5191=实用与QoL
+curse.category.5192=梦幻菜单
 curse.category.423=信息展示
 curse.category.426=模组扩展
 curse.category.434=装备武器
@@ -223,7 +228,8 @@ curse.category.4558=红石
 curse.category.4843=自动化
 curse.category.4906=MCreator
 
-# https://addons-ecs.forgesvc.net/api/v2/category/section/6
+# https://addons-ecs.forgesvc.net/api/v2/category/section/12
+curse.category.5193=数据包
 curse.category.399=蒸汽朋克
 curse.category.396=128x
 curse.category.398=512x 及更高
@@ -292,7 +298,7 @@ download.javafx.prepare=准备开始下载
 exception.access_denied=因为无法访问文件 %s，HMCL 没有对该文件的访问权限，或者该文件被其他程序打开。\n\
   请你检查当前操作系统帐户是否能访问该文件，比如非管理员用户可能不能访问其他帐户的个人文件夹内的文件。\n\
   对于 Windows 用户，你还可以尝试通过资源监视器查看是否有程序占用了该文件，如果是，你可以关闭占用此文件相关程序，或者重启电脑再试。
-exception.artifact_malformed=下载的文件正确，无法通过校验。
+exception.artifact_malformed=下载的文件无法通过校验。
 exception.ssl_handshake=无法建立 SSL 连接，因为当前 Java 虚拟机缺少相关的 SSL 证书。你可以尝试使用其他的 Java 虚拟机启动 HMCL 再试。 
 
 extension.bat=Windows 脚本
@@ -308,6 +314,7 @@ fatal.config_loading_failure=Hello Minecraft! Launcher 无法加载配置文件
 fatal.migration_requires_manual_reboot=Hello Minecraft! Launcher 即将完成升级，请重新打开 Hello Minecraft! Launcher。
 fatal.apply_update_failure=我们很抱歉 Hello Minecraft! Launcher 无法自动完成升级，因为出现了一些问题。\n但你依然可以从 %s 处手动下载 Hello Minecraft! Launcher 来完成升级。\n请考虑向我们反馈该问题。
 fatal.samba=如果您正在通过 Samba 共享的文件夹中运行 HMCL，HMCL 可能无法正常工作，请尝试更新您的 Java 或在本地文件夹内运行 HMCL。
+fatal.illegal_char=您的用户文件夹路径中存在非法字符‘=’。HMCL 能够运行，但一些功能无法正常使用。\n您将无法使用外置登陆账户以及离线登陆更换皮肤功能，并且在进行多人游戏时可能存在更大的安全隐患。
 
 feedback=反馈
 feedback.add=新增反馈
@@ -368,7 +375,7 @@ game.crash.reason.graphics_driver=当前游戏因为你的显卡驱动存在问
   详情请点击 <a href="https://hmcl.huangyuhui.net/help/game/graphics-card">此处</a> 查看
 game.crash.reason.illegal_access_error=当前游戏因为某些 Mod 的问题，无法继续运行。\n如果你认识：%1$s，你可以更新或删除对应 Mod 再试。
 game.crash.reason.jdk_9=当前游戏因为 Java 版本过高，无法继续运行。\n你需要下载安装 Java 8，并在游戏设置中将 Java 设置为 1.8 的版本。
-game.crash.reason.jvm_32bit=当前游戏因为内存分配过大，超过了 32 位 Java 内存限制，无法继续运行。\n如果你的电脑是 64 位系统，请下载安装并更换 64 位 Java。如果你的电脑室 32 位系统，你或许可以重新安装 64 位系统，或换一台新电脑。\n或者，你可以关闭游戏内存的自动分配，并且把内存限制调节为 1024 MB 或以下。
+game.crash.reason.jvm_32bit=当前游戏因为内存分配过大，超过了 32 位 Java 内存限制，无法继续运行。\n如果你的电脑是 64 位系统，请下载安装并更换 64 位 Java。如果你的电脑是 32 位系统，你或许可以重新安装 64 位系统，或换一台新电脑。\n或者，你可以关闭游戏内存的自动分配，并且把内存限制调节为 1024 MB 或以下。
 game.crash.reason.loading_crashed_forge=当前游戏因为模组 %1$s (%2$s) 错误，无法继续运行。\n你可以尝试删除或更新该模组以解决问题。
 game.crash.reason.loading_crashed_fabric=当前游戏因为模组 %1$s 错误，无法继续运行。\n你可以尝试删除或更新该模组以解决问题。
 game.crash.reason.memory_exceeded=当前游戏因为分配的内存过大，无法继续运行。\n该问题是由于系统页面文件太小导致的。\n你需要在游戏设置中关闭游戏内存的自动分配，并将游戏内存调低至游戏能正常启动为止。\n你还可以尝试调大系统的页面大小。
@@ -943,7 +950,7 @@ update.found=发现更新
 update.newest_version=最新版本为：%s
 update.bubble.title=发现更新：%s
 update.bubble.subtitle=点击此处进行升级
-update.note=开发版包含更多的功能以及错误修复，但也可能会包含其他的问题。
+update.note=测试版与开发版包含更多的功能以及错误修复，但也可能会包含其他的问题。
 update.latest=当前版本为最新版本
 update.no_browser=无法打开浏览器，网址已经复制到剪贴板了，您可以手动粘贴网址打开页面
 update.tooltip=更新

HMCLCore/build.gradle

@@ -1,19 +0,0 @@
-plugins {
-    id 'java-library'
-}
-
-dependencies {
-    api group: 'com.google.code.gson', name: 'gson', version: '2.8.1'
-    api group: 'com.moandjiezana.toml', name: 'toml4j', version: '0.7.2'
-    api group: 'org.tukaani', name: 'xz', version: '1.8'
-    api(group: 'org.hildan.fxgson', name: 'fx-gson', version: '3.1.0') {
-        exclude group: 'org.jetbrains', module: 'annotations'
-    }
-    api group: 'org.jenkins-ci', name: 'constant-pool-scanner', version: '1.2'
-    api group: 'com.github.steveice10', name: 'opennbt', version: '1.1'
-    api group: 'com.nqzero', name: 'permit-reflect', version: '0.3'
-    api group: 'org.nanohttpd', name: 'nanohttpd', version: '2.3.1'
-    api group: 'org.apache.commons', name: 'commons-compress', version: '1.21'
-    api group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
-    compileOnlyApi group: 'org.jetbrains', name: 'annotations', version: '16.0.3'
-}

HMCLCore/build.gradle.kts

@@ -0,0 +1,27 @@
+plugins {
+    `java-library`
+}
+
+dependencies {
+    api("com.google.code.gson:gson:2.8.1")
+    api("com.moandjiezana.toml:toml4j:0.7.2")
+    api("org.tukaani:xz:1.8")
+    api("org.hildan.fxgson:fx-gson:3.1.0") {
+        exclude(group = "org.jetbrains", module = "annotations")
+    }
+    api("org.jenkins-ci:constant-pool-scanner:1.2")
+    api("com.github.steveice10:opennbt:1.1")
+    api("com.nqzero:permit-reflect:0.3")
+    api("org.nanohttpd:nanohttpd:2.3.1")
+    api("org.apache.commons:commons-compress:1.21")
+    api("org.apache.commons:commons-lang3:3.12.0")
+    compileOnlyApi("org.jetbrains:annotations:16.0.3")
+}
+
+tasks.processResources {
+    dependsOn(":log4j-patch:jar")
+
+    into("assets/game") {
+        from(project(":log4j-patch").file("build/libs"))
+    }
+}

HMCLCore/src/main/java/org/jackhuang/hmcl/auth/AuthInfo.java

@@ -18,8 +18,10 @@
 package org.jackhuang.hmcl.auth;
 
 import org.jackhuang.hmcl.game.Arguments;
+import org.jackhuang.hmcl.game.LaunchOptions;
 import org.jackhuang.hmcl.util.Immutable;
 
+import java.io.IOException;
 import java.util.UUID;
 
 /**
@@ -27,26 +29,18 @@ import java.util.UUID;
  * @author huangyuhui
  */
 @Immutable
-public final class AuthInfo implements AutoCloseable {
+public class AuthInfo implements AutoCloseable {
 
     private final String username;
     private final UUID uuid;
     private final String accessToken;
     private final String userProperties;
-    private final Arguments arguments;
-    private final AutoCloseable closeable;
 
     public AuthInfo(String username, UUID uuid, String accessToken, String userProperties) {
-        this(username, uuid, accessToken, userProperties, null, null);
-    }
-
-    public AuthInfo(String username, UUID uuid, String accessToken, String userProperties, Arguments arguments, AutoCloseable closeable) {
         this.username = username;
         this.uuid = uuid;
         this.accessToken = accessToken;
         this.userProperties = userProperties;
-        this.arguments = arguments;
-        this.closeable = closeable;
     }
 
     public String getUsername() {
@@ -72,24 +66,14 @@ public final class AuthInfo implements AutoCloseable {
     }
 
     /**
+     * Called when launching game.
      * @return null if no argument is specified
      */
-    public Arguments getArguments() {
-        return arguments;
-    }
-
-    public AuthInfo withArguments(Arguments arguments) {
-        return new AuthInfo(username, uuid, accessToken, userProperties, arguments, closeable);
-    }
-
-    public AuthInfo withCloseable(AutoCloseable closeable) {
-        return new AuthInfo(username, uuid, accessToken, userProperties, arguments, closeable);
+    public Arguments getLaunchArguments(LaunchOptions options) throws IOException {
+        return null;
     }
 
     @Override
     public void close() throws Exception {
-        if (closeable != null) {
-            closeable.close();
-        }
     }
 }

HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorAccount.java

@@ -26,6 +26,7 @@ import org.jackhuang.hmcl.auth.yggdrasil.TextureType;
 import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
 import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilSession;
 import org.jackhuang.hmcl.game.Arguments;
+import org.jackhuang.hmcl.game.LaunchOptions;
 import org.jackhuang.hmcl.util.ToStringBuilder;
 import org.jackhuang.hmcl.util.function.ExceptionalSupplier;
 import java.io.IOException;
@@ -71,7 +72,7 @@ public class AuthlibInjectorAccount extends YggdrasilAccount {
         Optional<String> prefetchedMeta = server.getMetadataResponse();
 
         if (auth.isPresent() && artifact.isPresent() && prefetchedMeta.isPresent()) {
-            return Optional.of(auth.get().withArguments(generateArguments(artifact.get(), server, prefetchedMeta.get())));
+            return Optional.of(new AuthlibInjectorAuthInfo(auth.get(), artifact.get(), server, prefetchedMeta.get()));
         } else {
             return Optional.empty();
         }
@@ -112,14 +113,30 @@ public class AuthlibInjectorAccount extends YggdrasilAccount {
             }
         }
 
-        return auth.withArguments(generateArguments(artifact, server, prefetchedMeta));
+        return new AuthlibInjectorAuthInfo(auth, artifact, server, prefetchedMeta);
     }
 
-    private static Arguments generateArguments(AuthlibInjectorArtifactInfo artifact, AuthlibInjectorServer server, String prefetchedMeta) {
-        return new Arguments().addJVMArguments(
-                "-javaagent:" + artifact.getLocation().toString() + "=" + server.getUrl(),
-                "-Dauthlibinjector.side=client",
-                "-Dauthlibinjector.yggdrasil.prefetched=" + Base64.getEncoder().encodeToString(prefetchedMeta.getBytes(UTF_8)));
+    private static class AuthlibInjectorAuthInfo extends AuthInfo {
+
+        private final AuthlibInjectorArtifactInfo artifact;
+        private final AuthlibInjectorServer server;
+        private final String prefetchedMeta;
+
+        public AuthlibInjectorAuthInfo(AuthInfo authInfo, AuthlibInjectorArtifactInfo artifact, AuthlibInjectorServer server, String prefetchedMeta) {
+            super(authInfo.getUsername(), authInfo.getUUID(), authInfo.getAccessToken(), authInfo.getUserProperties());
+
+            this.artifact = artifact;
+            this.server = server;
+            this.prefetchedMeta = prefetchedMeta;
+        }
+
+        @Override
+        public Arguments getLaunchArguments(LaunchOptions options) {
+            return new Arguments().addJVMArguments(
+                    "-javaagent:" + artifact.getLocation().toString() + "=" + server.getUrl(),
+                    "-Dauthlibinjector.side=client",
+                    "-Dauthlibinjector.yggdrasil.prefetched=" + Base64.getEncoder().encodeToString(prefetchedMeta.getBytes(UTF_8)));
+        }
     }
 
     @Override

HMCLCore/src/main/java/org/jackhuang/hmcl/auth/offline/OfflineAccount.java

@@ -28,6 +28,7 @@ import org.jackhuang.hmcl.auth.yggdrasil.Texture;
 import org.jackhuang.hmcl.auth.yggdrasil.TextureModel;
 import org.jackhuang.hmcl.auth.yggdrasil.TextureType;
 import org.jackhuang.hmcl.game.Arguments;
+import org.jackhuang.hmcl.game.LaunchOptions;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.ToStringBuilder;
 import org.jackhuang.hmcl.util.gson.UUIDTypeAdapter;
@@ -129,15 +130,7 @@ public class OfflineAccount extends Account {
             }
 
             try {
-                YggdrasilServer server = new YggdrasilServer(0);
-                server.start();
-                server.addCharacter(new YggdrasilServer.Character(uuid, username, skin.load(username).run()));
-
-                return authInfo.withArguments(new Arguments().addJVMArguments(
-                                "-javaagent:" + artifact.getLocation().toString() + "=" + "http://localhost:" + server.getListeningPort(),
-                                "-Dauthlibinjector.side=client"
-                        ))
-                        .withCloseable(server::stop);
+                return new OfflineAuthInfo(authInfo, artifact);
             } catch (Exception e) {
                 throw new AuthenticationException(e);
             }
@@ -146,6 +139,46 @@ public class OfflineAccount extends Account {
         }
     }
 
+    private class OfflineAuthInfo extends AuthInfo {
+        private final AuthlibInjectorArtifactInfo artifact;
+        private YggdrasilServer server;
+
+        public OfflineAuthInfo(AuthInfo authInfo, AuthlibInjectorArtifactInfo artifact) {
+            super(authInfo.getUsername(), authInfo.getUUID(), authInfo.getAccessToken(), authInfo.getUserProperties());
+
+            this.artifact = artifact;
+        }
+
+        @Override
+        public Arguments getLaunchArguments(LaunchOptions options) throws IOException {
+            if (!options.isDaemon()) return null;
+
+            server = new YggdrasilServer(0);
+            server.start();
+
+            try {
+                server.addCharacter(new YggdrasilServer.Character(uuid, username, skin.load(username).run()));
+            } catch (IOException e) {
+                // ignore
+            } catch (Exception e) {
+                throw new IOException(e);
+            }
+
+            return new Arguments().addJVMArguments(
+                    "-javaagent:" + artifact.getLocation().toString() + "=" + "http://localhost:" + server.getListeningPort(),
+                    "-Dauthlibinjector.side=client"
+            );
+        }
+
+        @Override
+        public void close() throws Exception {
+            super.close();
+
+            if (server != null)
+                server.stop();
+        }
+    }
+
     @Override
     public Optional<AuthInfo> playOffline() throws AuthenticationException {
         return Optional.of(logIn());

HMCLCore/src/main/java/org/jackhuang/hmcl/download/DefaultDependencyManager.java

@@ -27,6 +27,7 @@ import org.jackhuang.hmcl.game.Library;
 import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.task.Task;
 
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -78,7 +79,8 @@ public class DefaultDependencyManager extends AbstractDependencyManager {
         Version version = original.resolve(repository);
         return Task.allOf(
                 Task.composeAsync(() -> {
-                    if (!repository.getVersionJar(version).exists())
+                    File versionJar = repository.getVersionJar(version);
+                    if (!versionJar.exists() || versionJar.length() == 0)
                         return new GameDownloadTask(this, null, version);
                     else
                         return null;

HMCLCore/src/main/java/org/jackhuang/hmcl/download/MaintainTask.java

@@ -27,6 +27,7 @@ import org.jackhuang.hmcl.util.versioning.VersionNumber;
 
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -62,18 +63,31 @@ public class MaintainTask extends Task<Version> {
         String mainClass = version.resolve(null).getMainClass();
 
         if (mainClass != null && mainClass.equals(LibraryAnalyzer.LAUNCH_WRAPPER_MAIN)) {
-            return maintainOptiFineLibrary(repository, maintainGameWithLaunchWrapper(unique(version), true), false);
+            version = maintainOptiFineLibrary(repository, maintainGameWithLaunchWrapper(unique(version), true), false);
         } else if (mainClass != null && mainClass.equals(LibraryAnalyzer.MOD_LAUNCHER_MAIN)) {
             // Forge 1.13 and OptiFine
-            return maintainOptiFineLibrary(repository, maintainGameWithCpwModLauncher(repository, unique(version)), true);
+            version = maintainOptiFineLibrary(repository, maintainGameWithCpwModLauncher(repository, unique(version)), true);
         } else if (mainClass != null && mainClass.equals(LibraryAnalyzer.BOOTSTRAP_LAUNCHER_MAIN)) {
             // Forge 1.17
-            return maintainGameWithCpwBoostrapLauncher(repository, unique(version));
+            version = maintainGameWithCpwBoostrapLauncher(repository, unique(version));
         } else {
             // Vanilla Minecraft does not need maintain
             // Fabric does not need maintain, nothing compatible with fabric now.
-            return maintainOptiFineLibrary(repository, unique(version), false);
+            version = maintainOptiFineLibrary(repository, unique(version), false);
         }
+
+        List<Library> libraries = version.getLibraries();
+        if (libraries.size() > 0) {
+            Library library = libraries.get(0);
+            if ("org.glavo".equals(library.getGroupId())
+                    && ("log4j-patch".equals(library.getArtifactId()) || "log4j-patch-beta9".equals(library.getArtifactId()))
+                    && "1.0".equals(library.getVersion())
+                    && library.getDownload() == null) {
+                version = version.setLibraries(libraries.subList(1, libraries.size()));
+            }
+        }
+
+        return version;
     }
 
     public static Version maintainPreservingPatches(GameRepository repository, Version version) {
@@ -136,10 +150,9 @@ public class MaintainTask extends Task<Version> {
                 builder.addJvmArgument("-Dhmcl.transformer.candidates=${library_directory}/" + library.getPath());
                 if (!libraryExisting) builder.addLibrary(hmclTransformerDiscoveryService);
                 Path libraryPath = repository.getLibraryFile(version, hmclTransformerDiscoveryService).toPath();
-                try {
+                try (InputStream input = MaintainTask.class.getResourceAsStream("/assets/game/HMCLTransformerDiscoveryService-1.0.jar")) {
                     Files.createDirectories(libraryPath.getParent());
-                    Files.copy(MaintainTask.class.getResourceAsStream("/assets/game/HMCLTransformerDiscoveryService-1.0.jar"),
-                            libraryPath, StandardCopyOption.REPLACE_EXISTING);
+                    Files.copy(input, libraryPath, StandardCopyOption.REPLACE_EXISTING);
                 } catch (IOException e) {
                     Logging.LOG.log(Level.WARNING, "Unable to unpack HMCLTransformerDiscoveryService", e);
                 }
@@ -270,7 +283,7 @@ public class MaintainTask extends Task<Version> {
     public static Version unique(Version version) {
         List<Library> libraries = new ArrayList<>();
 
-        SimpleMultimap<String, Integer> multimap = new SimpleMultimap<String, Integer>(HashMap::new, LinkedList::new);
+        SimpleMultimap<String, Integer> multimap = new SimpleMultimap<String, Integer>(HashMap::new, ArrayList::new);
 
         for (Library library : version.getLibraries()) {
             String id = library.getGroupId() + ":" + library.getArtifactId();

HMCLCore/src/main/java/org/jackhuang/hmcl/download/fabric/FabricAPIInstallTask.java

@@ -20,14 +20,12 @@ package org.jackhuang.hmcl.download.fabric;
 import org.jackhuang.hmcl.download.DefaultDependencyManager;
 import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.task.FileDownloadTask;
-import org.jackhuang.hmcl.task.GetTask;
 import org.jackhuang.hmcl.task.Task;
 
 import java.io.IOException;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -37,32 +35,15 @@ import java.util.List;
  */
 public final class FabricAPIInstallTask extends Task<Version> {
 
-    private GetTask dependent;
     private final DefaultDependencyManager dependencyManager;
     private final Version version;
     private final FabricAPIRemoteVersion remote;
-    private final List<Task<?>> dependencies = new LinkedList<>();
+    private final List<Task<?>> dependencies = new ArrayList<>(1);
 
     public FabricAPIInstallTask(DefaultDependencyManager dependencyManager, Version version, FabricAPIRemoteVersion remoteVersion) {
         this.dependencyManager = dependencyManager;
         this.version = version;
         this.remote = remoteVersion;
-
-    }
-
-    @Override
-    public boolean doPreExecute() {
-        return true;
-    }
-
-    @Override
-    public void preExecute() throws Exception {
-        this.dependent = new GetTask(new URL(remote.getUrls().get(0) + ".sha1"));
-    }
-
-    @Override
-    public Collection<? extends Task<?>> getDependents() {
-        return Collections.singleton(dependent);
     }
 
     @Override
@@ -78,9 +59,9 @@ public final class FabricAPIInstallTask extends Task<Version> {
     @Override
     public void execute() throws IOException {
         dependencies.add(new FileDownloadTask(
-                new URL(remote.getUrls().get(0)),
-                dependencyManager.getGameRepository().getRunDirectory(version.getId()).toPath().resolve("mods").resolve("fabric-api-" + remote.getFullVersion() + ".jar").toFile(),
-                new FileDownloadTask.IntegrityCheck("SHA-1", dependent.getResult().trim()))
+                new URL(remote.getVersion().getFile().getUrl()),
+                dependencyManager.getGameRepository().getRunDirectory(version.getId()).toPath().resolve("mods").resolve("fabric-api-" + remote.getVersion().getVersion() + ".jar").toFile(),
+                remote.getVersion().getFile().getIntegrityCheck())
         );
     }
 }

HMCLCore/src/main/java/org/jackhuang/hmcl/download/fabric/FabricAPIRemoteVersion.java

@@ -19,12 +19,15 @@ package org.jackhuang.hmcl.download.fabric;
 
 import org.jackhuang.hmcl.download.*;
 import org.jackhuang.hmcl.game.Version;
+import org.jackhuang.hmcl.mod.RemoteMod;
 import org.jackhuang.hmcl.task.Task;
 
+import java.time.Instant;
 import java.util.List;
 
 public class FabricAPIRemoteVersion extends RemoteVersion {
     private final String fullVersion;
+    private final RemoteMod.Version version;
 
     /**
      * Constructor.
@@ -33,10 +36,11 @@ public class FabricAPIRemoteVersion extends RemoteVersion {
      * @param selfVersion the version string of the remote version.
      * @param urls        the installer or universal jar original URL.
      */
-    FabricAPIRemoteVersion(String gameVersion, String selfVersion, String fullVersion, List<String> urls) {
-        super(LibraryAnalyzer.LibraryType.FABRIC_API.getPatchId(), gameVersion, selfVersion, null, urls);
+    FabricAPIRemoteVersion(String gameVersion, String selfVersion, String fullVersion, Instant datePublished, RemoteMod.Version version, List<String> urls) {
+        super(LibraryAnalyzer.LibraryType.FABRIC_API.getPatchId(), gameVersion, selfVersion, datePublished, urls);
 
         this.fullVersion = fullVersion;
+        this.version = version;
     }
 
     @Override
@@ -44,9 +48,18 @@ public class FabricAPIRemoteVersion extends RemoteVersion {
         return fullVersion;
     }
 
+    public RemoteMod.Version getVersion() {
+        return version;
+    }
+
     @Override
     public Task<Version> getInstallTask(DefaultDependencyManager dependencyManager, Version baseVersion) {
         return new FabricAPIInstallTask(dependencyManager, baseVersion, this);
     }
 
+    @Override
+    public int compareTo(RemoteVersion o) {
+        if (!(o instanceof FabricAPIRemoteVersion)) return 0;
+        return -this.getReleaseDate().compareTo(o.getReleaseDate());
+    }
 }

HMCLCore/src/main/java/org/jackhuang/hmcl/download/fabric/FabricAPIVersionList.java

@@ -19,17 +19,12 @@ package org.jackhuang.hmcl.download.fabric;
 
 import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.download.VersionList;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
+import org.jackhuang.hmcl.mod.RemoteMod;
+import org.jackhuang.hmcl.mod.modrinth.ModrinthRemoteModRepository;
+import org.jackhuang.hmcl.util.Lang;
 
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.concurrent.CompletableFuture;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import static org.jackhuang.hmcl.util.Lang.wrap;
 
@@ -49,38 +44,12 @@ public class FabricAPIVersionList extends VersionList<FabricAPIRemoteVersion> {
     @Override
     public CompletableFuture<?> refreshAsync() {
         return CompletableFuture.runAsync(wrap(() -> {
-            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-            DocumentBuilder builder = factory.newDocumentBuilder();
-            Document doc = builder.parse("https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api/maven-metadata.xml");
-            Element r = doc.getDocumentElement();
-            NodeList versionElements = r.getElementsByTagName("version");
-            for (int i = 0; i < versionElements.getLength(); i++) {
-                String versionName = versionElements.item(i).getTextContent();
-
-                Matcher matcher = FABRIC_VERSION_PATTERN.matcher(versionName);
-                if (matcher.find()) {
-                    String fabricVersion = matcher.group("version");
-                    if (matcher.group("build") != null) {
-                        fabricVersion += "." + matcher.group("build");
-                    }
-                    String gameVersion = matcher.group("mcversion");
-                    versions.put(gameVersion, new FabricAPIRemoteVersion(gameVersion, fabricVersion, versionName,
-                            Collections.singletonList(String.format(
-                                    "https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api/%1$s/fabric-api-%1$s.jar", versionName))));
+            for (RemoteMod.Version modVersion : Lang.toIterable(ModrinthRemoteModRepository.INSTANCE.getRemoteVersionsById("P7dR8mSH"))) {
+                for (String gameVersion : modVersion.getGameVersions()) {
+                    versions.put(gameVersion, new FabricAPIRemoteVersion(gameVersion, modVersion.getVersion(), modVersion.getName(), modVersion.getDatePublished(), modVersion,
+                            Collections.singletonList(modVersion.getFile().getUrl())));
                 }
             }
         }));
     }
-
-    @Override
-    protected Collection<FabricAPIRemoteVersion> getVersionsImpl(String gameVersion) {
-        Matcher matcher = GAME_VERSION_PATTERN.matcher(gameVersion);
-        if (matcher.find()) {
-            return super.getVersionsImpl(String.format("%s.%s", matcher.group("major"), matcher.group("minor")));
-        }
-        return super.getVersionsImpl(gameVersion);
-    }
-
-    private static final Pattern FABRIC_VERSION_PATTERN = Pattern.compile("^(?<version>[0-9.]+)\\+(build\\.(?<build>\\d+)-)?(?<mcversion>[0-9.]+)$");
-    private static final Pattern GAME_VERSION_PATTERN = Pattern.compile("^(?<major>[0-9]+)\\.(?<minor>[0-9]+)");
 }

HMCLCore/src/main/java/org/jackhuang/hmcl/download/fabric/FabricInstallTask.java

@@ -45,7 +45,7 @@ public final class FabricInstallTask extends Task<Version> {
     private final Version version;
     private final FabricRemoteVersion remote;
     private final GetTask launchMetaTask;
-    private final List<Task<?>> dependencies = new LinkedList<>();
+    private final List<Task<?>> dependencies = new ArrayList<>(1);
 
     public FabricInstallTask(DefaultDependencyManager dependencyManager, Version version, FabricRemoteVersion remoteVersion) {
         this.dependencyManager = dependencyManager;

HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeInstallTask.java

@@ -102,7 +102,10 @@ public final class ForgeInstallTask extends Task<Version> {
         String originalMainClass = version.resolve(dependencyManager.getGameRepository()).getMainClass();
         if (VersionNumber.VERSION_COMPARATOR.compare("1.13", remote.getGameVersion()) <= 0) {
             // Forge 1.13 is not compatible with fabric.
-            if (!LibraryAnalyzer.VANILLA_MAIN.equals(originalMainClass) && !LibraryAnalyzer.MOD_LAUNCHER_MAIN.equals(originalMainClass) && !LibraryAnalyzer.LAUNCH_WRAPPER_MAIN.equals(originalMainClass))
+            if (!LibraryAnalyzer.VANILLA_MAIN.equals(originalMainClass)
+                    && !LibraryAnalyzer.MOD_LAUNCHER_MAIN.equals(originalMainClass)
+                    && !LibraryAnalyzer.LAUNCH_WRAPPER_MAIN.equals(originalMainClass)
+                    && !LibraryAnalyzer.BOOTSTRAP_LAUNCHER_MAIN.equals(originalMainClass))
                 throw new UnsupportedInstallationException(UNSUPPORTED_LAUNCH_WRAPPER);
         } else {
             // Forge 1.12 and older versions is compatible with vanilla and launchwrapper.

HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeNewInstallTask.java

@@ -182,8 +182,8 @@ public class ForgeNewInstallTask extends Task<Version> {
     private final DefaultGameRepository gameRepository;
     private final Version version;
     private final Path installer;
-    private final List<Task<?>> dependents = new LinkedList<>();
-    private final List<Task<?>> dependencies = new LinkedList<>();
+    private final List<Task<?>> dependents = new ArrayList<>(1);
+    private final List<Task<?>> dependencies = new ArrayList<>(1);
 
     private ForgeNewInstallProfile profile;
     private List<Processor> processors;

HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeOldInstallTask.java

@@ -29,7 +29,7 @@ import org.jackhuang.hmcl.util.io.IOUtils;
 
 import java.io.*;
 import java.nio.file.Path;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipException;
@@ -41,7 +41,7 @@ public class ForgeOldInstallTask extends Task<Version> {
     private final Version version;
     private final Path installer;
     private final String selfVersion;
-    private final List<Task<?>> dependencies = new LinkedList<>();
+    private final List<Task<?>> dependencies = new ArrayList<>(1);
 
     ForgeOldInstallTask(DefaultDependencyManager dependencyManager, Version version, String selfVersion, Path installer) {
         this.dependencyManager = dependencyManager;

HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameAssetDownloadTask.java

@@ -34,8 +34,8 @@ import java.io.IOException;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.logging.Level;
 
@@ -50,8 +50,8 @@ public final class GameAssetDownloadTask extends Task<Void> {
     private final AssetIndexInfo assetIndexInfo;
     private final Path assetIndexFile;
     private final boolean integrityCheck;
-    private final List<Task<?>> dependents = new LinkedList<>();
-    private final List<Task<?>> dependencies = new LinkedList<>();
+    private final List<Task<?>> dependents = new ArrayList<>(1);
+    private final List<Task<?>> dependencies = new ArrayList<>();
 
     /**
      * Constructor.

HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameAssetIndexDownloadTask.java

@@ -33,7 +33,7 @@ import org.jackhuang.hmcl.util.io.FileUtils;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 
@@ -49,7 +49,7 @@ public final class GameAssetIndexDownloadTask extends Task<Void> {
     private final AbstractDependencyManager dependencyManager;
     private final Version version;
     private final boolean forceDownloading;
-    private final List<Task<?>> dependencies = new LinkedList<>();
+    private final List<Task<?>> dependencies = new ArrayList<>(1);
 
     /**
      * Constructor.

HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameDownloadTask.java

@@ -25,8 +25,8 @@ import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.util.CacheRepository;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -37,7 +37,7 @@ public final class GameDownloadTask extends Task<Void> {
     private final DefaultDependencyManager dependencyManager;
     private final String gameVersion;
     private final Version version;
-    private final List<Task<?>> dependencies = new LinkedList<>();
+    private final List<Task<?>> dependencies = new ArrayList<>();
 
     public GameDownloadTask(DefaultDependencyManager dependencyManager, String gameVersion, Version version) {
         this.dependencyManager = dependencyManager;

HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameInstallTask.java

@@ -23,9 +23,9 @@ import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 
 import static org.jackhuang.hmcl.download.LibraryAnalyzer.LibraryType.MINECRAFT;
@@ -37,7 +37,7 @@ public class GameInstallTask extends Task<Version> {
     private final Version version;
     private final GameRemoteVersion remote;
     private final VersionJsonDownloadTask downloadTask;
-    private final List<Task<?>> dependencies = new LinkedList<>();
+    private final List<Task<?>> dependencies = new ArrayList<>(1);
 
     public GameInstallTask(DefaultDependencyManager dependencyManager, Version version, GameRemoteVersion remoteVersion) {
         this.dependencyManager = dependencyManager;

HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameLibrariesTask.java

@@ -29,7 +29,7 @@ import org.jackhuang.hmcl.util.io.FileUtils;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 
@@ -45,7 +45,7 @@ public final class GameLibrariesTask extends Task<Void> {
     private final Version version;
     private final boolean integrityCheck;
     private final List<Library> libraries;
-    private final List<Task<?>> dependencies = new LinkedList<>();
+    private final List<Task<?>> dependencies = new ArrayList<>();
 
     /**
      * Constructor.

HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameVerificationFixTask.java

@@ -29,8 +29,8 @@ import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.FileSystem;
 import java.nio.file.Files;
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -41,7 +41,7 @@ public final class GameVerificationFixTask extends Task<Void> {
     private final DefaultDependencyManager dependencyManager;
     private final String gameVersion;
     private final Version version;
-    private final List<Task<?>> dependencies = new LinkedList<>();
+    private final List<Task<?>> dependencies = new ArrayList<>();
 
     public GameVerificationFixTask(DefaultDependencyManager dependencyManager, String gameVersion, Version version) {
         this.dependencyManager = dependencyManager;

HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/VersionJsonDownloadTask.java

@@ -24,8 +24,8 @@ import org.jackhuang.hmcl.task.GetTask;
 import org.jackhuang.hmcl.task.Task;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -35,8 +35,8 @@ import java.util.List;
 public final class VersionJsonDownloadTask extends Task<String> {
     private final String gameVersion;
     private final DefaultDependencyManager dependencyManager;
-    private final List<Task<?>> dependents = new LinkedList<>();
-    private final List<Task<?>> dependencies = new LinkedList<>();
+    private final List<Task<?>> dependents = new ArrayList<>(1);
+    private final List<Task<?>> dependencies = new ArrayList<>(1);
     private final VersionList<?> gameVersionList;
 
     public VersionJsonDownloadTask(String gameVersion, DefaultDependencyManager dependencyManager) {

HMCLCore/src/main/java/org/jackhuang/hmcl/download/liteloader/LiteLoaderInstallTask.java

@@ -23,9 +23,9 @@ import org.jackhuang.hmcl.game.*;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.util.Lang;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -38,8 +38,8 @@ public final class LiteLoaderInstallTask extends Task<Version> {
     private final DefaultDependencyManager dependencyManager;
     private final Version version;
     private final LiteLoaderRemoteVersion remote;
-    private final List<Task<?>> dependents = new LinkedList<>();
-    private final List<Task<?>> dependencies = new LinkedList<>();
+    private final List<Task<?>> dependents = new ArrayList<>();
+    private final List<Task<?>> dependencies = new ArrayList<>(1);
 
     public LiteLoaderInstallTask(DefaultDependencyManager dependencyManager, Version version, LiteLoaderRemoteVersion remoteVersion) {
         this.dependencyManager = dependencyManager;

HMCLCore/src/main/java/org/jackhuang/hmcl/download/optifine/OptiFineInstallTask.java

@@ -56,8 +56,8 @@ public final class OptiFineInstallTask extends Task<Version> {
     private final Version version;
     private final OptiFineRemoteVersion remote;
     private final Path installer;
-    private final List<Task<?>> dependents = new LinkedList<>();
-    private final List<Task<?>> dependencies = new LinkedList<>();
+    private final List<Task<?>> dependents = new ArrayList<>(0);
+    private final List<Task<?>> dependencies = new ArrayList<>(1);
     private Path dest;
 
     private final Library optiFineLibrary;
@@ -131,7 +131,7 @@ public final class OptiFineInstallTask extends Task<Version> {
                 !LibraryAnalyzer.BOOTSTRAP_LAUNCHER_MAIN.equals(originalMainClass))
             throw new UnsupportedInstallationException(UnsupportedInstallationException.UNSUPPORTED_LAUNCH_WRAPPER);
 
-        List<Library> libraries = new LinkedList<>();
+        List<Library> libraries = new ArrayList<>(4);
         libraries.add(optiFineLibrary);
 
         FileUtils.copyFile(dest, gameRepository.getLibraryFile(version, optiFineInstallerLibrary).toPath());
@@ -229,6 +229,7 @@ public final class OptiFineInstallTask extends Task<Version> {
         try (FileSystem fs = CompressingUtils.createReadOnlyZipFileSystem(installer)) {
             Path configClass = fs.getPath("Config.class");
             if (!Files.exists(configClass)) configClass = fs.getPath("net/optifine/Config.class");
+            if (!Files.exists(configClass)) configClass = fs.getPath("notch/net/optifine/Config.class");
             if (!Files.exists(configClass)) throw new IOException("Unrecognized installer");
             ConstantPool pool = ConstantPoolScanner.parse(Files.readAllBytes(configClass), ConstantType.UTF8);
             List<String> constants = new ArrayList<>();

HMCLCore/src/main/java/org/jackhuang/hmcl/game/Arguments.java

@@ -110,7 +110,7 @@ public final class Arguments {
     public static final List<Argument> DEFAULT_GAME_ARGUMENTS;
 
     static {
-        List<Argument> jvm = new LinkedList<>();
+        List<Argument> jvm = new ArrayList<>(8);
         jvm.add(new RuledArgument(Collections.singletonList(new CompatibilityRule(CompatibilityRule.Action.ALLOW, new OSRestriction(OperatingSystem.WINDOWS))), Collections.singletonList("-XX:HeapDumpPath=MojangTricksIntelDriversForPerformance_javaw.exe_minecraft.exe.heapdump")));
         jvm.add(new RuledArgument(Collections.singletonList(new CompatibilityRule(CompatibilityRule.Action.ALLOW, new OSRestriction(OperatingSystem.WINDOWS, "^10\\."))), Arrays.asList("-Dos.name=Windows 10", "-Dos.version=10.0")));
         jvm.add(new StringArgument("-Djava.library.path=${natives_directory}"));
@@ -120,7 +120,7 @@ public final class Arguments {
         jvm.add(new StringArgument("${classpath}"));
         DEFAULT_JVM_ARGUMENTS = Collections.unmodifiableList(jvm);
 
-        List<Argument> game = new LinkedList<>();
+        List<Argument> game = new ArrayList<>(1);
         game.add(new RuledArgument(Collections.singletonList(new CompatibilityRule(CompatibilityRule.Action.ALLOW, null, Collections.singletonMap("has_custom_resolution", true))), Arrays.asList("--width", "${resolution_width}", "--height", "${resolution_height}")));
         DEFAULT_GAME_ARGUMENTS = Collections.unmodifiableList(game);
     }

HMCLCore/src/main/java/org/jackhuang/hmcl/game/ExtractRules.java

@@ -17,8 +17,8 @@
  */
 package org.jackhuang.hmcl.game;
 
+import java.util.ArrayList;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -36,7 +36,7 @@ public final class ExtractRules {
     }
 
     public ExtractRules(List<String> exclude) {
-        this.exclude = new LinkedList<>(exclude);
+        this.exclude = new ArrayList<>(exclude);
     }
 
     public List<String> getExclude() {

HMCLCore/src/main/java/org/jackhuang/hmcl/game/LaunchOptions.java

@@ -40,6 +40,7 @@ public class LaunchOptions implements Serializable {
     private String profileName;
     private List<String> gameArguments = new ArrayList<>();
     private List<String> javaArguments = new ArrayList<>();
+    private List<String> javaAgents = new ArrayList<>(0);
     private Integer minMemory;
     private Integer maxMemory;
     private Integer metaspace;
@@ -59,6 +60,7 @@ public class LaunchOptions implements Serializable {
     private ProcessPriority processPriority = ProcessPriority.NORMAL;
     private boolean useNativeGLFW;
     private boolean useNativeOpenAL;
+    private boolean daemon;
 
     /**
      * The game directory
@@ -113,6 +115,11 @@ public class LaunchOptions implements Serializable {
         return Collections.unmodifiableList(javaArguments);
     }
 
+    @NotNull
+    public List<String> getJavaAgents() {
+        return Collections.unmodifiableList(javaAgents);
+    }
+
     /**
      * The minimum memory that the JVM can allocate.
      */
@@ -243,6 +250,13 @@ public class LaunchOptions implements Serializable {
         return useNativeOpenAL;
     }
 
+    /**
+     * Will launcher keeps alive after game launched or not.
+     */
+    public boolean isDaemon() {
+        return daemon;
+    }
+
     public static class Builder {
 
         private final LaunchOptions options = new LaunchOptions();
@@ -302,6 +316,10 @@ public class LaunchOptions implements Serializable {
             return options.javaArguments;
         }
 
+        public List<String> getJavaAgents() {
+            return options.javaAgents;
+        }
+
         /**
          * The minimum memory that the JVM can allocate.
          */
@@ -411,6 +429,10 @@ public class LaunchOptions implements Serializable {
             return options.useNativeOpenAL;
         }
 
+        public boolean isDaemon() {
+            return options.daemon;
+        }
+
         public Builder setGameDir(File gameDir) {
             options.gameDir = gameDir;
             return this;
@@ -448,6 +470,12 @@ public class LaunchOptions implements Serializable {
             return this;
         }
 
+        public Builder setJavaAgents(List<String> javaAgents) {
+            options.javaAgents.clear();
+            options.javaAgents.addAll(javaAgents);
+            return this;
+        }
+
         public Builder setMinMemory(Integer minMemory) {
             options.minMemory = minMemory;
             return this;
@@ -543,5 +571,10 @@ public class LaunchOptions implements Serializable {
             return this;
         }
 
+        public Builder setDaemon(boolean daemon) {
+            options.daemon = daemon;
+            return this;
+        }
+
     }
 }

HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java

@@ -19,13 +19,7 @@ package org.jackhuang.hmcl.launch;
 
 import org.jackhuang.hmcl.auth.AuthInfo;
 import org.jackhuang.hmcl.download.LibraryAnalyzer;
-import org.jackhuang.hmcl.game.Argument;
-import org.jackhuang.hmcl.game.Arguments;
-import org.jackhuang.hmcl.game.GameRepository;
-import org.jackhuang.hmcl.game.LaunchOptions;
-import org.jackhuang.hmcl.game.Library;
-import org.jackhuang.hmcl.game.NativesDirectoryType;
-import org.jackhuang.hmcl.game.Version;
+import org.jackhuang.hmcl.game.*;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.Log4jLevel;
 import org.jackhuang.hmcl.util.StringUtils;
@@ -50,8 +44,10 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.*;
 import java.util.function.Supplier;
+import java.util.logging.Level;
 
 import static org.jackhuang.hmcl.util.Lang.mapOf;
+import static org.jackhuang.hmcl.util.Logging.LOG;
 import static org.jackhuang.hmcl.util.Pair.pair;
 
 /**
@@ -77,14 +73,14 @@ public class DefaultLauncher extends Launcher {
         switch (options.getProcessPriority()) {
             case HIGH:
                 if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
-                    res.add("cmd", "/C", "start", "unused title", "/B", "/high");
+                    // res.add("cmd", "/C", "start", "unused title", "/B", "/high");
                 } else if (OperatingSystem.CURRENT_OS == OperatingSystem.LINUX || OperatingSystem.CURRENT_OS == OperatingSystem.OSX) {
                     res.add("nice", "-n", "-5");
                 }
                 break;
             case ABOVE_NORMAL:
                 if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
-                    res.add("cmd", "/C", "start", "unused title", "/B", "/abovenormal");
+                    // res.add("cmd", "/C", "start", "unused title", "/B", "/abovenormal");
                 } else if (OperatingSystem.CURRENT_OS == OperatingSystem.LINUX || OperatingSystem.CURRENT_OS == OperatingSystem.OSX) {
                     res.add("nice", "-n", "-1");
                 }
@@ -94,14 +90,14 @@ public class DefaultLauncher extends Launcher {
                 break;
             case BELOW_NORMAL:
                 if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
-                    res.add("cmd", "/C", "start", "unused title", "/B", "/belownormal");
+                    // res.add("cmd", "/C", "start", "unused title", "/B", "/belownormal");
                 } else if (OperatingSystem.CURRENT_OS == OperatingSystem.LINUX || OperatingSystem.CURRENT_OS == OperatingSystem.OSX) {
                     res.add("nice", "-n", "1");
                 }
                 break;
             case LOW:
                 if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
-                    res.add("cmd", "/C", "start", "unused title", "/B", "/low");
+                    // res.add("cmd", "/C", "start", "unused title", "/B", "/low");
                 } else if (OperatingSystem.CURRENT_OS == OperatingSystem.LINUX || OperatingSystem.CURRENT_OS == OperatingSystem.OSX) {
                     res.add("nice", "-n", "5");
                 }
@@ -116,6 +112,19 @@ public class DefaultLauncher extends Launcher {
 
         res.addAllWithoutParsing(options.getJavaArguments());
 
+        Charset encoding = OperatingSystem.NATIVE_CHARSET;
+
+        // After Java 17, file.encoding does not affect console encoding
+        if (options.getJava().getParsedVersion() <= JavaVersion.JAVA_17) {
+            try {
+                String fileEncoding = res.addDefault("-Dfile.encoding=", encoding.name());
+                if (fileEncoding != null)
+                    encoding = Charset.forName(fileEncoding.substring("-Dfile.encoding=".length()));
+            } catch (Throwable ex) {
+                LOG.log(Level.WARNING, "Bad file encoding", ex);
+            }
+        }
+
         // JVM Args
         if (!options.isNoGeneratedJVMArgs()) {
             appendJvmArgs(res);
@@ -180,15 +189,15 @@ public class DefaultLauncher extends Launcher {
 
             res.addDefault("-Dfml.ignoreInvalidMinecraftCertificates=", "true");
             res.addDefault("-Dfml.ignorePatchDiscrepancies=", "true");
-
-            // Fix RCE vulnerability of log4j2
-            res.addDefault("-Dlog4j2.formatMsgNoLookups=", "true");
-            res.addDefault("-Djava.rmi.server.useCodebaseOnly=", "true");
-            res.addDefault("-Dcom.sun.jndi.rmi.object.trustURLCodebase=", "false");
-            res.addDefault("-Dcom.sun.jndi.cosnaming.object.trustURLCodebase=", "false");
         }
 
-        if (isUsingLog4j()) {
+        // Fix RCE vulnerability of log4j2
+        res.addDefault("-Djava.rmi.server.useCodebaseOnly=", "true");
+        res.addDefault("-Dcom.sun.jndi.rmi.object.trustURLCodebase=", "false");
+        res.addDefault("-Dcom.sun.jndi.cosnaming.object.trustURLCodebase=", "false");
+
+        String formatMsgNoLookups = res.addDefault("-Dlog4j2.formatMsgNoLookups=", "true");
+        if (!"-Dlog4j2.formatMsgNoLookups=false".equals(formatMsgNoLookups) && isUsingLog4j()) {
             res.addDefault("-Dlog4j.configurationFile=", getLog4jConfigurationFile().getAbsolutePath());
         }
 
@@ -236,20 +245,25 @@ public class DefaultLauncher extends Launcher {
         configuration.put("${natives_directory}", nativeFolderPath);
 
         res.addAll(Arguments.parseArguments(version.getArguments().map(Arguments::getJvm).orElseGet(this::getDefaultJVMArguments), configuration));
-        if (authInfo.getArguments() != null && authInfo.getArguments().getJvm() != null && !authInfo.getArguments().getJvm().isEmpty())
-            res.addAll(Arguments.parseArguments(authInfo.getArguments().getJvm(), configuration));
+        Arguments argumentsFromAuthInfo = authInfo.getLaunchArguments(options);
+        if (argumentsFromAuthInfo != null && argumentsFromAuthInfo.getJvm() != null && !argumentsFromAuthInfo.getJvm().isEmpty())
+            res.addAll(Arguments.parseArguments(argumentsFromAuthInfo.getJvm(), configuration));
+
+        for (String javaAgent : options.getJavaAgents()) {
+            res.add("-javaagent:" + javaAgent);
+        }
 
         res.add(version.getMainClass());
 
-        res.addAll(Arguments.parseStringArguments(version.getMinecraftArguments().map(StringUtils::tokenize).orElseGet(LinkedList::new), configuration));
+        res.addAll(Arguments.parseStringArguments(version.getMinecraftArguments().map(StringUtils::tokenize).orElseGet(ArrayList::new), configuration));
 
         Map<String, Boolean> features = getFeatures();
         version.getArguments().map(Arguments::getGame).ifPresent(arguments -> res.addAll(Arguments.parseArguments(arguments, configuration, features)));
         if (version.getMinecraftArguments().isPresent()) {
             res.addAll(Arguments.parseArguments(this.getDefaultGameArguments(), configuration, features));
         }
-        if (authInfo.getArguments() != null && authInfo.getArguments().getGame() != null && !authInfo.getArguments().getGame().isEmpty())
-            res.addAll(Arguments.parseArguments(authInfo.getArguments().getGame(), configuration, features));
+        if (argumentsFromAuthInfo != null && argumentsFromAuthInfo.getGame() != null && !argumentsFromAuthInfo.getGame().isEmpty())
+            res.addAll(Arguments.parseArguments(argumentsFromAuthInfo.getGame(), configuration, features));
 
         if (StringUtils.isNotBlank(options.getServerIp())) {
             String[] args = options.getServerIp().split(":");
@@ -281,7 +295,7 @@ public class DefaultLauncher extends Launcher {
         res.addAllWithoutParsing(Arguments.parseStringArguments(options.getGameArguments(), configuration));
 
         res.removeIf(it -> getForbiddens().containsKey(it) && getForbiddens().get(it).get());
-        return new Command(res, tempNativeFolder);
+        return new Command(res, tempNativeFolder, encoding);
     }
 
     public Map<String, Boolean> getFeatures() {
@@ -346,7 +360,7 @@ public class DefaultLauncher extends Launcher {
     }
 
     private boolean isUsingLog4j() {
-        return VersionNumber.VERSION_COMPARATOR.compare(repository.getGameVersion(version).orElse("Unknown"), "1.7") >= 0;
+        return VersionNumber.VERSION_COMPARATOR.compare(repository.getGameVersion(version).orElse("1.7"), "1.7") >= 0;
     }
 
     public File getLog4jConfigurationFile() {
@@ -356,14 +370,13 @@ public class DefaultLauncher extends Launcher {
     public void extractLog4jConfigurationFile() throws IOException {
         File targetFile = getLog4jConfigurationFile();
         InputStream source;
-        if (VersionNumber.VERSION_COMPARATOR.compare(repository.getGameVersion(version).orElse("Unknown"), "1.12") < 0) {
+        if (VersionNumber.VERSION_COMPARATOR.compare(repository.getGameVersion(version).orElse("0.0"), "1.12") < 0) {
             source = DefaultLauncher.class.getResourceAsStream("/assets/game/log4j2-1.7.xml");
         } else {
             source = DefaultLauncher.class.getResourceAsStream("/assets/game/log4j2-1.12.xml");
         }
 
-        try (InputStream input = source;
-             OutputStream output = new FileOutputStream(targetFile)) {
+        try (InputStream input = source; OutputStream output = new FileOutputStream(targetFile)) {
             IOUtils.copyTo(input, output);
         }
     }
@@ -412,15 +425,7 @@ public class DefaultLauncher extends Launcher {
         final Command command = generateCommandLine(nativeFolder);
 
         // To guarantee that when failed to generate launch command line, we will not call pre-launch command
-        List<String> rawCommandLine = command.commandLine.asMutableList();
-
-        // Pass classpath using the environment variable, to reduce the command length
-        String classpath = null;
-        final int cpIndex = rawCommandLine.indexOf("-cp");
-        if (cpIndex >= 0 && cpIndex < rawCommandLine.size() - 1) {
-            rawCommandLine.remove(cpIndex); // remove "-cp"
-            classpath = rawCommandLine.remove(cpIndex);
-        }
+        List<String> rawCommandLine = command.commandLine.asList();
 
         if (command.tempNativeFolder != null) {
             Files.deleteIfExists(command.tempNativeFolder);
@@ -435,9 +440,8 @@ public class DefaultLauncher extends Launcher {
             decompressNatives(nativeFolder);
         }
 
-        if (isUsingLog4j()) {
+        if (isUsingLog4j())
             extractLog4jConfigurationFile();
-        }
 
         File runDirectory = repository.getRunDirectory(version.getId());
 
@@ -455,28 +459,22 @@ public class DefaultLauncher extends Launcher {
             }
             String appdata = options.getGameDir().getAbsoluteFile().getParent();
             if (appdata != null) builder.environment().put("APPDATA", appdata);
-            if (classpath != null) {
-                builder.environment().put("CLASSPATH", classpath);
-                // Fix #1153: On Windows, the 'classpath' environment variable in the context overrides the 'CLASSPATH'
-                // Environment variables on Windows are not case-sensitive; The lowercase 'classpath' overwrites any other case.
-                builder.environment().put("classpath", classpath);
-            }
+
             builder.environment().putAll(getEnvVars());
             process = builder.start();
         } catch (IOException e) {
             throw new ProcessCreationException(e);
         }
 
-        ManagedProcess p = new ManagedProcess(process, rawCommandLine, classpath);
+        ManagedProcess p = new ManagedProcess(process, rawCommandLine);
         if (listener != null)
-            startMonitors(p, listener, daemon);
+            startMonitors(p, listener, command.encoding, daemon);
         return p;
     }
 
     private Map<String, String> getEnvVars() {
         String versionName = Optional.ofNullable(options.getVersionName()).orElse(version.getId());
         Map<String, String> env = new HashMap<>();
-        env.put("LOG4J_FORMAT_MSG_NO_LOOKUPS", "true");
         env.put("INST_NAME", versionName);
         env.put("INST_ID", versionName);
         env.put("INST_DIR", repository.getVersionRoot(version.getId()).getAbsolutePath());
@@ -514,9 +512,8 @@ public class DefaultLauncher extends Launcher {
             decompressNatives(nativeFolder);
         }
 
-        if (isUsingLog4j()) {
+        if (isUsingLog4j())
             extractLog4jConfigurationFile();
-        }
 
         String scriptExtension = FileUtils.getExtension(scriptFile);
         boolean usePowerShell = "ps1".equals(scriptExtension);
@@ -635,17 +632,17 @@ public class DefaultLauncher extends Launcher {
             throw new ExecutionPolicyLimitException();
     }
 
-    private void startMonitors(ManagedProcess managedProcess, ProcessListener processListener, boolean isDaemon) {
+    private void startMonitors(ManagedProcess managedProcess, ProcessListener processListener, Charset encoding, boolean isDaemon) {
         processListener.setProcess(managedProcess);
         Thread stdout = Lang.thread(new StreamPump(managedProcess.getProcess().getInputStream(), it -> {
             processListener.onLog(it, Optional.ofNullable(Log4jLevel.guessLevel(it)).orElse(Log4jLevel.INFO));
             managedProcess.addLine(it);
-        }, OperatingSystem.NATIVE_CHARSET), "stdout-pump", isDaemon);
+        }, encoding), "stdout-pump", isDaemon);
         managedProcess.addRelatedThread(stdout);
         Thread stderr = Lang.thread(new StreamPump(managedProcess.getProcess().getErrorStream(), it -> {
             processListener.onLog(it, Log4jLevel.ERROR);
             managedProcess.addLine(it);
-        }, OperatingSystem.NATIVE_CHARSET), "stderr-pump", isDaemon);
+        }, encoding), "stderr-pump", isDaemon);
         managedProcess.addRelatedThread(stderr);
         managedProcess.addRelatedThread(Lang.thread(new ExitWaiter(managedProcess, Arrays.asList(stdout, stderr), processListener::onExit), "exit-waiter", isDaemon));
     }
@@ -653,10 +650,12 @@ public class DefaultLauncher extends Launcher {
     private static final class Command {
         final CommandBuilder commandLine;
         final Path tempNativeFolder;
+        final Charset encoding;
 
-        Command(CommandBuilder commandBuilder, Path tempNativeFolder) {
+        Command(CommandBuilder commandBuilder, Path tempNativeFolder, Charset encoding) {
             this.commandLine = commandBuilder;
             this.tempNativeFolder = tempNativeFolder;
+            this.encoding = encoding;
         }
     }
 }

HMCLCore/src/main/java/org/jackhuang/hmcl/mod/MinecraftInstanceTask.java

@@ -27,7 +27,7 @@ import java.io.IOException;
 import java.nio.charset.Charset;
 import java.nio.file.*;
 import java.nio.file.attribute.BasicFileAttributes;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 
 import static org.jackhuang.hmcl.util.DigestUtils.digest;
@@ -57,7 +57,7 @@ public final class MinecraftInstanceTask<T> extends Task<ModpackConfiguration<T>
 
     @Override
     public void execute() throws Exception {
-        List<ModpackConfiguration.FileInformation> overrides = new LinkedList<>();
+        List<ModpackConfiguration.FileInformation> overrides = new ArrayList<>();
 
         try (FileSystem fs = CompressingUtils.readonly(zipFile.toPath()).setEncoding(encoding).build()) {
             Path root = fs.getPath(subDirectory);

HMCLCore/src/main/java/org/jackhuang/hmcl/mod/RemoteMod.java

@@ -17,6 +17,8 @@
  */
 package org.jackhuang.hmcl.mod;
 
+import org.jackhuang.hmcl.task.FileDownloadTask;
+
 import java.io.IOException;
 import java.time.Instant;
 import java.util.List;
@@ -184,6 +186,18 @@ public class RemoteMod {
             return hashes;
         }
 
+        public FileDownloadTask.IntegrityCheck getIntegrityCheck() {
+            if (hashes.containsKey("md5")) {
+                return new FileDownloadTask.IntegrityCheck("MD5", hashes.get("sha1"));
+            } else if (hashes.containsKey("sha1")) {
+                return new FileDownloadTask.IntegrityCheck("SHA-1", hashes.get("sha1"));
+            } else if (hashes.containsKey("sha512")) {
+                return new FileDownloadTask.IntegrityCheck("SHA-256", hashes.get("sha1"));
+            } else {
+                return null;
+            }
+        }
+
         public String getUrl() {
             return url;
         }

HMCLCore/src/main/java/org/jackhuang/hmcl/mod/RemoteModRepository.java

@@ -25,7 +25,16 @@ import java.util.stream.Stream;
 
 public interface RemoteModRepository {
 
-    Stream<RemoteMod> search(String gameVersion, Category category, int pageOffset, int pageSize, String searchFilter, int sort)
+    enum SortType {
+        DATE_CREATED,
+        POPULARITY,
+        LAST_UPDATED,
+        NAME,
+        AUTHOR,
+        TOTAL_DOWNLOADS
+    }
+
+    Stream<RemoteMod> search(String gameVersion, Category category, int pageOffset, int pageSize, String searchFilter, SortType sort)
             throws IOException;
 
     Optional<RemoteMod.Version> getRemoteVersionByLocalFile(LocalModFile localModFile, Path file) throws IOException;
@@ -61,6 +70,7 @@ public interface RemoteModRepository {
     }
 
     String[] DEFAULT_GAME_VERSIONS = new String[]{
+            "1.18.1", "1.18",
             "1.17.1", "1.17",
             "1.16.5", "1.16.4", "1.16.3", "1.16.2", "1.16.1", "1.16",
             "1.15.2", "1.15.1", "1.15",

HMCLCore/src/main/java/org/jackhuang/hmcl/mod/curse/CurseCompletionTask.java

@@ -32,8 +32,8 @@ import org.jackhuang.hmcl.util.io.NetworkUtils;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -52,7 +52,7 @@ public final class CurseCompletionTask extends Task<Void> {
     private final ModManager modManager;
     private final String version;
     private CurseManifest manifest;
-    private final List<Task<?>> dependencies = new LinkedList<>();
+    private final List<Task<?>> dependencies = new ArrayList<>();
 
     private final AtomicBoolean allNameKnown = new AtomicBoolean(true);
     private final AtomicInteger finished = new AtomicInteger(0);

HMCLCore/src/main/java/org/jackhuang/hmcl/mod/curse/CurseForgeRemoteModRepository.java

@@ -63,10 +63,10 @@ public final class CurseForgeRemoteModRepository implements RemoteModRepository
     }
 
     @Override
-    public Stream<RemoteMod> search(String gameVersion, RemoteModRepository.Category category, int pageOffset, int pageSize, String searchFilter, int sort) throws IOException {
+    public Stream<RemoteMod> search(String gameVersion, RemoteModRepository.Category category, int pageOffset, int pageSize, String searchFilter, SortType sort) throws IOException {
         int categoryId = 0;
         if (category != null) categoryId = ((Category) category.getSelf()).getId();
-        return searchPaginated(gameVersion, categoryId, pageOffset, pageSize, searchFilter, sort).stream()
+        return searchPaginated(gameVersion, categoryId, pageOffset, pageSize, searchFilter, sort.ordinal()).stream()
                 .map(CurseAddon::toMod);
     }
 

HMCLCore/src/main/java/org/jackhuang/hmcl/mod/curse/CurseInstallTask.java

@@ -33,8 +33,8 @@ import org.jackhuang.hmcl.util.io.FileUtils;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -52,8 +52,8 @@ public final class CurseInstallTask extends Task<Void> {
     private final String name;
     private final File run;
     private final ModpackConfiguration<CurseManifest> config;
-    private final List<Task<?>> dependents = new LinkedList<>();
-    private final List<Task<?>> dependencies = new LinkedList<>();
+    private final List<Task<?>> dependents = new ArrayList<>(4);
+    private final List<Task<?>> dependencies = new ArrayList<>(1);
 
     /**
      * Constructor.

HMCLCore/src/main/java/org/jackhuang/hmcl/mod/curse/CurseManifestMinecraft.java

@@ -23,8 +23,8 @@ import org.jackhuang.hmcl.util.Immutable;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.gson.Validation;
 
+import java.util.ArrayList;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -47,7 +47,7 @@ public final class CurseManifestMinecraft implements Validation {
 
     public CurseManifestMinecraft(String gameVersion, List<CurseManifestModLoader> modLoaders) {
         this.gameVersion = gameVersion;
-        this.modLoaders = new LinkedList<>(modLoaders);
+        this.modLoaders = new ArrayList<>(modLoaders);
     }
 
     public String getGameVersion() {

HMCLCore/src/main/java/org/jackhuang/hmcl/mod/mcbbs/McbbsModpackCompletionTask.java

@@ -62,9 +62,8 @@ public class McbbsModpackCompletionTask extends CompletableFutureTask<Void> {
     private final String version;
     private final File configurationFile;
     private ModpackConfiguration<McbbsModpackManifest> configuration;
-    private GetTask dependent;
     private McbbsModpackManifest manifest;
-    private final List<Task<?>> dependencies = new LinkedList<>();
+    private final List<Task<?>> dependencies = new ArrayList<>();
 
     private final AtomicBoolean allNameKnown = new AtomicBoolean(true);
     private final AtomicInteger finished = new AtomicInteger(0);
@@ -108,11 +107,11 @@ public class McbbsModpackCompletionTask extends CompletableFutureTask<Void> {
                 }
             })).thenComposeAsync(wrap(unused1 -> {
                 return executor.one(new GetTask(new URL(manifest.getFileApi() + "/manifest.json")));
-            })).thenComposeAsync(wrap(unused1 -> {
+            })).thenComposeAsync(wrap(remoteManifestJson -> {
                 McbbsModpackManifest remoteManifest;
                 // We needs to update modpack from online server.
                 try {
-                    remoteManifest = JsonUtils.fromNonNullJson(dependent.getResult(), McbbsModpackManifest.class);
+                    remoteManifest = JsonUtils.fromNonNullJson(remoteManifestJson, McbbsModpackManifest.class);
                 } catch (JsonParseException e) {
                     throw new IOException("Unable to parse server manifest.json from " + manifest.getFileApi(), e);
                 }

HMCLCore/src/main/java/org/jackhuang/hmcl/mod/mcbbs/McbbsModpackLocalInstallTask.java

@@ -33,7 +33,7 @@ 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.List;
 import java.util.Optional;
 
@@ -47,8 +47,8 @@ public class McbbsModpackLocalInstallTask extends Task<Void> {
     private final boolean update;
     private final DefaultGameRepository repository;
     private final MinecraftInstanceTask<McbbsModpackManifest> instanceTask;
-    private final List<Task<?>> dependencies = new LinkedList<>();
-    private final List<Task<?>> dependents = new LinkedList<>();
+    private final List<Task<?>> dependencies = new ArrayList<>(2);
+    private final List<Task<?>> dependents = new ArrayList<>(4);
 
     public McbbsModpackLocalInstallTask(DefaultDependencyManager dependencyManager, File zipFile, Modpack modpack, McbbsModpackManifest manifest, String name) {
         this.dependencyManager = dependencyManager;

HMCLCore/src/main/java/org/jackhuang/hmcl/mod/mcbbs/McbbsModpackRemoteInstallTask.java

@@ -29,8 +29,8 @@ import org.jackhuang.hmcl.util.io.FileUtils;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 
 public class McbbsModpackRemoteInstallTask extends Task<Void> {
@@ -38,8 +38,8 @@ public class McbbsModpackRemoteInstallTask extends Task<Void> {
     private final String name;
     private final DefaultDependencyManager dependency;
     private final DefaultGameRepository repository;
-    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<>(1);
     private final McbbsModpackManifest manifest;
 
     public McbbsModpackRemoteInstallTask(DefaultDependencyManager dependencyManager, McbbsModpackManifest manifest, String name) {

HMCLCore/src/main/java/org/jackhuang/hmcl/mod/modrinth/ModrinthRemoteModRepository.java

@@ -52,11 +52,29 @@ public final class ModrinthRemoteModRepository implements RemoteModRepository {
     private ModrinthRemoteModRepository() {
     }
 
-    public List<ModResult> searchPaginated(String gameVersion, int pageOffset, int pageSize, String searchFilter) throws IOException {
+    private static String convertSortType(SortType sortType) {
+        switch (sortType) {
+            case DATE_CREATED:
+                return "newest";
+            case POPULARITY:
+            case NAME:
+            case AUTHOR:
+                return "relevance";
+            case LAST_UPDATED:
+                return "updated";
+            case TOTAL_DOWNLOADS:
+                return "downloads";
+            default:
+                throw new IllegalArgumentException("Unsupported sort type " + sortType);
+        }
+    }
+
+    public List<ModResult> searchPaginated(String gameVersion, int pageOffset, int pageSize, String searchFilter, SortType sort) throws IOException {
         Map<String, String> query = mapOf(
                 pair("query", searchFilter),
                 pair("offset", Integer.toString(pageOffset)),
-                pair("limit", Integer.toString(pageSize))
+                pair("limit", Integer.toString(pageSize)),
+                pair("index", convertSortType(sort))
         );
         if (StringUtils.isNotBlank(gameVersion)) {
             query.put("version", "versions=" + gameVersion);
@@ -68,8 +86,8 @@ public final class ModrinthRemoteModRepository implements RemoteModRepository {
     }
 
     @Override
-    public Stream<RemoteMod> search(String gameVersion, Category category, int pageOffset, int pageSize, String searchFilter, int sort) throws IOException {
-        return searchPaginated(gameVersion, pageOffset, pageSize, searchFilter).stream()
+    public Stream<RemoteMod> search(String gameVersion, Category category, int pageOffset, int pageSize, String searchFilter, SortType sort) throws IOException {
+        return searchPaginated(gameVersion, pageOffset, pageSize, searchFilter, sort).stream()
                 .map(ModResult::toMod);
     }
 

HMCLCore/src/main/java/org/jackhuang/hmcl/mod/multimc/MultiMCModpackInstallTask.java

@@ -40,7 +40,6 @@ import java.nio.file.FileSystem;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Optional;
 
@@ -55,8 +54,8 @@ public final class MultiMCModpackInstallTask extends Task<Void> {
     private final MultiMCInstanceConfiguration manifest;
     private final String name;
     private final DefaultGameRepository repository;
-    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 MultiMCModpackInstallTask(DefaultDependencyManager dependencyManager, File zipFile, Modpack modpack, MultiMCInstanceConfiguration manifest, String name) {
         this.zipFile = zipFile;

HMCLCore/src/main/java/org/jackhuang/hmcl/mod/server/ServerModpackCompletionTask.java

@@ -53,7 +53,7 @@ public class ServerModpackCompletionTask extends Task<Void> {
     private ModpackConfiguration<ServerModpackManifest> manifest;
     private GetTask dependent;
     private ServerModpackManifest remoteManifest;
-    private final List<Task<?>> dependencies = new LinkedList<>();
+    private final List<Task<?>> dependencies = new ArrayList<>();
 
     public ServerModpackCompletionTask(DefaultDependencyManager dependencyManager, String version) {
         this(dependencyManager, version, null);

HMCLCore/src/main/java/org/jackhuang/hmcl/mod/server/ServerModpackLocalInstallTask.java

@@ -32,7 +32,7 @@ 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.List;
 
 public class ServerModpackLocalInstallTask extends Task<Void> {
@@ -42,8 +42,8 @@ public class ServerModpackLocalInstallTask extends Task<Void> {
     private final ServerModpackManifest manifest;
     private final String name;
     private final DefaultGameRepository repository;
-    private final List<Task<?>> dependencies = new LinkedList<>();
-    private final List<Task<?>> dependents = new LinkedList<>();
+    private final List<Task<?>> dependencies = new ArrayList<>();
+    private final List<Task<?>> dependents = new ArrayList<>(4);
 
     public ServerModpackLocalInstallTask(DefaultDependencyManager dependencyManager, File zipFile, Modpack modpack, ServerModpackManifest manifest, String name) {
         this.zipFile = zipFile;

HMCLCore/src/main/java/org/jackhuang/hmcl/mod/server/ServerModpackRemoteInstallTask.java

@@ -29,8 +29,8 @@ import org.jackhuang.hmcl.util.io.FileUtils;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 
 public class ServerModpackRemoteInstallTask extends Task<Void> {
@@ -38,8 +38,8 @@ public class ServerModpackRemoteInstallTask extends Task<Void> {
     private final String name;
     private final DefaultDependencyManager dependency;
     private final DefaultGameRepository repository;
-    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<>(1);
     private final ServerModpackManifest manifest;
 
     public ServerModpackRemoteInstallTask(DefaultDependencyManager dependencyManager, ServerModpackManifest manifest, String name) {

HMCLCore/src/main/java/org/jackhuang/hmcl/task/TaskExecutor.java

@@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 public abstract class TaskExecutor {
     protected final Task<?> firstTask;
-    protected final List<TaskListener> taskListeners = new LinkedList<>();
+    protected final List<TaskListener> taskListeners = new ArrayList<>();
     protected final AtomicInteger totTask = new AtomicInteger(0);
     protected final AtomicBoolean cancelled = new AtomicBoolean(false);
     protected Exception exception;

HMCLCore/src/main/java/org/jackhuang/hmcl/util/StringUtils.java

@@ -199,13 +199,13 @@ public final class StringUtils {
 
     public static List<String> tokenize(String str) {
         if (str == null)
-            return new LinkedList<>();
+            return new ArrayList<>();
         else
             return tokenize(str, " \t\n\r\f");
     }
 
     public static List<String> tokenize(String str, String delim) {
-        LinkedList<String> result = new LinkedList<>();
+        ArrayList<String> result = new ArrayList<>();
         StringTokenizer tokenizer = new StringTokenizer(str, delim);
         while (tokenizer.hasMoreTokens()) {
             delim = tokenizer.nextToken();

HMCLCore/src/main/java/org/jackhuang/hmcl/util/io/FileUtils.java

@@ -20,6 +20,7 @@ package org.jackhuang.hmcl.util.io;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.StringUtils;
 
+import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -27,7 +28,7 @@ import java.lang.reflect.Method;
 import java.nio.charset.Charset;
 import java.nio.file.*;
 import java.nio.file.attribute.BasicFileAttributes;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -36,7 +37,6 @@ import java.util.function.Predicate;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 /**
- *
  * @author huang
  */
 public final class FileUtils {
@@ -393,7 +393,7 @@ public final class FileUtils {
     }
 
     public static List<File> listFilesByExtension(File file, String extension) {
-        List<File> result = new LinkedList<>();
+        List<File> result = new ArrayList<>();
         File[] files = file.listFiles();
         if (files != null)
             for (File it : files)
@@ -425,4 +425,24 @@ public final class FileUtils {
             return Optional.empty();
         }
     }
+
+    public static Path tmpSaveFile(Path file) {
+        return file.toAbsolutePath().resolveSibling("." + file.getFileName().toString() + ".tmp");
+    }
+
+    public static void saveSafely(Path file, String content) throws IOException {
+        Path tmpFile = tmpSaveFile(file);
+        try (BufferedWriter writer = Files.newBufferedWriter(tmpFile, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.CREATE)) {
+            writer.write(content);
+        }
+
+        try {
+            if (Files.exists(file) && Files.getAttribute(file, "dos:hidden") == Boolean.TRUE) {
+                Files.setAttribute(tmpFile, "dos:hidden", true);
+            }
+        } catch (Throwable ignored) {
+        }
+
+        Files.move(tmpFile, file, StandardCopyOption.REPLACE_EXISTING);
+    }
 }

HMCLCore/src/main/java/org/jackhuang/hmcl/util/platform/CommandBuilder.java

@@ -35,7 +35,7 @@ public final class CommandBuilder {
     private static final Pattern UNSTABLE_BOOLEAN_OPTION_PATTERN = Pattern.compile("-XX:(?<value>[+\\-])(?<key>[a-zA-Z0-9]+)");
 
     private final OperatingSystem os;
-    private final List<Item> raw = new LinkedList<>();
+    private final List<Item> raw = new ArrayList<>();
 
     public CommandBuilder() {
         this(OperatingSystem.CURRENT_OS);
@@ -83,33 +83,33 @@ public final class CommandBuilder {
         return this;
     }
 
-    public CommandBuilder addDefault(String opt) {
+    public String addDefault(String opt) {
         for (Item item : raw) {
             if (item.arg.equals(opt)) {
-                return this;
+                return item.arg;
             }
         }
         raw.add(new Item(opt, true));
-        return this;
+        return null;
     }
 
-    public CommandBuilder addDefault(String opt, String value) {
+    public String addDefault(String opt, String value) {
         for (Item item : raw) {
             if (item.arg.startsWith(opt)) {
                 LOG.info("Default option '" + opt + value + "' is suppressed by '" + item.arg + "'");
-                return this;
+                return item.arg;
             }
         }
         raw.add(new Item(opt + value, true));
-        return this;
+        return null;
     }
 
-    public CommandBuilder addUnstableDefault(String opt, boolean value) {
+    public String addUnstableDefault(String opt, boolean value) {
         for (Item item : raw) {
             final Matcher matcher = UNSTABLE_BOOLEAN_OPTION_PATTERN.matcher(item.arg);
             if (matcher.matches()) {
                 if (matcher.group("key").equals(opt)) {
-                    return this;
+                    return item.arg;
                 }
             }
         }
@@ -119,21 +119,21 @@ public final class CommandBuilder {
         } else {
             raw.add(new Item("-XX:-" + opt, true));
         }
-        return this;
+        return null;
     }
 
-    public CommandBuilder addUnstableDefault(String opt, String value) {
+    public String addUnstableDefault(String opt, String value) {
         for (Item item : raw) {
             final Matcher matcher = UNSTABLE_OPTION_PATTERN.matcher(item.arg);
             if (matcher.matches()) {
                 if (matcher.group("key").equals(opt)) {
-                    return this;
+                    return item.arg;
                 }
             }
         }
 
         raw.add(new Item("-XX:" + opt + "=" + value, true));
-        return this;
+        return null;
     }
 
     public boolean removeIf(Predicate<String> pred) {

HMCLCore/src/main/java/org/jackhuang/hmcl/util/platform/JavaVersion.java

@@ -112,6 +112,7 @@ public final class JavaVersion {
     public static final int JAVA_8 = 8;
     public static final int JAVA_9 = 9;
     public static final int JAVA_16 = 16;
+    public static final int JAVA_17 = 17;
 
     private static int parseVersion(String version) {
         Matcher matcher = VERSION.matcher(version);

HMCLCore/src/main/java/org/jackhuang/hmcl/util/platform/ManagedProcess.java

@@ -34,12 +34,12 @@ public class ManagedProcess {
     private final String classpath;
     private final Map<String, Object> properties = new HashMap<>();
     private final Queue<String> lines = new ConcurrentLinkedQueue<>();
-    private final List<Thread> relatedThreads = new LinkedList<>();
+    private final List<Thread> relatedThreads = new ArrayList<>();
 
     /**
      * Constructor.
      *
-     * @param process the raw system process that this instance manages.
+     * @param process  the raw system process that this instance manages.
      * @param commands the command line of {@code process}.
      */
     public ManagedProcess(Process process, List<String> commands) {
@@ -51,8 +51,8 @@ public class ManagedProcess {
     /**
      * Constructor.
      *
-     * @param process the raw system process that this instance manages.
-     * @param commands the command line of {@code process}.
+     * @param process   the raw system process that this instance manages.
+     * @param commands  the command line of {@code process}.
      * @param classpath the classpath of java process
      */
     public ManagedProcess(Process process, List<String> commands, String classpath) {
@@ -111,11 +111,11 @@ public class ManagedProcess {
 
     /**
      * Add related thread.
-     *
+     * <p>
      * If a thread is monitoring this raw process,
      * you are required to add the instance by this method.
      */
-    public void addRelatedThread(Thread thread) {
+    public synchronized void addRelatedThread(Thread thread) {
         relatedThreads.add(thread);
     }
 
@@ -146,7 +146,7 @@ public class ManagedProcess {
         destroyRelatedThreads();
     }
 
-    public void destroyRelatedThreads() {
+    public synchronized void destroyRelatedThreads() {
         relatedThreads.forEach(Thread::interrupt);
     }
 

HMCLCore/src/main/java/org/jackhuang/hmcl/util/platform/OperatingSystem.java

@@ -22,6 +22,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.charset.UnsupportedCharsetException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -112,15 +113,26 @@ public enum OperatingSystem {
     private static final Pattern MEMINFO_PATTERN = Pattern.compile("^(?<key>.*?):\\s+(?<value>\\d+) kB?$");
 
     static {
-        String nativeEncoding = System.getProperty("native.encoding", System.getProperty("sun.jnu.encoding"));
+        String nativeEncoding = System.getProperty("native.encoding");
+        String hmclNativeEncoding = System.getProperty("hmcl.native.encoding");
         Charset nativeCharset = Charset.defaultCharset();
 
-        if (nativeEncoding != null) {
-            try {
-                nativeCharset = Charset.forName(nativeEncoding);
-            } catch (UnsupportedCharsetException e) {
-                e.printStackTrace();
+        try {
+            if (hmclNativeEncoding != null) {
+                nativeCharset = Charset.forName(hmclNativeEncoding);
+            } else {
+                if (nativeEncoding != null && !nativeEncoding.equalsIgnoreCase(nativeCharset.name())) {
+                    nativeCharset = Charset.forName(nativeEncoding);
+                }
+
+                if (nativeCharset == StandardCharsets.UTF_8 || nativeCharset == StandardCharsets.US_ASCII) {
+                    nativeCharset = StandardCharsets.UTF_8;
+                } else if ("GBK".equalsIgnoreCase(nativeCharset.name()) || "GB2312".equalsIgnoreCase(nativeCharset.name())) {
+                    nativeCharset = Charset.forName("GB18030");
+                }
             }
+        } catch (UnsupportedCharsetException e) {
+            e.printStackTrace();
         }
         NATIVE_CHARSET = nativeCharset;
 

HMCLCore/src/main/resources/assets/game/log4j2-1.12.xml

@@ -22,7 +22,6 @@
             </filters>
             <AppenderRef ref="SysOut"/>
             <AppenderRef ref="File"/>
-            <AppenderRef ref="ServerGuiConsole"/>
         </Root>
     </Loggers>
 </Configuration>

HMCLCore/src/main/resources/assets/game/log4j2-1.7.xml

@@ -23,7 +23,6 @@
             </filters>
             <AppenderRef ref="SysOut"/>
             <AppenderRef ref="File"/>
-            <AppenderRef ref="ServerGuiConsole"/>
         </Root>
     </Loggers>
 </Configuration>

HMCLTransformerDiscoveryService/build.gradle

@@ -1,12 +0,0 @@
-version '1.0'
-
-dependencies {
-    compileOnly project.files("lib/modlauncher-4.1.0.jar")
-}
-
-jar {
-    manifest {
-        attributes 'Created-By': 'Copyright(c) 2013-2020 huangyuhui.',
-                'Implementation-Version': project.version
-    }
-}

HMCLTransformerDiscoveryService/src/main/resources/META-INF/services/cpw.mods.modlauncher.serviceapi.ITransformerDiscoveryService

@@ -1 +0,0 @@
-org.jackhuang.hmcl.HMCLTransformerDiscoveryService

README.md

@@ -58,5 +58,6 @@ Make sure you have Java installed with JavaFX 8 at least. Liberica full JDK 8 or
 |`-Dhmcl.update_source.override=<url>`|Override the update source.|
 |`-Dhmcl.authlibinjector.location=<path>`|Use specified authlib-injector (instead of downloading one).|
 |`-Dhmcl.openjfx.repo=<maven repository url>`|Add custom maven repository for download OpenJFX.|
+|`-Dhmcl.native.encoding=<encoding>`|Override the native encoding.|
 |`-Dhmcl.microsoft.auth.id=<App ID>`|Override Microsoft OAuth App ID.|
 |`-Dhmcl.microsoft.auth.secret=<App Secret>`|Override Microsoft OAuth App secret.|

build.gradle

@@ -1,221 +0,0 @@
-buildscript {
-    repositories {
-        mavenCentral()
-        maven { url 'https://plugins.gradle.org/m2/' }
-    }
-    dependencies {
-        classpath group: 'com.google.code.gson', name: 'gson', version: '2.8.1'
-    }
-}
-
-plugins {
-    id 'checkstyle'
-}
-
-group 'org.jackhuang'
-version '3.0'
-
-subprojects {
-    apply plugin: 'java'
-    apply plugin: 'idea'
-    apply plugin: 'maven-publish'
-    apply plugin: 'checkstyle'
-
-    repositories {
-        flatDir name: 'libs', dirs: rootProject.file('lib')
-
-        mavenCentral()
-
-        maven { url 'https://jitpack.io' }
-    }
-
-    checkstyle {
-        sourceSets = []
-    }
-
-    tasks.withType(Checkstyle) {
-        exclude 'de/javawi/jstun'
-    }
-
-    sourceCompatibility = 1.8
-    compileJava.options.encoding = "UTF-8"
-    compileTestJava.options.encoding = "UTF-8"
-
-    dependencies {
-        testImplementation group: 'junit', name: 'junit', version: '4.12'
-    }
-
-    publishing {
-        publications {
-            maven(MavenPublication) {
-                from components.java
-            }
-        }
-        repositories {
-            mavenLocal()
-        }
-    }
-}
-
-defaultTasks 'clean', 'build'
-
-var jfxModules = ['base', 'graphics', 'controls', 'fxml', 'media', 'web']
-var jfxArches = ['linux', 'linux-arm32-monocle', 'linux-aarch64', 'mac', 'mac-aarch64', 'win', 'win-x86']
-var jfxVersion = "17"
-var jfxRepos = ['https://repo1.maven.org/maven2', 'https://maven.aliyun.com/repository/central']
-var jfxDependenciesFile = file('HMCL/src/main/resources/assets/openjfx-dependencies.json')
-var jfxUnsupported = [
-        'linux-arm32-monocle': ['media', 'web']
-]
-
-var jfxInClasspath = false
-
-try {
-    Class.forName("javafx.application.Application", false, this.getClass().getClassLoader())
-    jfxInClasspath = true
-} catch (Throwable ignored) {
-}
-
-if (!jfxInClasspath && JavaVersion.current() >= JavaVersion.VERSION_11) {
-    String os = null
-    String arch = null
-
-    String osName = System.getProperty("os.name").toLowerCase(Locale.US)
-    if (osName.contains("win"))
-        os = 'win'
-    else if (osName.contains("mac"))
-        os = 'mac'
-    else if (osName.contains("solaris") || osName.contains("linux") || osName.contains("unix") || osName.contains("sunos"))
-        os = 'linux'
-    else
-        os = null
-
-    String archName = System.getProperty("os.arch").toLowerCase(Locale.US)
-    switch (archName) {
-        case "x86_64":
-        case "x86-64":
-        case "amd64":
-            arch = ''
-            break
-        case "x86":
-        case "x86_32":
-        case "x86-32":
-        case "i386":
-        case "i486":
-        case "i586":
-        case "i686":
-        case "i86pc":
-            arch = '-x86'
-            break
-        case "aarch64":
-            arch = '-aarch64';
-            break
-    }
-    String platform = "$os$arch"
-
-    if (os != null && arch != null && jfxArches.contains(platform)) {
-        var jfxDependencies = jfxModules.collect { module -> "org.openjfx:javafx-$module:$jfxVersion:$platform" }
-
-        subprojects {
-            repositories {
-                mavenCentral()
-            }
-            dependencies {
-                jfxDependencies.forEach {
-                    compileOnly it
-                }
-            }
-        }
-    }
-}
-
-import com.google.gson.*
-
-task 'generateOpenJFXDependencies' {
-    doLast {
-        var jfxDependencies = new JsonArray()
-
-        jfxModules.forEach { module ->
-            JsonObject m = new JsonObject()
-            m.addProperty("module", "javafx.$module")
-            m.addProperty("groupId", "org.openjfx")
-            m.addProperty("artifactId", "javafx-$module")
-            m.addProperty("version", jfxVersion)
-
-            var sha1 = new JsonObject()
-            jfxArches.forEach { arch ->
-                if (jfxUnsupported.getOrDefault(arch, []).contains(module)) {
-                    return
-                }
-
-                sha1.addProperty(
-                        arch,
-                        new URL("${jfxRepos.head()}/org/openjfx/javafx-$module/$jfxVersion/javafx-$module-$jfxVersion-${arch}.jar.sha1").getText("UTF-8")
-                )
-            }
-            m.add("sha1", sha1)
-
-            jfxDependencies.add(m)
-        }
-
-        jfxDependenciesFile.text = new GsonBuilder().setPrettyPrinting().create().toJson(jfxDependencies)
-    }
-}
-
-// Ensure that the mirror repository caches files
-task 'preTouchOpenJFXDependencies' {
-    doLast {
-        jfxRepos.tail().forEach { repo ->
-            jfxModules.forEach { module ->
-                jfxArches.forEach { arch ->
-                    if (jfxUnsupported.getOrDefault(arch, []).contains(module)) {
-                        return
-                    }
-                    var jarUrl = "$repo/org/openjfx/javafx-$module/$jfxVersion/javafx-$module-$jfxVersion-${arch}.jar"
-
-                    [jarUrl, jarUrl + ".sha1"].forEach { url ->
-                        try {
-                            new URL(url).getBytes()
-                            System.out.println(url)
-                        } catch (Throwable ignored) {
-                            ignored.printStackTrace()
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-task 'checkTranslations' {
-    group 'verification'
-    doLast {
-        var en = new Properties()
-        var zh = new Properties()
-        var zh_CN = new Properties()
-
-        file("HMCL/src/main/resources/assets/lang/I18N.properties").withInputStream { en.load(it) }
-        file("HMCL/src/main/resources/assets/lang/I18N_zh.properties").withInputStream { zh.load(it) }
-        file("HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties").withInputStream { zh_CN.load(it) }
-
-        boolean success = true
-
-        zh_CN.forEach { k, v ->
-            if (!en.containsKey(k)) {
-                project.logger.log(LogLevel.WARN, "I18N.properties missing key '$k'")
-                success = false
-            }
-        }
-
-        zh_CN.forEach { k, v ->
-            if (!zh.containsKey(k)) {
-                project.logger.log(LogLevel.WARN, "I18N_zh.properties missing key '$k'")
-                success = false
-            }
-        }
-
-        if (!success) {
-            throw new GradleException("Part of the translation is missing")
-        }
-    }
-}

build.gradle.kts

@@ -0,0 +1,200 @@
+buildscript {
+    repositories {
+        mavenCentral()
+        maven(url = "https://plugins.gradle.org/m2/")
+    }
+
+    dependencies {
+        classpath("com.google.code.gson:gson:2.8.1")
+    }
+}
+
+plugins {
+    id("checkstyle")
+}
+
+group = "org.jackhuang"
+version = "3.0"
+
+subprojects {
+    apply {
+        plugin("java")
+        plugin("idea")
+        plugin("maven-publish")
+        plugin("checkstyle")
+    }
+
+    repositories {
+        flatDir {
+            name = "libs"
+            dirs = setOf(rootProject.file("lib"))
+        }
+        mavenCentral()
+        maven(url = "https://jitpack.io")
+    }
+
+    tasks.withType<JavaCompile> {
+        sourceCompatibility = "1.8"
+        targetCompatibility = "1.8"
+
+        options.encoding = "UTF-8"
+    }
+
+    configure<CheckstyleExtension> {
+        sourceSets = setOf()
+    }
+
+    tasks.withType<Checkstyle> {
+        exclude("de/javawi/jstun")
+    }
+
+    dependencies {
+        "testImplementation"("junit:junit:4.12")
+    }
+
+    configure<PublishingExtension> {
+        publications {
+            create<MavenPublication>("maven") {
+                from(components["java"])
+            }
+        }
+        repositories {
+            mavenLocal()
+        }
+    }
+}
+
+tasks.create("checkTranslations") {
+    doLast {
+        val hmclLangDir = file("HMCL/src/main/resources/assets/lang")
+
+        val en = java.util.Properties().apply {
+            hmclLangDir.resolve("I18N.properties").bufferedReader().use { load(it) }
+        }
+
+        val zh = java.util.Properties().apply {
+            hmclLangDir.resolve("I18N_zh.properties").bufferedReader().use { load(it) }
+        }
+
+        val zh_CN = java.util.Properties().apply {
+            hmclLangDir.resolve("I18N_zh_CN.properties").bufferedReader().use { load(it) }
+        }
+
+        var success = true
+
+        zh_CN.forEach {
+            if (!en.containsKey(it.key)) {
+                project.logger.warn("I18N.properties missing key '${it.key}'")
+                success = false
+            }
+        }
+
+        zh_CN.forEach {
+            if (!zh.containsKey(it.key)) {
+                project.logger.warn("I18N_zh.properties missing key '${it.key}'")
+                success = false
+            }
+        }
+
+        if (!success) {
+            throw GradleException("Part of the translation is missing")
+        }
+    }
+}
+
+defaultTasks("clean", "build")
+
+val jfxModules = listOf("base", "graphics", "controls", "fxml", "media", "web")
+val jfxClassifier = listOf(
+    "linux", "linux-arm32-monocle", "linux-aarch64",
+    "mac", "mac-aarch64",
+    "win", "win-x86"
+)
+val jfxVersion = "17"
+val jfxMirrorRepos = listOf("https://maven.aliyun.com/repository/central")
+val jfxDependenciesFile = rootProject.file("HMCL/src/main/resources/assets/openjfx-dependencies.json")
+val jfxUnsupported = mapOf(
+    "linux-arm32-monocle" to listOf("media", "web")
+)
+
+fun isSupported(module: String, classifier: String) = when (classifier) {
+    "linux-arm32-monocle" -> module != "media" && module != "web"
+    else -> true
+}
+
+val jfxInClasspath =
+    try {
+        Class.forName("javafx.application.Application", false, this.javaClass.classLoader)
+        true
+    } catch (ignored: Throwable) {
+        false
+    }
+
+if (!jfxInClasspath && JavaVersion.current() >= JavaVersion.VERSION_11) {
+    val os = System.getProperty("os.name").toLowerCase().let { osName ->
+        when {
+            osName.contains("win") -> "win"
+            osName.contains("mac") -> "mac"
+            osName.contains("linux") || osName.contains("unix") -> "linux"
+            else -> null
+        }
+    }
+
+    val classifier = if (os == null) null else when (System.getProperty("os.arch").toLowerCase()) {
+        "x86_64", "x86-64", "amd64", "ia32e", "em64t", "x64" -> os
+        "x86", "x86_32", "x86-32", "i386", "i486", "i586", "i686", "i86pc", "ia32", "x32" -> "$os-x86"
+        "arm64", "aarch64", "armv8", "armv9" -> "$os-aarch64"
+        else -> null
+    }
+
+    if (classifier != null && classifier in jfxClassifier) {
+        rootProject.subprojects {
+            for (module in jfxModules) {
+                dependencies.add("compileOnly", "org.openjfx:javafx-$module:$jfxVersion:$classifier")
+            }
+        }
+    }
+}
+
+rootProject.tasks.create("generateOpenJFXDependencies") {
+    doLast {
+        val jfxDependencies = jfxModules.map { module ->
+            linkedMapOf(
+                "module" to "javafx.$module",
+                "groupId" to "org.openjfx",
+                "artifactId" to "javafx-$module",
+                "version" to jfxVersion,
+                "sha1" to jfxClassifier.filter { classifier -> isSupported(module, classifier) }
+                    .associateWith { classifier ->
+                        java.net.URL("https://repo1.maven.org/maven2/org/openjfx/javafx-$module/$jfxVersion/javafx-$module-$jfxVersion-$classifier.jar.sha1")
+                            .readText()
+                    }
+            )
+        }
+
+        jfxDependenciesFile.writeText(
+            com.google.gson.GsonBuilder().setPrettyPrinting().create().toJson(jfxDependencies)
+        )
+    }
+}
+
+// Ensure that the mirror repository caches files
+rootProject.tasks.create("preTouchOpenJFXDependencies") {
+    doLast {
+        for (repo in jfxMirrorRepos) {
+            for (module in jfxModules) {
+                for (classifier in jfxClassifier) {
+                    if (isSupported(module, classifier)) {
+                        val jarUrl =
+                            java.net.URL("$repo/org/openjfx/javafx-$module/$jfxVersion/javafx-$module-$jfxVersion-$classifier.jar")
+                        try {
+                            jarUrl.readBytes()
+                        } catch (e: Throwable) {
+                            logger.warn("An exception occurred while pre touching $jarUrl", e)
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

minecraft/libraries/HMCLTransformerDiscoveryService/build.gradle.kts

@@ -0,0 +1,19 @@
+version = "1.0"
+
+dependencies {
+    compileOnly(project.files("lib/modlauncher-4.1.0.jar"))
+}
+
+tasks.compileJava {
+    sourceCompatibility = "1.8"
+    targetCompatibility = "1.8"
+}
+
+tasks.jar {
+    manifest {
+        attributes(
+            "Created-By" to "Copyright(c) 2013-2020 huangyuhui.",
+            "Implementation-Version" to project.version
+        )
+    }
+}

minecraft/libraries/log4j-patch/LICENSE

@@ -0,0 +1,13 @@
+        DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                    Version 2, December 2004
+
+ Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. You just DO WHAT THE FUCK YOU WANT TO.

minecraft/libraries/log4j-patch/README.md

@@ -0,0 +1,6 @@
+# Log4j Patch
+
+Copy from [Glavo/log4j-patch](https://github.com/Glavo/log4j-patch/). 
+
+`org.apache.logging.log4j.core.lookup.JndiLookup` is licensed under the WTFPL 2.0 license,
+and `org.apache.logging.log4j.core.lookup.Interpolator` is licensed under the Apache 2.0 license.

minecraft/libraries/log4j-patch/build.gradle.kts

@@ -0,0 +1,53 @@
+import java.io.RandomAccessFile
+
+version = "1.0"
+
+sourceSets.create("agent") {
+    java {
+        srcDir("src/main/agent")
+    }
+}
+
+dependencies {
+    compileOnly("org.apache.logging.log4j:log4j-core:2.0-beta9")
+}
+
+tasks.withType<JavaCompile> {
+    sourceCompatibility = "1.8"
+    targetCompatibility = "1.8"
+
+    doLast {
+        val tree = fileTree(destinationDirectory)
+        tree.include("**/*.class")
+        tree.exclude("module-info.class")
+        tree.forEach {
+            RandomAccessFile(it, "rw").use { rf ->
+                rf.seek(7)   // major version
+                rf.write(50)   // java 6
+                rf.close()
+            }
+        }
+    }
+}
+
+val agentJar = tasks.create<Jar>("agentJar") {
+    dependsOn(tasks.compileJava)
+
+    archiveBaseName.set("log4j-patch-agent")
+
+    manifest {
+        attributes("Premain-Class" to "org.glavo.log4j.patch.agent.Log4jAgent")
+    }
+
+    from(sourceSets["agent"].output)
+    from(sourceSets["main"].output) {
+        includeEmptyDirs = false
+        eachFile { path = "org/glavo/log4j/patch/agent/$name.bin" }
+    }
+
+}
+
+tasks.jar {
+    enabled = false
+    dependsOn(agentJar)
+}