fix(1.21.2): trying my best to keep it together 😭

Author: rvbsm

build.gradle.kts

@@ -64,7 +64,9 @@ dependencies {
         "fabric-key-binding-api-v1",
         "fabric-lifecycle-events-v1",
         "fabric-networking-api-v1",
-        "fabric-screen-api-v1", // bruh
+
+        "fabric-screen-api-v1",
+        "fabric-resource-loader-v0" // until yacl is updated
     ).map { fabricApi.module(it, property("fabric.api").toString()) }.forEach(::modImplementation)
 
     modImplementation("com.terraformersmc:modmenu:${property("api.modmenu")}")

src/main/java/dev/rvbsm/fsit/mixin/EntityMixin.java

@@ -1,11 +1,10 @@
 package dev.rvbsm.fsit.mixin;
 
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.MovementType;
 import net.minecraft.util.math.Vec3d;
 
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
-import com.llamalad7.mixinextras.sugar.Local;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -21,22 +20,12 @@ public abstract class EntityMixin {
     @Shadow
     public abstract Vec3d getPos();
 
-    @Inject(
-        method = "move",
-        at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;setPosition(DDD)V", ordinal = 1))
-    protected void move(
-        CallbackInfo ci,
-        @Local(ordinal = 1) Vec3d velocity
-    ) {
+    @Inject(method = "move", at = @At("TAIL"))
+    protected void onMove(MovementType type, Vec3d movement, CallbackInfo ci) {
     }
 
     @ModifyReturnValue(method = "hasPlayerRider", at = @At("RETURN"))
     protected boolean hasPlayerRider(boolean original) {
         return original;
     }
-
-    @ModifyReturnValue(method = "updatePassengerForDismount", at = @At("RETURN"))
-    protected Vec3d updatePassengerForDismount(Vec3d original, @Local(argsOnly = true) LivingEntity passenger) {
-        return original;
-    }
 }

src/main/java/dev/rvbsm/fsit/mixin/LivingEntityMixin.java

@@ -1,9 +1,21 @@
 package dev.rvbsm.fsit.mixin;
 
+import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
 
 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;
 
 @Mixin(LivingEntity.class)
 public abstract class LivingEntityMixin extends EntityMixin {
+
+    @Shadow
+    public abstract void stopRiding();
+
+    @Inject(method = "onDismounted", at = @At("TAIL"))
+    protected void onDismount(Entity vehicle, CallbackInfo ci) {
+    }
 }

src/main/java/dev/rvbsm/fsit/mixin/PlayerEntityMixin.java

@@ -1,16 +1,17 @@
 package dev.rvbsm.fsit.mixin;
 
+import net.minecraft.entity.EntityPose;
 import net.minecraft.entity.player.PlayerAbilities;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.util.math.Vec3d;
 
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
 
 import dev.rvbsm.fsit.api.player.PlayerPose;
 import dev.rvbsm.fsit.entity.ModPose;
@@ -27,11 +28,13 @@ public abstract class PlayerEntityMixin extends LivingEntityMixin implements Pla
     @Shadow
     public abstract PlayerAbilities getAbilities();
 
-    @ModifyExpressionValue(
+    @ModifyArg(
         method = "updatePose",
-        at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerEntity;isSwimming()Z"))
-    private boolean isCrawling(boolean isSwimming) {
-        return isSwimming || this.fsit$isInPose(ModPose.Crawling);
+        at = @At(
+            value = "INVOKE",
+            target = "Lnet/minecraft/entity/player/PlayerEntity;setPose(Lnet/minecraft/entity/EntityPose;)V"))
+    private EntityPose isCrawling(EntityPose pose) {
+        return this.fsit$isInPose(ModPose.Crawling) ? EntityPose.SWIMMING : pose;
     }
 
     @Override

src/main/java/dev/rvbsm/fsit/mixin/ServerPlayerEntityMixin.java

@@ -1,15 +1,14 @@
 package dev.rvbsm.fsit.mixin;
 
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.MovementType;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.Util;
 import net.minecraft.util.math.Vec3d;
 
-import com.llamalad7.mixinextras.sugar.Local;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -37,9 +36,6 @@ public abstract class ServerPlayerEntityMixin extends PlayerEntityMixin implemen
     @Unique
     private long lastSneakTime = 0L;
 
-    @Shadow
-    public abstract void stopRiding();
-
     @Inject(method = "playerTick", at = @At("TAIL"))
     private void tickPosing(CallbackInfo ci) {
         if (this.fsit$isInPose()) {
@@ -68,16 +64,16 @@ private void copyConfig(ServerPlayerEntity oldPlayer, boolean alive, CallbackInf
         }
     }
 
-    @Inject(method = "stopRiding", at = @At("TAIL"))
-    private void resetPose(CallbackInfo ci, @Local Entity entity) {
-        if (this.fsit$isInPose(ModPose.Sitting)) {
-            this.fsit$resetPose();
-        }
+    @Override
+    protected void onMove(MovementType type, Vec3d movement, CallbackInfo ci) {
+        this.playerVelocity = movement;
     }
 
     @Override
-    protected void move(CallbackInfo ci, Vec3d velocity) {
-        this.playerVelocity = velocity;
+    protected void onDismount(Entity vehicle, CallbackInfo ci) {
+        if (this.fsit$isInPose(ModPose.Sitting)) {
+            this.fsit$resetPose();
+        }
     }
 
     @Override