TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-17 00:29:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #2912 (and other tiny sanitizations)

Browse Source
This commit is contained in:
artdeell 2023-02-01 22:01:22 +03:00
parent 27a3bb8121
commit 0ade45665d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java
View File

@ -282,7 +282,7 @@ public class JavaGUILauncherActivity extends BaseActivity implements View.OnTouc
Logger.getInstance().appendToLog("Info: Java arguments: " + Arrays.toString(javaArgList.toArray(new String[0]))); Logger.getInstance().appendToLog("Info: Java arguments: " + Arrays.toString(javaArgList.toArray(new String[0])));
return JREUtils.launchJavaVM(this, javaArgList); return JREUtils.launchJavaVM(this, null,javaArgList);
} catch (Throwable th) { } catch (Throwable th) {
Tools.showError(this, th, true); Tools.showError(this, th, true);
return -1; return -1;

2
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java
View File

@ -176,7 +176,7 @@ public final class Tools {
javaArgList.add(versionInfo.mainClass); javaArgList.add(versionInfo.mainClass);
javaArgList.addAll(Arrays.asList(launchArgs)); javaArgList.addAll(Arrays.asList(launchArgs));
// ctx.appendlnToLog("full args: "+javaArgList.toString()); // ctx.appendlnToLog("full args: "+javaArgList.toString());
JREUtils.launchJavaVM(activity, javaArgList); JREUtils.launchJavaVM(activity, gamedirPath, javaArgList);
} }
public static String getGameDirPath(@NonNull MinecraftProfile minecraftProfile){ public static String getGameDirPath(@NonNull MinecraftProfile minecraftProfile){

8
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java
View File

@ -190,7 +190,7 @@ public class JREUtils {
Map<String, String> envMap = new ArrayMap<>(); Map<String, String> envMap = new ArrayMap<>();
envMap.put("POJAV_NATIVEDIR", NATIVE_LIB_DIR); envMap.put("POJAV_NATIVEDIR", NATIVE_LIB_DIR);
envMap.put("JAVA_HOME", Tools.DIR_HOME_JRE); envMap.put("JAVA_HOME", Tools.DIR_HOME_JRE);
envMap.put("HOME", Tools.DIR_GAME_NEW); envMap.put("HOME", Tools.DIR_GAME_HOME);
envMap.put("TMPDIR", activity.getCacheDir().getAbsolutePath()); envMap.put("TMPDIR", activity.getCacheDir().getAbsolutePath());
envMap.put("LIBGL_MIPMAP", "3"); envMap.put("LIBGL_MIPMAP", "3");
@ -274,7 +274,7 @@ public class JREUtils {
// return ldLibraryPath; // return ldLibraryPath;
} }
public static int launchJavaVM(final Activity activity,final List<String> JVMArgs) throws Throwable { public static int launchJavaVM(final Activity activity, String gameDirectory, final List<String> JVMArgs) throws Throwable {
JREUtils.relocateLibPath(); JREUtils.relocateLibPath();
// For debugging only! // For debugging only!
/* /*
@ -309,7 +309,7 @@ public class JREUtils {
initJavaRuntime(); initJavaRuntime();
setupExitTrap(activity.getApplication()); setupExitTrap(activity.getApplication());
chdir(Tools.DIR_GAME_NEW); chdir(gameDirectory == null ? Tools.DIR_GAME_NEW : gameDirectory);
userArgs.add(0,"java"); //argv[0] is the program name according to C standard. userArgs.add(0,"java"); //argv[0] is the program name according to C standard.
final int exitCode = VMLauncher.launchJVM(userArgs.toArray(new String[0])); final int exitCode = VMLauncher.launchJVM(userArgs.toArray(new String[0]));
@ -340,7 +340,7 @@ public class JREUtils {
ArrayList<String> overridableArguments = new ArrayList<>(Arrays.asList( ArrayList<String> overridableArguments = new ArrayList<>(Arrays.asList(
"-Djava.home=" + Tools.DIR_HOME_JRE, "-Djava.home=" + Tools.DIR_HOME_JRE,
"-Djava.io.tmpdir=" + ctx.getCacheDir().getAbsolutePath(), "-Djava.io.tmpdir=" + ctx.getCacheDir().getAbsolutePath(),
"-Duser.home=" + new File(Tools.DIR_GAME_NEW).getParent(), "-Duser.home=" + Tools.DIR_GAME_HOME,
"-Duser.language=" + System.getProperty("user.language"), "-Duser.language=" + System.getProperty("user.language"),
"-Dos.name=Linux", "-Dos.name=Linux",
"-Dos.version=Android-" + Build.VERSION.RELEASE, "-Dos.version=Android-" + Build.VERSION.RELEASE,