Merge remote-tracking branch 'official/main' into prs-base

burningtnt · Oct 13, 2024 · 9c1dfa1 · 9c1dfa1
2 parents a2ad9cf + 00b7085
commit 9c1dfa1
Show file tree

Hide file tree

Showing 5 changed files with 301 additions and 26 deletions.
diff --git a/HMCL/build.gradle.kts b/HMCL/build.gradle.kts
@@ -203,11 +203,68 @@ tasks.build {
     dependsOn(makeExecutables)
 }
 
+fun parseToolOptions(options: String?): List<String> {
+    if (options == null)
+        return listOf()
+
+    val builder = StringBuilder()
+    val result = mutableListOf<String>()
+
+    var offset = 0
+
+    loop@ while (offset < options.length) {
+        val ch = options[offset]
+        if (Character.isWhitespace(ch)) {
+            if (builder.isNotEmpty()) {
+                result += builder.toString()
+                builder.clear()
+            }
+
+            while (offset < options.length && Character.isWhitespace(options[offset])) {
+                offset++
+            }
+
+            continue@loop
+        }
+
+        if (ch == '\'' || ch == '"') {
+            offset++
+
+            while (offset < options.length) {
+                val ch2 = options[offset++]
+                if (ch2 != ch) {
+                    builder.append(ch2)
+                } else {
+                    continue@loop
+                }
+            }
+
+            throw GradleException("Unmatched quote in $options")
+        }
+
+        builder.append(ch)
+        offset++
+    }
+
+    if (builder.isNotEmpty()) {
+        result += builder.toString()
+    }
+
+    return result
+}
+
 tasks.create<JavaExec>("run") {
     dependsOn(tasks.jar)
 
     group = "application"
 
     classpath = files(jarPath)
     workingDir = rootProject.rootDir
+
+    val vmOptions = parseToolOptions(System.getenv("HMCL_JAVA_OPTS"))
+    jvmArgs(vmOptions)
+
+    doFirst {
+        logger.quiet("HMCL_JAVA_OPTS: $vmOptions")
+    }
 }
diff --git a/HMCL/src/main/resources/assets/css/root.css b/HMCL/src/main/resources/assets/css/root.css
@@ -431,7 +431,6 @@
 
 .jfx-layout-heading {
     -fx-font-size: 20.0px;
-    -fx-font-family: -fx-base-font-family;
     -fx-alignment: center-left;
     -fx-padding: 5.0 0.0 5.0 0.0;
 }
@@ -449,18 +448,15 @@
 
 .dialog-error {
     -fx-text-fill: #d32f2f;
-    -fx-font-family: -fx-base-font-family;
     -fx-padding: 0.7em 0.8em;
 }
 
 .dialog-accept {
     -fx-text-fill: #03A9F4;
-    -fx-font-family: -fx-base-font-family;
     -fx-padding: 0.7em 0.8em;
 }
 
 .dialog-cancel {
-    -fx-font-family: -fx-base-font-family;
     -fx-padding: 0.7em 0.8em;
 }
 

diff --git a/HMCL/src/main/resources/assets/natives.json b/HMCL/src/main/resources/assets/natives.json
@@ -2265,6 +2265,226 @@
     "org.lwjgl:lwjgl-glfw:3.3.1:natives-linux": null,
     "org.lwjgl:lwjgl-stb:3.3.1:natives-linux": null,
     "org.lwjgl:lwjgl-tinyfd:3.3.1:natives-linux": null,
