Improve block entity position context

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) {
+        if (!player.getWorld().isClient && pos != null) {
             for (var pair : changedStacks.keySet()) {
                 ItemStack stack = new ItemStack(Registries.ITEM.getEntry(pair.getItem()), 1, pair.getChanges());
                 if (stack.isEmpty()) {

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

@@ -0,0 +1,31 @@
+package com.github.quiltservertools.ledger.mixin;
+
+import com.github.quiltservertools.ledger.utility.HandlerWithContext;
+import com.llamalad7.mixinextras.sugar.Local;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.screen.NamedScreenHandlerFactory;
+import net.minecraft.screen.ScreenHandler;
+import net.minecraft.server.network.ServerPlayerEntity;
+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;
+import java.util.OptionalInt;
+
+@Mixin(ServerPlayerEntity.class)
+public abstract class ServerPlayerEntityMixin {
+
+    @Inject(
+            method = "openHandledScreen",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/server/network/ServerPlayerEntity;onScreenHandlerOpened(Lnet/minecraft/screen/ScreenHandler;)V"
+            )
+    )
+    public void addPositionContext(NamedScreenHandlerFactory factory, CallbackInfoReturnable<OptionalInt> cir, @Local ScreenHandler screenHandler) {
+        if (factory instanceof BlockEntity blockEntity) {
+            ((HandlerWithContext) screenHandler).setPos(blockEntity.getPos());
+        }
+    }
+
+}

src/main/kotlin/com/github/quiltservertools/ledger/utility/HandlerWithContext.kt

@@ -5,8 +5,7 @@ import net.minecraft.server.network.ServerPlayerEntity
 import net.minecraft.util.math.BlockPos
 
 interface HandlerWithContext {
+    var pos: BlockPos?
     fun getPlayer(): ServerPlayerEntity?
-    fun getPos(): BlockPos?
-    fun setPos(pos: BlockPos)
     fun onStackChanged(old: ItemStack, new: ItemStack, pos: BlockPos)
 }

src/main/resources/ledger.mixins.json

@@ -1,104 +1,102 @@
 {
-    "required": true,
-    "package": "com.github.quiltservertools.ledger.mixin",
-    "mixins": [
-        "AbstractBlockMixin",
-        "AnvilScreenHandlerMixin",
-        "AxeItemMixin",
-        "BlockItemMixin",
-        "BlockMixin",
-        "BucketDispenserBehaviorMixin",
-        "BucketItemMixin",
-        "CampfireBlockEntityMixin",
-        "DoubleInventoryMixin",
-        "DyeItemMixin",
-      "ExplosionImplMixin",
-        "FillCommandMixin",
-        "FlintAndSteelItemMixin",
-        "FrostWalkerEnchantmentMixin",
-        "HoeItemMixin",
-        "HoneycombItemMixin",
-        "ItemScattererMixin",
-        "JukeboxPlayableComponentMixin",
-        "LockableContainerBlockEntityMixin",
-        "NetherPortalMixin",
-        "ScreenHandlerMixin",
-        "SetBlockCommandMixin",
-        "ShovelItemMixin",
-        "SlotMixin",
-        "blocks.AbstractPlantPartBlockMixin",
-        "blocks.AbstractPlantStemBlockMixin",
-        "blocks.BambooBlockMixin",
-        "blocks.BedBlockMixin",
-        "blocks.CactusBlockMixin",
-        "blocks.CakeBlockMixin",
-        "blocks.CampfireBlockMixin",
-        "blocks.CandleBlockMixin",
-        "blocks.CarvedPumpkinBlockMixin",
-        "blocks.ChorusFlowerBlockMixin",
-        "blocks.ChorusPlantBlockMixin",
-        "blocks.ComparatorBlockMixin",
-        "blocks.DaylightDetectorBlockMixin",
-        "blocks.DoorBlockMixin",
-        "blocks.FarmlandBlockMixin",
-        "blocks.FenceGateBlockMixin",
-        "blocks.FireBlockMixin",
-        "blocks.FlowerPotBlockMixin",
-        "blocks.FluidBlockMixin",
-        "blocks.IceBlockMixin",
-        "blocks.JukeBoxBlockMixin",
-        "blocks.LeavesBlockMixin",
-        "blocks.LeverBlockMixin",
-        "blocks.LilyPadBlockMixin",
-        "blocks.NoteBlockMixin",
-        "blocks.PointedDripstoneBlockMixin",
-        "blocks.RepeaterBlockMixin",
-        "blocks.RootedDirtBlockMixin",
-        "blocks.ScaffoldingBlockMixin",
-        "blocks.SpongeBlockMixin",
-        "blocks.SpreadableBlockMixin",
-        "blocks.SugarCaneBlockMixin",
-        "blocks.TrapdoorBlockMixin",
-        "blocks.WetSpongeBlockMixin",
-        "blocks.cauldron.CauldronBehaviorMixin",
-        "blocks.cauldron.CauldronBlockMixin",
-        "blocks.cauldron.LeveledCauldronBlockMixin",
-        "blocks.coral.CoralBlockBlockMixin",
-        "blocks.coral.CoralBlockMixin",
-        "blocks.coral.CoralFanBlockMixin",
-        "blocks.coral.CoralWallFanBlockMixin",
-        "blocks.lectern.LecternBlockMixin",
-        "blocks.lectern.LecternScreenHandlerMixin",
-        "blocks.lectern.ScreenHandlerMixin",
-        "blocks.sign.AbstractSignBlockMixin",
-        "blocks.sign.SignBlockEntityMixin",
-        "entities.ArmorStandEntityMixin",
-        "entities.CatEntityMixin",
-        "entities.CreeperEntityMixin",
-        "entities.EndCrystalEntityMixin",
-        "entities.EnderDragonEntityMixin",
-        "entities.EvokerEntityWololoGoalMixin",
-        "entities.ExplosiveProjectileEntityMixin",
-        "entities.FallingBlockEntityMixin",
-        "entities.ItemEntityMixin",
-        "entities.ItemFrameEntityMixin",
-        "entities.LightningEntityMixin",
-        "entities.LivingEntityMixin",
-        "entities.ServerPlayerEntityMixin",
-        "entities.RavagerEntityMixin",
-        "entities.SheepEntityMixin",
-        "entities.SnowGolemEntityMixin",
-      "entities.MobEntityMixin",
-        "entities.WolfEntityMixin",
-        "entities.silverfish.CallForHelpGoalMixin",
-        "entities.silverfish.WanderAndInfestGoalMixin",
-        "preview.ChestBlockMixin",
-        "preview.EntityTrackerEntryAccessor",
-        "preview.LockableContainerBlockEntityMixin",
-        "preview.LootableContainerBlockEntityMixin",
-        "preview.ServerPlayerEntityMixin"
-    ],
-    "injectors": {
-        "defaultRequire": 1
-    }
+  "required": true,
+  "package": "com.github.quiltservertools.ledger.mixin",
+  "mixins": [
+    "AbstractBlockMixin",
+    "AnvilScreenHandlerMixin",
+    "AxeItemMixin",
+    "BlockItemMixin",
+    "BlockMixin",
+    "BucketDispenserBehaviorMixin",
+    "BucketItemMixin",
+    "CampfireBlockEntityMixin",
+    "DoubleInventoryMixin",
+    "DyeItemMixin",
+    "ExplosionImplMixin",
+    "FillCommandMixin",
+    "FlintAndSteelItemMixin",
+    "FrostWalkerEnchantmentMixin",
+    "HoeItemMixin",
+    "HoneycombItemMixin",
+    "ItemScattererMixin",
+    "JukeboxPlayableComponentMixin",
+    "LockableContainerBlockEntityMixin",
+    "NetherPortalMixin",
+    "ScreenHandlerMixin",
+    "ServerPlayerEntityMixin",
+    "SetBlockCommandMixin",
+    "ShovelItemMixin",
+    "SlotMixin",
+    "blocks.AbstractPlantPartBlockMixin",
+    "blocks.AbstractPlantStemBlockMixin",
+    "blocks.BambooBlockMixin",
+    "blocks.BedBlockMixin",
+    "blocks.CactusBlockMixin",
+    "blocks.CakeBlockMixin",
+    "blocks.CampfireBlockMixin",
+    "blocks.CandleBlockMixin",
+    "blocks.CarvedPumpkinBlockMixin",
+    "blocks.ChorusFlowerBlockMixin",
+    "blocks.ChorusPlantBlockMixin",
+    "blocks.ComparatorBlockMixin",
+    "blocks.DaylightDetectorBlockMixin",
+    "blocks.DoorBlockMixin",
+    "blocks.FarmlandBlockMixin",
+    "blocks.FenceGateBlockMixin",
+    "blocks.FireBlockMixin",
+    "blocks.FlowerPotBlockMixin",
+    "blocks.FluidBlockMixin",
+    "blocks.IceBlockMixin",
+    "blocks.JukeBoxBlockMixin",
+    "blocks.LeavesBlockMixin",
+    "blocks.LeverBlockMixin",
+    "blocks.LilyPadBlockMixin",
+    "blocks.NoteBlockMixin",
+    "blocks.PointedDripstoneBlockMixin",
+    "blocks.RepeaterBlockMixin",
+    "blocks.RootedDirtBlockMixin",
+    "blocks.ScaffoldingBlockMixin",
+    "blocks.SpongeBlockMixin",
+    "blocks.SpreadableBlockMixin",
+    "blocks.SugarCaneBlockMixin",
+    "blocks.TrapdoorBlockMixin",
+    "blocks.WetSpongeBlockMixin",
+    "blocks.cauldron.CauldronBehaviorMixin",
+    "blocks.cauldron.CauldronBlockMixin",
+    "blocks.cauldron.LeveledCauldronBlockMixin",
+    "blocks.coral.CoralBlockBlockMixin",
+    "blocks.coral.CoralBlockMixin",
+    "blocks.coral.CoralFanBlockMixin",
+    "blocks.coral.CoralWallFanBlockMixin",
+    "blocks.lectern.LecternBlockMixin",
+    "blocks.lectern.LecternScreenHandlerMixin",
+    "blocks.lectern.ScreenHandlerMixin",
+    "blocks.sign.AbstractSignBlockMixin",
+    "blocks.sign.SignBlockEntityMixin",
+    "entities.ArmorStandEntityMixin",
+    "entities.CatEntityMixin",
+    "entities.CreeperEntityMixin",
+    "entities.EndCrystalEntityMixin",
+    "entities.EnderDragonEntityMixin",
+    "entities.EvokerEntityWololoGoalMixin",
+    "entities.ExplosiveProjectileEntityMixin",
+    "entities.FallingBlockEntityMixin",
+    "entities.ItemEntityMixin",
+    "entities.ItemFrameEntityMixin",
+    "entities.LightningEntityMixin",
+    "entities.LivingEntityMixin",
+    "entities.MobEntityMixin",
+    "entities.RavagerEntityMixin",
+    "entities.ServerPlayerEntityMixin",
+    "entities.SheepEntityMixin",
+    "entities.SnowGolemEntityMixin",
+    "entities.WolfEntityMixin",
+    "entities.silverfish.CallForHelpGoalMixin",
+    "entities.silverfish.WanderAndInfestGoalMixin",
+    "preview.EntityTrackerEntryAccessor",
+    "preview.ServerPlayerEntityMixin"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
 }