1.21.5 (#313)

* Update to 1.21.5

---------

Co-authored-by: Drex <[email protected]>

Author: PotatoPresident

gradle.properties

@@ -2,7 +2,7 @@ kotlin.code.style=official
 org.gradle.jvmargs=-Xmx2G
 
 # Mod Properties
-modVersion = 1.3.7
+modVersion = 1.3.9
 mavenGroup = com.github.quiltservertools
 modId = ledger
 modName = Ledger

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

libs.versions.toml

@@ -1,17 +1,17 @@
 [versions]
-minecraft = "1.21.4"
-yarn-mappings = "1.21.4+build.1"
-fabric-loader = "0.16.9"
+minecraft = "1.21.5"
+yarn-mappings = "1.21.5+build.1"
+fabric-loader = "0.16.10"
 
-fabric-api = "0.110.5+1.21.4"
+fabric-api = "0.119.5+1.21.5"
 
 # Kotlin
 kotlin = "2.1.0"
 # Also modrinth version in gradle.properties
 fabric-kotlin = "1.13.0+kotlin.2.1.0"
 
 fabric-permissions = "0.3.3"
-translations = "2.4.0+1.21.2-rc1"
+translations = "2.5.0+1.21.5-rc1"
 
 exposed = "0.58.0"
 sqlite-jdbc = "3.47.2.0"
@@ -45,5 +45,5 @@ detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting",
 [plugins]
 kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
-loom = { id = "fabric-loom", version = "1.9.+" }
+loom = { id = "fabric-loom", version = "1.10.+" }
 git_hooks = { id = "com.github.jakemarsden.git-hooks", version = "0.0.2" }

src/main/java/com/github/quiltservertools/ledger/mixin/BucketDispenserBehaviorMixin.java

@@ -15,14 +15,14 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-@Mixin(targets = "net/minecraft/block/dispenser/DispenserBehavior$13")
+@Mixin(targets = "net/minecraft/block/dispenser/DispenserBehavior$11")
 public abstract class BucketDispenserBehaviorMixin extends ItemDispenserBehavior {
 
     @Inject(
             method = "dispenseSilently",
             at = @At(
                     value = "INVOKE",
-                    target = "Lnet/minecraft/block/FluidDrainable;tryDrainFluid(Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/world/WorldAccess;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)Lnet/minecraft/item/ItemStack;",
+                    target = "Lnet/minecraft/block/FluidDrainable;tryDrainFluid(Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/world/WorldAccess;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)Lnet/minecraft/item/ItemStack;",
                     shift = At.Shift.AFTER
             )
     )

src/main/java/com/github/quiltservertools/ledger/mixin/BucketItemMixin.java

@@ -7,6 +7,7 @@
 import com.llamalad7.mixinextras.sugar.Local;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Waterloggable;
+import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.fluid.Fluid;
 import net.minecraft.item.BucketItem;
@@ -15,7 +16,6 @@
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -30,25 +30,32 @@ public abstract class BucketItemMixin {
     private Fluid fluid;
 
     @Inject(method = "placeFluid", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;breakBlock(Lnet/minecraft/util/math/BlockPos;Z)Z"))
-    private void logFluidBreak(@Nullable PlayerEntity player, World world, BlockPos pos, @Nullable BlockHitResult hitResult, CallbackInfoReturnable<Boolean> cir) {
+    private void logFluidBreak(LivingEntity user, World world, BlockPos pos, BlockHitResult hitResult, CallbackInfoReturnable<Boolean> cir) {
         var blockstate = world.getBlockState(pos);
-        if (!blockstate.isAir()) {
+        if (!blockstate.isAir() && user instanceof PlayerEntity player) {
             BlockBreakCallback.EVENT.invoker().breakBlock(world, pos, world.getBlockState(pos), world.getBlockEntity(pos), Sources.FLUID, player);
         }
     }
-    
-    @Inject(method = "placeFluid", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/BucketItem;playEmptyingSound(Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/world/WorldAccess;Lnet/minecraft/util/math/BlockPos;)V", ordinal = 1))
-    private void logFluidPlace(@Nullable PlayerEntity player, World world, BlockPos pos, @Nullable BlockHitResult hitResult, CallbackInfoReturnable<Boolean> cir) {
-        if (player != null) {
+
+    @Inject(method = "placeFluid", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/BucketItem;playEmptyingSound(Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/world/WorldAccess;Lnet/minecraft/util/math/BlockPos;)V"))
+    private void logFluidPlace(LivingEntity user, World world, BlockPos pos, BlockHitResult hitResult, CallbackInfoReturnable<Boolean> cir) {
+        if (user instanceof PlayerEntity player) {
             BlockPlaceCallback.EVENT.invoker().place(world, pos, this.fluid.getDefaultState().getBlockState(), null, player);
         } else {
             BlockPlaceCallback.EVENT.invoker().place(world, pos, this.fluid.getDefaultState().getBlockState(), null, Sources.REDSTONE);
         }
     }
 
-    @Inject(method = "placeFluid", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/BucketItem;playEmptyingSound(Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/world/WorldAccess;Lnet/minecraft/util/math/BlockPos;)V", ordinal = 0))
-    private void logWaterlog(PlayerEntity player, World world, BlockPos pos, BlockHitResult hitResult, CallbackInfoReturnable<Boolean> cir, @Local BlockState blockState) {
-        if (player != null) {
+    @Inject(
+            method = "placeFluid",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/item/BucketItem;playEmptyingSound(Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/world/WorldAccess;Lnet/minecraft/util/math/BlockPos;)V",
+                    ordinal = 0
+            )
+    )
+    private void logWaterlog(LivingEntity user, World world, BlockPos pos, BlockHitResult hitResult, CallbackInfoReturnable<Boolean> cir, @Local BlockState blockState) {
+        if (user instanceof PlayerEntity player) {
             BlockChangeCallback.EVENT.invoker().changeBlock(
                     world,
                     pos,

src/main/java/com/github/quiltservertools/ledger/mixin/FillCommandMixin.java

@@ -15,6 +15,7 @@
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.math.BlockBox;
 import net.minecraft.util.math.BlockPos;
+import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Coerce;
@@ -38,6 +39,7 @@ private static void logFillChanges(
             BlockStateArgument block,
             @Coerce Object mode,
             Predicate<CachedBlockPosition> filter,
+            boolean strict,
             CallbackInfoReturnable<Integer> cir,
             @Local BlockPos pos) {
         ServerWorld world = source.getWorld();

src/main/java/com/github/quiltservertools/ledger/mixin/SetBlockCommandMixin.java

@@ -22,8 +22,14 @@
 
 @Mixin(SetBlockCommand.class)
 public abstract class SetBlockCommandMixin {
-    @ModifyArgs(method = "execute", at = @At(value = "INVOKE", target = "Lnet/minecraft/command/argument/BlockStateArgument;setBlockState(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;I)Z"))
-    private static void logSetBlockChange(Args args, ServerCommandSource source, BlockPos pos, BlockStateArgument block, SetBlockCommand.Mode mode, @Nullable Predicate<CachedBlockPosition> condition) {
+    @ModifyArgs(
+            method = "execute",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/command/argument/BlockStateArgument;setBlockState(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;I)Z"
+            )
+    )
+    private static void logSetBlockChange(Args args, ServerCommandSource source, BlockPos pos, BlockStateArgument block, SetBlockCommand.Mode mode, @Nullable Predicate<CachedBlockPosition> condition, boolean strict) {
         ServerWorld world = args.get(0);
 
         BlockState oldState = world.getBlockState(pos);

src/main/java/com/github/quiltservertools/ledger/mixin/blocks/LilyPadBlockMixin.java

@@ -5,6 +5,7 @@
 import net.minecraft.block.BlockState;
 import net.minecraft.block.LilyPadBlock;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityCollisionHandler;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.vehicle.AbstractBoatEntity;
 import net.minecraft.util.math.BlockPos;
@@ -17,7 +18,7 @@
 @Mixin(LilyPadBlock.class)
 public abstract class LilyPadBlockMixin {
     @Inject(method = "onEntityCollision", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;breakBlock(Lnet/minecraft/util/math/BlockPos;ZLnet/minecraft/entity/Entity;)Z"))
-    private void ledgerLogLilyPadBreak(BlockState state, World world, BlockPos pos, Entity entity, CallbackInfo ci) {
+    private void ledgerLogLilyPadBreak(BlockState state, World world, BlockPos pos, Entity entity, EntityCollisionHandler handler, CallbackInfo ci) {
         AbstractBoatEntity boat = (AbstractBoatEntity) entity;
         if (boat.getFirstPassenger() instanceof PlayerEntity player) {
             BlockBreakCallback.EVENT.invoker().breakBlock(world, new BlockPos(pos), state, null, Sources.VEHICLE, player);

src/main/java/com/github/quiltservertools/ledger/mixin/blocks/SpongeBlockMixin.java

@@ -28,7 +28,7 @@ private static void logWaterDrainNonSource(BlockPos actorBlockPos, World world,
     }
 
     @Inject(method = "method_49829", at = @At(value = "INVOKE",
-            target = "Lnet/minecraft/block/FluidDrainable;tryDrainFluid(Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/world/WorldAccess;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)Lnet/minecraft/item/ItemStack;"))
+            target = "Lnet/minecraft/block/FluidDrainable;tryDrainFluid(Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/world/WorldAccess;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)Lnet/minecraft/item/ItemStack;"))
     private static void logWaterDrainSource(BlockPos actorBlockPos, World world, BlockPos pos, CallbackInfoReturnable<Boolean> cir) {
         BlockBreakCallback.EVENT.invoker().breakBlock(world, pos, world.getBlockState(pos), null, Sources.SPONGE);
     }

src/main/java/com/github/quiltservertools/ledger/mixin/blocks/cauldron/LeveledCauldronBlockMixin.java

@@ -5,6 +5,7 @@
 import net.minecraft.block.BlockState;
 import net.minecraft.block.LeveledCauldronBlock;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityCollisionHandler;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.fluid.Fluid;
 import net.minecraft.util.math.BlockPos;
@@ -52,7 +53,7 @@ private static void ledgerLogDecrementLevelCauldron(BlockState state, World worl
 
     @Inject(method = "onEntityCollision", at = @At(value = "INVOKE",
             target = "Lnet/minecraft/block/LeveledCauldronBlock;onFireCollision(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;)V"))
-    private void ledgerLogPlayerExtinguish(BlockState state, World world, BlockPos pos, Entity entity, CallbackInfo ci) {
+    private void ledgerLogPlayerExtinguish(BlockState state, World world, BlockPos pos, Entity entity, EntityCollisionHandler handler, CallbackInfo ci) {
         if (entity instanceof PlayerEntity) {
             playerEntity = (PlayerEntity) entity;
         }