Revert "Update CheckJavaTask.java"

This reverts commit 20aa200.
HMCL-dev · Oct 12, 2022 · f4d0f96 · f4d0f96
1 parent 20aa200
commit f4d0f96
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/HMCLPE/src/main/java/com/tungsten/hmclpe/launcher/launch/check/CheckJavaTask.java b/HMCLPE/src/main/java/com/tungsten/hmclpe/launcher/launch/check/CheckJavaTask.java
@@ -73,14 +73,9 @@ else if (privateGameSetting.gameDirSetting.type == 1){
                     .create();
             Version version = gson.fromJson(versionJson, Version.class);
             expectedJava = version.getMinimumLauncherVersion() < 9 ? 8 : (version.getJavaVersion() == null ? 8 : version.getJavaVersion().getMajorVersion());
-            if (version.getJavaVersion() == null){
-                expectedJava = privateGameSetting.javaSetting.name.equals("default") ? 8 : 17;
-            }
             if (privateGameSetting.javaSetting.autoSelect) {
-                if (version.getJavaVersion() == null || version.getJavaVersion().getMajorVersion() == 8){
-                    java = 8;
-                }
-                else {
+                java = expectedJava;
+                if (expectedJava == 16) {
                     java = 17;
                 }
             }
@@ -91,7 +86,7 @@ else if (privateGameSetting.gameDirSetting.type == 1){
                 return null;
             }
             else {
-                return new Exception(activity.getString(R.string.launch_check_dialog_exception_error_java) + "--java" + java);
+                return new Exception(activity.getString(R.string.launch_check_dialog_exception_error_java) + " -- java" + java);
             }
         }
         catch (Exception e) {