From: Irtimaled <irtimaled@gmail.com>
Date: Fri, 15 May 2020 21:08:18 +0000 (-0700)
Subject: Ensure keys are registered before adding to controls list
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=139ad2373a8e05540388e4a9ce22e53930d57b0a;p=BoundingBoxOutlineReloaded.git

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 c85cb93..61c7078 100644
--- 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 71d3b7e..463d4c9 100644
--- 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();
     }