From 60d6791f0c9aa695d5afcd75a4b9ae767b5fe2c1 Mon Sep 17 00:00:00 2001 From: Babbaj Date: Wed, 16 Aug 2023 00:27:23 -0400 Subject: [PATCH] proguard: get java from gradle runtime before JAVA_HOME --- .../src/main/java/baritone/gradle/task/ProguardTask.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java b/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java index 435eabcf3..810d5ef27 100644 --- a/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java +++ b/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java @@ -114,6 +114,9 @@ public class ProguardTask extends BaritoneGradleTask { ex.printStackTrace(); } + path = findJavaByGradleCurrentRuntime(); + if (path != null) return path; + try { path = findJavaByJavaHome(); if (path != null) return path; @@ -122,10 +125,6 @@ public class ProguardTask extends BaritoneGradleTask { ex.printStackTrace(); } - - path = findJavaByGradleCurrentRuntime(); - if (path != null) return path; - throw new Exception("Unable to find java to determine ProGuard libraryjars. Please specify forkOptions.executable in javaCompile," + " JAVA_HOME environment variable, or make sure to run Gradle with the correct JDK (a v1.8 only)"); }