[release/3.6] 优化 Java 自动选择规则 (#4534)

#4515

Author: Glavo

HMCL/src/main/java/org/jackhuang/hmcl/java/JavaManager.java

@@ -255,16 +255,15 @@ public static void removeJava(Path realPath) throws InterruptedException {
         }
     }
 
-    private static int compareJavaVersion(JavaRuntime java1, JavaRuntime java2, GameJavaVersion suggestedJavaVersion) {
-        if (suggestedJavaVersion != null) {
-            boolean b1 = java1.getParsedVersion() == suggestedJavaVersion.getMajorVersion();
-            boolean b2 = java2.getParsedVersion() == suggestedJavaVersion.getMajorVersion();
+    private static JavaRuntime chooseJava(@Nullable JavaRuntime java1, JavaRuntime java2) {
+        if (java1 == null)
+            return java2;
 
-            if (b1 != b2)
-                return b1 ? 1 : -1;
-        }
-
-        return java1.getVersionNumber().compareTo(java2.getVersionNumber());
+        if (java1.getParsedVersion() != java2.getParsedVersion())
+            // Prefer the Java version that is closer to the game's recommended Java version
+            return java1.getParsedVersion() < java2.getParsedVersion() ? java1 : java2;
+        else
+            return java1.getVersionNumber().compareTo(java2.getVersionNumber()) >= 0 ? java1 : java2;
     }
 
     @Nullable
@@ -280,9 +279,6 @@ public static JavaRuntime findSuitableJava(Collection<JavaRuntime> javaRuntimes,
                 && (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS || OperatingSystem.CURRENT_OS == OperatingSystem.MACOS)
                 && (gameVersion == null || gameVersion.compareTo("1.6") < 0);
 
-        GameJavaVersion suggestedJavaVersion =
-                (version != null && gameVersion != null && gameVersion.compareTo("1.7.10") >= 0) ? version.getJavaVersion() : null;
-
         JavaRuntime mandatory = null;
         JavaRuntime suggested = null;
         for (JavaRuntime java : javaRuntimes) {
@@ -310,15 +306,10 @@ public static JavaRuntime findSuitableJava(Collection<JavaRuntime> javaRuntimes,
             }
 
             if (!violationMandatory) {
-                if (mandatory == null) mandatory = java;
-                else if (compareJavaVersion(java, mandatory, suggestedJavaVersion) > 0)
-                    mandatory = java;
-
-                if (!violationSuggested) {
-                    if (suggested == null) suggested = java;
-                    else if (compareJavaVersion(java, suggested, suggestedJavaVersion) > 0)
-                        suggested = java;
-                }
+                mandatory = chooseJava(mandatory, java);
+
+                if (!violationSuggested)
+                    suggested = chooseJava(suggested, java);
             }
         }
 

HMCLCore/src/test/java/org/jackhuang/hmcl/util/platform/JavaRuntimeTest.java

@@ -13,6 +13,7 @@ public final class JavaRuntimeTest {
     public void testParseVersion() {
         assertEquals(8, parseVersion("1.8.0_302"));
         assertEquals(8, parseVersion("1.8-internal"));
+        assertEquals(8, parseVersion("8.0"));
         assertEquals(11, parseVersion("11"));
         assertEquals(11, parseVersion("11.0.12"));
         assertEquals(11, parseVersion("11-internal"));