From 2f8d51183dfcb3037a0563b1f4358653ff76633e Mon Sep 17 00:00:00 2001 From: Kogepan229 <73163994+Kogepan229@users.noreply.github.com> Date: Sat, 22 Mar 2025 23:41:57 +0900 Subject: [PATCH] Fix terminal key bindings for mouse (#270) Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- .../github/loader/KeybindLoader.java | 31 +++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/glodblock/github/loader/KeybindLoader.java b/src/main/java/com/glodblock/github/loader/KeybindLoader.java index f232cc46..b51e7d94 100644 --- a/src/main/java/com/glodblock/github/loader/KeybindLoader.java +++ b/src/main/java/com/glodblock/github/loader/KeybindLoader.java @@ -30,21 +30,34 @@ public class KeybindLoader implements Runnable { FMLCommonHandler.instance().bus().register(this); } + @SideOnly(Side.CLIENT) @SubscribeEvent public void onKeyInput(InputEvent.KeyInputEvent event) { + if (openTerminal.isPressed()) { + handleOpenTerminalKey(); + } + } + + @SideOnly(Side.CLIENT) + @SubscribeEvent + public void onMouseInput(InputEvent.MouseInputEvent event) { + if (openTerminal.isPressed()) { + handleOpenTerminalKey(); + } + } + + private void handleOpenTerminalKey() { if (Minecraft.getMinecraft().currentScreen != null) return; - EntityClientPlayerMP p = Minecraft.getMinecraft().thePlayer; - if (p.openContainer == null) { + EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; + if (player.openContainer == null) { return; } - if (openTerminal.isPressed()) { - ImmutablePair term = Util.getUltraWirelessTerm(p); - if (term != null && term.getRight().getItem() instanceof ItemWirelessUltraTerminal) { - ItemWirelessUltraTerminal.switchTerminal( - p, - ((ItemWirelessUltraTerminal) term.getRight().getItem()).guiGuiType(term.getRight())); - } + ImmutablePair term = Util.getUltraWirelessTerm(player); + if (term != null && term.getRight().getItem() instanceof ItemWirelessUltraTerminal) { + ItemWirelessUltraTerminal.switchTerminal( + player, + ((ItemWirelessUltraTerminal) term.getRight().getItem()).guiGuiType(term.getRight())); } } }