Ensure keys are registered before adding to controls list

diff --git a/src/main/java/com/irtimaled/bbor/client/ClientProxy.java b/src/main/java/com/irtimaled/bbor/client/ClientProxy.java
index c85cb93447fcfc9ce1070b359a31301b010834ed..61c707829f34f065089faf8b6132e95288a6b6ac 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/ClientProxy.java
+++ b/src/main/java/com/irtimaled/bbor/client/ClientProxy.java
@@ -13,7 +13,7 @@ import com.irtimaled.bbor.common.EventBus;
 import com.irtimaled.bbor.common.VillageColorCache;
 
 public class ClientProxy extends CommonProxy {
-    static {
+    public static void registerKeyBindings() {
         Key mainKey = KeyListener.register("bbor.key.toggleActive", "key.keyboard.b")
                 .onKeyPressHandler(ClientRenderer::toggleActive);
         mainKey.register("key.keyboard.g")

diff --git a/src/main/java/com/irtimaled/bbor/mixin/client/settings/MixinGameSettings.java b/src/main/java/com/irtimaled/bbor/mixin/client/settings/MixinGameSettings.java
index 71d3b7efa6cfce4f7416b2598066fdd22824a310..463d4c9ad115881eacb21359098c77ba5c8af186 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/mixin/client/settings/MixinGameSettings.java
+++ b/src/main/java/com/irtimaled/bbor/mixin/client/settings/MixinGameSettings.java
@@ -1,5 +1,6 @@
 package com.irtimaled.bbor.mixin.client.settings;
 
+import com.irtimaled.bbor.client.ClientProxy;
 import com.irtimaled.bbor.client.keyboard.KeyListener;
 import net.minecraft.client.GameSettings;
 import net.minecraft.client.Minecraft;
@@ -23,6 +24,7 @@ public abstract class MixinGameSettings {
 
     @Inject(method = "<init>(Lnet/minecraft/client/Minecraft;Ljava/io/File;)V", at = @At("RETURN"))
     private void init(Minecraft minecraft, File file, CallbackInfo ci) {
+        ClientProxy.registerKeyBindings();
         keyBindings = ArrayUtils.addAll(keyBindings, KeyListener.keyBindings());
         this.loadOptions();
     }