aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/de
diff options
context:
space:
mode:
authormatthias-luger <58751503+matthias-luger@users.noreply.github.com>2021-11-05 20:46:01 +0100
committerGitHub <noreply@github.com>2021-11-05 20:46:01 +0100
commit5cc73b705cf4c6d6887e650daf8222b63dedc011 (patch)
treefa8d60069e0156e137f45209d3b9f5fe0c203255 /src/main/java/de
parent161c01a2be916670c5bb4730760966f78e35afd0 (diff)
parentec5b9f6d45b34f4c6bcc79725180e35344242a20 (diff)
downloadCOFL-5cc73b705cf4c6d6887e650daf8222b63dedc011.tar.gz
COFL-5cc73b705cf4c6d6887e650daf8222b63dedc011.tar.bz2
COFL-5cc73b705cf4c6d6887e650daf8222b63dedc011.zip
Merge pull request #29 from Coflnet/feature/reenable-hotkeys
Reenable Hotkeys
Diffstat (limited to 'src/main/java/de')
-rw-r--r--src/main/java/de/torui/coflsky/CoflSky.java4
-rw-r--r--src/main/java/de/torui/coflsky/EventRegistry.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/de/torui/coflsky/CoflSky.java b/src/main/java/de/torui/coflsky/CoflSky.java
index 69cd136..53ffe71 100644
--- a/src/main/java/de/torui/coflsky/CoflSky.java
+++ b/src/main/java/de/torui/coflsky/CoflSky.java
@@ -44,7 +44,7 @@ public class CoflSky
CoflSky.Wrapper = new WSClientWrapper(webSocketURIPrefix);
keyBindings = new KeyBinding[] {
- new KeyBinding("key.replay_last.onclick", Keyboard.KEY_R, "SkyCofl"),
+ new KeyBinding("key.replay_last.onclick", Keyboard.KEY_NONE, "SkyCofl"),
};
if(event.getSide() == Side.CLIENT) {
@@ -53,7 +53,7 @@ public class CoflSky
for (int i = 0; i < keyBindings.length; ++i)
{
- //ClientRegistry.registerKeyBinding(keyBindings[i]);
+ ClientRegistry.registerKeyBinding(keyBindings[i]);
}
diff --git a/src/main/java/de/torui/coflsky/EventRegistry.java b/src/main/java/de/torui/coflsky/EventRegistry.java
index f47d0a1..c68836f 100644
--- a/src/main/java/de/torui/coflsky/EventRegistry.java
+++ b/src/main/java/de/torui/coflsky/EventRegistry.java
@@ -54,7 +54,7 @@ public class EventRegistry{
@SideOnly(Side.CLIENT)
- //@SubscribeEvent(priority = EventPriority.NORMAL, receiveCanceled = true)
+ @SubscribeEvent(priority = EventPriority.NORMAL, receiveCanceled = true)
public void onEvent(KeyInputEvent event) {
if(CoflSky.keyBindings[0].isPressed()) {