From 139ad2373a8e05540388e4a9ce22e53930d57b0a Mon Sep 17 00:00:00 2001 From: Irtimaled Date: Fri, 15 May 2020 14:08:18 -0700 Subject: [PATCH] Ensure keys are registered before adding to controls list --- src/main/java/com/irtimaled/bbor/client/ClientProxy.java | 2 +- .../irtimaled/bbor/mixin/client/settings/MixinGameSettings.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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 = "(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(); } -- 2.44.0