Downgrade to 1.12.2

[BoundingBoxOutlineReloaded.git] / src / main / java / com / irtimaled / bbor / mixin / client / settings / MixinGameSettings.java

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 2f60067ecfc368d3052cddc243ffd8c7e61cb7c3..322af8155c2100c44a300fed0336e4c5b751c72f 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,8 +1,8 @@
 package com.irtimaled.bbor.mixin.client.settings;
 
 import com.irtimaled.bbor.client.keyboard.KeyListener;
-import net.minecraft.client.GameSettings;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.settings.GameSettings;
 import net.minecraft.client.settings.KeyBinding;
 import org.apache.commons.lang3.ArrayUtils;
 import org.spongepowered.asm.mixin.Mixin;
@@ -21,18 +21,9 @@ public abstract class MixinGameSettings {
     @Shadow
     public abstract void loadOptions();
 
-    @Inject(method = "<init>()V", at = @At("RETURN"))
-    private void init(CallbackInfo ci) {
-        keyBindings = getKeysAll();
-    }
-
-    private KeyBinding[] getKeysAll() {
-        return ArrayUtils.addAll(keyBindings, KeyListener.keyBindings());
-    }
-
     @Inject(method = "<init>(Lnet/minecraft/client/Minecraft;Ljava/io/File;)V", at = @At("RETURN"))
     private void init(Minecraft minecraft, File file, CallbackInfo ci) {
-        keyBindings = getKeysAll();
+        keyBindings = ArrayUtils.addAll(keyBindings, KeyListener.keyBindings());
         this.loadOptions();
     }
 }