From 8f32ea36e5edfe541082dbbaccd4ad33e4222b64 Mon Sep 17 00:00:00 2001 From: Leo dev Date: Wed, 26 Mar 2025 14:43:31 +0100 Subject: [PATCH] click issue fix, not all mods rendering now --- .../org/saturnclient/saturnmods/ModManager.java | 2 +- src/main/java/org/saturnclient/ui/SaturnUi.java | 7 ------- .../org/saturnclient/ui/widgets/SaturnScroll.java | 14 +++++++++----- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/saturnclient/saturnmods/ModManager.java b/src/main/java/org/saturnclient/saturnmods/ModManager.java index e8c9441..7eb5e67 100644 --- a/src/main/java/org/saturnclient/saturnmods/ModManager.java +++ b/src/main/java/org/saturnclient/saturnmods/ModManager.java @@ -49,7 +49,7 @@ public class ModManager { new ArmorDisplay(), new ArmorDisplay(), new ArmorDisplay(), - new ArmorDisplay(), + new Coordinates(), }; public static void init() { diff --git a/src/main/java/org/saturnclient/ui/SaturnUi.java b/src/main/java/org/saturnclient/ui/SaturnUi.java index 405ffcb..2ec0ad3 100644 --- a/src/main/java/org/saturnclient/ui/SaturnUi.java +++ b/src/main/java/org/saturnclient/ui/SaturnUi.java @@ -69,13 +69,6 @@ public class SaturnUi extends Screen { widget.y < mouseY && widget.y + widget.height > mouseY; - SaturnClient.LOGGER.info( - "Render mouse X: " + - (mouseX - widget.x) + - ", mouse Y: " + - (mouseY - widget.y) - ); - MatrixStack matrices = context.getMatrices(); matrices.push(); matrices.translate(widget.x, widget.y, 0); diff --git a/src/main/java/org/saturnclient/ui/widgets/SaturnScroll.java b/src/main/java/org/saturnclient/ui/widgets/SaturnScroll.java index 890f91c..d8fad9f 100644 --- a/src/main/java/org/saturnclient/ui/widgets/SaturnScroll.java +++ b/src/main/java/org/saturnclient/ui/widgets/SaturnScroll.java @@ -122,23 +122,27 @@ public class SaturnScroll extends SaturnWidget { "[SaturnScroll] Click at: x=" + mouseX + ", y=" + mouseY ); - mouseX -= x; - mouseY -= (y - scroll); - for (SaturnWidget widget : children) { widget.focused = false; if (!widget.visible) { continue; } - double adjustedMouseX = (mouseX - widget.x) / widget.scale; - double adjustedMouseY = (mouseY - widget.y) / widget.scale; + double adjustedMouseX = (mouseX - widget.x); + double adjustedMouseY = (mouseY - widget.y); boolean isMouseInside = adjustedMouseX >= 0 && adjustedMouseX <= widget.width && adjustedMouseY >= 0 && adjustedMouseY <= widget.height; + System.out.println( + widget.getClass().getName() + + " Adjusted at: x=" + + adjustedMouseX + + ", y=" + + adjustedMouseY + ); if (isMouseInside) { widget.focused = true; widget.click((int) adjustedMouseX, (int) adjustedMouseY);