From b21528a7db782a0978a9a51a0338c5ed4e5a88d5 Mon Sep 17 00:00:00 2001
From: artdeell <ultramaksim@gmail.com>
Date: Thu, 15 Jul 2021 12:23:14 +0300
Subject: [PATCH] [Update] Auto-select a compartible runtime if the default one
 isn't compartible enough

---
 .../tasks/MinecraftDownloaderTask.java        | 21 ++++++++++++++++---
 .../src/main/res/values/strings.xml           |  1 +
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/MinecraftDownloaderTask.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/MinecraftDownloaderTask.java
index be6f06671..a25b7983c 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/MinecraftDownloaderTask.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/MinecraftDownloaderTask.java
@@ -90,7 +90,12 @@ public class MinecraftDownloaderTask extends AsyncTask<String, String, Throwable
 
                 //Now we have the reliable information to check if our runtime settings are good enough
                 if(verInfo.javaVersion != null) { //1.17+
+                    PerVersionConfig.update();
                     PerVersionConfig.VersionConfig cfg = PerVersionConfig.configMap.get(p1[0]);
+                    if(cfg == null) {
+                        cfg = new PerVersionConfig.VersionConfig();
+                        PerVersionConfig.configMap.put(p1[0],cfg);
+                    }
                      MultiRTUtils.Runtime r = cfg.selectedRuntime != null?MultiRTUtils.read(cfg.selectedRuntime):MultiRTUtils.read(LauncherPreferences.PREF_DEFAULT_RUNTIME);
                      if(r.javaVersion < verInfo.javaVersion.majorVersion) {
                          String appropriateRuntime = MultiRTUtils.getNearestJREName(verInfo.javaVersion.majorVersion);
@@ -98,7 +103,16 @@ public class MinecraftDownloaderTask extends AsyncTask<String, String, Throwable
                              cfg.selectedRuntime = appropriateRuntime;
                              PerVersionConfig.update();
                          }else{
-                             return new Exception("Unable to find a compatible Java Runtime for this version");
+                             mActivity.runOnUiThread(()->{
+                                 AlertDialog.Builder bldr = new AlertDialog.Builder(mActivity);
+                                 bldr.setTitle(R.string.global_error);
+                                 bldr.setMessage(R.string.multirt_nocompartiblert);
+                                 bldr.setPositiveButton(android.R.string.ok,(dialog, which)->{
+                                     dialog.dismiss();
+                                 });
+                                 bldr.show();
+                             });
+                             throw new SilentException();
                          }
                      } //if else, we are satisfied
                 }
@@ -223,7 +237,7 @@ public class MinecraftDownloaderTask extends AsyncTask<String, String, Throwable
         }
     }
     private int addProgress = 0;
-
+    public static class SilentException extends Exception{}
     public void zeroProgress() {
         addProgress = 0;
     }
@@ -316,7 +330,7 @@ public class MinecraftDownloaderTask extends AsyncTask<String, String, Throwable
         mActivity.mLaunchProgress.setMax(100);
         mActivity.mLaunchProgress.setProgress(0);
         mActivity.statusIsLaunching(false);
-        if(p1 != null) {
+        if(p1 != null && !(p1 instanceof SilentException)) {
             p1.printStackTrace();
             Tools.showError(mActivity, p1);
         }
@@ -407,6 +421,7 @@ public class MinecraftDownloaderTask extends AsyncTask<String, String, Throwable
             File objectsDir = new File(outputDir, "objects");
             zeroProgress();
             for(String assetKey : assetsObjects.keySet()) {
+                if(!mActivity.mIsAssetsProcessing) break;
                 JAssetInfo asset = assetsObjects.get(assetKey);
                 assetsSizeBytes+=asset.size;
                 String assetPath = asset.hash.substring(0, 2) + "/" + asset.hash;
diff --git a/app_pojavlauncher/src/main/res/values/strings.xml b/app_pojavlauncher/src/main/res/values/strings.xml
index 390dfbc18..1b0a474ba 100644
--- a/app_pojavlauncher/src/main/res/values/strings.xml
+++ b/app_pojavlauncher/src/main/res/values/strings.xml
@@ -222,4 +222,5 @@
     <string name="multirt_config_setdefault">Set default</string>
     <string name="multirt_config_setdefault_already">Default</string>
     <string name="multirt_config_removeerror_last">You must have at least one Java Runtime installed</string>
+    <string name="multirt_nocompartiblert">Can\'t find any compartible Java Runtime</string>
 </resources>