Skip to content

Commit 1ef2e96

Browse files
committed
fix calculation of item count in bulk filter item
#264
1 parent f7c0c8f commit 1ef2e96

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/main/java/me/desht/modularrouters/container/handler/BaseModuleHandler.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@
99
import net.minecraft.core.component.DataComponentType;
1010
import net.minecraft.world.item.ItemStack;
1111
import net.minecraft.world.item.component.ItemContainerContents;
12+
import net.neoforged.neoforge.items.IItemHandler;
1213

1314
import javax.annotation.Nonnull;
1415
import javax.annotation.Nullable;
1516
import java.util.List;
17+
import java.util.function.BiFunction;
1618
import java.util.stream.IntStream;
1719

1820
public abstract class BaseModuleHandler extends GhostItemHandler {
@@ -74,8 +76,8 @@ protected void onContentsChanged(int slot) {
7476
*
7577
* @return number of items in the filter
7678
*/
77-
public static int getFilterItemCount(ItemStack holderStack) {
78-
ModuleFilterHandler handler = new ModuleFilterHandler(holderStack, null);
79+
public static int getFilterItemCount(ItemStack holderStack, BiFunction<ItemStack, ModularRouterBlockEntity, BaseModuleHandler> factory) {
80+
BaseModuleHandler handler = factory.apply(holderStack, null);
7981
return (int) IntStream.range(0, handler.getSlots())
8082
.filter(i -> !handler.getStackInSlot(i).isEmpty())
8183
.count();

src/main/java/me/desht/modularrouters/item/smartfilter/BulkItemFilter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public InteractionResult useOn(UseOnContext ctx) {
6060

6161
@Override
6262
public int getSize(ItemStack filterStack) {
63-
return BaseModuleHandler.getFilterItemCount(filterStack);
63+
return BaseModuleHandler.getFilterItemCount(filterStack, BulkFilterHandler::new);
6464
}
6565

6666
private InteractionResult handleUseServerSide(UseOnContext ctx) {

0 commit comments

Comments
 (0)