From 99a031cea4e14fb31e6926d3441b24e326e9a6e5 Mon Sep 17 00:00:00 2001
From: Glavo <zjx001202@gmail.com>
Date: Tue, 8 Apr 2025 12:29:14 +0800
Subject: [PATCH] =?UTF-8?q?Gradle=20run=20task=20=E5=BA=94=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=20HMCL=5FJAVA=5FHOME=20=E6=89=80=E6=8C=87=E5=90=91?=
 =?UTF-8?q?=E7=9A=84=20Java=20(#3804)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HMCL/build.gradle.kts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/HMCL/build.gradle.kts b/HMCL/build.gradle.kts
index a53d87750..78b9f02e5 100644
--- a/HMCL/build.gradle.kts
+++ b/HMCL/build.gradle.kts
@@ -251,8 +251,15 @@ tasks.create<JavaExec>("run") {
     val vmOptions = parseToolOptions(System.getenv("HMCL_JAVA_OPTS"))
     jvmArgs(vmOptions)
 
+    val hmclJavaHome = System.getenv("HMCL_JAVA_HOME")
+    if (hmclJavaHome != null) {
+        this.executable(file(hmclJavaHome).resolve("bin")
+            .resolve(if (System.getProperty("os.name").lowercase().startsWith("windows")) "java.exe" else "java"))
+    }
+
     doFirst {
-        logger.quiet("HMCL_JAVA_OPTS: $vmOptions")
+        logger.quiet("HMCL_JAVA_OPTS: {}", vmOptions)
+        logger.quiet("HMCL_JAVA_HOME: {}", hmclJavaHome ?: System.getProperty("java.home"))
     }
 }