From 717445786d7fd3fdb9eb2a194df4085ae6ed61bb Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Sun, 15 Jan 2023 13:41:01 +0000 Subject: [PATCH] Null safety, fix event log spam, increse sorting index --- .../java/me/eigenraven/lwjgl3ify/Lwjgl3ifyCoremod.java | 2 +- .../me/eigenraven/lwjgl3ify/LwjglRedirectTransformer.java | 6 ++++++ src/main/java/org/lwjglx/input/EventQueue.java | 7 ++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/eigenraven/lwjgl3ify/Lwjgl3ifyCoremod.java b/src/main/java/me/eigenraven/lwjgl3ify/Lwjgl3ifyCoremod.java index 623063f..96e9b32 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/Lwjgl3ifyCoremod.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/Lwjgl3ifyCoremod.java @@ -7,7 +7,7 @@ import org.apache.logging.log4j.Logger; @IFMLLoadingPlugin.MCVersion("1.7.10") @IFMLLoadingPlugin.TransformerExclusions({"org.lwjglx", "org.lwjgl", "me.eigenraven.lwjgl3ify"}) -@IFMLLoadingPlugin.SortingIndex(1000000) +@IFMLLoadingPlugin.SortingIndex(Integer.MAX_VALUE - 2) public class Lwjgl3ifyCoremod implements IFMLLoadingPlugin { public static final Logger LOGGER = LogManager.getLogger(Tags.MODID); diff --git a/src/main/java/me/eigenraven/lwjgl3ify/LwjglRedirectTransformer.java b/src/main/java/me/eigenraven/lwjgl3ify/LwjglRedirectTransformer.java index f17bbec..2f12a7f 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/LwjglRedirectTransformer.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/LwjglRedirectTransformer.java @@ -12,6 +12,9 @@ public class LwjglRedirectTransformer extends Remapper implements IClassTransfor @Override public byte[] transform(String name, String transformedName, byte[] basicClass) { + if (basicClass == null) { + return null; + } ClassReader reader = new ClassReader(basicClass); ClassWriter writer = new ClassWriter(0); ClassVisitor visitor = new RemappingClassAdapter(writer, this); @@ -28,6 +31,9 @@ public class LwjglRedirectTransformer extends Remapper implements IClassTransfor @Override public String map(String typeName) { + if (typeName == null) { + return null; + } calls++; final String OLD_PREFIX_GL = "org/lwjgl/"; final String NEW_PREFIX_GL = "org/lwjglx/"; diff --git a/src/main/java/org/lwjglx/input/EventQueue.java b/src/main/java/org/lwjglx/input/EventQueue.java index 85d95a4..fc503a3 100644 --- a/src/main/java/org/lwjglx/input/EventQueue.java +++ b/src/main/java/org/lwjglx/input/EventQueue.java @@ -10,6 +10,7 @@ class EventQueue { private int eventCount = 0; private int currentEventPos = -1; private int nextEventPos = 0; + private long lastDroppedMessageMs = 0; EventQueue(int maxEvents) { this.maxEvents = maxEvents; @@ -22,7 +23,11 @@ class EventQueue { eventCount++; // increment event count if (eventCount > maxEvents) { eventCount = maxEvents; // cap max events - System.out.println("Dropping LWJGL input events due to not frequent enough polling"); + long ms = System.currentTimeMillis(); + if (ms - lastDroppedMessageMs > 1000) { + lastDroppedMessageMs = ms; + System.out.println("Dropping LWJGL input events due to not frequent enough polling"); + } } nextEventPos++; // increment next event position