feat: Improve trinket setHolder calls

Now trinkets link to their holders much more reliably, that also fixes a bug with empty trinket slot not working with `apoli:holder` actions

src/main/java/com/github/shap_po/shappoli/mixin/integration/trinkets/LivingEntityMixin.java

@@ -1,7 +1,6 @@
 package com.github.shap_po.shappoli.mixin.integration.trinkets;
 
 import com.github.shap_po.shappoli.integration.trinkets.power.ActionOnTrinketChangePower;
-import com.github.shap_po.shappoli.util.InventoryUtil;
 import dev.emi.trinkets.api.SlotType;
 import dev.emi.trinkets.api.TrinketInventory;
 import dev.emi.trinkets.api.TrinketsApi;
@@ -47,8 +46,6 @@ private void tick(CallbackInfo info) {
                 ItemStack newStack = inventory.getStack(index);
                 ItemStack newStackCopy = newStack.copy(); // old stack is removed when unequipped
 
-                InventoryUtil.setHolder(newStack, entity); // link the stack to the player, so it can be used in powers
-
                 if (!ItemStack.areEqual(newStack, oldStack)) {
                     // Call unequip powers on old trinket
                     PowerHolderComponent.withPowers(entity, ActionOnTrinketChangePower.class,

src/main/java/com/github/shap_po/shappoli/mixin/integration/trinkets/TrinketInventoryMixin.java

@@ -0,0 +1,19 @@
+package com.github.shap_po.shappoli.mixin.integration.trinkets;
+
+import com.github.shap_po.shappoli.util.InventoryUtil;
+import com.llamalad7.mixinextras.injector.ModifyReturnValue;
+import dev.emi.trinkets.api.TrinketInventory;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.item.ItemStack;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(TrinketInventory.class)
+public class TrinketInventoryMixin {
+    @ModifyReturnValue(method = "getStack", at = @At("RETURN"))
+    private ItemStack shappoli$modifyGetStack(ItemStack stack) {
+        LivingEntity entity = ((TrinketInventory) (Object) this).getComponent().getEntity();
+        InventoryUtil.setHolder(stack, entity);
+        return stack;
+    }
+}

src/main/resources/shappoli.mixins.json

@@ -7,6 +7,7 @@
     "VillagerEntityMixin",
     "integration.trinkets.LivingEntityMixin",
     "integration.trinkets.SurvivalTrinketSlotMixin",
+    "integration.trinkets.TrinketInventoryMixin",
     "integration.trinkets.TrinketSlotMixin",
     "integration.wildfire_gender.GenderLayerMixin"
   ],