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

将＂室＂改成＂是＂

.github/workflows/gitee.yml

@@ -5,6 +5,7 @@ on:
 
 jobs:
   run:
+    if: ${{ github.repository_owner == 'huanghongxun' }}
     runs-on: ubuntu-latest
     steps:
       - name: Mirror Github to Gitee

HMCL/build.gradle

@@ -1,235 +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:.*'))
-    }
-
-    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, boolean makeLaunchScript) {
+    public LaunchOptions getLaunchOptions(String version, JavaVersion javaVersion, File gameDir, List<String> javaAgents, boolean makeLaunchScript) {
         VersionSetting vs = getVersionSetting(version);
 
         LaunchOptions.Builder builder = new LaunchOptions.Builder()
@@ -359,7 +359,8 @@ public class HMCLGameRepository extends DefaultGameRepository {
                 .setProcessPriority(vs.getProcessPriority())
                 .setUseNativeGLFW(vs.isUseNativeGLFW())
                 .setUseNativeOpenAL(vs.isUseNativeOpenAL())
-                .setDaemon(!makeLaunchScript && vs.getLauncherVisibility().isDaemon());
+                .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(), scriptFile != null);
+                    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/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/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/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/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,6 +19,7 @@ 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;
@@ -52,10 +53,8 @@ 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.
@@ -177,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);
 
@@ -188,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) {
@@ -255,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;
@@ -355,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;
         }
@@ -414,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;
 
@@ -117,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) {
@@ -152,7 +153,7 @@ 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);
@@ -311,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);
 
@@ -345,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);

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/resources/assets/lang/I18N.properties

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

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

@@ -314,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=新增回饋

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

@@ -298,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 脚本
@@ -314,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=新增反馈
@@ -374,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你还可以尝试调大系统的页面大小。

HMCLCore/build.gradle

@@ -1,27 +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'
-}
-
-tasks.processResources {
-    dependsOn ':log4j-patch:jar'
-
-    into('assets/game') {
-        from project(':log4j-patch').file("build/libs")
-    }
-}

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/offline/OfflineAccount.java

@@ -159,7 +159,7 @@ public class OfflineAccount extends Account {
             try {
                 server.addCharacter(new YggdrasilServer.Character(uuid, username, skin.load(username).run()));
             } catch (IOException e) {
-                throw e;
+                // ignore
             } catch (Exception e) {
                 throw new IOException(e);
             }

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

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

@@ -24,8 +24,8 @@ 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.LinkedList;
 import java.util.List;
 
 /**
@@ -38,7 +38,7 @@ public final class FabricAPIInstallTask extends Task<Version> {
     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;

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

@@ -23,11 +23,8 @@ import org.jackhuang.hmcl.mod.RemoteMod;
 import org.jackhuang.hmcl.mod.modrinth.ModrinthRemoteModRepository;
 import org.jackhuang.hmcl.util.Lang;
 
-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;
 
@@ -55,16 +52,4 @@ public class FabricAPIVersionList extends VersionList<FabricAPIRemoteVersion> {
             }
         }));
     }
-
-    @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());

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;
@@ -114,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.
      */
@@ -310,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.
          */
@@ -460,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;

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

@@ -42,7 +42,6 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
 import java.util.*;
 import java.util.function.Supplier;
 import java.util.logging.Level;
@@ -126,8 +125,6 @@ public class DefaultLauncher extends Launcher {
             }
         }
 
-        Optional<Library> log4j = findLog4j();
-
         // JVM Args
         if (!options.isNoGeneratedJVMArgs()) {
             appendJvmArgs(res);
@@ -192,13 +189,6 @@ public class DefaultLauncher extends Launcher {
 
             res.addDefault("-Dfml.ignoreInvalidMinecraftCertificates=", "true");
             res.addDefault("-Dfml.ignorePatchDiscrepancies=", "true");
-
-            if (log4j.isPresent()) {
-                String enableJndi = res.addDefault("-Dlog4j2.enableJndi=", "false");
-                if (!"-Dlog4j2.enableJndi=true".equals(enableJndi)) {
-                    res.add("-javaagent:" + repository.getLibraryFile(version, LOG4J_PATCH_AGENT).getAbsolutePath() + "=" + log4j.get().getVersion().startsWith("2.0-beta"));
-                }
-            }
         }
 
         // Fix RCE vulnerability of log4j2
@@ -207,7 +197,7 @@ public class DefaultLauncher extends Launcher {
         res.addDefault("-Dcom.sun.jndi.cosnaming.object.trustURLCodebase=", "false");
 
         String formatMsgNoLookups = res.addDefault("-Dlog4j2.formatMsgNoLookups=", "true");
-        if (!"-Dlog4j2.formatMsgNoLookups=false".equals(formatMsgNoLookups) && log4j.isPresent()) {
+        if (!"-Dlog4j2.formatMsgNoLookups=false".equals(formatMsgNoLookups) && isUsingLog4j()) {
             res.addDefault("-Dlog4j.configurationFile=", getLog4jConfigurationFile().getAbsolutePath());
         }
 
@@ -259,9 +249,13 @@ public class DefaultLauncher extends Launcher {
         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)));
@@ -365,17 +359,8 @@ public class DefaultLauncher extends Launcher {
         }
     }
 
