forked from PojavLauncherTeam/PojavLauncher
-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
revert if I can't get this working
- Loading branch information
Showing
5 changed files
with
113 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
99 changes: 99 additions & 0 deletions
99
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JRE21Util.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| package net.kdt.pojavlaunch; | ||
|
|
||
| import static net.kdt.pojavlaunch.Architecture.archAsString; | ||
|
|
||
| import android.app.Activity; | ||
| import android.content.res.AssetManager; | ||
| import android.util.Log; | ||
|
|
||
| import net.kdt.pojavlaunch.multirt.MultiRTUtils; | ||
| import net.kdt.pojavlaunch.multirt.Runtime; | ||
| import net.kdt.pojavlaunch.value.launcherprofiles.LauncherProfiles; | ||
| import net.kdt.pojavlaunch.value.launcherprofiles.MinecraftProfile; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| public class JRE21Util { | ||
| public static final String NEW_JRE_NAME = "Internal-21"; | ||
|
|
||
| public static boolean checkInternalNewJre(AssetManager assetManager) { | ||
| String launcher_jre21_version; | ||
| String installed_jre21_version = MultiRTUtils.__internal__readBinpackVersion(NEW_JRE_NAME); | ||
| try { | ||
| launcher_jre21_version = Tools.read(assetManager.open("components/jre-new-21/version")); | ||
| }catch (IOException exc) { | ||
| //we don't have a runtime included! | ||
| return installed_jre21_version != null; //if we have one installed -> return true -> proceed (no updates but the current one should be functional) | ||
| //if we don't -> return false -> Cannot find compatible Java runtime | ||
| } | ||
| if(!launcher_jre21_version.equals(installed_jre21_version)) // this implicitly checks for null, so it will unpack the runtime even if we don't have one installed | ||
| return unpackjre21(assetManager, launcher_jre21_version); | ||
| else return true; | ||
| } | ||
|
|
||
| private static boolean unpackjre21(AssetManager assetManager, String rt_version) { | ||
| try { | ||
| MultiRTUtils.installRuntimeNamedBinpack( | ||
| assetManager.open("components/jre-new-21/universal.tar.xz"), | ||
| assetManager.open("components/jre-new-21/bin-" + archAsString(Tools.DEVICE_ARCHITECTURE) + ".tar.xz"), | ||
| "Internal-21", rt_version); | ||
| MultiRTUtils.postPrepare("Internal-21"); | ||
| return true; | ||
| }catch (IOException e) { | ||
| Log.e("jre21Auto", "Internal JRE unpack failed", e); | ||
| return false; | ||
| } | ||
| } | ||
| public static boolean isInternalNewJRE(String s_runtime) { | ||
| Runtime runtime = MultiRTUtils.read(s_runtime); | ||
| if(runtime == null) return false; | ||
| return NEW_JRE_NAME.equals(runtime.name); | ||
| } | ||
|
|
||
| /** @return true if everything is good, false otherwise. */ | ||
| public static boolean installNewJreIfNeeded(Activity activity, JMinecraftVersionList.Version versionInfo) { | ||
| //Now we have the reliable information to check if our runtime settings are good enough | ||
| if (versionInfo.javaVersion == null || versionInfo.javaVersion.component.equalsIgnoreCase("jre-legacy")) | ||
| return true; | ||
|
|
||
| LauncherProfiles.load(); | ||
| MinecraftProfile minecraftProfile = LauncherProfiles.getCurrentProfile(); | ||
|
|
||
| String selectedRuntime = Tools.getSelectedRuntime(minecraftProfile); | ||
|
|
||
| Runtime runtime = MultiRTUtils.read(selectedRuntime); | ||
| if (runtime.javaVersion >= versionInfo.javaVersion.majorVersion) { | ||
| return true; | ||
| } | ||
|
|
||
| String appropriateRuntime = MultiRTUtils.getNearestJreName(versionInfo.javaVersion.majorVersion); | ||
| if (appropriateRuntime != null) { | ||
| if (jre21Util.isInternalNewJRE(appropriateRuntime)) { | ||
| jre21Util.checkInternalNewJre(activity.getAssets()); | ||
| } | ||
| minecraftProfile.javaDir = Tools.LAUNCHERPROFILES_RTPREFIX + appropriateRuntime; | ||
| LauncherProfiles.load(); | ||
| } else { | ||
| if (versionInfo.javaVersion.majorVersion <= 21) { // there's a chance we have an internal one for this case | ||
| if (!jre21Util.checkInternalNewJre(activity.getAssets())){ | ||
| showRuntimeFail(activity, versionInfo); | ||
| return false; | ||
| } else { | ||
| minecraftProfile.javaDir = Tools.LAUNCHERPROFILES_RTPREFIX + jre21Util.NEW_JRE_NAME; | ||
| LauncherProfiles.load(); | ||
| } | ||
| } else { | ||
| showRuntimeFail(activity, versionInfo); | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| private static void showRuntimeFail(Activity activity, JMinecraftVersionList.Version verInfo) { | ||
| Tools.dialogOnUiThread(activity, activity.getString(R.string.global_error), | ||
| activity.getString(R.string.multirt_nocompatiblert, verInfo.javaVersion.majorVersion)); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters