Update KeyEvent and MouseClickEvent with some helper methods

Author: Wide-Cat

src/main/java/meteordevelopment/meteorclient/events/meteor/KeyEvent.java

@@ -21,4 +21,12 @@ public static KeyEvent get(KeyInput input, KeyAction action) {
         INSTANCE.action = action;
         return INSTANCE;
     }
+
+    public int key() {
+        return INSTANCE.input.key();
+    }
+
+    public int modifiers() {
+        return INSTANCE.input.modifiers();
+    }
 }

src/main/java/meteordevelopment/meteorclient/events/meteor/MouseClickEvent.java

@@ -13,15 +13,19 @@
 public class MouseClickEvent extends Cancellable {
     private static final MouseClickEvent INSTANCE = new MouseClickEvent();
 
-    public MouseInput input;
     public Click click;
+    public MouseInput input;
     public KeyAction action;
 
-    public static MouseClickEvent get(MouseInput mouseInput, Click click, KeyAction action) {
+    public static MouseClickEvent get(Click click, KeyAction action) {
         INSTANCE.setCancelled(false);
-        INSTANCE.input = mouseInput;
         INSTANCE.click = click;
+        INSTANCE.input = click.buttonInfo();
         INSTANCE.action = action;
         return INSTANCE;
     }
+
+    public int button() {
+        return INSTANCE.input.button();
+    }
 }

src/main/java/meteordevelopment/meteorclient/mixin/MouseMixin.java

@@ -41,7 +41,7 @@ private void onMouseButton(long window, MouseInput mouseInput, int action, Callb
         Input.setButtonState(mouseInput.button(), action != GLFW_RELEASE);
 
         Click click = new Click(getScaledX(client.getWindow()), getScaledY(client.getWindow()), mouseInput);
-        if (MeteorClient.EVENT_BUS.post(MouseClickEvent.get(mouseInput, click, KeyAction.get(action))).isCancelled()) ci.cancel();
+        if (MeteorClient.EVENT_BUS.post(MouseClickEvent.get(click, KeyAction.get(action))).isCancelled()) ci.cancel();
     }
 
     @Inject(method = "onMouseScroll", at = @At("HEAD"), cancellable = true)

src/main/java/meteordevelopment/meteorclient/settings/KeybindSetting.java

@@ -32,13 +32,13 @@ public KeybindSetting(String name, String description, Keybind defaultValue, Con
     @EventHandler(priority = EventPriority.HIGHEST)
     private void onKeyBinding(KeyEvent event) {
         if (widget == null) return;
-        if (event.action == KeyAction.Press && event.input.key() == GLFW.GLFW_KEY_ESCAPE && widget.onClear()) event.cancel();
-        else if (event.action == KeyAction.Release && widget.onAction(true, event.input.key(), event.input.modifiers())) event.cancel();
+        if (event.action == KeyAction.Press && event.key() == GLFW.GLFW_KEY_ESCAPE && widget.onClear()) event.cancel();
+        else if (event.action == KeyAction.Release && widget.onAction(true, event.key(), event.modifiers())) event.cancel();
     }
 
     @EventHandler(priority = EventPriority.HIGHEST)
     private void onMouseClickBinding(MouseClickEvent event) {
-        if (event.action == KeyAction.Press && widget != null && widget.onAction(false, event.input.button(), 0)) event.cancel();
+        if (event.action == KeyAction.Press && widget != null && widget.onAction(false, event.button(), 0)) event.cancel();
     }
 
     @EventHandler(priority = EventPriority.HIGH)

src/main/java/meteordevelopment/meteorclient/systems/macros/Macros.java

@@ -62,7 +62,7 @@ private void onKey(KeyEvent event) {
         if (event.action == KeyAction.Release) return;
 
         for (Macro macro : macros) {
-            if (macro.onAction(true, event.input.key(), event.input.modifiers())) return;
+            if (macro.onAction(true, event.key(), event.modifiers())) return;
         }
     }
 
@@ -71,7 +71,7 @@ private void onMouse(MouseClickEvent event) {
         if (event.action == KeyAction.Release) return;
 
         for (Macro macro : macros) {
-            if (macro.onAction(false, event.input.button(), 0)) return;
+            if (macro.onAction(false, event.button(), 0)) return;
         }
     }
 

src/main/java/meteordevelopment/meteorclient/systems/modules/Modules.java

@@ -213,12 +213,12 @@ public boolean isBinding() {
 
     @EventHandler(priority = EventPriority.HIGHEST)
     private void onKeyBinding(KeyEvent event) {
-        if (event.action == KeyAction.Release && onBinding(true, event.input.key(), event.input.modifiers())) event.cancel();
+        if (event.action == KeyAction.Release && onBinding(true, event.key(), event.modifiers())) event.cancel();
     }
 
     @EventHandler(priority = EventPriority.HIGHEST)
     private void onButtonBinding(MouseClickEvent event) {
-        if (event.action == KeyAction.Release && onBinding(false, event.input.button(), 0)) event.cancel();
+        if (event.action == KeyAction.Release && onBinding(false, event.button(), 0)) event.cancel();
     }
 
     private boolean onBinding(boolean isKey, int value, int modifiers) {
@@ -250,13 +250,13 @@ else if (value == GLFW.GLFW_KEY_ESCAPE) {
     @EventHandler(priority = EventPriority.HIGH)
     private void onKey(KeyEvent event) {
         if (event.action == KeyAction.Repeat) return;
-        onAction(true, event.input.key(), event.input.modifiers(), event.action == KeyAction.Press);
+        onAction(true, event.key(), event.modifiers(), event.action == KeyAction.Press);
     }
 
     @EventHandler(priority = EventPriority.HIGH)
     private void onMouseClick(MouseClickEvent event) {
         if (event.action == KeyAction.Repeat) return;
-        onAction(false, event.input.button(), 0, event.action == KeyAction.Press);
+        onAction(false, event.button(), 0, event.action == KeyAction.Press);
     }
 
     private void onAction(boolean isKey, int value, int modifiers, boolean isPress) {

src/main/java/meteordevelopment/meteorclient/systems/modules/combat/Offhand.java

@@ -240,7 +240,7 @@ else if ((isClicking || !autoTotem.isLocked() && !item.isOffhand())) {
     @EventHandler
     private void onMouseClick(MouseClickEvent event) {
         // Detects if the User is right-clicking
-        isClicking = mc.currentScreen == null && !Modules.get().get(AutoTotem.class).isLocked() && !usableItem() && !mc.player.isUsingItem() && event.action == KeyAction.Press && event.input.button() == GLFW_MOUSE_BUTTON_RIGHT;
+        isClicking = mc.currentScreen == null && !Modules.get().get(AutoTotem.class).isLocked() && !usableItem() && !mc.player.isUsingItem() && event.action == KeyAction.Press && event.button() == GLFW_MOUSE_BUTTON_RIGHT;
     }
 
     private boolean usableItem() {

src/main/java/meteordevelopment/meteorclient/systems/modules/movement/GUIMove.java

@@ -112,12 +112,12 @@ public boolean disableArrows() {
 
     @EventHandler
     private void onKey(KeyEvent event) {
-        onInput(event.input.key(), event.action);
+        onInput(event.key(), event.action);
     }
 
     @EventHandler
     private void onButton(MouseClickEvent event) {
-        onInput(event.input.button(), event.action);
+        onInput(event.button(), event.action);
     }
 
     private void onInput(int key, KeyAction action) {

src/main/java/meteordevelopment/meteorclient/systems/modules/player/MiddleClickExtra.java

@@ -90,7 +90,7 @@ public void onDeactivate() {
 
     @EventHandler
     private void onMouseClick(MouseClickEvent event) {
-        if (event.action != KeyAction.Press || event.input.button() != GLFW_MOUSE_BUTTON_MIDDLE || mc.currentScreen != null) return;
+        if (event.action != KeyAction.Press || event.button() != GLFW_MOUSE_BUTTON_MIDDLE || mc.currentScreen != null) return;
 
         if (mode.get() == Mode.AddFriend) {
             if (mc.targetedEntity == null) return;

src/main/java/meteordevelopment/meteorclient/systems/modules/render/Freecam.java

@@ -284,14 +284,14 @@ public void onKey(KeyEvent event) {
         if (Input.isKeyPressed(GLFW.GLFW_KEY_F3)) return;
         if (checkGuiMove()) return;
 
-        if (onInput(event.input.key(), event.action)) event.cancel();
+        if (onInput(event.key(), event.action)) event.cancel();
     }
 
     @EventHandler(priority = EventPriority.HIGH)
     private void onMouseClick(MouseClickEvent event) {
         if (checkGuiMove()) return;
 
-        if (onInput(event.input.button(), event.action)) event.cancel();
+        if (onInput(event.button(), event.action)) event.cancel();
     }
 
     private boolean onInput(int key, KeyAction action) {