-    private static final Library LOG4J_PATCH_AGENT = new Library(new Artifact("org.glavo", "log4j-patch-agent", "1.0"));
-
-    private Optional<Library> findLog4j() {
-        return 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())))
-                .findFirst();
-    }
-
-    private boolean isLog4jUnsafe(Library log4j) {
-        return VersionNumber.VERSION_COMPARATOR.compare(log4j.getVersion(), "2.17") < 0;
+    private boolean isUsingLog4j() {
+        return VersionNumber.VERSION_COMPARATOR.compare(repository.getGameVersion(version).orElse("1.7"), "1.7") >= 0;
     }
 
     public File getLog4jConfigurationFile() {
@@ -396,17 +381,6 @@ public class DefaultLauncher extends Launcher {
         }
     }
 
-    public void extractLog4jAgent() throws IOException {
-        Path log4jPatchPath = repository.getLibraryFile(version, LOG4J_PATCH_AGENT).toPath();
-        String patchName = LOG4J_PATCH_AGENT.getArtifactId() + "-" + LOG4J_PATCH_AGENT.getVersion();
-        if (Files.notExists(log4jPatchPath)) {
-            try (InputStream input = DefaultLauncher.class.getResourceAsStream("/assets/game/" + patchName + ".jar")) {
-                Files.createDirectories(log4jPatchPath.getParent());
-                Files.copy(input, log4jPatchPath, StandardCopyOption.REPLACE_EXISTING);
-            }
-        }
-    }
-
     protected Map<String, String> getConfigurations() {
         return mapOf(
                 // defined by Minecraft official launcher
@@ -466,12 +440,8 @@ public class DefaultLauncher extends Launcher {
             decompressNatives(nativeFolder);
         }
 
-        Optional<Library> log4j = findLog4j();
-        if (log4j.isPresent()) {
+        if (isUsingLog4j())
             extractLog4jConfigurationFile();
-            if (isLog4jUnsafe(log4j.get()))
-                extractLog4jAgent();
-        }
 
         File runDirectory = repository.getRunDirectory(version.getId());
 
@@ -542,12 +512,8 @@ public class DefaultLauncher extends Launcher {
             decompressNatives(nativeFolder);
         }
 
-        Optional<Library> log4j = findLog4j();
-        if (log4j.isPresent()) {
+        if (isUsingLog4j())
             extractLog4jConfigurationFile();
-            if (isLog4jUnsafe(log4j.get()))
-                extractLog4jAgent();
-        }
 
         String scriptExtension = FileUtils.getExtension(scriptFile);
         boolean usePowerShell = "ps1".equals(scriptExtension);

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/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;

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

@@ -63,7 +63,7 @@ public class McbbsModpackCompletionTask extends CompletableFutureTask<Void> {
     private final File configurationFile;
     private ModpackConfiguration<McbbsModpackManifest> configuration;
     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);

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

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

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

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

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

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

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/build.gradle

@@ -1,52 +0,0 @@
-version '1.0'
-
-sourceSets.create("agent") {
-    java {
-        srcDir 'src/main/agent'
-    }
-}
-
-dependencies {
-    compileOnly group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.0-beta9'
-}
-
-tasks.withType(JavaCompile) {
-    sourceCompatibility = 8
-    targetCompatibility = 8
-
-    doLast {
-        FileTree tree = fileTree('build/classes/java')
-        tree.include '**/*.class'
-        tree.each {
-            RandomAccessFile rf = new RandomAccessFile(it, "rw")
-            rf.seek(7)   // major version
-            rf.write(50) // java 6
-            rf.close()
-        }
-    }
-}
-
-task agentJar(type: Jar) {
-    dependsOn(tasks.compileJava)
-
-    baseName = 'log4j-patch-agent'
-
-    manifest {
-        attributes 'Premain-Class': 'org.glavo.log4j.patch.agent.Log4jAgent'
-    }
-
-    from(sourceSets.agent.output)
-    from(sourceSets.main.output) {
-        includeEmptyDirs = false
-
-        eachFile {
-            it.path = "org/glavo/log4j/patch/agent/${it.name}.bin"
-        }
-    }
-}
-
-tasks.jar {
-    enabled = false
-    dependsOn agentJar
-}
-

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

settings.gradle

@@ -1,8 +0,0 @@
-rootProject.name = 'HMCL3'
-include ':HMCL'
-include ':HMCLCore'
-include ':HMCLTransformerDiscoveryService'
-include ':log4j-patch'
-
-project(':HMCLTransformerDiscoveryService').projectDir = file('minecraft/libraries/HMCLTransformerDiscoveryService')
-project(':log4j-patch').projectDir = file('minecraft/libraries/log4j-patch')

settings.gradle.kts

@@ -0,0 +1,13 @@
+rootProject.name = "HMCL3"
+include(
+    "HMCL",
+    "HMCLCore",
+    "HMCLTransformerDiscoveryService",
+    "log4j-patch"
+)
+
+val minecraftLibraries = listOf("log4j-patch", "HMCLTransformerDiscoveryService")
+
+for (library in minecraftLibraries) {
+    project(":$library").projectDir = file("minecraft/libraries/$library")
+}