+    "org.lwjgl:lwjgl:3.3.2": {
+      "name": "org.lwjgl:lwjgl:3.3.4",
+      "downloads": {
+        "artifact": {
+          "path": "org/lwjgl/lwjgl/3.3.4/lwjgl-3.3.4.jar",
+          "url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl/3.3.4/lwjgl-3.3.4.jar",
+          "sha1": "b86c3e4832426e8a6b466013b7cb34b40e9ce956",
+          "size": 800127
+        }
+      }
+    },
+    "org.lwjgl:lwjgl:3.3.2:natives-linux": {
+      "name": "org.glavo.hmcl:lwjgl3-natives:3.3.4-rc2",
+      "downloads": {
+        "classifiers": {
+          "linux-loongarch64": {
+            "path": "org/glavo/hmcl/lwjgl3-natives/3.3.4-rc2/lwjgl3-natives-3.3.4-rc2-linux-loongarch64.jar",
+            "url": "https://repo1.maven.org/maven2/org/glavo/hmcl/lwjgl3-natives/3.3.4-rc2-linux-loongarch64/lwjgl3-natives-3.3.4-rc2-linux-loongarch64.jar",
+            "sha1": "34a7f913c6750f2bede863f59c074cc4d540fb64",
+            "size": 12234234
+          }
+        }
+      },
+      "extract": {
+        "exclude": [
+          "META-INF/"
+        ]
+      },
+      "natives": {
+        "linux": "linux-loongarch64"
+      }
+    },
+    "org.lwjgl:lwjgl-jemalloc:3.3.2": {
+      "name": "org.lwjgl:lwjgl-jemalloc:3.3.4",
+      "downloads": {
+        "artifact": {
+          "path": "org/lwjgl/lwjgl-jemalloc/3.3.4/lwjgl-jemalloc-3.3.4.jar",
+          "url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-jemalloc/3.3.4/lwjgl-jemalloc-3.3.4.jar",
+          "sha1": "e3f5dcb8e13f3a5ed3f740fd30a114cee2a80bc4",
+          "size": 46430
+        }
+      }
+    },
+    "org.lwjgl:lwjgl-jemalloc:3.3.2:natives-linux": null,
+    "org.lwjgl:lwjgl-openal:3.3.2": {
+      "name": "org.lwjgl:lwjgl-openal:3.3.4",
+      "downloads": {
+        "artifact": {
+          "path": "org/lwjgl/lwjgl-openal/3.3.4/lwjgl-openal-3.3.4.jar",
+          "url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-openal/3.3.4/lwjgl-openal-3.3.4.jar",
+          "sha1": "9b74d3ea380c83353d42af43ad9659e04dabe84a",
+          "size": 113103
+        }
+      }
+    },
+    "org.lwjgl:lwjgl-openal:3.3.2:natives-linux": null,
+    "org.lwjgl:lwjgl-opengl:3.3.2": {
+      "name": "org.lwjgl:lwjgl-opengl:3.3.4",
+      "downloads": {
+        "artifact": {
+          "path": "org/lwjgl/lwjgl-opengl/3.3.4/lwjgl-opengl-3.3.4.jar",
+          "url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-opengl/3.3.4/lwjgl-opengl-3.3.4.jar",
+          "sha1": "2852ac7d9f6fc71349f1ce28e2708ff1977f18af",
+          "size": 931960
+        }
+      }
+    },
+    "org.lwjgl:lwjgl-opengl:3.3.2:natives-linux": null,
+    "org.lwjgl:lwjgl-glfw:3.3.2": {
+      "name": "org.lwjgl:lwjgl-glfw:3.3.4",
+      "downloads": {
+        "artifact": {
+          "path": "org/lwjgl/lwjgl-glfw/3.3.4/lwjgl-glfw-3.3.4.jar",
+          "url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-glfw/3.3.4/lwjgl-glfw-3.3.4.jar",
+          "sha1": "7e46ecdec85db8738053cfde1414352cd62dab74",
+          "size": 147044
+        }
+      }
+    },
+    "org.lwjgl:lwjgl-glfw:3.3.2:natives-linux": null,
+    "org.lwjgl:lwjgl-stb:3.3.2": {
+      "name": "org.lwjgl:lwjgl-stb:3.3.4",
+      "downloads": {
+        "artifact": {
+          "path": "org/lwjgl/lwjgl-stb/3.3.4/lwjgl-stb-3.3.4.jar",
+          "url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-stb/3.3.4/lwjgl-stb-3.3.4.jar",
+          "sha1": "5821735d5ef23f6da8542887344e57eb181b7cac",
+          "size": 143112
+        }
+      }
+    },
+    "org.lwjgl:lwjgl-stb:3.3.2:natives-linux": null,
+    "org.lwjgl:lwjgl-tinyfd:3.3.2": {
+      "name": "org.lwjgl:lwjgl-tinyfd:3.3.4",
+      "downloads": {
+        "artifact": {
+          "path": "org/lwjgl/lwjgl-tinyfd/3.3.4/lwjgl-tinyfd-3.3.4.jar",
+          "url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-tinyfd/3.3.4/lwjgl-tinyfd-3.3.4.jar",
+          "sha1": "2d73789ffd8962b38d9d599cc38b2383ce818c7a",
+          "size": 15928
+        }
+      }
+    },
+    "org.lwjgl:lwjgl-tinyfd:3.3.2:natives-linux": null,
+    "org.lwjgl:lwjgl:3.3.3": {
+      "name": "org.lwjgl:lwjgl:3.3.4",
+      "downloads": {
+        "artifact": {
+          "path": "org/lwjgl/lwjgl/3.3.4/lwjgl-3.3.4.jar",
+          "url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl/3.3.4/lwjgl-3.3.4.jar",
+          "sha1": "b86c3e4832426e8a6b466013b7cb34b40e9ce956",
+          "size": 800127
+        }
+      }
+    },
+    "org.lwjgl:lwjgl:3.3.3:natives-linux": {
+      "name": "org.glavo.hmcl:lwjgl3-natives:3.3.4-rc2",
+      "downloads": {
+        "classifiers": {
+          "linux-loongarch64": {
+            "path": "org/glavo/hmcl/lwjgl3-natives/3.3.4-rc2/lwjgl3-natives-3.3.4-rc2-linux-loongarch64.jar",
+            "url": "https://repo1.maven.org/maven2/org/glavo/hmcl/lwjgl3-natives/3.3.4-rc2-linux-loongarch64/lwjgl3-natives-3.3.4-rc2-linux-loongarch64.jar",
+            "sha1": "34a7f913c6750f2bede863f59c074cc4d540fb64",
+            "size": 12234234
+          }
+        }
+      },
+      "extract": {
+        "exclude": [
+          "META-INF/"
+        ]
+      },
+      "natives": {
+        "linux": "linux-loongarch64"
+      }
+    },
+    "org.lwjgl:lwjgl-jemalloc:3.3.3": {
+      "name": "org.lwjgl:lwjgl-jemalloc:3.3.4",
+      "downloads": {
+        "artifact": {
+          "path": "org/lwjgl/lwjgl-jemalloc/3.3.4/lwjgl-jemalloc-3.3.4.jar",
+          "url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-jemalloc/3.3.4/lwjgl-jemalloc-3.3.4.jar",
+          "sha1": "e3f5dcb8e13f3a5ed3f740fd30a114cee2a80bc4",
+          "size": 46430
+        }
+      }
+    },
+    "org.lwjgl:lwjgl-jemalloc:3.3.3:natives-linux": null,
+    "org.lwjgl:lwjgl-openal:3.3.3": {
+      "name": "org.lwjgl:lwjgl-openal:3.3.4",
+      "downloads": {
+        "artifact": {
+          "path": "org/lwjgl/lwjgl-openal/3.3.4/lwjgl-openal-3.3.4.jar",
+          "url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-openal/3.3.4/lwjgl-openal-3.3.4.jar",
+          "sha1": "9b74d3ea380c83353d42af43ad9659e04dabe84a",
+          "size": 113103
+        }
+      }
+    },
+    "org.lwjgl:lwjgl-openal:3.3.3:natives-linux": null,
+    "org.lwjgl:lwjgl-opengl:3.3.3": {
+      "name": "org.lwjgl:lwjgl-opengl:3.3.4",
+      "downloads": {
+        "artifact": {
+          "path": "org/lwjgl/lwjgl-opengl/3.3.4/lwjgl-opengl-3.3.4.jar",
+          "url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-opengl/3.3.4/lwjgl-opengl-3.3.4.jar",
+          "sha1": "2852ac7d9f6fc71349f1ce28e2708ff1977f18af",
+          "size": 931960
+        }
+      }
+    },
+    "org.lwjgl:lwjgl-opengl:3.3.3:natives-linux": null,
+    "org.lwjgl:lwjgl-glfw:3.3.3": {
+      "name": "org.lwjgl:lwjgl-glfw:3.3.4",
+      "downloads": {
+        "artifact": {
+          "path": "org/lwjgl/lwjgl-glfw/3.3.4/lwjgl-glfw-3.3.4.jar",
+          "url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-glfw/3.3.4/lwjgl-glfw-3.3.4.jar",
+          "sha1": "7e46ecdec85db8738053cfde1414352cd62dab74",
+          "size": 147044
+        }
+      }
+    },
+    "org.lwjgl:lwjgl-glfw:3.3.3:natives-linux": null,
+    "org.lwjgl:lwjgl-stb:3.3.3": {
+      "name": "org.lwjgl:lwjgl-stb:3.3.4",
+      "downloads": {
+        "artifact": {
+          "path": "org/lwjgl/lwjgl-stb/3.3.4/lwjgl-stb-3.3.4.jar",
+          "url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-stb/3.3.4/lwjgl-stb-3.3.4.jar",
+          "sha1": "5821735d5ef23f6da8542887344e57eb181b7cac",
+          "size": 143112
+        }
+      }
+    },
+    "org.lwjgl:lwjgl-stb:3.3.3:natives-linux": null,
+    "org.lwjgl:lwjgl-tinyfd:3.3.3": {
+      "name": "org.lwjgl:lwjgl-tinyfd:3.3.4",
+      "downloads": {
+        "artifact": {
+          "path": "org/lwjgl/lwjgl-tinyfd/3.3.4/lwjgl-tinyfd-3.3.4.jar",
+          "url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-tinyfd/3.3.4/lwjgl-tinyfd-3.3.4.jar",
+          "sha1": "2d73789ffd8962b38d9d599cc38b2383ce818c7a",
+          "size": 15928
+        }
+      }
+    },
+    "org.lwjgl:lwjgl-tinyfd:3.3.3:natives-linux": null,
+    "org.lwjgl:lwjgl-freetype:3.3.3": {
+      "name": "org.lwjgl:lwjgl-freetype:3.3.4",
+      "downloads": {
+        "artifact": {
+          "path": "org/lwjgl/lwjgl-freetype/3.3.4/lwjgl-freetype-3.3.4.jar",
+          "url": "https://repo1.maven.org/maven2/org/lwjgl/lwjgl-freetype/3.3.4/lwjgl-freetype-3.3.4.jar",
+          "sha1": "23f7bf165068ef2ca80ae1b79fd905af20498600",
+          "size": 453489
+        }
+      }
+    },
+    "org.lwjgl:lwjgl-freetype:3.3.3:natives-linux": null,
     "net.java.dev.jna:jna:5.8.0": {
       "name": "net.java.dev.jna:jna:5.13.0",
       "downloads": {

diff --git a/PLATFORM.md b/PLATFORM.md
@@ -2,17 +2,18 @@
 
 English | [简体中文](PLATFORM_cn.md)
 
-|                            | Windows                                           | Linux                     | Mac OS                                                                  | FreeBSD                  |
-|----------------------------|:--------------------------------------------------|:--------------------------|:------------------------------------------------------------------------|:-------------------------|
-| x86-64                     | ✅️                                                | ✅️                        | ✅️                                                                      | 👌 (Minecraft 1.13~1.21) |
-| x86                        | ✅️ (~1.20.4)                                      | ✅️ (~1.20.4)              | /                                                                       | /                        |
-| ARM64                      | 👌 (Minecraft 1.8~1.18.2)<br/>✅ (Minecraft 1.19+) | 👌 (Minecraft 1.8~1.20.6) | 👌 (Minecraft 1.6~1.18.2)<br/>✅ (Minecraft 1.19+)<br/>✅ (use Rosetta 2) | ❔                        |
-| ARM32                      | /️                                                | 👌 (Minecraft 1.8~1.20.1) | /                                                                       | /                        |
-| MIPS64el                   | /                                                 | 👌 (Minecraft 1.8~1.20.1) | /                                                                       | /                        |
-| RISC-V 64                  | /                                                 | 👌 (Minecraft 1.13~1.21)  | /                                                                       | /                        |
-| LoongArch64                | /                                                 | 👌 (Minecraft 1.6~1.20.1) | /                                                                       | /                        |
-| PowerPC-64 (Little-Endian) | /                                                 | ❔                         | /                                                                       | /                        |
-| S390x                      | /                                                 | ❔                         | /                                                                       | /                        |
+|                            | Windows                                           | Linux                      | Mac OS                                                                  | FreeBSD                    |
+|----------------------------|:--------------------------------------------------|:---------------------------|:------------------------------------------------------------------------|:---------------------------|
+| x86-64                     | ✅️                                                | ✅️                         | ✅️                                                                      | 👌 (Minecraft 1.13~1.21.1) |
+| x86                        | ✅️ (~1.20.4)                                      | ✅️ (~1.20.4)               | /                                                                       | /                          |
+| ARM64                      | 👌 (Minecraft 1.8~1.18.2)<br/>✅ (Minecraft 1.19+) | 👌 (Minecraft 1.8~1.20.6)  | 👌 (Minecraft 1.6~1.18.2)<br/>✅ (Minecraft 1.19+)<br/>✅ (use Rosetta 2) | ❔                          |
+| ARM32                      | /️                                                | 👌 (Minecraft 1.8~1.20.1)  | /                                                                       | /                          |
+| MIPS64el                   | /                                                 | 👌 (Minecraft 1.8~1.20.1)  | /                                                                       | /                          |
+| RISC-V 64                  | /                                                 | 👌 (Minecraft 1.13~1.21.1) | /                                                                       | /                          |
+| LoongArch64                | /                                                 | 👌 (Minecraft 1.6~1.21.1)  | /                                                                       | /                          |
+| LoongArch64 (Old World)    | /                                                 | 👌 (Minecraft 1.6~1.20.1)  | /                                                                       | /                          |
+| PowerPC-64 (Little-Endian) | /                                                 | ❔                          | /                                                                       | /                          |
+| S390x                      | /                                                 | ❔                          | /                                                                       | /                          |
 
 Legend: