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..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
@@ -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;
@@ -62,15 +63,14 @@ 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) {
         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 +78,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,25 +87,25 @@ 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()
         );
 
         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<String, KeyMapping> 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;
             }
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);
     }