Trevor features and solver (#92)

2 files changed, 3 insertions, 12 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/AccessorKeyBinding.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/AccessorKeyBinding.java
index a06f3c339..53abc49dc 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/AccessorKeyBinding.java
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/AccessorKeyBinding.java
@@ -7,11 +7,6 @@ import org.spongepowered.asm.mixin.gen.Invoker;
 
 @Mixin(KeyBinding.class)
 public interface AccessorKeyBinding {
-    @Accessor("pressed")
-    boolean getPressed_skyhanni();
-
-    @Accessor("pressed")
-    void setPressed_skyhanni(boolean newVal);
 
     @Accessor("pressTime")
     int getPressTime_skyhanni();
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinKeyBinding.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinKeyBinding.java
index 8862b57e4..35a9bc780 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinKeyBinding.java
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinKeyBinding.java
@@ -3,7 +3,6 @@ package at.hannibal2.skyhanni.mixins.transformers;
 import at.hannibal2.skyhanni.features.garden.farming.GardenCustomKeybinds;
 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;
@@ -11,16 +10,13 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(KeyBinding.class)
 public class MixinKeyBinding {
-    @Shadow private int keyCode;
-
     @Inject(method = "onTick", at = @At("HEAD"), cancellable = true)
     private static void noOnTick(int keyCode, CallbackInfo ci) {
         GardenCustomKeybinds.onTick(keyCode, ci);
     }
 
-    @Inject(method = "setKeyBindState", at = @At("HEAD"), cancellable = true)
-    private static void nosetKeyBindState(int keyCode, boolean pressed, CallbackInfo ci) {
-        GardenCustomKeybinds.setKeyBindState(keyCode, pressed, ci);
+    @Inject(method = "isKeyDown", at = @At("HEAD"), cancellable = true)
+    public void noIsKeyDown(CallbackInfoReturnable<Boolean> cir) {
+        GardenCustomKeybinds.isKeyDown((KeyBinding) (Object) this, cir);
     }
-
 }