From 620d77c53f37c2e96720e29b76346c5aa6b1ec0d Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 31 Dec 2018 21:53:55 +0800 Subject: v1.1 --- .../me/shedaniel/mixins/MixinMinecraftClient.java | 7 ---- .../java/me/shedaniel/mixins/SettingsMixin.java | 42 ---------------------- 2 files changed, 49 deletions(-) delete mode 100755 src/main/java/me/shedaniel/mixins/SettingsMixin.java (limited to 'src/main/java/me/shedaniel/mixins') diff --git a/src/main/java/me/shedaniel/mixins/MixinMinecraftClient.java b/src/main/java/me/shedaniel/mixins/MixinMinecraftClient.java index 5b0b20961..110ff5beb 100644 --- a/src/main/java/me/shedaniel/mixins/MixinMinecraftClient.java +++ b/src/main/java/me/shedaniel/mixins/MixinMinecraftClient.java @@ -30,11 +30,4 @@ public class MixinMinecraftClient { profiler.end(); } - @Inject(method = "method_1508", at = @At("HEAD")) - public void onProcessKeyBinds(CallbackInfo ci) { - for (KeybindHandler keybindHandler : Core.getListeners(KeybindHandler.class)) { - keybindHandler.processKeybinds(); - } - } - } diff --git a/src/main/java/me/shedaniel/mixins/SettingsMixin.java b/src/main/java/me/shedaniel/mixins/SettingsMixin.java deleted file mode 100755 index 5182f5ccd..000000000 --- a/src/main/java/me/shedaniel/mixins/SettingsMixin.java +++ /dev/null @@ -1,42 +0,0 @@ -package me.shedaniel.mixins; - -import me.shedaniel.Core; -import me.shedaniel.listenerdefinitions.PreLoadOptions; -import net.minecraft.client.settings.GameOptions; -import net.minecraft.client.settings.KeyBinding; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import java.util.ArrayList; -import java.util.List; - -/** - * Created by James on 8/7/2018. - */ - -@Mixin(GameOptions.class) -public class SettingsMixin { - - @Shadow public KeyBinding[] keysAll; - - public SettingsMixin() { - System.out.println("loaded"); - } - - @Inject(method = "load", at = @At("HEAD")) - public void beforeLoadOptions(CallbackInfo ci) { - Core.getListeners(PreLoadOptions.class).stream().forEach(f -> processNewBindings(f.loadOptions())); - } - - private void processNewBindings(List newBindings) { - List toAdd = new ArrayList<>(); - toAdd.addAll(newBindings); - for(KeyBinding keyBinding : keysAll) - toAdd.add(keyBinding); - keysAll = (KeyBinding[]) toAdd.toArray(new KeyBinding[0]); - } - -} -- cgit