From ecb2fd1b50570b892a2743255f9568b1c2ad1196 Mon Sep 17 00:00:00 2001 From: Zpiboo Date: Sat, 10 Oct 2026 22:05:57 +0200 Subject: [PATCH 1/2] chore: remove absolute class references where they can be imported normally --- .../compatibility/fabric_26_3/EventHandler.java | 15 ++++++++------- .../compatibility/fabric_26_3/MPKGuiScreen.java | 7 ++++--- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/EventHandler.java b/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/EventHandler.java index 2078605c..7845bb9a 100644 --- a/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/EventHandler.java +++ b/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/EventHandler.java @@ -8,6 +8,7 @@ import io.github.kurrycat.mpkmod.ticks.ButtonMS; import io.github.kurrycat.mpkmod.ticks.ButtonMSList; import io.github.kurrycat.mpkmod.util.BoundingBox3D; +import io.github.kurrycat.mpkmod.util.Mouse; import io.github.kurrycat.mpkmod.util.Vector3D; import net.fabricmc.fabric.api.networking.v1.PacketSender; import net.minecraft.client.DeltaTracker; @@ -69,8 +70,8 @@ public void onKey(KeyEvent input, int action) { public void onMouseMove(double x, double y, double dx, double dy) { API.Events.onMouseInput( - io.github.kurrycat.mpkmod.util.Mouse.Button.NONE, - io.github.kurrycat.mpkmod.util.Mouse.State.NONE, + Mouse.Button.NONE, + Mouse.State.NONE, (int) x, (int) y, (int) dx, (int) dy, 0, System.nanoTime() ); @@ -78,8 +79,8 @@ public void onMouseMove(double x, double y, double dx, double dy) { public void onMouseScroll(double vertical, double x, double y) { API.Events.onMouseInput( - io.github.kurrycat.mpkmod.util.Mouse.Button.NONE, - io.github.kurrycat.mpkmod.util.Mouse.State.NONE, + Mouse.Button.NONE, + Mouse.State.NONE, (int) x, (int) y, 0, 0, (int) vertical, System.nanoTime() ); @@ -87,9 +88,9 @@ public void onMouseScroll(double vertical, double x, double y) { public void onMouseButton(MouseButtonInfo input, int action, double x, double y) { API.Events.onMouseInput( - io.github.kurrycat.mpkmod.util.Mouse.Button.fromIntLatest(input.button()), - input.button() == 0 ? io.github.kurrycat.mpkmod.util.Mouse.State.NONE : - (action == 1 ? io.github.kurrycat.mpkmod.util.Mouse.State.DOWN : io.github.kurrycat.mpkmod.util.Mouse.State.UP), + Mouse.Button.fromIntLatest(input.button()), + input.button() == 0 ? Mouse.State.NONE : + (action == 1 ? Mouse.State.DOWN : Mouse.State.UP), (int) x, (int) y, 0, 0, 0, System.nanoTime() ); diff --git a/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/MPKGuiScreen.java b/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/MPKGuiScreen.java index 3403023a..a1e74b65 100644 --- a/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/MPKGuiScreen.java +++ b/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/MPKGuiScreen.java @@ -3,6 +3,7 @@ import io.github.kurrycat.mpkmod.compatibility.API; import io.github.kurrycat.mpkmod.compatibility.MCClasses.Profiler; import io.github.kurrycat.mpkmod.util.MathUtil; +import io.github.kurrycat.mpkmod.util.Mouse; import io.github.kurrycat.mpkmod.util.Vector2D; import net.minecraft.client.gui.GuiGraphicsExtractor; import net.minecraft.client.gui.screens.Screen; @@ -57,19 +58,19 @@ public boolean isPauseScreen() { @Override public boolean mouseClicked(MouseButtonEvent click, boolean doubled) { - eventReceiver.onMouseClicked(new Vector2D(click.x(), click.y()), io.github.kurrycat.mpkmod.util.Mouse.Button.fromIntLatest(click.button())); + eventReceiver.onMouseClicked(new Vector2D(click.x(), click.y()), Mouse.Button.fromIntLatest(click.button())); return super.mouseClicked(click, doubled); } @Override public boolean mouseReleased(MouseButtonEvent click) { - eventReceiver.onMouseReleased(new Vector2D(click.x(), click.y()), io.github.kurrycat.mpkmod.util.Mouse.Button.fromIntLatest(click.button())); + eventReceiver.onMouseReleased(new Vector2D(click.x(), click.y()), Mouse.Button.fromIntLatest(click.button())); return super.mouseReleased(click); } @Override public boolean mouseDragged(MouseButtonEvent click, double offsetX, double offsetY) { - eventReceiver.onMouseClickMove(new Vector2D(click.x(), click.y()), io.github.kurrycat.mpkmod.util.Mouse.Button.fromIntLatest(click.button()), 0); + eventReceiver.onMouseClickMove(new Vector2D(click.x(), click.y()), Mouse.Button.fromIntLatest(click.button()), 0); return super.mouseDragged(click, offsetX, offsetY); } From ad6e6589af87ae2a0e06a556cd82bf8c126f0bb3 Mon Sep 17 00:00:00 2001 From: Zpiboo Date: Sat, 10 Oct 2026 22:07:44 +0200 Subject: [PATCH 2/2] fix: compare InputConstant.Key objects instead of raw keycodes for mpkmod keybindings --- .../compatibility/fabric_26_3/EventHandler.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/EventHandler.java b/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/EventHandler.java index 7845bb9a..a05c49fd 100644 --- a/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/EventHandler.java +++ b/fabric-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/EventHandler.java @@ -63,9 +63,8 @@ public void onKey(KeyEvent input, int action) { API.Events.onKeyInput(input.key(), inputKey.getDisplayName().getString(), action == 1); - if (action != 0) { - checkKeyBinding(input.key()); - } + if (action != 0) + checkKeyBinding( InputConstants.Type.KEYBOARD.getOrCreate(input.key()) ); } public void onMouseMove(double x, double y, double dx, double dy) { @@ -96,17 +95,17 @@ public void onMouseButton(MouseButtonInfo input, int action, double x, double y) ); if (action == 1) - checkKeyBinding(input.button()); + checkKeyBinding( InputConstants.Type.MOUSE.getOrCreate(input.button()) ); } - private void checkKeyBinding(int keyCode) { + private void checkKeyBinding(InputConstants.Key key) { if (Minecraft.getInstance().gui.screen() != null) return; for (Map.Entry keyBindingEntry : MPKMod.keyBindingMap.entrySet()) { InputConstants.Key boundKey = ((KeyMappingAccessor) keyBindingEntry.getValue()).getKey(); String keyBindId = keyBindingEntry.getKey(); - if (boundKey.getValue() == keyCode) { + if (boundKey == key) { API.Events.onKeybind(keyBindId); return; }