Improve item pickup logging

Author: DrexHD

libs.versions.toml

@@ -1,16 +1,16 @@
 [versions]
-minecraft = "1.21.10-rc1"
-yarn-mappings = "1.21.10-rc1+build.1"
+minecraft = "1.21.10"
+yarn-mappings = "1.21.10+build.2"
 fabric-loader = "0.17.2"
 
-fabric-api = "0.134.1+1.21.10"
+fabric-api = "0.135.0+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"
+fabric-permissions = "0.5.0"
 translations = "2.5.2+1.21.9-pre3"
 
 exposed = "1.0.0-rc-2"

src/main/java/com/github/quiltservertools/ledger/mixin/entities/ItemEntityMixin.java

@@ -1,27 +1,47 @@
 package com.github.quiltservertools.ledger.mixin.entities;
 
 import com.github.quiltservertools.ledger.callbacks.ItemPickUpCallback;
+import com.llamalad7.mixinextras.sugar.Local;
+import com.llamalad7.mixinextras.sugar.Share;
+import com.llamalad7.mixinextras.sugar.ref.LocalRef;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityType;
 import net.minecraft.entity.ItemEntity;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
+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(ItemEntity.class)
-public abstract class ItemEntityMixin {
-    @Unique
-    private ItemEntity itemEntity;
+public abstract class ItemEntityMixin extends Entity {
+
+    @Shadow
+    public abstract ItemStack getStack();
+
+    public ItemEntityMixin(EntityType<?> type, World world) {
+        super(type, world);
+    }
 
     @Inject(method = "onPlayerCollision", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerInventory;insertStack(Lnet/minecraft/item/ItemStack;)Z"))
-    private void storeEntity(PlayerEntity player, CallbackInfo ci) {
-        itemEntity = (ItemEntity) (Object) this;
-        itemEntity.copyFrom(itemEntity);
+    public void storeItemStack(PlayerEntity player, CallbackInfo ci, @Local ItemStack itemStack, @Share("originalItemStack") LocalRef<ItemStack> originalItemStackRef) {
+        originalItemStackRef.set(itemStack.copy());
     }
 
-    @Inject(method = "onPlayerCollision", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerEntity;sendPickup(Lnet/minecraft/entity/Entity;I)V"))
-    private void logPlayerItemPickUp(PlayerEntity player, CallbackInfo ci) {
-        ItemPickUpCallback.EVENT.invoker().pickUp(itemEntity, player);
+    // insertStack modifies the ItemStack instance of the ItemEntity
+    // The player may not be able to pick up all items from the stack
+    @Inject(method = "onPlayerCollision", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerInventory;insertStack(Lnet/minecraft/item/ItemStack;)Z", shift = At.Shift.AFTER))
+    private void logPlayerItemPickUp(PlayerEntity player, CallbackInfo ci, @Local ItemStack modifiedItemStack, @Share("originalItemStack") LocalRef<ItemStack> originalItemStackRef) {
+        var originalItemStack = originalItemStackRef.get();
+
+        int modifiedCount = modifiedItemStack.getCount();
+        int originalCount = originalItemStack.getCount();
+        if (modifiedCount < originalCount) {
+            ItemEntity itemEntityCopy = new ItemEntity(this.getEntityWorld(), this.getX(), this.getY(), this.getZ(), originalItemStackRef.get().copyWithCount(originalCount - modifiedCount));
+            ItemPickUpCallback.EVENT.invoker().pickUp(itemEntityCopy, player);
+        }
     }
 }