Merge pull request #227 from AngelAuraMC/feat/misc

feat: Download JREs from github

Author: alexytomi

.github/workflows/android.yml

@@ -38,35 +38,35 @@ jobs:
           branch: buildjre8
           name: jre8-pojav
 
-      - name: Get JRE17
-        uses: dawidd6/action-download-artifact@v9
-        with:
-          workflow: build.yml
-          path: app_pojavlauncher/src/main/assets/components/jre-new
-          workflow_conclusion: completed
-          repo: AngelAuraMC/angelauramc-openjdk-build
-          branch: buildjre17-21
-          name: jre17-pojav
-
-      - name: Get JRE21
-        uses: dawidd6/action-download-artifact@v9
-        with:
-          workflow: build.yml
-          path: app_pojavlauncher/src/main/assets/components/jre-21
-          workflow_conclusion: completed
-          repo: AngelAuraMC/angelauramc-openjdk-build
-          branch: buildjre17-21
-          name: jre21-pojav
-
-      - name: Get JRE25
-        uses: dawidd6/action-download-artifact@v9
-        with:
-          workflow: build.yml
-          path: app_pojavlauncher/src/main/assets/components/jre-25
-          workflow_conclusion: completed
-          repo: FCL-Team/Android-OpenJDK-Build
-          branch: Build_JRE_25
-          name: jre25-multiarch
+      # - name: Get JRE17
+      #   uses: dawidd6/action-download-artifact@v9
+      #   with:
+      #     workflow: build.yml
+      #     path: app_pojavlauncher/src/main/assets/components/jre-new
+      #     workflow_conclusion: completed
+      #     repo: AngelAuraMC/angelauramc-openjdk-build
+      #     branch: buildjre17-21
+      #     name: jre17-pojav
+      #
+      # - name: Get JRE21
+      #   uses: dawidd6/action-download-artifact@v9
+      #   with:
+      #     workflow: build.yml
+      #     path: app_pojavlauncher/src/main/assets/components/jre-21
+      #     workflow_conclusion: completed
+      #     repo: AngelAuraMC/angelauramc-openjdk-build
+      #     branch: buildjre17-21
+      #     name: jre21-pojav
+      #
+      # - name: Get JRE25
+      #   uses: dawidd6/action-download-artifact@v9
+      #   with:
+      #     workflow: build.yml
+      #     path: app_pojavlauncher/src/main/assets/components/jre-25
+      #     workflow_conclusion: completed
+      #     repo: FCL-Team/Android-OpenJDK-Build
+      #     branch: Build_JRE_25
+      #     name: jre25-multiarch
 
       - uses: gradle/actions/setup-gradle@v4
         with:

app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/NewJREUtil.java

@@ -1,17 +1,27 @@
 package net.kdt.pojavlaunch;
 
 import static net.kdt.pojavlaunch.Architecture.archAsString;
+import static net.kdt.pojavlaunch.Architecture.getDeviceArchitecture;
+import static net.kdt.pojavlaunch.Tools.NATIVE_LIB_DIR;
+import static net.kdt.pojavlaunch.Tools.isOnline;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.res.AssetManager;
 import android.util.Log;
 
+import com.kdt.mcgui.ProgressLayout;
+
 import net.kdt.pojavlaunch.multirt.MultiRTUtils;
 import net.kdt.pojavlaunch.multirt.Runtime;
+import net.kdt.pojavlaunch.progresskeeper.DownloaderProgressWrapper;
+import net.kdt.pojavlaunch.utils.DownloadUtils;
 import net.kdt.pojavlaunch.utils.MathUtils;
 import net.kdt.pojavlaunch.value.launcherprofiles.LauncherProfiles;
 import net.kdt.pojavlaunch.value.launcherprofiles.MinecraftProfile;
 
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
@@ -56,7 +66,7 @@ private static InternalRuntime getInternalRuntime(Runtime runtime) {
     }
 
     private static MathUtils.RankedValue<Runtime> getNearestInstalledRuntime(int targetVersion) {
-        List<Runtime> runtimes = MultiRTUtils.getRuntimes();
+        List<Runtime> runtimes = MultiRTUtils.getInstalledRuntimes();
         return MathUtils.findNearestPositive(targetVersion, runtimes, (runtime)->runtime.javaVersion);
     }
 
