From c2144dcfc82b95dd1a0e1a2f39950df4f7476d02 Mon Sep 17 00:00:00 2001
From: Klesti Selimaj <klesti.selimay@icloud.com>
Date: Sat, 7 Mar 2026 17:43:01 +0100
Subject: [PATCH] Fixed screen events

---
 .../saturnclient/ui/SaturnScreenFabric.java   | 36 +++++++++++++------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/SaturnScreenFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/SaturnScreenFabric.java
index e4cd945..2afca4c 100644
--- a/versions/1.21.4/src/main/java/org/saturnclient/ui/SaturnScreenFabric.java
+++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/SaturnScreenFabric.java
@@ -90,31 +90,47 @@ public class SaturnScreenFabric extends Screen implements ScreenProvider {
 
     @Override
     public boolean mouseClicked(double mouseX, double mouseY, int button) {
-        return screen.mouseClicked(mouseX, mouseY, button);
+        if (screen.mouseClicked(mouseX, mouseY, button)) {
+            return true;
+        }
+
+        return super.mouseClicked(mouseX, mouseY, button);
     }
 
     @Override
     public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
-        return screen.mouseDragged(mouseX, mouseY, button, deltaX, deltaY);
+        if (screen.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)) {
+            return true;
+        }
+
+        return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY);
     }
 
     @Override
     public boolean mouseReleased(double mouseX, double mouseY, int button) {
-        return screen.mouseReleased(mouseX, mouseY, button);
+        if (screen.mouseReleased(mouseX, mouseY, button)) {
+            return true;
+        }
+
+        return super.mouseReleased(mouseX, mouseY, button);
     }
 
     @Override
-    public boolean mouseScrolled(
-            double mouseX,
-            double mouseY,
-            double horizontalAmount,
-            double verticalAmount) {
-        return screen.mouseScrolled(mouseX, mouseY, horizontalAmount, verticalAmount);
+    public boolean mouseScrolled(double mouseX, double mouseY, double horizontalAmount, double verticalAmount) {
+        if (screen.mouseScrolled(mouseX, mouseY, horizontalAmount, verticalAmount)) {
+            return true;
+        }
+
+        return super.mouseScrolled(mouseX, mouseY, horizontalAmount, verticalAmount);
     }
 
     @Override
     public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
-        return screen.keyPressed(keyCode, scanCode, modifiers);
+        if (screen.keyPressed(keyCode, scanCode, modifiers)) {
+            return true;
+        }
+
+        return super.keyPressed(keyCode, scanCode, modifiers);
     }
 
     @Override