From 3e503f31b85fa2c9d6c69d62c1df656b41029a5f Mon Sep 17 00:00:00 2001 From: mfishma Date: Mon, 17 Aug 2026 06:14:55 -0700 Subject: [PATCH] Fix slider and cycling controllers on 26.3+ by using InputConstants for mouse buttons (Fixes #348) --- .../gui/controllers/cycling/CyclingControllerElement.java | 7 +++---- .../gui/controllers/slider/SliderControllerElement.java | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/dev/isxander/yacl3/gui/controllers/cycling/CyclingControllerElement.java b/src/main/java/dev/isxander/yacl3/gui/controllers/cycling/CyclingControllerElement.java index 54086d1a..fa1e5768 100644 --- a/src/main/java/dev/isxander/yacl3/gui/controllers/cycling/CyclingControllerElement.java +++ b/src/main/java/dev/isxander/yacl3/gui/controllers/cycling/CyclingControllerElement.java @@ -36,13 +36,12 @@ public void cycleValue(int increment) { } @Override - public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) { - if (!isMouseOver(event.x(), event.y()) || (event.button() != 0 && event.button() != 1) || !isAvailable()) + public boolean mouseClicked(@NonNull MouseButtonEvent event, boolean doubleClick) { + if (!isMouseOver(event.x(), event.y()) || (event.button() != InputConstants.MOUSE_BUTTON_LEFT && event.button() != InputConstants.MOUSE_BUTTON_RIGHT) || !isAvailable()) return false; playDownSound(); - cycleValue(event.button() == 1 || event.hasShiftDown() || event.hasControlDown() ? -1 : 1); - + cycleValue(event.button() == InputConstants.MOUSE_BUTTON_RIGHT || event.hasShiftDown() || event.hasControlDown() ? -1 : 1); return true; } diff --git a/src/main/java/dev/isxander/yacl3/gui/controllers/slider/SliderControllerElement.java b/src/main/java/dev/isxander/yacl3/gui/controllers/slider/SliderControllerElement.java index c2f92114..fb7460c9 100644 --- a/src/main/java/dev/isxander/yacl3/gui/controllers/slider/SliderControllerElement.java +++ b/src/main/java/dev/isxander/yacl3/gui/controllers/slider/SliderControllerElement.java @@ -63,7 +63,7 @@ protected void extractValueText(GuiGraphicsExtractor graphics, int mouseX, int m @Override public boolean mouseClicked(@NonNull MouseButtonEvent event, boolean doubleClick) { - if (!isAvailable() || event.button() != 0 || !isHoveredSliderBounds(event.x(), event.y())) + if (!isAvailable() || event.button() != InputConstants.MOUSE_BUTTON_LEFT || !isHoveredSliderBounds(event.x(), event.y())) return false; mouseDown = true; @@ -78,7 +78,7 @@ private boolean isHoveredSliderBounds(double mouseX, double mouseY) { @Override public boolean mouseDragged(@NonNull MouseButtonEvent event, double dx, double dy) { - if (!isAvailable() || event.button() != 0 || !mouseDown) + if (!isAvailable() || event.button() != InputConstants.MOUSE_BUTTON_LEFT || !mouseDown) return false; setValueFromMouse(event.x());