1.21.10 and 1.21.9 Update (#338)

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

Author: IxPrumxI

gradle.properties

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

libs.versions.toml

@@ -1,17 +1,17 @@
 [versions]
-minecraft = "1.21.8"
-yarn-mappings = "1.21.8+build.1"
-fabric-loader = "0.17.1"
+minecraft = "1.21.10-rc1"
+yarn-mappings = "1.21.10-rc1+build.1"
+fabric-loader = "0.17.2"
 
-fabric-api = "0.131.0+1.21.8"
+fabric-api = "0.134.1+1.21.10"
 
 # Kotlin
 kotlin = "2.2.0"
 # Also modrinth version in gradle.properties
 fabric-kotlin = "1.13.4+kotlin.2.2.0"
 
 fabric-permissions = "0.4.1"
-translations = "2.5.1+1.21.5"
+translations = "2.5.2+1.21.9-pre3"
 
 exposed = "0.61.0"
 sqlite-jdbc = "3.50.3.0"

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

@@ -29,7 +29,7 @@ public abstract class BucketDispenserBehaviorMixin extends ItemDispenserBehavior
     private void logFluidPickup(BlockPointer pointer, ItemStack stack, CallbackInfoReturnable<ItemStack> cir, @Local(argsOnly = true) ItemStack itemStack, @Local BlockPos pos, @Local BlockState blockState) {
         var world = pointer.world();
         if (!itemStack.isEmpty()) {
-            if (blockState.isLiquid() || blockState.isOf(Blocks.POWDER_SNOW)) {
+            if (!blockState.getFluidState().isEmpty() || blockState.isOf(Blocks.POWDER_SNOW)) {
                 BlockBreakCallback.EVENT.invoker().breakBlock(world, pos, blockState, world.getBlockEntity(pos), Sources.REDSTONE);
             } else {
                 BlockChangeCallback.EVENT.invoker().changeBlock(

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

@@ -0,0 +1,25 @@
+package com.github.quiltservertools.ledger.mixin;
+
+import com.github.quiltservertools.ledger.callbacks.ItemDropCallback;
+import com.llamalad7.mixinextras.sugar.Local;
+import net.minecraft.entity.ItemEntity;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.ai.brain.task.TargetUtil;
+import net.minecraft.entity.passive.CopperGolemEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.Vec3d;
+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.callback.CallbackInfo;
+
+@Mixin(TargetUtil.class)
+public class CopperGolemGiveMixin {
+
+    @Inject(method = "give(Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/util/math/Vec3d;F)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;spawnEntity(Lnet/minecraft/entity/Entity;)Z"))
+    private static void onItemGiven(LivingEntity entity, ItemStack stack, Vec3d targetLocation, Vec3d velocityFactor, float yOffset, CallbackInfo ci, @Local ItemEntity itemEntity) {
+        if (entity instanceof CopperGolemEntity) {
+            ItemDropCallback.EVENT.invoker().drop(itemEntity, entity);
+        }
+    }
+}

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

@@ -28,6 +28,6 @@ private void ledgerOldEntity(ItemStack stack, PlayerEntity player, LivingEntity
 
     @Inject(method = "useOnEntity", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/passive/SheepEntity;setColor(Lnet/minecraft/util/DyeColor;)V", shift = At.Shift.AFTER))
     private void ledgerPlayerDyeSheep(ItemStack stack, PlayerEntity player, LivingEntity entity, Hand hand, CallbackInfoReturnable<ActionResult> cir) {
-        EntityModifyCallback.EVENT.invoker().modify(player.getWorld(), entity.getBlockPos(), oldEntityTags, entity, stack, player, Sources.DYE);
+        EntityModifyCallback.EVENT.invoker().modify(player.getEntityWorld(), entity.getBlockPos(), oldEntityTags, entity, stack, player, Sources.DYE);
     }
 }

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

@@ -2,6 +2,7 @@
 
 import com.github.quiltservertools.ledger.callbacks.BlockChangeCallback;
 import com.github.quiltservertools.ledger.utility.Sources;
+import com.llamalad7.mixinextras.sugar.Local;
 import net.minecraft.block.BlockState;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.HoneycombItem;
@@ -16,10 +17,10 @@
 @Mixin(HoneycombItem.class)
 public abstract class HoneycombItemMixin {
     @ModifyArgs(method = "method_34719", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;setBlockState(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;I)Z"))
-    private static void logCopperWaxing(Args args, ItemUsageContext context, BlockPos pos, World world, BlockState state) {
+    private static void logCopperWaxing(Args args, @Local World world, @Local PlayerEntity player) {
+        BlockPos pos = args.get(0);
         BlockState oldState = world.getBlockState(pos);
         BlockState newState = args.get(1);
-        PlayerEntity player = context.getPlayer();
         if (player == null) {
             BlockChangeCallback.EVENT.invoker().changeBlock(world, pos, oldState, newState, null, null, Sources.INTERACT);
         } else {

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

@@ -0,0 +1,29 @@
+package com.github.quiltservertools.ledger.mixin;
+
+import com.github.quiltservertools.ledger.callbacks.BlockBreakCallback;
+import com.github.quiltservertools.ledger.utility.Sources;
+import com.llamalad7.mixinextras.sugar.Local;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+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.callback.CallbackInfoReturnable;
+
+@Mixin(World.class)
+public abstract class LilyPadBreakageMixin {
+    @Inject(method = "breakBlock", at = @At(value = "RETURN", ordinal = 1))
+    private void ledgerModifyLilyPadBreakArgs(BlockPos pos, boolean drop, Entity entity, int maxUpdateDepth, CallbackInfoReturnable<Boolean> cir, @Local BlockState state) {
+        if (!state.getBlock().equals(Blocks.LILY_PAD)) return;
+        World world = (World) (Object) this;
+        if (entity.getFirstPassenger() instanceof PlayerEntity player) {
+            BlockBreakCallback.EVENT.invoker().breakBlock(world, pos, state, null, Sources.VEHICLE, player);
+        } else {
+            BlockBreakCallback.EVENT.invoker().breakBlock(world, pos, state, null, Sources.VEHICLE);
+        }
+    }
+}

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

@@ -0,0 +1,59 @@
+package com.github.quiltservertools.ledger.mixin;
+
+import com.github.quiltservertools.ledger.callbacks.ItemInsertCallback;
+import com.github.quiltservertools.ledger.callbacks.ItemRemoveCallback;
+import com.github.quiltservertools.ledger.utility.Sources;
+import net.minecraft.entity.EquipmentSlot;
+import net.minecraft.entity.ai.brain.task.MoveItemsTask;
+import net.minecraft.entity.mob.PathAwareEntity;
+import net.minecraft.inventory.Inventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+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;
+import org.spongepowered.asm.mixin.injection.ModifyArgs;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.invoke.arg.Args;
+import java.util.WeakHashMap;
+
+@Mixin(MoveItemsTask.class)
+public class MoveItemsTaskMixin {
+
+    @Shadow
+    private MoveItemsTask.Storage targetStorage;
+
+    @Unique
+    private static final WeakHashMap<PathAwareEntity, BlockPos> ledger$entityTargetMap = new WeakHashMap<>();
+
+    @Inject(method = "takeStack", at = @At(value = "INVOKE", target = "Lnet/minecraft/inventory/Inventory;markDirty()V"))
+    public void onTakeStack(PathAwareEntity entity, Inventory inventory, CallbackInfo ci) {
+        ItemStack stack = entity.getEquippedStack(EquipmentSlot.MAINHAND);
+        World world = entity.getEntityWorld();
+        ItemRemoveCallback.EVENT.invoker().remove(stack, targetStorage.pos(), (ServerWorld) world, Sources.COPPER_GOLEM, entity);
+    }
+
+    @Inject(method = "placeStack", at = @At(value = "INVOKE", target = "Lnet/minecraft/inventory/Inventory;markDirty()V"))
+    private void onPlaceStack(PathAwareEntity entity, Inventory inventory, CallbackInfo ci) {
+        ledger$entityTargetMap.put(entity, targetStorage.pos());
+    }
+
+    @Inject(method = "invalidateTargetStorage", at = @At("HEAD"))
+    private void onInvalidateTargetStorage(PathAwareEntity entity, CallbackInfo ci) {
+        ledger$entityTargetMap.remove(entity);
+    }
+
+    @ModifyArgs(method = "insertStack", at = @At(value = "INVOKE", target = "Lnet/minecraft/inventory/Inventory;setStack(ILnet/minecraft/item/ItemStack;)V"))
+    private static void onInsertStack(Args args, PathAwareEntity entity, Inventory inventory) {
+        ItemStack itemStack = args.get(1);
+        World world = entity.getEntityWorld();
+        BlockPos targetPos = ledger$entityTargetMap.getOrDefault(entity, null);
+        if (targetPos == null) return;
+
+        ItemInsertCallback.EVENT.invoker().insert(itemStack, targetPos, (ServerWorld) world, Sources.COPPER_GOLEM, entity);
+    }
+}

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

@@ -66,7 +66,7 @@ private void ledgerDropInventoryGetPlayer(PlayerEntity player, Inventory invento
 
     @Inject(method = "onClosed", at = @At(value = "RETURN"))
     private void ledgerCloseScreenLogChanges(PlayerEntity player, CallbackInfo ci) {
-        if (!player.getWorld().isClient && pos != null) {
+        if (!player.getEntityWorld().isClient() && pos != null) {
             for (var pair : changedStacks.keySet()) {
                 ItemStack stack = new ItemStack(Registries.ITEM.getEntry(pair.getItem()), 1, pair.getChanges());
                 if (stack.isEmpty()) {
@@ -82,11 +82,11 @@ private void ledgerCloseScreenLogChanges(PlayerEntity player, CallbackInfo ci) {
                 }
                 if (count > 0) {
                     for (ItemStack splitStack : splitStacks) {
-                        ItemInsertCallback.EVENT.invoker().insert(splitStack, pos, (ServerWorld) player.getWorld(), Sources.PLAYER, (ServerPlayerEntity) player);
+                        ItemInsertCallback.EVENT.invoker().insert(splitStack, pos, (ServerWorld) player.getEntityWorld(), Sources.PLAYER, (ServerPlayerEntity) player);
                     }
                 } else {
                     for (ItemStack splitStack : splitStacks) {
-                        ItemRemoveCallback.EVENT.invoker().remove(splitStack, pos, (ServerWorld) player.getWorld(), Sources.PLAYER, (ServerPlayerEntity) player);
+                        ItemRemoveCallback.EVENT.invoker().remove(splitStack, pos, (ServerWorld) player.getEntityWorld(), Sources.PLAYER, (ServerPlayerEntity) player);
                     }
                 }
             }

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

@@ -31,7 +31,7 @@ public void addPositionContext(NamedScreenHandlerFactory factory, CallbackInfoRe
     }
 
     @Inject(method = "startRiding", at = @At(value = "RETURN"))
-    public void onPlayerStartedRiding(Entity entity, boolean force, CallbackInfoReturnable<Boolean> cir) {
+    public void onPlayerStartedRiding(Entity entity, boolean force, boolean emitEvent, CallbackInfoReturnable<Boolean> cir) {
         ServerPlayerEntity player = (ServerPlayerEntity) (Object) this;
 
         if (!cir.getReturnValue()) {