2009Scape/2009Scape-mobile
1
0
Fork 0
mirror of https://github.com/2009scape/2009Scape-mobile.git synced 2025-12-19 21:10:11 -07:00
Code Issues Projects Releases Packages Wiki Activity

[JRE Startup check] Enable JVM arguments check

Browse source
This commit is contained in:
khanhduytran0 2020-11-06 15:32:08 +07:00
parent 2d73af1ea9
commit 8960365524
3 changed files with 57 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

46
app/src/main/java/net/kdt/pojavlaunch/MainActivity.java
View file

@ -956,28 +956,42 @@ public class MainActivity extends LoggableActivity implements OnTouchListener, O
appendlnToLog("--------- beggining with launcher debug");
checkLWJGL3Installed();
checkJavaArchitecture();
// checkJavaArgsIsLaunchable();
appendlnToLog("Info: Custom Java arguments: \"" + LauncherPreferences.PREF_CUSTOM_JAVA_ARGS + "\"");
Map<String, String> jreReleaseList = readJREReleaseProperties();
checkJavaArchitecture(jreReleaseList.get("OS_ARCH"));
checkJavaArgsIsLaunchable(jreReleaseList.get("JAVA_VERSION"));
// appendlnToLog("Info: Custom Java arguments: \"" + LauncherPreferences.PREF_CUSTOM_JAVA_ARGS + "\"");
JREUtils.redirectAndPrintJRELog(this, mProfile.getAccessToken());
Tools.launchMinecraft(this, mProfile, mVersionInfo);
}
private void checkJavaArchitecture() throws Exception {
private Map<String, String> readJREReleaseProperties() throws IOException {
Map<String, String> jreReleaseMap = new ArrayMap<>();
BufferedReader jreReleaseReader = new BufferedReader(new FileReader(Tools.homeJreDir + "/release"));
String currLine;
while ((currLine = jreReleaseReader.readLine()) != null) {
if (!currLine.isEmpty() || currLine.contains("=")) {
String[] keyValue = currLine.split("=");
jreReleaseMap.put(keyValue[0], keyValue[1].replace("\"", ""));
}
}
jreReleaseReader.close();
return jreReleaseMap;
}
private void checkJavaArchitecture(String jreArch) throws Exception {
String[] argName = Tools.currentArch.split("/");
String releaseContent = Tools.read(Tools.homeJreDir + "/release");
int osArchIndex = releaseContent.indexOf("OS_ARCH=\"") + 9;
releaseContent = releaseContent.substring(osArchIndex);
releaseContent = releaseContent.substring(0, releaseContent.indexOf("\""));
appendlnToLog("Architecture: " + Tools.currentArch);
if (!(releaseContent.contains(argName[0]) || releaseContent.contains(argName[1]))) {
appendlnToLog("Architecture " + Tools.currentArch + " is incompatible with Java Runtime " + releaseContent);
throw new RuntimeException(getString(R.string.mcn_check_fail_incompatiblearch, Tools.currentArch, releaseContent));
if (!(jreArch.contains(argName[0]) || jreArch.contains(argName[1]))) {
appendlnToLog("Architecture " + Tools.currentArch + " is incompatible with Java Runtime " + jreArch);
throw new RuntimeException(getString(R.string.mcn_check_fail_incompatiblearch, Tools.currentArch, jreArch));
}
}
/*
private void checkJavaArgsIsLaunchable() throws Throwable {
private void checkJavaArgsIsLaunchable(String jreVersion) throws Throwable {
if (jreVersion.equals("1.9.0")) return;
appendlnToLog("Info: Custom Java arguments: \"" + LauncherPreferences.PREF_CUSTOM_JAVA_ARGS + "\"");
// Test java
@ -987,9 +1001,7 @@ public class MainActivity extends LoggableActivity implements OnTouchListener, O
appendlnToLog("[JRETest] " + text);
}
});
Tools.mLaunchShell = shell;
JREUtils.setJavaEnvironment(this, Tools.LTYPE_PROCESS);
Tools.mLaunchShell = null;
JREUtils.setJavaEnvironment(this, shell);
List<String> testArgs = new ArrayList<String>();
testArgs.add(Tools.homeJreDir + "/bin/java");
@ -1010,7 +1022,7 @@ public class MainActivity extends LoggableActivity implements OnTouchListener, O
// throw new RuntimeException(getString(R.string.mcn_check_fail_java));
}
}
*/
private void checkLWJGL3Installed() {
File lwjgl3dir = new File(Tools.MAIN_PATH, "lwjgl3");
if (!lwjgl3dir.exists() || lwjgl3dir.isFile() || lwjgl3dir.list().length == 0) {