[Feature] Keybinding Refactoring (#957)

Co-authored-by: Martin Robertz <[email protected]>

src/main/java/codechicken/nei/KeyManager.java

@@ -2,14 +2,19 @@ package codechicken.nei;
 
 import java.util.HashMap;
 import java.util.LinkedList;
-import java.util.Map.Entry;
+import java.util.Map;
+import java.util.StringJoiner;
+
+import net.minecraft.client.settings.KeyBinding;
 
 import org.lwjgl.input.Keyboard;
 
 import codechicken.nei.util.NEIKeyboardUtils;
+import codechicken.nei.util.NEIMouseUtils;
+import cpw.mods.fml.client.registry.ClientRegistry;
 
 /**
- * Good old down/held/up keystate tracker
+ * Registers NEI key bindings as vanilla {@link KeyBinding}s and exposes their state to the rest of NEI.
  */
 public class KeyManager {
 
@@ -18,33 +23,92 @@ public class KeyManager {
         public void tickKeyStates();
     }
 
-    public static class KeyState {
-
-        public boolean down;
-        public boolean held;
-        public boolean up;
-    }
-
-    public static HashMap<String, KeyState> keyStates = new HashMap<>();
     public static LinkedList<IKeyStateTracker> trackers = new LinkedList<>();
 
-    public static void tickKeyStates() {
-        for (Entry<String, KeyState> entry : keyStates.entrySet()) {
-            final int keyCode = NEIKeyboardUtils.unhash(NEIClientConfig.getKeyBinding(entry.getKey()));
-            final boolean down = keyCode > 0 && keyCode < Keyboard.KEYBOARD_SIZE && Keyboard.isKeyDown(keyCode);
-            final KeyState state = entry.getValue();
+    private static final Map<String, KeyBinding> keyBindings = new HashMap<>();
 
-            if (down) {
-                state.down = !state.held;
-                state.up = false;
-            } else {
-                state.up = state.held;
-                state.down = false;
-            }
+    public static KeyBinding registerKeyBinding(String ident, int defaultKey) {
+        return keyBindings.computeIfAbsent(ident, id -> {
+            final KeyBinding binding = new KeyBinding(
+                    "nei.options.keys." + id,
+                    NEIKeyboardUtils.unhash(defaultKey),
+                    categoryFor(id));
+            ClientRegistry.registerKeyBinding(binding);
+            return binding;
+        });
+    }
 
-            state.held = down;
+    public static KeyBinding getKeyBinding(String ident) {
+        return keyBindings.get(ident);
+    }
+
+    public static int getKeyCode(String ident) {
+        final KeyBinding binding = keyBindings.get(ident);
+        return binding == null ? Keyboard.KEY_NONE : binding.getKeyCode();
+    }
+
+    public static boolean isKeyDown(String ident) {
+        final KeyBinding binding = keyBindings.get(ident);
+        final int keyCode = binding == null ? Keyboard.KEY_NONE : binding.getKeyCode();
+        return keyCode > Keyboard.KEY_NONE && keyCode < Keyboard.KEYBOARD_SIZE && Keyboard.isKeyDown(keyCode);
+    }
+
+    public static boolean isHashDown(String ident) {
+        return isHashDown(ident, 0);
+    }
+
+    public static boolean isHashDown(String ident, int modifierMask) {
+        if (isKeyDown(ident)) {
+            return ((modifierMask & NEIKeyboardUtils.CTRL_HASH) != 0) == NEIClientUtils.controlKey()
+                    && ((modifierMask & NEIKeyboardUtils.SHIFT_HASH) != 0) == NEIClientUtils.shiftKey()
+                    && ((modifierMask & NEIKeyboardUtils.ALT_HASH) != 0) == NEIClientUtils.altKey();
         }
 
+        return false;
+    }
+
+    public static String getKeyName(String ident) {
+        return getKeyName(ident, 0);
+    }
+
+    public static String getKeyName(String ident, int meta) {
+        final int keyCode = getKeyCode(ident);
+        return keyCode == Keyboard.KEY_NONE ? null : NEIKeyboardUtils.getKeyName(keyCode + meta);
+    }
+
+    public static String getKeyName(String ident, int meta, int mouseBind) {
+        final int keyCode = getKeyCode(ident);
+        return keyCode == Keyboard.KEY_NONE && mouseBind == NEIMouseUtils.MOUSE_BTN_NONE ? null
+                : getKeyName(keyCode + meta, mouseBind);
+    }
+
+    public static String getKeyName(int keyBind, int mouseBind) {
+        StringJoiner keyText = new StringJoiner(" + ");
+        String keyHash = keyBind == Keyboard.KEY_NONE ? "" : NEIKeyboardUtils.getKeyName(keyBind);
+        String mouseHash = mouseBind == NEIMouseUtils.MOUSE_BTN_NONE ? "" : NEIMouseUtils.getKeyName(mouseBind);
+
+        if (!keyHash.isEmpty()) {
+            keyText.add(keyHash);
+        }
+
+        if (!mouseHash.isEmpty()) {
+            keyText.add(mouseHash);
+        }
+
+        return keyText.toString();
+    }
+
+    public static boolean isPressed(String ident) {
+        final KeyBinding binding = keyBindings.get(ident);
+        return binding != null && binding.isPressed();
+    }
+
+    private static String categoryFor(String ident) {
+        final int dot = ident.indexOf('.');
+        return dot < 0 ? "nei.options.keys" : "nei.options.keys." + ident.substring(0, dot);
+    }
+
+    public static void tickKeyStates() {
         for (IKeyStateTracker tracker : trackers) tracker.tickKeyStates();
     }
 }