From d4a895fcde2782105a21cb3fd2699f9f6043ed0d Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sun, 18 Oct 2020 01:57:51 +0200 Subject: [PATCH] some more slight API changes --- src/main/java/de/ellpeck/prettypipes/network/PipeItem.java | 4 ++++ src/main/java/de/ellpeck/prettypipes/network/PipeNetwork.java | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/ellpeck/prettypipes/network/PipeItem.java b/src/main/java/de/ellpeck/prettypipes/network/PipeItem.java index f145a93..dee9db0 100644 --- a/src/main/java/de/ellpeck/prettypipes/network/PipeItem.java +++ b/src/main/java/de/ellpeck/prettypipes/network/PipeItem.java @@ -284,6 +284,10 @@ public class PipeItem implements INBTSerializable { this.path.add(NBTUtil.readBlockPos(list.getCompound(i))); } + public int getItemsOnTheWay(BlockPos goalInv){ + return this.stack.getCount(); + } + @OnlyIn(Dist.CLIENT) public void render(PipeTileEntity tile, MatrixStack matrixStack, Random random, float partialTicks, int light, int overlay, IRenderTypeBuffer buffer) { matrixStack.translate( diff --git a/src/main/java/de/ellpeck/prettypipes/network/PipeNetwork.java b/src/main/java/de/ellpeck/prettypipes/network/PipeNetwork.java index ddccaec..17b5655 100644 --- a/src/main/java/de/ellpeck/prettypipes/network/PipeNetwork.java +++ b/src/main/java/de/ellpeck/prettypipes/network/PipeNetwork.java @@ -444,7 +444,7 @@ public class PipeNetwork implements ICapabilitySerializable, GraphL return this.pipeItems.get(pos); } - private Stream getPipeItemsOnTheWay(BlockPos goalInv) { + public Stream getPipeItemsOnTheWay(BlockPos goalInv) { this.startProfile("get_pipe_items_on_the_way"); Stream ret = this.pipeItems.values().stream().filter(i -> i.getDestInventory().equals(goalInv)); this.endProfile(); @@ -454,7 +454,7 @@ public class PipeNetwork implements ICapabilitySerializable, GraphL public int getItemsOnTheWay(BlockPos goalInv, ItemStack type, ItemEqualityType... equalityTypes) { return this.getPipeItemsOnTheWay(goalInv) .filter(i -> type == null || ItemEqualityType.compareItems(i.stack, type, equalityTypes)) - .mapToInt(i -> i.stack.getCount()).sum(); + .mapToInt(i -> i.getItemsOnTheWay(goalInv)).sum(); } @Override