From 7bba8d2862f74d561fc93d0dfbe9f5879919128a Mon Sep 17 00:00:00 2001 From: coolGi Date: Thu, 23 Mar 2023 18:08:36 +1030 Subject: [PATCH] Sava commit for the new Config UI --- build.gradle | 5 +++++ .../com/seibel/lod/common/wrappers/gui/MinecraftScreen.java | 1 + gradle.properties | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 64f32c55f..f4adb26fe 100644 --- a/build.gradle +++ b/build.gradle @@ -186,6 +186,11 @@ subprojects { p -> shadowMe("org.openjfx:javafx-swing:${rootProject.javafx_version}") shadowMe("org.openjfx:javafx-controls:${rootProject.javafx_version}") shadowMe("org.openjfx:javafx-graphics:${rootProject.javafx_version}") + + + shadowMe("org.lwjgl:lwjgl-jawt:3.3.1") { + exclude group: "org.lwjgl", module: "lwjgl" + } diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/gui/MinecraftScreen.java b/common/src/main/java/com/seibel/lod/common/wrappers/gui/MinecraftScreen.java index 67e068b63..1b0985570 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/gui/MinecraftScreen.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/gui/MinecraftScreen.java @@ -33,6 +33,7 @@ public class MinecraftScreen { protected ConfigScreenRenderer(Screen parent, AbstractScreen screen, String translationName) { super(translate(translationName)); + screen.minecraftWindow = Minecraft.getInstance().getWindow().getWindow(); this.parent = parent; this.screen = screen; } diff --git a/gradle.properties b/gradle.properties index 99826eb34..35110ad83 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,7 +23,7 @@ javafx_version=19 svgSalamander_version=1.1.3 log4j_version=2.19.0 -lwjgl_version=3.3.0 +lwjgl_version=3.2.3 joml_version=1.10.2 # Internal Properties (These are set at runtime for Forgix to merge jar's)