@@ -84,7 +94,7 @@ public static boolean installNewJreIfNeeded(Activity activity, JMinecraftVersion
             // Check whether the selection is an internal runtime
             InternalRuntime internalRuntime = getInternalRuntime(runtime);
             // If it is, check if updates are available from the APK file
-            if(internalRuntime != null) {
+            if (internalRuntime != null) {
                 // Not calling showRuntimeFail on failure here because we did, technically, find the compatible runtime
                 return checkInternalRuntime(assetManager, internalRuntime);
             }
@@ -100,6 +110,18 @@ public static boolean installNewJreIfNeeded(Activity activity, JMinecraftVersion
                 nearestInternalRuntime, nearestInstalledRuntime, (value)->value.rank
         );
 
+        // Check if the selected runtime actually exists in the APK, else download it
+        // If it isn't InternalRuntime then it wasn't in the apk in the first place!
+        if (selectedRankedRuntime.value instanceof InternalRuntime)
+            if (!checkInternalRuntime(assetManager, (InternalRuntime) selectedRankedRuntime.value)) {
+                if (nearestInstalledRuntime == null) // If this was non-null then it would be a valid runtime and we can leave it be
+                    tryDownloadRuntime(activity, gameRequiredVersion);
+                // This means the internal runtime didn't extract so let's use installed instead
+                // This also refreshes it so after the runtime download, it can find the new runtime
+                selectedRankedRuntime = getNearestInstalledRuntime(gameRequiredVersion);
+            }
+
+
         // No possible selections
         if(selectedRankedRuntime == null) {
             showRuntimeFail(activity, versionInfo);
@@ -141,6 +163,47 @@ private static void showRuntimeFail(Activity activity, JMinecraftVersionList.Ver
                 activity.getString(R.string.multirt_nocompatiblert, verInfo.javaVersion.majorVersion));
     }
 
+    public static boolean isJavaVersionAvailableForDownload(int version) {
+        for (ExternalRuntime javaVersion : ExternalRuntime.values()) {
+            if (javaVersion.majorVersion == version) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static String getJreSource(int javaVersion, String arch){
+        return String.format("https://github.com/AngelAuraMC/angelauramc-openjdk-build/releases/download/download_jre%1$s/jre%1$s-android-%2$s.tar.xz", javaVersion, arch);
+    }
+    /**
+     * @return whether installation was successful or not
+     */
+    private static void tryDownloadRuntime(Context activity, int javaVersion){
+        if (!isOnline(activity)) throw new RuntimeException(activity.getString(R.string.multirt_no_internet));
+        String arch = archAsString(getDeviceArchitecture());
+        // Checks for using this method
+        if (!isJavaVersionAvailableForDownload(javaVersion)) throw new RuntimeException("This is not an available JRE version");
+        if ((getDeviceArchitecture() == Architecture.ARCH_X86 && javaVersion >= 21)) throw new RuntimeException("x86 is not supported on Java"+javaVersion);
+        try {
+            File outputFile = new File(Tools.DIR_CACHE, String.format("jre%s-android-%s.tar.xz", javaVersion, arch));
+            DownloaderProgressWrapper monitor = new DownloaderProgressWrapper(R.string.newdl_downloading_jre_runtime,
+                    ProgressLayout.UNPACK_RUNTIME);
+            monitor.extraString = Integer.toString(javaVersion);
+            DownloadUtils.downloadFileMonitored(
+                    getJreSource(javaVersion, arch),
+                    outputFile,
+                    null,
+                    monitor
+            );
+            String jreName = "External-" + javaVersion;
+            MultiRTUtils.installRuntimeNamed(NATIVE_LIB_DIR, new FileInputStream(outputFile), jreName);
+            MultiRTUtils.postPrepare(jreName);
+            outputFile.delete();
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to download Java "+javaVersion+" for "+arch, e);
+        }
+    }
+
     private enum InternalRuntime {
         JRE_17(17, "Internal-17", "components/jre-new"),
         JRE_21(21, "Internal-21", "components/jre-21"),
@@ -155,4 +218,24 @@ private enum InternalRuntime {
         }
     }
 
+    public enum ExternalRuntime {
+        JRE_8(8, "External-8"),
+        JRE_17(17, "External-17"),
+        JRE_21(21, "External-21"),
+        JRE_25(25, "External-25");
+        public final int majorVersion;
+        public final String name;
+        public final String downloadLink;
+        public boolean isDownloading = false;
+
+        ExternalRuntime(int majorVersion, String name) {
+            this.majorVersion = majorVersion;
+            this.name = name;
+            this.downloadLink = getJreSource(majorVersion, archAsString(getDeviceArchitecture()));
+        }
+        public void downloadRuntime(Context activity){
+            tryDownloadRuntime(activity, majorVersion);
+        }
+    }
+
 }

app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/ProfileEditorFragment.java

@@ -42,7 +42,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Objects;
 
 public class ProfileEditorFragment extends Fragment implements CropperUtils.CropperListener{
     public static final String TAG = "ProfileEditorFragment";
@@ -173,7 +172,7 @@ private void loadValues(@NonNull String profile, @NonNull Context context){
         );
 
         // Runtime spinner
-        List<Runtime> runtimes = MultiRTUtils.getRuntimes();
+        List<Runtime> runtimes = MultiRTUtils.getInstalledRuntimes();
         int jvmIndex = runtimes.indexOf(new Runtime("<Default>"));
         if (mTempProfile.javaDir != null) {
             String selectedRuntime = mTempProfile.javaDir.substring(Tools.LAUNCHERPROFILES_RTPREFIX.length());

app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/multirt/MultiRTConfigDialog.java

@@ -27,11 +27,16 @@ public void refresh() {
         if(adapter != null) adapter.notifyDataSetChanged();
     }
 
+    public MultiRTConfigDialog get() {
+        return this;
+    }
+
     /** Build the dialog behavior and style */
     public void prepare(Context activity, ActivityResultLauncher<Object> installJvmLauncher) {
         mDialogView = new RecyclerView(activity);
         mDialogView.setLayoutManager(new LinearLayoutManager(activity, LinearLayoutManager.VERTICAL, false));
         RTRecyclerViewAdapter adapter = new RTRecyclerViewAdapter();
+        adapter.setDialog(get());
         mDialogView.setAdapter(adapter);
 
         mDialog = new AlertDialog.Builder(activity)

app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/multirt/MultiRTUtils.java

@@ -1,5 +1,6 @@
 package net.kdt.pojavlaunch.multirt;
 
+import static net.kdt.pojavlaunch.Architecture.getDeviceArchitecture;
 import static net.kdt.pojavlaunch.Tools.NATIVE_LIB_DIR;
 import static org.apache.commons.io.FileUtils.listFiles;
 
@@ -8,6 +9,8 @@
 
 import com.kdt.mcgui.ProgressLayout;
 
+import net.kdt.pojavlaunch.Architecture;
+import net.kdt.pojavlaunch.NewJREUtil.ExternalRuntime;
 import net.kdt.pojavlaunch.R;
 import net.kdt.pojavlaunch.Tools;
 import net.kdt.pojavlaunch.utils.MathUtils;
@@ -36,7 +39,7 @@ public class MultiRTUtils {
     private static final String JAVA_VERSION_STR = "JAVA_VERSION=\"";
     private static final String OS_ARCH_STR = "OS_ARCH=\"";
 
-    public static List<Runtime> getRuntimes() {
+    public static List<Runtime> getInstalledRuntimes() {
         if(!RUNTIME_FOLDER.exists() && !RUNTIME_FOLDER.mkdirs()) {
             throw new RuntimeException("Failed to create runtime directory");
         }
@@ -51,16 +54,33 @@ public static List<Runtime> getRuntimes() {
         return runtimes;
     }
 
+    /**
+     *
+     * @return Java versions which are not installed but are present in {@link ExternalRuntime}
+     */
+    public static List<ExternalRuntime> getRuntimesToDownload() {
+        List<ExternalRuntime> runtimesToDownload = new ArrayList<>();
+        ExternalRuntime[] downloadableRuntimes = ExternalRuntime.values();
+        for (ExternalRuntime downloadableruntime : downloadableRuntimes) {
+            if(getExactJreName(downloadableruntime.majorVersion) == null){
+                // x86 isn't supported anymore for JRE25
+                if (!(getDeviceArchitecture() == Architecture.ARCH_X86 && downloadableruntime.majorVersion >= 21))
+                    runtimesToDownload.add(downloadableruntime);
+            }
+        }
+        return runtimesToDownload;
+    }
+
     public static String getExactJreName(int majorVersion) {
-        List<Runtime> runtimes = getRuntimes();
+        List<Runtime> runtimes = getInstalledRuntimes();
         for(Runtime r : runtimes)
             if(r.javaVersion == majorVersion)return r.name;
 
         return null;
     }
 
     public static String getNearestJreName(int majorVersion) {
-        List<Runtime> runtimes = getRuntimes();
+        List<Runtime> runtimes = getInstalledRuntimes();
         MathUtils.RankedValue<Runtime> nearestRankedRuntime = MathUtils.findNearestPositive(majorVersion, runtimes, (runtime)->runtime.javaVersion);
         if(nearestRankedRuntime == null) return null;
         Runtime nearestRuntime = nearestRankedRuntime.value;