feat: Allow marking keybinds to never conflict

Author: BlayTheNinth

fabric/src/main/resources/balm.mixins.json

@@ -36,6 +36,7 @@
     "ItemInHandRendererMixin",
     "KeyboardHandlerMixin",
     "KeyMappingAccessor",
+    "KeyMappingMixin",
     "LevelRendererMixin",
     "MinecraftMixin",
     "MouseHandlerAccessor",

forge/src/main/resources/balm.mixins.json

@@ -17,6 +17,7 @@
     "CheckboxAccessor",
     "ImageButtonAccessor",
     "KeyMappingAccessor",
+    "KeyMappingMixin",
     "MouseHandlerAccessor",
     "ScreenAccessor",
     "MinecraftMixin",

shared/src/main/java/net/blay09/mods/balm/api/client/keymappings/BalmKeyMappings.java

@@ -2,7 +2,8 @@
 
 import com.mojang.blaze3d.platform.InputConstants;
 import net.minecraft.client.KeyMapping;
-import net.minecraft.client.player.Input;
+
+import java.util.Optional;
 
 public interface BalmKeyMappings {
     KeyMapping registerKeyMapping(String name, int keyCode, String category);
@@ -32,4 +33,8 @@ default boolean isActiveAndMatches(KeyMapping keyMapping, InputConstants.Type ty
     boolean isKeyDownIgnoreContext(KeyMapping keyMapping);
 
     boolean isActiveAndKeyDown(KeyMapping keyMapping);
+
+    Optional<Boolean> conflictsWith(KeyMapping first, KeyMapping second);
+
+    void ignoreConflicts(KeyMapping keyMapping);
 }

shared/src/main/java/net/blay09/mods/balm/common/client/keymappings/CommonBalmKeyMappings.java

@@ -1,5 +1,6 @@
 package net.blay09.mods.balm.common.client.keymappings;
 
+import com.google.common.collect.Sets;
 import com.mojang.blaze3d.platform.InputConstants;
 import net.blay09.mods.balm.api.client.keymappings.BalmKeyMappings;
 import net.blay09.mods.balm.api.client.keymappings.KeyConflictContext;
@@ -16,6 +17,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 public abstract class CommonBalmKeyMappings implements BalmKeyMappings {
+    private final Set<KeyMapping> ignoreConflicts = Sets.newConcurrentHashSet();
     private final Map<KeyMapping, Set<KeyMapping>> multiModifierKeyMappings = new ConcurrentHashMap<>();
 
     @Override
@@ -168,6 +170,19 @@ public boolean isActiveAndMatches(@Nullable KeyMapping keyMapping, InputConstant
         return isActive(keyMapping) && (type == InputConstants.Type.MOUSE ? keyMapping.matchesMouse(keyCode) : keyMapping.matches(keyCode, scanCode));
     }
 
+    @Override
+    public Optional<Boolean> conflictsWith(KeyMapping first, KeyMapping second) {
+        if (ignoreConflicts.contains(first) || ignoreConflicts.contains(second)) {
+            return Optional.of(false);
+        }
+        return Optional.empty();
+    }
+
+    @Override
+    public void ignoreConflicts(KeyMapping keyMapping) {
+        ignoreConflicts.add(keyMapping);
+    }
+
     protected abstract boolean isContextActive(KeyMapping keyMapping);
 
     protected boolean isContextActive(KeyConflictContext conflictContext) {

shared/src/main/java/net/blay09/mods/balm/mixin/KeyMappingMixin.java

@@ -0,0 +1,17 @@
+package net.blay09.mods.balm.mixin;
+
+import net.blay09.mods.balm.api.client.BalmClient;
+import net.minecraft.client.KeyMapping;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(KeyMapping.class)
+public class KeyMappingMixin {
+    @Inject(method = "same(Lnet/minecraft/client/KeyMapping;)Z", cancellable = true, at = @At("HEAD"))
+    public void same(KeyMapping keyMapping, CallbackInfoReturnable<Boolean> callbackInfo) {
+        KeyMapping thisKeyMapping = (KeyMapping) (Object) this;
+        BalmClient.getKeyMappings().conflictsWith(thisKeyMapping, keyMapping).ifPresent(callbackInfo::setReturnValue);
+    }
+}