re-add 1.21.9 support, fix fapi dependency (#5755)

Author: crosby-moe

build.gradle.kts

@@ -78,6 +78,7 @@ dependencies {
 
     modInclude(fabricApi.module("fabric-api-base", properties["fapi_version"] as String))
     modInclude(fabricApi.module("fabric-resource-loader-v0", properties["fapi_version"] as String))
+    modInclude(fabricApi.module("fabric-resource-loader-v1", properties["fapi_version"] as String))
 
     // Compat fixes
     modCompileOnly(fabricApi.module("fabric-renderer-indigo", properties["fapi_version"] as String))

src/main/java/meteordevelopment/meteorclient/mixin/CobwebBlockMixin.java

@@ -13,6 +13,7 @@
 import net.minecraft.entity.EntityCollisionHandler;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
+import org.spongepowered.asm.mixin.Dynamic;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -22,8 +23,14 @@
 
 @Mixin(CobwebBlock.class)
 public abstract class CobwebBlockMixin {
-    @Inject(method = "onEntityCollision", at = @At("HEAD"), cancellable = true)
+    @Inject(method = "onEntityCollision", at = @At("HEAD"), cancellable = true, require = 0)
     private void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entity, EntityCollisionHandler handler, boolean bl, CallbackInfo ci) {
         if (entity == mc.player && Modules.get().get(NoSlow.class).cobweb()) ci.cancel();
     }
+
+    @Dynamic("1.21.9 Method Parameters")
+    @Inject(method = "onEntityCollision", at = @At("HEAD"), cancellable = true, require = 0)
+    private void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entity, EntityCollisionHandler handler, CallbackInfo ci) {
+        if (entity == mc.player && Modules.get().get(NoSlow.class).cobweb()) ci.cancel();
+    }
 }

src/main/java/meteordevelopment/meteorclient/mixin/SweetBerryBushBlockMixin.java

@@ -13,6 +13,7 @@
 import net.minecraft.entity.EntityCollisionHandler;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
+import org.spongepowered.asm.mixin.Dynamic;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -22,8 +23,14 @@
 
 @Mixin(SweetBerryBushBlock.class)
 public abstract class SweetBerryBushBlockMixin {
-    @Inject(method = "onEntityCollision", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;slowMovement(Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/Vec3d;)V"), cancellable = true)
+    @Inject(method = "onEntityCollision", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;slowMovement(Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/Vec3d;)V"), cancellable = true, require = 0)
     private void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entity, EntityCollisionHandler handler, boolean bl, CallbackInfo ci) {
         if (entity == mc.player && Modules.get().get(NoSlow.class).berryBush()) ci.cancel();
     }
+
+    @Dynamic("1.21.9 Method Parameters")
+    @Inject(method = "onEntityCollision", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;slowMovement(Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/Vec3d;)V"), cancellable = true, require = 0)
+    private void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entity, EntityCollisionHandler handler, CallbackInfo ci) {
+        if (entity == mc.player && Modules.get().get(NoSlow.class).berryBush()) ci.cancel();
+    }
 }

src/main/resources/fabric.mod.json

@@ -47,7 +47,7 @@
   },
   "depends": {
     "java": ">=21",
-    "minecraft": ["${minecraft_version}"],
+    "minecraft": ["${minecraft_version}", "1.21.9"],
     "fabricloader": ">=${loader_version}"
   },
   "breaks": {