Skip to content

Fix mouse input #67

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 5 commits into from
Oct 8, 2026
Merged

Fix mouse input #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6d96b39
26.3 compatibility
Exterminate5573 Sep 16, 2026
f24ca61
Fix settings loading
Exterminate5573 Sep 16, 2026
e84f22f
also save
Exterminate5573 Sep 16, 2026
1109653
forgor
Exterminate5573 Sep 16, 2026
bf33c8f
fix mouse button issues
Exterminate5573 Oct 7, 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
18 changes: 9 additions & 9 deletions common/src/main/java/io/github/kurrycat/mpkmod/gui/ComponentScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,14 @@ public void onKeyEvent(int keyCode, int scanCode, int modifiers, boolean isCharT
}
}

public void onMouseClicked(Vector2D mouse, int mouseButton) {
public void onMouseClicked(Vector2D mouse, Mouse.Button mouseButton) {
super.onMouseClicked(mouse, mouseButton);

if (handleMouseInput(Mouse.State.DOWN, mouse, Mouse.Button.fromInt(mouseButton))) return;
if (handleMouseInput(Mouse.State.DOWN, mouse, mouseButton)) return;

if (movableComponents.isEmpty()) return;

if (Mouse.Button.LEFT.equals(mouseButton)) {
if (Mouse.Button.LEFT.equals(mouseButton.value)) {
highlighted.clear();
lastClickedPos = mouse;

Expand All @@ -111,7 +111,7 @@ public void onMouseClicked(Vector2D mouse, int mouseButton) {
selected.add(clicked);
holding.add(clicked);
}
} else if (Mouse.Button.RIGHT.equals(mouseButton)) {
} else if (Mouse.Button.RIGHT.equals(mouseButton.value)) {
highlighted.clear();
if (lastClickedPos != null && lastClicked == null) {
lastClickedPos = null;
Expand Down Expand Up @@ -207,24 +207,24 @@ public void onMouseClicked(Vector2D mouse, int mouseButton) {
}
}

public void onMouseClickMove(Vector2D mouse, int mouseButton, long timeSinceLastClick) {
public void onMouseClickMove(Vector2D mouse, Mouse.Button mouseButton, long timeSinceLastClick) {
super.onMouseClickMove(mouse, mouseButton, timeSinceLastClick);

if (handleMouseInput(Mouse.State.DRAG, mouse, Mouse.Button.fromInt(mouseButton))) return;
if (handleMouseInput(Mouse.State.DRAG, mouse, mouseButton)) return;

if (movableComponents.isEmpty()) return;

selected = selected.stream().filter(c -> holding.contains(c)).collect(Collectors.toCollection(HashSet::new));
}

public void onMouseReleased(Vector2D mouse, int mouseButton) {
public void onMouseReleased(Vector2D mouse, Mouse.Button mouseButton) {
super.onMouseReleased(mouse, mouseButton);

if (handleMouseInput(Mouse.State.UP, mouse, Mouse.Button.fromInt(mouseButton))) return;
if (handleMouseInput(Mouse.State.UP, mouse, mouseButton)) return;

if (movableComponents.isEmpty()) return;

if (Mouse.Button.LEFT.equals(mouseButton) && lastClickedPos != null) {
if (Mouse.Button.LEFT.equals(mouseButton.value) && lastClickedPos != null) {
boolean moved = lastClickedPos.sub(mouse).lengthSqr() > 3 * 3;
if (!moved && lastClicked != null) {
selected.clear();
Expand Down
7 changes: 4 additions & 3 deletions common/src/main/java/io/github/kurrycat/mpkmod/gui/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.MCClasses.Minecraft;
import io.github.kurrycat.mpkmod.compatibility.MCClasses.Renderer2D;
import io.github.kurrycat.mpkmod.gui.components.ComponentHolder;
import io.github.kurrycat.mpkmod.util.Mouse;
import io.github.kurrycat.mpkmod.util.Vector2D;

import java.awt.*;
Expand Down Expand Up @@ -59,13 +60,13 @@ public void onGuiResized(Vector2D screenSize) {
public void onKeyEvent(int keyCode, int scanCode, int modifiers, boolean pressed) {
}

public void onMouseClicked(Vector2D mouse, int mouseButton) {
public void onMouseClicked(Vector2D mouse, Mouse.Button mouseButton) {
}

public void onMouseClickMove(Vector2D mouse, int mouseButton, long timeSinceLastClick) {
public void onMouseClickMove(Vector2D mouse, Mouse.Button mouseButton, long timeSinceLastClick) {
}

public void onMouseReleased(Vector2D mouse, int mouseButton) {
public void onMouseReleased(Vector2D mouse, Mouse.Button mouseButton) {
}

/**
Expand Down
19 changes: 18 additions & 1 deletion common/src/main/java/io/github/kurrycat/mpkmod/util/Mouse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,24 @@ public boolean equals(int v) {
public static Button fromInt(int v) {
for (Button b : values())
if (b.value == v) return b;
return null;
return NONE;
}

public static Button fromIntLatest(int v) {
switch (v) {
case 1:
return LEFT;
case 2:
return WHEEL;
case 3:
return RIGHT;
case 4: // TODO Test 4 & 5
return BUTTON_4;
case 5:
return BUTTON_5;
default:
return NONE;
}
}
}

Expand Down
6 changes: 3 additions & 3 deletions fabric-26.3/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ dependencies {

implementation include("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}")

compileOnly "com.viaversion:viafabricplus-api:5.0.1" // TODO: Update
compileOnly "com.terraformersmc:modmenu:21.0.0-beta.1" // TODO: Update
compileOnly "com.viaversion:viafabricplus-api:5.1.1"
compileOnly "com.terraformersmc:modmenu:21.0.0"

implementation "com.github.MPKMod.MPKNetworkAPI:common:${project.networkApiVersion}"
}
Expand All @@ -46,7 +46,7 @@ publishMods {
modrinth {
projectId = "412tAvWq"
accessToken = providers.environmentVariable("MODRINTH_TOKEN")
minecraftVersions.add("26.2")
minecraftVersions.add("26.3")
}
/*github {
repository = "MPKMod/MPKMod2"
Expand Down
4 changes: 2 additions & 2 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 @@ -87,8 +87,8 @@ 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.fromInt(input.button()),
input.button() == -1 ? io.github.kurrycat.mpkmod.util.Mouse.State.NONE :
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),
(int) x, (int) y, 0, 0,
0, System.nanoTime()
Expand Down
6 changes: 3 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 @@ -57,19 +57,19 @@ public boolean isPauseScreen() {

@Override
public boolean mouseClicked(MouseButtonEvent click, boolean doubled) {
eventReceiver.onMouseClicked(new Vector2D(click.x(), click.y()), click.button());
eventReceiver.onMouseClicked(new Vector2D(click.x(), click.y()), io.github.kurrycat.mpkmod.util.Mouse.Button.fromIntLatest(click.button()));
return super.mouseClicked(click, doubled);
}

@Override
public boolean mouseReleased(MouseButtonEvent click) {
eventReceiver.onMouseReleased(new Vector2D(click.x(), click.y()), click.button());
eventReceiver.onMouseReleased(new Vector2D(click.x(), click.y()), io.github.kurrycat.mpkmod.util.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()), click.button(), 0);
eventReceiver.onMouseClickMove(new Vector2D(click.x(), click.y()), io.github.kurrycat.mpkmod.util.Mouse.Button.fromIntLatest(click.button()), 0);
return super.mouseDragged(click, offsetX, offsetY);
}

Expand Down
6 changes: 3 additions & 3 deletions ...12.2/src/main/java/io/github/kurrycat/mpkmod/compatibility/forge_1_12_2/MPKGuiScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,19 +77,19 @@ protected void keyTyped(char typedChar, int keyCode) throws IOException {
@Override
protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException {
super.mouseClicked(mouseX, mouseY, mouseButton);
eventReceiver.onMouseClicked(new Vector2D(mouseX, mouseY), mouseButton);
eventReceiver.onMouseClicked(new Vector2D(mouseX, mouseY), io.github.kurrycat.mpkmod.util.Mouse.Button.fromInt(mouseButton));
}

@Override
protected void mouseClickMove(int mouseX, int mouseY, int clickedMouseButton, long timeSinceLastClick) {
super.mouseClickMove(mouseX, mouseY, clickedMouseButton, timeSinceLastClick);
eventReceiver.onMouseClickMove(new Vector2D(mouseX, mouseY), clickedMouseButton, timeSinceLastClick);
eventReceiver.onMouseClickMove(new Vector2D(mouseX, mouseY), io.github.kurrycat.mpkmod.util.Mouse.Button.fromInt(clickedMouseButton), timeSinceLastClick);
}

@Override
protected void mouseReleased(int mouseX, int mouseY, int state) {
super.mouseReleased(mouseX, mouseY, state);
eventReceiver.onMouseReleased(new Vector2D(mouseX, mouseY), state);
eventReceiver.onMouseReleased(new Vector2D(mouseX, mouseY), io.github.kurrycat.mpkmod.util.Mouse.Button.fromInt(state));
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions ...e-1.8.9/src/main/java/io/github/kurrycat/mpkmod/compatibility/forge_1_8/MPKGuiScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,19 +77,19 @@ protected void keyTyped(char typedChar, int keyCode) throws IOException {
@Override
protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException {
super.mouseClicked(mouseX, mouseY, mouseButton);
eventReceiver.onMouseClicked(new Vector2D(mouseX, mouseY), mouseButton);
eventReceiver.onMouseClicked(new Vector2D(mouseX, mouseY), io.github.kurrycat.mpkmod.util.Mouse.Button.fromInt(mouseButton));
}

@Override
protected void mouseClickMove(int mouseX, int mouseY, int clickedMouseButton, long timeSinceLastClick) {
super.mouseClickMove(mouseX, mouseY, clickedMouseButton, timeSinceLastClick);
eventReceiver.onMouseClickMove(new Vector2D(mouseX, mouseY), clickedMouseButton, timeSinceLastClick);
eventReceiver.onMouseClickMove(new Vector2D(mouseX, mouseY), io.github.kurrycat.mpkmod.util.Mouse.Button.fromInt(clickedMouseButton), timeSinceLastClick);
}

@Override
protected void mouseReleased(int mouseX, int mouseY, int state) {
super.mouseReleased(mouseX, mouseY, state);
eventReceiver.onMouseReleased(new Vector2D(mouseX, mouseY), state);
eventReceiver.onMouseReleased(new Vector2D(mouseX, mouseY), io.github.kurrycat.mpkmod.util.Mouse.Button.fromInt(state));
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$group=io.github.kurrycat.mpkmod
$jitpackGroup=com.github.mpkmod
$version=2.3.4
$version=2.3.5
$apiVersion=1.0
$modBaseName=mpkmod
$commonBaseName=mpkmod-common
Expand Down
Loading