Skip to content

Fix widget mouse button checks on 26.3 #247

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rubensworks merged 1 commit into from
Sep 25, 2026
Merged

Fix widget mouse button checks on 26.3 #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion ...er-common/src/main/java/org/cyclops/cyclopscore/client/gui/component/WidgetScrollBar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.cyclops.cyclopscore.client.gui.component;

import com.mojang.blaze3d.platform.InputConstants;
import net.minecraft.client.gui.GuiGraphicsExtractor;
import net.minecraft.client.gui.components.AbstractWidget;
import net.minecraft.client.gui.narration.NarrationElementOutput;
Expand Down Expand Up @@ -91,7 +92,7 @@ public boolean mouseScrolled(double mouseX, double mouseY, double scrollX, doubl

@Override
public boolean mouseDragged(MouseButtonEvent mouse, double offsetX, double offsetY) {
boolean flag = mouse.button() == 0 || mouse.button() == 1;
boolean flag = mouse.button() == InputConstants.MOUSE_BUTTON_LEFT || mouse.button() == InputConstants.MOUSE_BUTTON_RIGHT;
int xMax = getX() + 14;
int yMax = getY() + height;

Expand Down
3 changes: 2 additions & 1 deletion ...main/java/org/cyclops/cyclopscore/client/gui/component/input/WidgetTextFieldExtended.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.cyclops.cyclopscore.client.gui.component.input;

import com.mojang.blaze3d.platform.InputConstants;
import net.minecraft.client.gui.Font;
import net.minecraft.client.gui.GuiGraphicsExtractor;
import net.minecraft.client.gui.components.EditBox;
Expand Down Expand Up @@ -63,7 +64,7 @@ public void extractWidgetRenderState(GuiGraphicsExtractor guiGraphics, int mouse

@Override
public boolean mouseClicked(MouseButtonEvent event, boolean isDoubleClick) {
if (event.button() == 1 && event.x() >= this.getX() && event.x() < this.getX() + this.width
if (event.button() == InputConstants.MOUSE_BUTTON_RIGHT && event.x() >= this.getX() && event.x() < this.getX() + this.width
&& event.y() >= this.getY() && event.y() < this.getY() + this.height) {
// Select everything
this.setFocused(true);
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/org/cyclops/cyclopscore/client/gui/container/ContainerScreenScrolling.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ public void extractBackground(GuiGraphicsExtractor guiGraphics, int mouseX, int

@Override
public boolean mouseDragged(MouseButtonEvent event, double mouseX, double mouseY) {
if (this.getFocused() != null && this.isDragging() && event.button() == 0
if (this.getFocused() != null && this.isDragging() && event.button() == InputConstants.MOUSE_BUTTON_LEFT
&& this.getFocused().mouseDragged(event, mouseX, mouseY)) {
return true;
}
Expand Down
Loading