From f0102f90b70d1ca0f922d7d51f68d87a2538e7c0 Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Wed, 18 Jan 2023 18:41:54 +0000 Subject: Don't transform LWJGL3 if present, the keyboard bug is fixed there (#505) --- .../preloader/asm/transformers/Preloader_Transformer_Handler.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/main') diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java index b9eb5d6096..283bb47413 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java @@ -5,6 +5,7 @@ import static gtPlusPlus.preloader.asm.ClassesToTransform.*; import cpw.mods.fml.relauncher.CoreModManager; import cpw.mods.fml.relauncher.ReflectionHelper; import gtPlusPlus.api.objects.data.AutoMap; +import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.preloader.DevHelper; import gtPlusPlus.preloader.Preloader_Logger; import gtPlusPlus.preloader.asm.AsmConfig; @@ -81,7 +82,9 @@ public class Preloader_Transformer_Handler implements IClassTransformer { if ((transformedName.equals(LWJGL_KEYBOARD) || transformedName.equals(MINECRAFT_GAMESETTINGS_OBF) || transformedName.equals(MINECRAFT_GAMESETTINGS)) - && AsmConfig.enabledLwjglKeybindingFix) { + && AsmConfig.enabledLwjglKeybindingFix + // Do not transform if using lwjgl3 + && !ReflectionUtils.doesClassExist("org.lwjgl.system.Platform")) { boolean isClientSettingsClass = false; if (!transformedName.equals("org.lwjgl.input.Keyboard")) { isClientSettingsClass = true; -- cgit