diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/PLaunchApp.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/PLaunchApp.java index daddf9a4..7d7ccf4e 100644 --- a/JavaApp/src/main/java/net/kdt/pojavlaunch/PLaunchApp.java +++ b/JavaApp/src/main/java/net/kdt/pojavlaunch/PLaunchApp.java @@ -61,15 +61,14 @@ public class PLaunchApp { // Start Minecraft there! System.out.println("Finding a version"); String mcver = "1.13"; - /* + try { mcver = Tools.read(Tools.DIR_GAME_NEW + "/config_ver.txt"); } catch (IOException e) { System.out.println("config_ver.txt not found, defaulting to Minecraft 1.13"); } - */ - System.out.println("Launching Minecraft " + mcver); + System.out.println("Launching Minecraft " + mcver); MinecraftAccount acc = new MinecraftAccount(); acc.selectedVersion = mcver; JMinecraftVersionList.Version version = Tools.getVersionInfo(mcver); diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java index a3db8865..0c805343 100644 --- a/JavaApp/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java +++ b/JavaApp/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java @@ -72,7 +72,7 @@ public class LauncherPreferences } */ - File argsFile = new File(Tools.DIR_GAME_HOME, "overrideargs.txt"); + File argsFile = new File(Tools.DIR_GAME_NEW, "overrideargs.txt"); try { if (!argsFile.exists()) { argsFile.createNewFile(); diff --git a/Natives/JavaLauncher.c b/Natives/JavaLauncher.c index 5736ed53..952a963f 100644 --- a/Natives/JavaLauncher.c +++ b/Natives/JavaLauncher.c @@ -59,14 +59,15 @@ int launchJVM(int argc, char *argv[]) { margv[margc++] = "/usr/lib/jvm/java-16-openjdk/bin/java"; margv[margc++] = "-XstartOnFirstThread"; margv[margc++] = "-Djava.library.path=/Applications/PojavLauncher.app/Frameworks"; - debug("Reading custom JVM args (overrideargs.txt)"); char jvmargs[10000]; FILE* argsFile = fopen(args_path, "r"); - if (argsFile) { + debug("Reading custom JVM args (overrideargs.txt), opened=%d\n", argsFile != NULL); + if (argsFile != NULL) { fscanf(argsFile, "%s", jvmargs); char *pch; pch = strtok(jvmargs, " "); while (pch != NULL) { + debug("Added custom arg: %s\n", pck); margv[margc++] = pch; pch = strtok(NULL, " "); }