Skip to content

Fix 26.3 mouse/keyboard keycode overlaps reflecting on MPKMod keybindings #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Exterminate5573 merged 2 commits into from
Oct 11, 2026
Merged

Fix 26.3 mouse/keyboard keycode overlaps reflecting on MPKMod keybindings #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ecb2fd1
chore: remove absolute class references where they can be imported no…
zpiboo Oct 10, 2026
ad6e658
fix: compare InputConstant.Key objects instead of raw keycodes for mp…
zpiboo Oct 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions ...-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/EventHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -62,50 +63,49 @@ 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()
);
}

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()
);
}

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;
}
Expand Down
7 changes: 4 additions & 3 deletions ...-26.3/src/main/java/io/github/kurrycat/mpkmod/compatibility/fabric_26_3/MPKGuiScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}

Expand Down
Loading