diff --git a/src/main/java/de/ellpeck/naturesaura/Helper.java b/src/main/java/de/ellpeck/naturesaura/Helper.java
index bdd0b0d4..1b527144 100644
--- a/src/main/java/de/ellpeck/naturesaura/Helper.java
+++ b/src/main/java/de/ellpeck/naturesaura/Helper.java
@@ -121,7 +121,7 @@ public final class Helper {
                 var handStack = player.getItemInHand(hand);
                 if (!handStack.isEmpty()) {
                     var remain = handler.insertItem(slot, handStack, player.level.isClientSide);
-                    if (!ItemStack.isSame(remain, handStack)) {
+                    if (!ItemStack.matches(remain, handStack)) {
                         if (sound)
                             player.level.playSound(player, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5,
                                     SoundEvents.ITEM_FRAME_ADD_ITEM, SoundSource.PLAYERS, 0.75F, 1F);
diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityGratedChute.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityGratedChute.java
index 110f0cad..8f449d23 100644
--- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityGratedChute.java
+++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityGratedChute.java
@@ -75,7 +75,7 @@ public class BlockEntityGratedChute extends BlockEntityImpl implements ITickable
                         if (stack.isEmpty())
                             continue;
                         var left = this.items.insertItem(0, stack, false);
-                        if (!ItemStack.isSame(stack, left)) {
+                        if (!ItemStack.matches(stack, left)) {
                             if (left.isEmpty()) {
                                 item.kill();
                             } else {
diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityHopperUpgrade.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityHopperUpgrade.java
index 671b4434..7e6fc949 100644
--- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityHopperUpgrade.java
+++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityHopperUpgrade.java
@@ -59,7 +59,7 @@ public class BlockEntityHopperUpgrade extends BlockEntityImpl implements ITickab
                     }
                 }
 
-                if (!ItemStack.isSame(stack, copy)) {
+                if (!ItemStack.matches(stack, copy)) {
                     item.setItem(copy);
                     if (copy.isEmpty())
                         item.kill();
diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityItemDistributor.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityItemDistributor.java
index af8010f8..07bf3a1b 100644
--- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityItemDistributor.java
+++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityItemDistributor.java
@@ -43,7 +43,7 @@ public class BlockEntityItemDistributor extends BlockEntityImpl implements ITick
                 continue;
             for (var j = 0; j < dest.getSlots(); j++) {
                 var remain = dest.insertItem(j, stack, false);
-                if (!ItemStack.isSame(remain, stack)) {
+                if (!ItemStack.matches(remain, stack)) {
                     above.extractItem(i, 1, false);
                     this.cooldown = 3;
                     return;
diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPlacer.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPlacer.java
index 372270c1..c09f9d67 100644
--- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPlacer.java
+++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityPlacer.java
@@ -68,7 +68,7 @@ public class BlockEntityPlacer extends BlockEntityImpl implements ITickableBlock
 
                 var pos = validPositions.get(this.level.random.nextInt(validPositions.size()));
                 var left = this.tryPlace(stack.copy(), pos);
-                if (ItemStack.isSame(stack, left))
+                if (ItemStack.matches(stack, left))
                     continue;
 
                 handler.extractItem(i, 1, false);