Rework MovementMixin & manualTickMovement to duplicate less vanilla code

Notably it actually calls KeyboardInput::tick instead of a copied version
Fixes gh-21
Fixes gh-18

Author: PieKing1215

common/build.gradle

@@ -8,6 +8,7 @@ dependencies {
     // which get remapped to the correct annotations on each platform.
     // Do NOT use other classes from Fabric Loader.
     modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version"
+    implementation(annotationProcessor("io.github.llamalad7:mixinextras-common:${mixin_extras_version}"))
 
     modApi("me.shedaniel.cloth:cloth-config:${get("cloth_version")}"){
         exclude(group: "net.fabricmc")

common/src/main/java/me/pieking1215/invmove/InvMove.java

@@ -111,6 +111,8 @@ public ResourceLocation parseResource(String path){
 
     protected Map<ToggleKeyMapping, Boolean> wasToggleKeyDown = new HashMap<>();
 
+    protected boolean forceRawKeyDown = false;
+
     public final List<Module> modules = new ArrayList<>();
 
     public InvMove() {
@@ -179,7 +181,7 @@ private boolean handleToggleMovementKey(Screen screen, boolean couldMove) {
         return couldMove;
     }
 
-    public void onInputUpdate(Input input){
+    public void onInputUpdate(Input input, boolean sneaking, float sneakSpeed){
         if(Minecraft.getInstance().player == null) {
             return;
         }
@@ -262,16 +264,7 @@ public void onInputUpdate(Input input){
             }
 
             // tick movement
-            // TODO: consider mixing into KeyboardInput::tick or KeyMapping::isDown instead of this for better compatibility
-            //       that would also fix swift sneak (gh-21)
-            manualTickMovement(input, Minecraft.getInstance().player.isMovingSlowly(), Minecraft.getInstance().player.isSpectator());
-
-            // set sprinting using raw keybind data
-            // edit: this is commented out to let vanilla handle it (requires an extra mixin on forge)
-            //       letting vanilla do it might fix some bugs with other mods that affect sprinting
-//            if(!Minecraft.getInstance().player.isSprinting() && !Minecraft.getInstance().player.isCrouching()) {
-//                Minecraft.getInstance().player.setSprinting(rawIsKeyDown(Minecraft.getInstance().options.keySprint));
-//            }
+            inputTickRaw(input, sneaking, sneakSpeed);
 
         }else if(Minecraft.getInstance().screen != null){
             // we are in a screen that we can't move in
@@ -366,29 +359,16 @@ public static Field[] getDeclaredFieldsSuper(Class<?> aClass) {
     }
 
     /**
-     * Clone of Input.tick but uses raw keybind data
+     * Calls Input.tick but forces using raw keybind data
      */
-    public void manualTickMovement(Input input, boolean slow, boolean noDampening) {
-
-        input.up = rawIsKeyDown(Minecraft.getInstance().options.keyUp);
-        input.down = rawIsKeyDown(Minecraft.getInstance().options.keyDown);
-        input.left = rawIsKeyDown(Minecraft.getInstance().options.keyLeft);
-        input.right = rawIsKeyDown(Minecraft.getInstance().options.keyRight);
-        input.forwardImpulse = input.up == input.down ? 0.0F : (float)(input.up ? 1 : -1);
-        input.leftImpulse = input.left == input.right ? 0.0F : (float)(input.left ? 1 : -1);
-        input.jumping = rawIsKeyDown(Minecraft.getInstance().options.keyJump) && InvMoveConfig.MOVEMENT.JUMP.get();
-
-        input.shiftKeyDown = rawIsKeyDown(Minecraft.getInstance().options.keyShift);
-        if (!noDampening && (input.shiftKeyDown || slow)) {
-            input.leftImpulse = (float)((double)input.leftImpulse * 0.3D);
-            input.forwardImpulse = (float)((double)input.forwardImpulse * 0.3D);
-        }
+    public void inputTickRaw(Input input, boolean sneaking, float sneakSpeed) {
+        forceRawKeyDown = true;
+        input.tick(sneaking, sneakSpeed);
+        forceRawKeyDown = false;
     }
 
-    public static boolean rawIsKeyDown(KeyMapping key){
-        // this field is accesswidened
-        // can't use the method because it has extra conditions in forge
-        return key.isDown;
+    public boolean shouldForceRawKeyDown() {
+        return forceRawKeyDown;
     }
 
     /**

common/src/main/java/me/pieking1215/invmove/mixin/client/MovementMixin.java

@@ -1,20 +1,28 @@
 package me.pieking1215.invmove.mixin.client;
 
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import me.pieking1215.invmove.InvMove;
+import net.minecraft.client.player.Input;
 import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.world.entity.player.Abilities;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
 @Mixin(LocalPlayer.class)
 public class MovementMixin {
-    @Inject(
+    @WrapOperation(
             method = "aiStep",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/client/tutorial/Tutorial;onInput(Lnet/minecraft/client/player/Input;)V")
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/Input;tick(ZF)V")
     )
-    private void onInput(CallbackInfo info) {
+    private void onTick(Input instance, boolean sneaking, float sneakSpeed, Operation<Void> original) {
+        original.call(instance, sneaking, sneakSpeed);
+
         //noinspection ConstantConditions
-        InvMove.instance().onInputUpdate(((LocalPlayer)(Object)this).input);
+        InvMove.instance().onInputUpdate(instance, sneaking, sneakSpeed);
     }
 }

gradle.properties

@@ -3,6 +3,7 @@ org.gradle.jvmargs=-Xmx3G
 #org.gradle.parallel=true
 
 fabric_loader_version = 0.16.7
+mixin_extras_version = 0.4.1
 
 # Key mod properties
 id = invmove

neoforge/build.gradle

@@ -34,6 +34,9 @@ repositories {
 dependencies {
     neoForge "net.neoforged:neoforge:${get("neoforge")}"
 
+    implementation(annotationProcessor("io.github.llamalad7:mixinextras-common:${mixin_extras_version}"))
+    implementation(include("io.github.llamalad7:mixinextras-neoforge:${mixin_extras_version}"))
+
     modApi "me.shedaniel.cloth:cloth-config-neoforge:${get("cloth_version")}"
 
     common(project(path: ":common:$stonecutter.current.project", configuration: 'namedElements')) { transitive false }

neoforge/src/main/java/me/pieking1215/invmove/neoforge/mixin/client/KeyMappingIsDownMixin.java

@@ -0,0 +1,26 @@
+package me.pieking1215.invmove.neoforge.mixin.client;
+
+import me.pieking1215.invmove.InvMove;
+import net.minecraft.client.KeyMapping;
+import net.minecraft.client.ToggleKeyMapping;
+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.CallbackInfoReturnable;
+
+@Mixin(
+        value = {KeyMapping.class, ToggleKeyMapping.class}
+)
+public class KeyMappingIsDownMixin {
+    @Inject(
+            method = "isDown",
+            at = @At("HEAD"),
+            cancellable = true
+    )
+    private void overrideIsDown(CallbackInfoReturnable<Boolean> cir) {
+        if (InvMove.instance().shouldForceRawKeyDown()) {
+            cir.setReturnValue(((KeyMapping)(Object)this).isDown);
+        }
+    }
+}

neoforge/src/main/resources/invmove-neoforge.mixins.json

@@ -4,6 +4,7 @@
   "package": "me.pieking1215.invmove.neoforge.mixin",
   "compatibilityLevel": "JAVA_16",
   "client": [
+    "client.KeyMappingIsDownMixin",
     "client.SprintKeyDownMixin"
   ],
   "mixins": [