Merge remote-tracking branch 'official/main' into support3093/depreca…

…te-custom-version-folder

# Conflicts:
#	HMCL/src/main/resources/assets/lang/I18N.properties
#	HMCL/src/main/resources/assets/lang/I18N_zh.properties
#	HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -1,36 +1,42 @@
-name: Bug 反馈 | Bug Feedback
+name: Bug 反馈 | Bug Report
 description: 
-  反馈一个 HMCL 错误。| Bug Feedback.
+  反馈一个 HMCL 错误。| File a bug report for HMCL.
 title: "[Bug] "
 labels: bug
 body:
   - type: markdown
     attributes:
       value: |
         提交前请确认：
-        * 该问题确实是 **HMCL 的错误**，而**不是 Minecraft 非正常退出**，如果你的 Minecraft 非正常退出，请前往 [QQ 群](https://docs.hmcl.net/groups.html)/[Discord 频道](https://discord.gg/jVvC7HfM6U) 中获取帮助。
-        * 你的启动器版本是**最新的快照版本**，可以点击 [此处](https://zkitefly.github.io/HMCL-Snapshot-Update/) 下载最新快照版本。
-    
-        如果你的问题并不属于上述两类，你可以选取另一种 Issue 类型，或者直接前往 [QQ 群](https://docs.hmcl.net/groups.html)/[Discord 频道](https://discord.gg/jVvC7HfM6U) 中获取帮助。
-
+
+        * 该问题确实是 **HMCL 的错误**，而**不是 Minecraft 非正常退出**，如果你的 Minecraft 非正常退出，请前往 [QQ 群](https://docs.hmcl.net/groups.html)/[Discord 服务器](https://discord.gg/jVvC7HfM6U) 获取帮助。
+        * 你的启动器版本是**最新的预览版本**，可以点击 [此处](https://zkitefly.github.io/HMCL-Snapshot-Update/) 下载最新预览版本。
+
+        如果你的问题并不属于上述两类，你可以选取另一种 Issue 类型，或者直接前往 [QQ 群](https://docs.hmcl.net/groups.html)/[Discord 服务器](https://discord.gg/jVvC7HfM6U) 获取帮助。
+
         Before submitting, please confirm:
-        * The issue is indeed **an error of HMCL**, not **Minecraft abnormal exit**. If your Minecraft exits abnormally, please go to the [QQ group](https://docs.hmcl.net/groups.html) or [Discord channel](https://discord.gg/jVvC7HfM6U) for help.
-        * Your launcher version is **the latest snapshot version**. You can click [here](https://github.com/burningtnt/HMCL-Snapshot-Update/raw/master/datas/HMCL-dev.jar) to download the latest snapshot version.
-
-        If your issue does not fall into the above two categories, you can choose another type of issue or directly go to the [QQ group](https://docs.hmcl.net/groups.html) or [Discord channel](https://discord.gg/jVvC7HfM6U) for help.
+
+        * The issue is indeed **a bug of HMCL**, not **Minecraft abnormal exit**. If your Minecraft exits abnormally, please go to the [QQ group](https://docs.hmcl.net/groups.html) or [Discord server](https://discord.gg/jVvC7HfM6U) for help.
+        * Your launcher is the **latest nightly build**. You can click [here](https://zkitefly.github.io/HMCL-Snapshot-Update/en) to download the latest nightly build.
+
+        If your issue does not fall into the above two categories, you can choose another type of issue or directly go to the [QQ group](https://docs.hmcl.net/groups.html) or [Discord server](https://discord.gg/jVvC7HfM6U) for help.
   - type: input
     id: platform
     attributes:
       label: 平台 | Platform
-      description: 请输入您遇到 BUG 的平台。 Please enter the platform on which you encountered the bug. 
+      description: |
+        请输入你遇到问题的平台。
+        Please enter the platform on which you encountered the bug.
       placeholder: e.g. Windows 11
     validations:
       required: true
   - type: textarea
     id: bug-report
     attributes:
-      label: 问题描述 | Problem Description
-      description: 请尽可能地详细描述你所遇到的问题，并描述如何重新触发这个问题。 Please describe the problem you met in as much detail as possible. Besides, please describe how to trigger this problem again.
+      label: 问题描述 | Bug Description
+      description: |
+        请尽可能地详细描述你所遇到的问题，并描述如何重新触发这个问题。
+        Please describe the bug you met in as much detail as possible. Additionally, describe the steps to reproduce this bug.
       placeholder: |
         1. 点击 HMCL 上的某个按钮 | Click a button named ...
         2. 向下翻页 | Scroll down
@@ -42,12 +48,12 @@ body:
     attributes:
       label: 启动器崩溃报告 / 启动器日志文件 | Launcher Crash Report / Launcher Log File
       description: |
-        如果您的启动器崩溃了，请将崩溃报告填入（或将文件拖入）下方。
-        如果您的启动器没有崩溃，请在遇到问题后不要退出启动器，在启动器的【设置】>【通用】>【调试】一栏中点击“导出启动器日志”，并将导出的日志拖到下方的输入栏中。 
+        如果你的启动器崩溃了，请将崩溃报告填入（或将文件拖入）下方。
+        如果你的启动器没有崩溃，请在遇到问题后**不要退出启动器**，在启动器的 “设置 → 通用 → 调试” 一栏中点击 “导出启动器日志”，并将导出的日志拖到下方的输入栏中。
         **请注意：启动器崩溃报告或日志文件是诊断问题的重要依据，请务必上传！**
         
-        If your launcher crashes, please fill it in (or drag the file in) below.
-        If your launcher doesn't crash, please DO NOT EXIT your launcher, click "Export Launcher Log" in the [Settings] > [General] > [Debug] column of the launcher, and drag the exported log to the input field below.
-        **Attention: The crash report or the log file is the key to solve the problem. Please update it!**
+        If your launcher crashes, please fill in (or drag the file in) the following input field with the crash report.
+        If your launcher does not crash, please DO NOT EXIT your launcher, click "Export Launcher Logs" in the "Settings → General → Debug" of the launcher, and drag the exported log to the following input field.
+        **ATTENTION: The crash report or log file is the key to resolving the bug. Please upload them!**
     validations:
       required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,11 +1,11 @@
 blank_issues_enabled: false
 contact_links:
-  - name: QQ 群 | QQ Groups
+  - name: QQ 群 | QQ Group
     url: https://docs.hmcl.net/groups.html
-    about: Hello Minecraft! Launcher 的官方 QQ 交流群。| The official QQ groups of Hello Minecraft! Laucher.
-  - name: Discord 频道 | Discord Channel
+    about: Hello Minecraft! Launcher 的官方 QQ 交流群。| The official QQ group of Hello Minecraft! Launcher.
+  - name: Discord 服务器 | Discord Server
     url: https://discord.gg/jVvC7HfM6U
-    about: Hello Minecraft! Launcher 的官方 Discord 频道。| The official Discord channel of Hello Minecraft! Launcher.
+    about: Hello Minecraft! Launcher 的官方 Discord 服务器。| The official Discord server of Hello Minecraft! Launcher.
   - name: 其他反馈 | Others
     url: https://github.com/HMCL-dev/HMCL/discussions/new/choose
     about: 通过 Discussions 反馈其他问题。| Report other problems in Discussions.

.github/ISSUE_TEMPLATE/feature.yml

@@ -1,22 +1,28 @@
 name: 新功能 | Feature Request
-description: 为 HMCL 提出新功能 | A new feature for HMCL
+description: 为 HMCL 提出新功能。| Suggest a new feature or enhancement for HMCL.
 title: "[Feature] "
 labels: enhancement
 body:
 - type: markdown
   attributes:
-    value: 请确认 Issues 列表无重复的项目。| Please make sure that no duplicated issues has already been delivered.
+    value: |
+      请确认 Issues 列表无重复的项目。
+      Please make sure that no duplicate issues have already been submitted.
 - type: textarea
   id: description
   attributes:
     label: 描述 | Description
-    description: 请详细描述你想加入的新功能。| Please describe the new feature detaily.
+    description: |
+      请详细描述你想加入的新功能。
+      Please describe the new feature in detail.
   validations:
     required: true
 - type: textarea
   id: reason
   attributes:
     label: 原因 | Reason
-    description: 请描述该功能带来的好处及原因。| Please describe why you want to add the feature into HMCL.
+    description: |
+      请描述该功能带来的好处及原因。
+      Please describe why you want to add the feature or enhancement to HMCL.
   validations:
     required: true

.github/workflows/check-update.yml

@@ -50,16 +50,19 @@ jobs:
         if: ${{ env.continue == 'true' }}
         run: |
           echo "The full changelogs can be found on the website: https://docs.hmcl.net/changelog/dev.html" >> RELEASE_NOTE
-          echo "Notice: changelogs are written in Chinese." >> RELEASE_NOTE
+          echo "" >> RELEASE_NOTE
+          echo "*Notice: changelogs are written in Chinese.*" >> RELEASE_NOTE
           echo "" >> RELEASE_NOTE
           echo "| File Name | SHA-256 Checksum |"  >> RELEASE_NOTE
           echo "| ---  | --- |" >> RELEASE_NOTE
-          echo "| HMCL-$HMCL_VERSION.exe | $(cat HMCL-$HMCL_VERSION.exe.sha256) |" >> RELEASE_NOTE
-          echo "| HMCL-$HMCL_VERSION.jar | $(cat HMCL-$HMCL_VERSION.jar.sha256) |" >> RELEASE_NOTE
-          echo "| HMCL-$HMCL_VERSION.sh  | $(cat HMCL-$HMCL_VERSION.sh.sha256) |"  >> RELEASE_NOTE
+          echo "| [HMCL-$HMCL_VERSION.exe]($GH_DOWNLOAD_BASE_URL/v$HMCL_VERSION/HMCL-$HMCL_VERSION.exe) | \`$(cat HMCL-$HMCL_VERSION.exe.sha256)\` |" >> RELEASE_NOTE
+          echo "| [HMCL-$HMCL_VERSION.jar]($GH_DOWNLOAD_BASE_URL/v$HMCL_VERSION/HMCL-$HMCL_VERSION.jar) | \`$(cat HMCL-$HMCL_VERSION.jar.sha256)\` |" >> RELEASE_NOTE
+          echo "| [HMCL-$HMCL_VERSION.sh]($GH_DOWNLOAD_BASE_URL/v$HMCL_VERSION/HMCL-$HMCL_VERSION.sh)   | \`$(cat HMCL-$HMCL_VERSION.sh.sha256)\` |"  >> RELEASE_NOTE
+        env:
+          GH_DOWNLOAD_BASE_URL: https://github.com/HMCL-dev/HMCL/releases/download
       - name: Create release
         if: ${{ env.continue == 'true' }}
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           body_path: RELEASE_NOTE
           files: |
@@ -69,6 +72,7 @@ jobs:
           target_commitish: ${{ env.HMCL_COMMIT_SHA }}
           name: ${{ env.HMCL_TAG_NAME }}
           tag_name: ${{ env.HMCL_TAG_NAME }}
+          prerelease: true
   stable-check-update:
     if: ${{ github.repository_owner == 'HMCL-dev' }}
     needs: dev-check-update
@@ -114,16 +118,18 @@ jobs:
           echo "" >> RELEASE_NOTE
           echo "The full changelogs can be found on the website: https://docs.hmcl.net/changelog/stable.html" >> RELEASE_NOTE
           echo "" >> RELEASE_NOTE
-          echo "Notice: changelogs are written in Chinese." >> RELEASE_NOTE
+          echo "*Notice: changelogs are written in Chinese.*" >> RELEASE_NOTE
           echo "" >> RELEASE_NOTE
           echo "| File Name | SHA-256 Checksum |"  >> RELEASE_NOTE
           echo "| ---  | --- |" >> RELEASE_NOTE
-          echo "| HMCL-$HMCL_VERSION.exe | $(cat HMCL-$HMCL_VERSION.exe.sha256) |" >> RELEASE_NOTE
-          echo "| HMCL-$HMCL_VERSION.jar | $(cat HMCL-$HMCL_VERSION.jar.sha256) |" >> RELEASE_NOTE
-          echo "| HMCL-$HMCL_VERSION.sh  | $(cat HMCL-$HMCL_VERSION.sh.sha256) |"  >> RELEASE_NOTE
+          echo "| [HMCL-$HMCL_VERSION.exe]($GH_DOWNLOAD_BASE_URL/release-$HMCL_VERSION/HMCL-$HMCL_VERSION.exe) | \`$(cat HMCL-$HMCL_VERSION.exe.sha256)\` |" >> RELEASE_NOTE
+          echo "| [HMCL-$HMCL_VERSION.jar]($GH_DOWNLOAD_BASE_URL/release-$HMCL_VERSION/HMCL-$HMCL_VERSION.jar) | \`$(cat HMCL-$HMCL_VERSION.jar.sha256)\` |" >> RELEASE_NOTE
+          echo "| [HMCL-$HMCL_VERSION.sh]($GH_DOWNLOAD_BASE_URL/release-$HMCL_VERSION/HMCL-$HMCL_VERSION.sh)   | \`$(cat HMCL-$HMCL_VERSION.sh.sha256)\` |"  >> RELEASE_NOTE
+        env:
+          GH_DOWNLOAD_BASE_URL: https://github.com/HMCL-dev/HMCL/releases/download
       - name: Create release
         if: ${{ env.continue == 'true' }}
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           body_path: RELEASE_NOTE
           files: |

.github/workflows/gradle.yml

@@ -14,11 +14,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 11
+    - name: Set up JDK 8
       uses: actions/setup-java@v4
       with:
         distribution: 'zulu'
-        java-version: '11'
+        java-version: 8
         java-package: 'jdk+fx'
     - name: Build with Gradle
       run: ./gradlew build --no-daemon

HMCL/build.gradle.kts

@@ -25,7 +25,7 @@ val buildNumber = System.getenv("BUILD_NUMBER")?.toInt().let { number ->
         if (!shortCommit.isNullOrEmpty()) "$prefix-$shortCommit" else "SNAPSHOT"
     }
 }
-val versionRoot = System.getenv("VERSION_ROOT") ?: "3.5"
+val versionRoot = System.getenv("VERSION_ROOT") ?: "3.6"
 val versionType = System.getenv("VERSION_TYPE") ?: if (isOfficial) "nightly" else "unofficial"
 
 val microsoftAuthId = System.getenv("MICROSOFT_AUTH_ID") ?: ""
@@ -37,13 +37,13 @@ version = "$versionRoot.$buildNumber"
 dependencies {
     implementation(project(":HMCLCore"))
     implementation("libs:JFoenix")
+    implementation("com.twelvemonkeys.imageio:imageio-webp:3.12.0")
 }
 
 fun digest(algorithm: String, bytes: ByteArray): 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"
@@ -111,14 +111,17 @@ tasks.getByName<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("sha
     exclude("**/package-info.class")
     exclude("META-INF/maven/**")
 
+    exclude("META-INF/services/javax.imageio.spi.ImageReaderSpi")
+    exclude("META-INF/services/javax.imageio.spi.ImageInputStreamSpi")
+
     minimize {
         exclude(dependency("com.google.code.gson:.*:.*"))
         exclude(dependency("libs:JFoenix:.*"))
     }
 
     manifest {
         attributes(
-            "Created-By" to "Copyright(c) 2013-2024 huangyuhui.",
+            "Created-By" to "Copyright(c) 2013-2025 huangyuhui.",
             "Main-Class" to "org.jackhuang.hmcl.Main",
             "Multi-Release" to "true",
             "Implementation-Version" to project.version,
@@ -167,33 +170,10 @@ fun createExecutable(suffix: String, header: String) {
 }
 
 tasks.processResources {
-    fun convertToBSS(resource: String) {
-        doFirst {
-            val cssFile = File(projectDir, "src/main/resources/$resource")
-            val bssFile = File(projectDir, "build/compiled-resources/${resource.substring(0, resource.length - 4)}.bss")
-            bssFile.parentFile.mkdirs()
-            javaexec {
-                classpath = sourceSets["main"].compileClasspath
-                mainClass.set("com.sun.javafx.css.parser.Css2Bin")
-                args(cssFile, bssFile)
-            }
-        }
-    }
-
-    from("build/compiled-resources")
-
-    convertToBSS("assets/css/root.css")
-    convertToBSS("assets/css/blue.css")
-
     into("META-INF/versions/11") {
         from(sourceSets["java11"].output)
     }
     dependsOn(tasks["java11Classes"])
-
-    into("assets") {
-        from(project.layout.buildDirectory.file("openjfx-dependencies.json"))
-    }
-    dependsOn(rootProject.tasks["generateOpenJFXDependencies"])
 }
 
 val makeExecutables = tasks.create("makeExecutables") {
@@ -208,11 +188,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")
+    }
 }