Merge pull request #218 from JayMensink/duplicate-macro-indicator

Duplicate Macro Bind Indicator
RedstoneTools · Jun 8, 2023 · 7c0cfa5 · 7c0cfa5
2 parents cffa749 + 0c77f39
commit 7c0cfa5
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 0 deletions.
diff --git a/src/main/java/tools/redstone/redstonetools/macros/KeyBindingMixin.java b/src/main/java/tools/redstone/redstonetools/macros/KeyBindingMixin.java
@@ -1,9 +1,12 @@
 package tools.redstone.redstonetools.macros;
 
 import net.minecraft.client.option.KeyBinding;
+import net.minecraft.client.util.InputUtil.Key;
 
 public interface KeyBindingMixin {
 
     void removeKeybinding(KeyBinding keyBinding);
 
+    KeyBinding getBindingFromKey(Key key);
+
 }
diff --git a/src/main/java/tools/redstone/redstonetools/macros/Macro.java b/src/main/java/tools/redstone/redstonetools/macros/Macro.java
@@ -1,5 +1,6 @@
 package tools.redstone.redstonetools.macros;
 
+import net.fabricmc.fabric.api.client.keybinding.KeyBindingRegistry;
 import tools.redstone.redstonetools.macros.actions.Action;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.minecraft.client.MinecraftClient;
@@ -85,10 +86,12 @@ public void setKey(Key key) {
     }
 
     public void changeKeyBindingKeyCode() {
+
         if (this.keyBinding != null) {
             MinecraftClient.getInstance().options.setKeyCode(keyBinding,key);
             KeyBinding.updateKeysByCode();
         }
+
     }
 
     public Key getKey(){

diff --git a/src/main/java/tools/redstone/redstonetools/macros/gui/screen/MacroEditScreen.java b/src/main/java/tools/redstone/redstonetools/macros/gui/screen/MacroEditScreen.java
@@ -24,6 +24,7 @@
 import net.minecraft.text.LiteralText;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
+import tools.redstone.redstonetools.utils.KeyBindingUtils;
 
 import java.util.List;
 
@@ -92,6 +93,7 @@ public void init() {
         Key keyCode = macro.getKey();
         Text text = keyCode.getLocalizedText();
         if (keyCode == InputUtil.UNKNOWN_KEY) text = Text.of("");
+        if ( KeyBindingUtils.isKeyAlreadyBound(keyCode) ) { text = new LiteralText(text.getString()).formatted(Formatting.RED); }
 
         keyBindButton = new ButtonWidget(this.width / 2 + 26, 55, 75, 20, text, (button) -> {
             detectingKeycodeKey = true;
@@ -244,6 +246,7 @@ private boolean updateKeybinding(Key key) {
             detectingKeycodeKey = false;
             Text text = key.getLocalizedText();
             if (key == InputUtil.UNKNOWN_KEY) text = Text.of("");
+            if ( KeyBindingUtils.isKeyAlreadyBound(key) ) { text = new LiteralText(text.getString()).formatted(Formatting.RED); }
 
             keyBindButton.setMessage(text);
             macro.setKey(key);

diff --git a/src/main/java/tools/redstone/redstonetools/mixin/macros/KeyBindingMixinImpl.java b/src/main/java/tools/redstone/redstonetools/mixin/macros/KeyBindingMixinImpl.java
@@ -22,4 +22,9 @@ public void removeKeybinding(KeyBinding keyBinding) {
         KEY_TO_BINDINGS.entrySet().removeIf(entry -> entry.getValue().equals(this));
     }
 
+    @Override
+    public KeyBinding getBindingFromKey(InputUtil.Key key) {
+        return KEY_TO_BINDINGS.get(key);
+    }
+
 }
diff --git a/src/main/java/tools/redstone/redstonetools/utils/KeyBindingUtils.java b/src/main/java/tools/redstone/redstonetools/utils/KeyBindingUtils.java
@@ -1,6 +1,8 @@
 package tools.redstone.redstonetools.utils;
 
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.option.KeyBinding;
+import net.minecraft.client.util.InputUtil.Key;
 import tools.redstone.redstonetools.macros.KeyBindingMixin;
 
 public class KeyBindingUtils {
@@ -9,4 +11,9 @@ public static void removeKeyBinding(KeyBinding keyBinding) {
         ((KeyBindingMixin)keyBinding).removeKeybinding(keyBinding);
     }
 
+    public static boolean isKeyAlreadyBound(Key key) {
+        KeyBinding foundKeyBinding = ( (KeyBindingMixin)MinecraftClient.getInstance().options.attackKey ).getBindingFromKey(key);
+        return foundKeyBinding != null;
+    }
+
 }