From 1005eee31c4bc9769553333724fa65648e0f51c1 Mon Sep 17 00:00:00 2001 From: Bob Date: Mon, 15 May 2023 23:12:50 +0200 Subject: [PATCH] bronk --- .../java/com/hbm/main/ModEventHandlerClient.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/hbm/main/ModEventHandlerClient.java b/src/main/java/com/hbm/main/ModEventHandlerClient.java index de63427b1..2fd559dd2 100644 --- a/src/main/java/com/hbm/main/ModEventHandlerClient.java +++ b/src/main/java/com/hbm/main/ModEventHandlerClient.java @@ -960,13 +960,14 @@ public class ModEventHandlerClient { @SideOnly(Side.CLIENT) @SubscribeEvent public void onMouseClicked(InputEvent.KeyInputEvent event) { - - if(GeneralConfig.enableKeybindOverlap) { + + Minecraft mc = Minecraft.getMinecraft(); + if(GeneralConfig.enableKeybindOverlap && (mc.currentScreen == null || mc.currentScreen.allowUserInput)) { boolean state = Mouse.getEventButtonState(); int keyCode = Mouse.getEventButton() - 100; //if anything errors here, run ./gradlew clean setupDecompWorkSpace - for(Object o : KeyBinding.keybindSet) { + for(Object o : KeyBinding.keybindArray) { KeyBinding key = (KeyBinding) o; if(key.getKeyCode() == keyCode && KeyBinding.hash.lookup(key.getKeyCode()) != key) { @@ -984,12 +985,13 @@ public class ModEventHandlerClient { @SubscribeEvent public void onKeyTyped(InputEvent.KeyInputEvent event) { - if(GeneralConfig.enableKeybindOverlap) { + Minecraft mc = Minecraft.getMinecraft(); + if(GeneralConfig.enableKeybindOverlap && (mc.currentScreen == null || mc.currentScreen.allowUserInput)) { boolean state = Keyboard.getEventKeyState(); int keyCode = Keyboard.getEventKey(); //if anything errors here, run ./gradlew clean setupDecompWorkSpace - for(Object o : KeyBinding.keybindSet) { + for(Object o : KeyBinding.keybindArray) { KeyBinding key = (KeyBinding) o; if(key.getKeyCode() == keyCode && KeyBinding.hash.lookup(key.getKeyCode()) != key) {