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

Tools.java: Add a global method to launch JVM with additional args

Browse source
This commit is contained in:
khanhduytran0 2020-11-05 20:21:42 +07:00
parent 7c0f688f89
commit e8a972c0ba
2 changed files with 18 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

38
app/src/main/java/net/kdt/pojavlaunch/Tools.java
View file

@ -70,40 +70,31 @@ public final class Tools
public static ShellProcessOperation mLaunchShell;
private static int exitCode = 0;
public static void launchMinecraft(final LoggableActivity ctx, MCProfile.Builder profile, JMinecraftVersionList.Version versionInfo) throws Throwable {
JREUtils.relocateLibPath(ctx);
String[] launchArgs = getMinecraftArgs(profile, versionInfo);
List<String> javaArgList = new ArrayList<String>();
/*
if (LAUNCH_TYPE == LTYPE_PROCESS || LAUNCH_TYPE == LTYPE_BINARYEXEC) javaArgList.add(Tools.homeJreDir + "/bin/java");
else javaArgList.add("java");
*/
javaArgList.add(Tools.homeJreDir + "/bin/java");
String launchClassPath = generateLaunchClassPath(profile.getVersion());
System.out.println("Java Classpath: " + launchClassPath);
getJavaArgs(ctx, javaArgList);
List<String> javaArgList = new ArrayList<String>();
javaArgList.add("-cp");
/*
if (versionInfo.mainClass.equals("net.minecraft.launchwrapper.Launch")) {
// Also preload LWJGL3 to fix crash on send input events
javaArgList.add(Tools.MAIN_PATH + "/lwjgl3/ClassWrapper.jar:" + getLWJGL3ClassPath());
javaArgList.add("ClassWrapper");
javaArgList.add(launchClassPath);
} else { */
javaArgList.add(getLWJGL3ClassPath() + ":" + launchClassPath);
// }
javaArgList.add(versionInfo.mainClass);
javaArgList.addAll(Arrays.asList(launchArgs));
// can fix java?
// setEnvironment("ORIGIN", Tools.homeJreDir + "/lib");
launchJavaVM(ctx, javaArgList);
}
public static void launchJavaVM(final LoggableActivity ctx, final List<String> args) throws Throwable {
JREUtils.relocateLibPath(ctx);
List<String> javaArgList = new ArrayList<String>();
javaArgList.add(Tools.homeJreDir + "/bin/java");
getJavaArgs(ctx, javaArgList);
javaArgList.addAll(args);
JREUtils.setJavaEnvironment(ctx);
JREUtils.initJavaRuntime();
JREUtils.chdir(Tools.MAIN_PATH);
@ -113,9 +104,6 @@ public final class Tools
exitCode = VMLauncher.launchJVM(javaArgList.toArray(new String[0]));
ctx.appendlnToLog("Java Exit code: " + exitCode);
ctx.runOnUiThread(new Runnable(){
@Override
public void run() {