From f9d72a3b8773ba8c966fd40fb8511b0eb87c9d00 Mon Sep 17 00:00:00 2001
From: Ellpeck <me@ellpeck.de>
Date: Sun, 22 Nov 2020 19:29:04 +0100
Subject: [PATCH] fixed retrieval modules ignoring filter extensions Closes #59

---
 .../ellpeck/prettypipes/misc/ItemFilter.java  |  2 +-
 .../retrieval/RetrievalModuleItem.java        | 37 +++++++++----------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/main/java/de/ellpeck/prettypipes/misc/ItemFilter.java b/src/main/java/de/ellpeck/prettypipes/misc/ItemFilter.java
index 5f2471e..fe99ad1 100644
--- a/src/main/java/de/ellpeck/prettypipes/misc/ItemFilter.java
+++ b/src/main/java/de/ellpeck/prettypipes/misc/ItemFilter.java
@@ -122,7 +122,7 @@ public class ItemFilter extends ItemStackHandler {
         return false;
     }
 
-    private List<ItemFilter> getAllFilters() {
+    public List<ItemFilter> getAllFilters() {
         List<ItemFilter> filters = this.pipe.streamModules()
                 .filter(p -> p.getRight() instanceof FilterIncreaseModuleItem)
                 .map(p -> new ItemFilter(18, p.getLeft(), this.pipe))
diff --git a/src/main/java/de/ellpeck/prettypipes/pipe/modules/retrieval/RetrievalModuleItem.java b/src/main/java/de/ellpeck/prettypipes/pipe/modules/retrieval/RetrievalModuleItem.java
index c022895..a5f009b 100644
--- a/src/main/java/de/ellpeck/prettypipes/pipe/modules/retrieval/RetrievalModuleItem.java
+++ b/src/main/java/de/ellpeck/prettypipes/pipe/modules/retrieval/RetrievalModuleItem.java
@@ -6,8 +6,6 @@ import de.ellpeck.prettypipes.items.ModuleItem;
 import de.ellpeck.prettypipes.items.ModuleTier;
 import de.ellpeck.prettypipes.misc.ItemEqualityType;
 import de.ellpeck.prettypipes.misc.ItemFilter;
-import de.ellpeck.prettypipes.network.NetworkLocation;
-import de.ellpeck.prettypipes.network.PipeItem;
 import de.ellpeck.prettypipes.network.PipeNetwork;
 import de.ellpeck.prettypipes.pipe.PipeTileEntity;
 import de.ellpeck.prettypipes.pipe.containers.AbstractPipeContainer;
@@ -15,11 +13,8 @@ import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
-import net.minecraftforge.items.IItemHandler;
 import org.apache.commons.lang3.tuple.Pair;
 
-import java.util.List;
-
 public class RetrievalModuleItem extends ModuleItem {
     private final int maxExtraction;
     private final int speed;
@@ -45,21 +40,23 @@ public class RetrievalModuleItem extends ModuleItem {
         ItemFilter filter = new ItemFilter(this.filterSlots, module, tile);
         ItemEqualityType[] equalityTypes = ItemFilter.getEqualityTypes(tile);
         filter.isWhitelist = true;
-        // loop through filter to see which items to pull
-        for (int f = 0; f < filter.getSlots(); f++) {
-            ItemStack filtered = filter.getStackInSlot(f);
-            if (filtered.isEmpty())
-                continue;
-            ItemStack copy = filtered.copy();
-            copy.setCount(this.maxExtraction);
-            Pair<BlockPos, ItemStack> dest = tile.getAvailableDestination(copy, true, this.preventOversending);
-            if (dest == null)
-                continue;
-            ItemStack remain = dest.getRight().copy();
-            // are we already waiting for crafting results? If so, don't request those again
-            remain.shrink(network.getCurrentlyCraftingAmount(tile.getPos(), copy, equalityTypes));
-            if (network.requestItem(tile.getPos(), dest.getLeft(), remain, equalityTypes).isEmpty())
-                break;
+        // loop through filters to see which items to pull
+        for (ItemFilter subFilter : filter.getAllFilters()) {
+            for (int f = 0; f < subFilter.getSlots(); f++) {
+                ItemStack filtered = subFilter.getStackInSlot(f);
+                if (filtered.isEmpty())
+                    continue;
+                ItemStack copy = filtered.copy();
+                copy.setCount(this.maxExtraction);
+                Pair<BlockPos, ItemStack> dest = tile.getAvailableDestination(copy, true, this.preventOversending);
+                if (dest == null)
+                    continue;
+                ItemStack remain = dest.getRight().copy();
+                // are we already waiting for crafting results? If so, don't request those again
+                remain.shrink(network.getCurrentlyCraftingAmount(tile.getPos(), copy, equalityTypes));
+                if (network.requestItem(tile.getPos(), dest.getLeft(), remain, equalityTypes).isEmpty())
+                    break;
+            }
         }
     }