Get 1.17.1 building

[BoundingBoxOutlineReloaded.git] / src / main / java / com / irtimaled / bbor / client / keyboard / KeyListener.java

diff --git a/src/main/java/com/irtimaled/bbor/client/keyboard/KeyListener.java b/src/main/java/com/irtimaled/bbor/client/keyboard/KeyListener.java
index a680d7c74736a87c4fbd00e8e0455463a115bcb9..0a7bd4107d92f133cefb6ca36eb5928e3d18fa0c 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/keyboard/KeyListener.java
+++ b/src/main/java/com/irtimaled/bbor/client/keyboard/KeyListener.java
@@ -1,55 +1,56 @@
 package com.irtimaled.bbor.client.keyboard;
 
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.settings.KeyBinding;
-import net.minecraft.client.util.InputMappings;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.option.KeyBinding;
+import net.minecraft.client.util.InputUtil;
 import org.lwjgl.glfw.GLFW;
 
 import java.util.HashSet;
 import java.util.Set;
 
 public class KeyListener {
-    private static final Minecraft minecraft = Minecraft.getInstance();
+    private static final MinecraftClient minecraft = MinecraftClient.getInstance();
     private static long mainWindowHandle;
-    private static Set<Key> keys = new HashSet<>();
+    private static final Set<Key> keys = new HashSet<>();
+    private static final Set<CustomKeyBinding> keyBindings = new HashSet<>();
+    public static final String Category = "Bounding Box Outline Reloaded";
 
     public static void init() {
-        mainWindowHandle = minecraft.mainWindow.getHandle();
+        mainWindowHandle = minecraft.getWindow().getHandle();
         GLFW.glfwSetKeyCallback(mainWindowHandle, KeyListener::onKeyEvent);
     }
 
-    public static Key register(String description, int keyCode, String category) {
-        Key key = new Key(description, keyCode, category);
+    public static Key register(String description, String keyName) {
+        InputUtil.Key input = InputUtil.fromTranslationKey(keyName);
+        CustomKeyBinding keyBinding = new CustomKeyBinding(description, input.getCode());
+        keyBindings.add(keyBinding);
+
+        Key key = keyBinding.getKey();
         keys.add(key);
         return key;
     }
 
     private static void onKeyEvent(long windowHandle, int keyCode, int scanCode, int action, int modifiers) {
-        if (windowHandle == mainWindowHandle && minecraft.currentScreen == null && keyCode != -1 && !InputMappings.isKeyDown(292)) {
-            InputMappings.Input input = InputMappings.getInputByCode(keyCode, scanCode);
-            for (Key key : keys) {
-                if (key.getInput() == input) {
-                    switch (action) {
-                        case GLFW.GLFW_PRESS:
-                            key.press();
-                            break;
-                        case GLFW.GLFW_REPEAT:
-                            key.repeat();
-                            break;
-                        case GLFW.GLFW_RELEASE:
-                            key.release();
-                            return;
-                    }
-                    if (minecraft.currentScreen != null)
-                        key.release();
-                    return;
-                }
+        boolean isPressed = action > 0;
+        if (windowHandle == mainWindowHandle &&
+                minecraft.currentScreen == null &&
+                keyCode != -1 &&
+                !InputUtil.isKeyPressed(mainWindowHandle, 292) &&
+                handleKeyEvent(keyCode, isPressed))
+            return;
+        minecraft.keyboard.onKey(windowHandle, keyCode, scanCode, action, modifiers);
+    }
+
+    private static boolean handleKeyEvent(int keyCode, boolean isPressed) {
+        for (Key key : keys) {
+            if (key.handleKeyEvent(keyCode, isPressed)) {
+                return true;
             }
         }
-        minecraft.keyboardListener.onKeyEvent(windowHandle, keyCode, scanCode, action, modifiers);
+        return false;
     }
 
     public static KeyBinding[] keyBindings() {
-        return keys.stream().toArray(KeyBinding[]::new);
+        return keyBindings.toArray(new KeyBinding[0]);
     }
 }