Fix Keybindings can't be rebound to mouse 4/5 key (side key)

close minecraft-access#190
boholder · Nov 11, 2023 · dfc4855 · dfc4855
1 parent 2ce825b
commit dfc4855
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/common/src/main/java/com/github/khanshoaib3/minecraft_access/utils/system/KeyUtils.java b/common/src/main/java/com/github/khanshoaib3/minecraft_access/utils/system/KeyUtils.java
@@ -23,6 +23,7 @@ public static boolean isAnyPressed(int... keyCodes) {
         return IntStream.of(keyCodes).anyMatch(c -> InputUtil.isKeyPressed(handle, c));
     }
 
+    @SuppressWarnings("unused")
     public static boolean isAllPressed(int... keyCodes) {
         MinecraftClient minecraftClient = MinecraftClient.getInstance();
         if (minecraftClient == null) return false;
@@ -36,18 +37,12 @@ public static boolean isAllPressed(int... keyCodes) {
      * Get these instances via InputUtil.fromTranslationKey({key})
      */
     public static boolean isAnyPressed(KeyBinding... keyBindings) {
-        int[] array = Arrays.stream(keyBindings)
-                .mapToInt(b -> InputUtil.fromTranslationKey(b.getBoundKeyTranslationKey()).getCode())
-                .toArray();
-        return isAnyPressed(array);
+        return Arrays.stream(keyBindings).anyMatch(KeyBinding::isPressed);
     }
 
     @SuppressWarnings("unused")
     public static boolean isAllPressed(KeyBinding... keyBindings) {
-        int[] array = Arrays.stream(keyBindings)
-                .mapToInt(b -> InputUtil.fromTranslationKey(b.getBoundKeyTranslationKey()).getCode())
-                .toArray();
-        return isAllPressed(array);
+        return Arrays.stream(keyBindings).allMatch(KeyBinding::isPressed);
     }
 
     public static boolean isF3Pressed() {