refactor: compact handlers a bit

Author: lineargraph

build-src/src/main/kotlin/moulconfig.manifold.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 manifold {
-	manifoldVersion.set("2025.1.25")
+	manifoldVersion.set("2025.1.27")
 }
 
 dependencies {

modern/templates/java/io/github/notenoughupdates/moulconfig/platform/MoulConfigScreenComponent.java

@@ -88,24 +88,15 @@ public boolean charTyped(CharInput input){
     #if MC < 12109
     @Override
     public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
-        if (guiContext.root.keyboardEvent(new KeyboardEvent.KeyPressed(keyCode, scanCode, true), createContext()))
-            return true;
-        if (keyCode == InputUtil.GLFW_KEY_ESCAPE) {
-            if (guiContext.getFocusedElement() != null) {
-                guiContext.setFocusedElement(null);
-            } else {
-                close();
-            }
-            return true;
-        }
-        return false;
-    }
     #else
     @Override
     public boolean keyPressed(KeyInput input) {
-        if (guiContext.root.keyboardEvent(new KeyboardEvent.KeyPressed(input.key(), input.scancode(), true), createContext()))
+        int keyCode = input.key();
+        int scanCode = input.scancode();
+    #endif
+        if (guiContext.root.keyboardEvent(new KeyboardEvent.KeyPressed(keyCode, scanCode, true), createContext()))
             return true;
-        if (input.key() == InputUtil.GLFW_KEY_ESCAPE) {
+        if (keyCode == InputUtil.GLFW_KEY_ESCAPE) {
             if (guiContext.getFocusedElement() != null) {
                 guiContext.setFocusedElement(null);
             } else {
@@ -115,25 +106,21 @@ public boolean keyPressed(KeyInput input) {
         }
         return false;
     }
-    #endif
 
     #if MC < 12109
     @Override
     public boolean keyReleased(int keyCode, int scanCode, int modifiers) {
-        return guiContext.root.keyboardEvent(
-            new KeyboardEvent.KeyPressed(keyCode, scanCode, false),
-            createContext()
-        );
-    }
     #else
     @Override
     public boolean keyReleased(KeyInput input) {
+        int keyCode = input.key();
+        int scanCode = input.scancode();
+    #endif
         return guiContext.root.keyboardEvent(
-            new KeyboardEvent.KeyPressed(input.key(), input.scancode(), false),
+            new KeyboardEvent.KeyPressed(keyCode, scanCode, false),
             createContext()
         );
     }
-    #endif
 
     @Override
     public void mouseMoved(double mouseX, double mouseY) {
@@ -158,37 +145,19 @@ public void mouseMoved(double mouseX, double mouseY) {
         guiContext.getRoot().mouseEvent(event, ctx);
     }
 
-    #if MC < 12109
     @Override
-    public boolean mouseClicked(double mouseX, double mouseY, int button) {
+    public boolean mouseClicked(#if MC < 12109 double mouseX, double mouseY, int button #else Click click, boolean doubled #endif) {
         return guiContext.root.mouseEvent(
-            new MouseEvent.Click(button, true), createContext()
+            new MouseEvent.Click(#if MC < 12109 button #else click.button() #endif, true), createContext()
         );
     }
-    #else
-    @Override
-    public boolean mouseClicked(Click click, boolean doubled) {
-        return guiContext.root.mouseEvent(
-            new MouseEvent.Click(click.button(), true), createContext()
-        );
-    }
-    #endif
 
-    #if MC < 12109
-    @Override
-    public boolean mouseReleased(double mouseX, double mouseY, int button) {
-        return guiContext.root.mouseEvent(
-            new MouseEvent.Click(button, false), createContext()
-        );
-    }
-    #else
     @Override
-    public boolean mouseReleased(Click click) {
+    public boolean mouseReleased(#if MC < 12109 double mouseX, double mouseY, int button #else Click click #endif) {
         return guiContext.root.mouseEvent(
-            new MouseEvent.Click(click.button(), false), createContext()
+            new MouseEvent.Click(#if MC < 12109 button #else click.button() #endif, false), createContext()
         );
     }
-    #endif
 
     @Override
     public boolean mouseScrolled(double mouseX, double mouseY, double horizontalAmount, double verticalAmount) {
@@ -200,15 +169,15 @@ public boolean mouseScrolled(double mouseX, double mouseY, double horizontalAmou
         );
     }
 
-    #if MC < 12109
-    @Override
-    public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
-        return true;
-    }
-    #else
+
     @Override
-    public boolean mouseDragged(Click click, double offsetX, double offsetY) {
+    public boolean mouseDragged(
+        #if MC < 12109
+        double mouseX, double mouseY, int button, double deltaX, double deltaY
+        #else
+        Click click, double offsetX, double offsetY
+        #endif
+    ) {
         return true;
     }
-    #endif
 }