aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/preloader
diff options
context:
space:
mode:
authorAlexdoru <57050655+Alexdoru@users.noreply.github.com>2024-09-05 01:11:15 +0200
committerGitHub <noreply@github.com>2024-09-04 23:11:15 +0000
commiteb25cb901172dfa4d68f44de8f61d52958f53cfa (patch)
tree199829c571b38d36d91d330c1b7529acf0682090 /src/main/java/gtPlusPlus/preloader
parentb0364a9c8630d217daf1d9b8379253d4eeeb0b76 (diff)
downloadGT5-Unofficial-eb25cb901172dfa4d68f44de8f61d52958f53cfa.tar.gz
GT5-Unofficial-eb25cb901172dfa4d68f44de8f61d52958f53cfa.tar.bz2
GT5-Unofficial-eb25cb901172dfa4d68f44de8f61d52958f53cfa.zip
Delete/modify some reflection + more renaming (#3037)
Diffstat (limited to 'src/main/java/gtPlusPlus/preloader')
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java7
1 files changed, 3 insertions, 4 deletions
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 06372740e4..dc033514f1 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
@@ -8,7 +8,7 @@ import net.minecraft.launchwrapper.IClassTransformer;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassWriter;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gregtech.asm.GTCorePlugin;
import gtPlusPlus.preloader.PreloaderCore;
import gtPlusPlus.preloader.PreloaderLogger;
import gtPlusPlus.preloader.asm.AsmConfig;
@@ -48,9 +48,8 @@ public class Preloader_Transformer_Handler implements IClassTransformer {
// Fix LWJGL index array out of bounds on keybinding IDs
if ((transformedName.equals(LWJGL_KEYBOARD) || transformedName.equals(MINECRAFT_GAMESETTINGS))
&& AsmConfig.enabledLwjglKeybindingFix
- // Do not transform if using lwjgl3
- && !ReflectionUtils.doesClassExist("org.lwjgl.system.Platform")) {
- boolean isClientSettingsClass = !transformedName.equals("org.lwjgl.input.Keyboard");
+ && !GTCorePlugin.islwjgl3Present()) {
+ boolean isClientSettingsClass = !transformedName.equals(LWJGL_KEYBOARD);
PreloaderLogger.INFO("LWJGL Keybinding index out of bounds fix", "Transforming " + transformedName);
return new ClassTransformer_LWJGL_Keyboard(basicClass, isClientSettingsClass).getWriter()
.toByteArray();