fix: Item stack resurrection causing incorrect internal state of Lith…

…iumStackList
CaffeineMC · Jun 20, 2024 · 737d5a3 · 737d5a3
1 parent 89b9a0b
commit 737d5a3
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/src/main/java/me/jellysquid/mods/lithium/mixin/block/hopper/HopperBlockEntityMixin.java b/src/main/java/me/jellysquid/mods/lithium/mixin/block/hopper/HopperBlockEntityMixin.java
@@ -1,5 +1,6 @@
 package me.jellysquid.mods.lithium.mixin.block.hopper;
 
+import com.llamalad7.mixinextras.sugar.Local;
 import me.jellysquid.mods.lithium.api.inventory.LithiumCooldownReceivingInventory;
 import me.jellysquid.mods.lithium.api.inventory.LithiumInventory;
 import me.jellysquid.mods.lithium.common.block.entity.SleepingBlockEntity;
@@ -822,4 +823,19 @@ private void checkSleepingConditions() {
             sleepingBlockEntity.wakeUpNow();
         }
     }
+
+
+    //FIX for item stack revival issues
+    @Inject(
+            method = "extract(Lnet/minecraft/block/entity/Hopper;Lnet/minecraft/inventory/Inventory;ILnet/minecraft/util/math/Direction;)Z",
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;setCount(I)V")
+    )
+    private static void replaceEmptyStackWithEmptyBeforeRevival(Hopper hopper, Inventory inventory, int slot, Direction side, CallbackInfoReturnable<Boolean> cir, @Local(ordinal = 0) ItemStack itemStack) {
+        if (itemStack.getCount() == 0) {
+            if (inventory instanceof LithiumInventory lithiumInventory) {
+                LithiumStackList lithiumStackList = InventoryHelper.getLithiumStackList(lithiumInventory);
+                lithiumStackList.set(slot, ItemStack.EMPTY);
+            }
+        }
+    }
 }