build.gradle

@@ -111,9 +111,6 @@ dependencies {
     compileOnly fg.deobf("mezz.jei:jei-1.19.2-common-api:11.3.0.260")
     runtimeOnly fg.deobf("mezz.jei:jei-1.19.2-forge:11.3.0.260")
 
-    // test storage drawers
-    runtimeOnly fg.deobf("curse.maven:storage-drawers-223852:3884263")
-
     // to test the rf requiring and crafting stuff
 /*    runtimeOnly fg.deobf("curse.maven:powah-352656:3057732")
     runtimeOnly fg.deobf("curse.maven:lollipop-347954:3057731")

src/main/java/de/ellpeck/prettypipes/pipe/PipeBlockEntity.java

@@ -39,6 +39,7 @@ import net.minecraftforge.common.capabilities.ForgeCapabilities;
 import net.minecraftforge.common.util.Lazy;
 import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.items.IItemHandler;
+import net.minecraftforge.items.ItemHandlerHelper;
 import net.minecraftforge.items.ItemStackHandler;
 import org.apache.commons.lang3.tuple.Pair;
 
@@ -197,27 +198,10 @@ public class PipeBlockEntity extends BlockEntity implements MenuProvider, IPipeC
                 continue;
             if (!force && this.streamModules().anyMatch(m -> !m.getRight().canAcceptItem(m.getLeft(), this, stack, dir, handler)))
                 continue;
-
-            var startSlot = 0;
-            var slotAmount = handler.getSlots();
-            // the 0th slot of a storage drawer is a "catch-all" for any items that can be inserted into the drawer, and all
-            // subsequent slots are the actual slots for the items. this causes a problem because the drawer will seem to have
-            // space for more items that it actually does, so we restrict to only inspecting the 0th slot here.
-            // see https://github.com/Ellpeck/PrettyPipes/issues/131#issuecomment-1288653623 and Discord convo with Quinteger
-            if (handler.getClass().getName().equals("com.jaquadro.minecraft.storagedrawers.capabilities.DrawerItemHandler"))
-                slotAmount = 1;
-
-            // check how many items from the stack we can insert into this destination in total
-            var remain = stack;
-            for (var i = startSlot; i < slotAmount; i++) {
-                remain = handler.insertItem(i, remain, true);
-                if (remain.isEmpty())
-                    break;
-            }
+            var remain = ItemHandlerHelper.insertItem(handler, stack, true);
             // did we insert anything?
             if (remain.getCount() == stack.getCount())
                 continue;
-
             var toInsert = stack.copy();
             toInsert.shrink(remain.getCount());
             // limit to the max amount that modules allow us to insert
@@ -239,7 +223,7 @@ public class PipeBlockEntity extends BlockEntity implements MenuProvider, IPipeC
                     }
                     // totalSpace will be the amount of items that fit into the attached container
                     var totalSpace = 0;
-                    for (var i = startSlot; i < slotAmount; i++) {
+                    for (var i = 0; i < handler.getSlots(); i++) {
                         var copy = stack.copy();
                         var maxStackSize = copy.getMaxStackSize();
                         // if the container can store more than 64 items in this slot, then it's likely
@@ -258,7 +242,6 @@ public class PipeBlockEntity extends BlockEntity implements MenuProvider, IPipeC
                         toInsert.setCount(totalSpace - onTheWay);
                 }
             }
-
             // we return the item that can actually be inserted, NOT the remainder!
             if (!toInsert.isEmpty())
                 return Pair.of(offset, toInsert);