From 21be99f2a1fdd29678d2094b42e8cd3a57b56ec9 Mon Sep 17 00:00:00 2001 From: CrushedPixel Date: Fri, 12 Jun 2015 22:50:08 +0200 Subject: [PATCH] Changed KeyInputHandler not to oppress Key Inputs when not in Replay --- src/main/java/eu/crushedpixel/replaymod/ReplayMod.java | 1 - .../crushedpixel/replaymod/events/KeyInputHandler.java | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/eu/crushedpixel/replaymod/ReplayMod.java b/src/main/java/eu/crushedpixel/replaymod/ReplayMod.java index 7856b1da..7f4da56b 100755 --- a/src/main/java/eu/crushedpixel/replaymod/ReplayMod.java +++ b/src/main/java/eu/crushedpixel/replaymod/ReplayMod.java @@ -102,7 +102,6 @@ public class ReplayMod { MinecraftForge.EVENT_BUS.register(guiEventHandler = new GuiEventHandler()); FMLCommonHandler.instance().bus().register(keyInputHandler); - MinecraftForge.EVENT_BUS.register(keyInputHandler); FMLCommonHandler.instance().bus().register(mouseInputHandler); MinecraftForge.EVENT_BUS.register(mouseInputHandler); diff --git a/src/main/java/eu/crushedpixel/replaymod/events/KeyInputHandler.java b/src/main/java/eu/crushedpixel/replaymod/events/KeyInputHandler.java index b451703d..1d2e6dab 100755 --- a/src/main/java/eu/crushedpixel/replaymod/events/KeyInputHandler.java +++ b/src/main/java/eu/crushedpixel/replaymod/events/KeyInputHandler.java @@ -112,11 +112,6 @@ public class KeyInputHandler { for(KeyBinding kb : keyBindings) { if(!kb.isKeyDown()) continue; - if(kb.getKeyDescription().equals("key.chat") && kb.isPressed()) { - mc.displayGuiScreen(new GuiMouseInput(ReplayMod.overlay)); - break; - } - handleCustomKeybindings(kb, found, -1); found = true; } @@ -135,6 +130,10 @@ public class KeyInputHandler { if(!ReplayHandler.isInReplay()) return; + if(kb.getKeyDescription().equals("key.chat") && (kb.isPressed() || kb.getKeyCode() == keyCode)) { + mc.displayGuiScreen(new GuiMouseInput(ReplayMod.overlay)); + } + if(kb.getKeyDescription().equals(KeybindRegistry.KEY_PLAY_PAUSE) && (kb.isPressed() || kb.getKeyCode() == keyCode) && !ReplayHandler.isInPath()) { ReplayMod.overlay.togglePlayPause(); }