packetadder wip

1 files changed, 6 insertions, 8 deletions

diff --git a/src/main/java/me/shedaniel/mixins/SettingsMixin.java b/src/main/java/me/shedaniel/mixins/SettingsMixin.java
index fa4dee435..bc7408d6e 100755
--- a/src/main/java/me/shedaniel/mixins/SettingsMixin.java
+++ b/src/main/java/me/shedaniel/mixins/SettingsMixin.java
@@ -1,9 +1,9 @@
 package me.shedaniel.mixins;
 
+import me.shedaniel.Core;
 import me.shedaniel.listenerdefinitions.PreLoadOptions;
-import net.minecraft.client.GameSettings;
+import net.minecraft.client.settings.GameOptions;
 import net.minecraft.client.settings.KeyBinding;
-import org.dimdev.riftloader.RiftLoader;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -17,7 +17,7 @@ import java.util.List;
  * Created by James on 8/7/2018.
  */
 
-@Mixin(GameSettings.class)
+@Mixin(GameOptions.class)
 public class SettingsMixin {
     @Shadow
     public KeyBinding[] keyBindings;
@@ -26,18 +26,16 @@ public class SettingsMixin {
         System.out.println("loaded");
     }
     
-    @Inject(method = "loadOptions", at = @At("HEAD"))
+    @Inject(method = "load", at = @At("HEAD"))
     public void beforeLoadOptions(CallbackInfo ci) {
-        
-        RiftLoader.instance.getListeners(PreLoadOptions.class).stream().forEach(f -> processNewBindings(f.loadOptions()));
+        Core.getListeners(PreLoadOptions.class).stream().forEach(f -> processNewBindings(f.loadOptions()));
     }
     
     private void processNewBindings(List<KeyBinding> newBindings) {
         List<KeyBinding> toAdd = new ArrayList<>();
         toAdd.addAll(newBindings);
-        for(KeyBinding keyBinding : keyBindings) {
+        for(KeyBinding keyBinding : keyBindings)
             toAdd.add(keyBinding);
-        }
         keyBindings = (KeyBinding[]) toAdd.toArray(new KeyBinding[0]);
     }