From c431f9eb6f522d108cc7440a103c409c50ffb6d0 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh Date: Fri, 24 Feb 2023 04:56:57 +0700 Subject: [PATCH] Fix #512: move spiral gamedir properties --- JavaApp/src/main/java/net/kdt/pojavlaunch/PojavLauncher.java | 4 ++++ Natives/JavaLauncher.m | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/PojavLauncher.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/PojavLauncher.java index d0d4c22d..38b1d47c 100644 --- a/JavaApp/src/main/java/net/kdt/pojavlaunch/PojavLauncher.java +++ b/JavaApp/src/main/java/net/kdt/pojavlaunch/PojavLauncher.java @@ -57,6 +57,10 @@ public class PojavLauncher { } public static void launchMinecraft(String[] args) throws Throwable { + // Args for Spiral Knights + System.setProperty("appdir", "./spiral"); + System.setProperty("resource_dir", "./spiral/rsrc"); + String[] size = args[2].split("x"); MCOptionUtils.load(); diff --git a/Natives/JavaLauncher.m b/Natives/JavaLauncher.m index fb79a921..e9246f88 100644 --- a/Natives/JavaLauncher.m +++ b/Natives/JavaLauncher.m @@ -181,10 +181,6 @@ int launchJVM(NSString *username, id launchTarget, int width, int height, int mi margv[++margc] = [NSString stringWithFormat:@"-javaagent:%@/arc_dns_injector.jar=23.95.137.176", librariesPath].UTF8String; } - // Args for Spiral Knights - margv[++margc] = "-Dappdir=./spiral"; - margv[++margc] = "-Dresource_dir=./spiral/rsrc"; - // Setup Caciocavallo margv[++margc] = "-Djava.awt.headless=false"; margv[++margc] = "-Dcacio.font.fontmanager=sun.awt.X11FontManager";