This commit is contained in:
Bob 2023-05-15 23:12:50 +02:00
parent e63996f9f2
commit 1005eee31c

View File

@ -960,13 +960,14 @@ public class ModEventHandlerClient {
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
@SubscribeEvent @SubscribeEvent
public void onMouseClicked(InputEvent.KeyInputEvent event) { 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(); boolean state = Mouse.getEventButtonState();
int keyCode = Mouse.getEventButton() - 100; int keyCode = Mouse.getEventButton() - 100;
//if anything errors here, run ./gradlew clean setupDecompWorkSpace //if anything errors here, run ./gradlew clean setupDecompWorkSpace
for(Object o : KeyBinding.keybindSet) { for(Object o : KeyBinding.keybindArray) {
KeyBinding key = (KeyBinding) o; KeyBinding key = (KeyBinding) o;
if(key.getKeyCode() == keyCode && KeyBinding.hash.lookup(key.getKeyCode()) != key) { if(key.getKeyCode() == keyCode && KeyBinding.hash.lookup(key.getKeyCode()) != key) {
@ -984,12 +985,13 @@ public class ModEventHandlerClient {
@SubscribeEvent @SubscribeEvent
public void onKeyTyped(InputEvent.KeyInputEvent event) { 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(); boolean state = Keyboard.getEventKeyState();
int keyCode = Keyboard.getEventKey(); int keyCode = Keyboard.getEventKey();
//if anything errors here, run ./gradlew clean setupDecompWorkSpace //if anything errors here, run ./gradlew clean setupDecompWorkSpace
for(Object o : KeyBinding.keybindSet) { for(Object o : KeyBinding.keybindArray) {
KeyBinding key = (KeyBinding) o; KeyBinding key = (KeyBinding) o;
if(key.getKeyCode() == keyCode && KeyBinding.hash.lookup(key.getKeyCode()) != key) { if(key.getKeyCode() == keyCode && KeyBinding.hash.lookup(key.getKeyCode()) != key) {