Merge branch 'master' into 1.19.4

buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java

@@ -126,6 +126,9 @@ public class ProguardTask extends BaritoneGradleTask {
             ex.printStackTrace();
         }
 
+        path = findJavaByGradleCurrentRuntime();
+        if (path != null) return path;
+
         try {
             path = findJavaByJavaHome();
             if (path != null) return path;
@@ -134,10 +137,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)");
     }