diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/Tools.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/Tools.java index 5c8ae782..66d0e5cd 100644 --- a/JavaApp/src/main/java/net/kdt/pojavlaunch/Tools.java +++ b/JavaApp/src/main/java/net/kdt/pojavlaunch/Tools.java @@ -129,8 +129,8 @@ public final class Tools // overrideableArgList.add("-Dorg.lwjgl.util.DebugLoader=true"); // GLFW Stub width height - overrideableArgList.add("-Dglfwstub.windowWidth=" + CallbackBridge.windowWidth); - overrideableArgList.add("-Dglfwstub.windowHeight=" + CallbackBridge.windowHeight); + overrideableArgList.add("-Dglfwstub.windowWidth=" + GLFW.mGLFWWindowWidth); + overrideableArgList.add("-Dglfwstub.windowHeight=" + GLFW.mGLFWWindowHeight); overrideableArgList.add("-Dglfwstub.initEgl=false"); overrideableArgList.add("-Dnet.minecraft.clientmodname=" + Tools.APP_NAME); diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java index 9b87525c..bd6b97b4 100644 --- a/JavaApp/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java +++ b/JavaApp/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java @@ -103,9 +103,6 @@ public class JREUtils envMap.put("MESA_GLSL_CACHE_DIR", System.getProperty("java.io.tmpdir")); envMap.put("DYLD_LIBRARY_PATH", LD_LIBRARY_PATH); // envMap.put("PATH", Tools.DIR_HOME_JRE + "/bin:" + Os.getenv("PATH")); - - envMap.put("AWTSTUB_WIDTH", Integer.toString(CallbackBridge.windowWidth)); - envMap.put("AWTSTUB_HEIGHT", Integer.toString(CallbackBridge.windowHeight)); File customEnvFile = new File(Tools.DIR_GAME_NEW, "custom_env.txt"); if (customEnvFile.exists() && customEnvFile.isFile()) { diff --git a/JavaApp/src/main/java/org/lwjgl/glfw/CallbackBridge.java b/JavaApp/src/main/java/org/lwjgl/glfw/CallbackBridge.java index 92e00599..10df288d 100644 --- a/JavaApp/src/main/java/org/lwjgl/glfw/CallbackBridge.java +++ b/JavaApp/src/main/java/org/lwjgl/glfw/CallbackBridge.java @@ -39,7 +39,6 @@ public class CallbackBridge { } // BEGIN launcher side - public static volatile int windowWidth, windowHeight; public static int mouseX, mouseY; public static boolean mouseLeft; public static StringBuilder DEBUG_STRING = new StringBuilder(); @@ -47,8 +46,8 @@ public class CallbackBridge { public static native void nativeLaunchUI(String[] uiArgs); public static void callback_AppDelegate_didFinishLaunching(int width, int height) { - windowWidth = width; - windowHeight = height; + GLFW.mGLFWWindowWidth = width; + GLFW.mGLFWWindowHeight = height; net.kdt.pojavlaunch.PLaunchApp.applicationDidFinishLaunching(); }