From d1c8ad38fc533fd65b7dd72d63d691ba111eae3f Mon Sep 17 00:00:00 2001
From: simibubi <31564874+simibubi@users.noreply.github.com>
Date: Sat, 3 Apr 2021 19:41:33 +0200
Subject: [PATCH] Chute extraction refactor

---
 .../block/chute/ChuteTileEntity.java          | 45 +++++++------------
 .../block/chute/SmartChuteTileEntity.java     | 10 ++++-
 2 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteTileEntity.java
index 09fa728fa..16fec0f34 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteTileEntity.java
+++ b/src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteTileEntity.java
@@ -72,7 +72,6 @@ public class ChuteTileEntity extends SmartTileEntity implements IHaveGoggleInfor
 	ChuteItemHandler itemHandler;
 	LazyOptional<IItemHandler> lazyHandler;
 	boolean canPickUpItems;
-	boolean canFilterItems;
 
 	float bottomPullDistance;
 	float beltBelowOffset;
@@ -91,7 +90,6 @@ public class ChuteTileEntity extends SmartTileEntity implements IHaveGoggleInfor
 		itemHandler = new ChuteItemHandler(this);
 		lazyHandler = LazyOptional.of(() -> itemHandler);
 		canPickUpItems = false;
-		canFilterItems = false;
 		capAbove = LazyOptional.empty();
 		capBelow = LazyOptional.empty();
 		bottomPullDistance = 0;
@@ -326,40 +324,25 @@ public class ChuteTileEntity extends SmartTileEntity implements IHaveGoggleInfor
 	private void handleInputFromAbove() {
 		if (!capAbove.isPresent())
 			capAbove = grabCapability(Direction.UP);
-		if (!capAbove.isPresent())
-			return;
-
-		int count = getExtractionAmount();
-		IItemHandler inv = capAbove.orElse(null);
-		Predicate<ItemStack> canAccept = this::canAcceptItem;
-		if (count == 0) {
-			item = ItemHelper.extract(inv, canAccept, ExtractionCountMode.UPTO, canFilterItems ? 64 : 16, false);
-			return;
-		}
-
-		if (!ItemHelper.extract(inv, canAccept, ExtractionCountMode.EXACTLY, count, true)
-			.isEmpty())
-			item = ItemHelper.extract(inv, canAccept, ExtractionCountMode.EXACTLY, count, false);
+		handleInput(capAbove.orElse(null));
 	}
 
 	private void handleInputFromBelow() {
 		if (!capBelow.isPresent())
 			capBelow = grabCapability(Direction.DOWN);
-		if (!capBelow.isPresent())
-			return;
+		handleInput(capBelow.orElse(null));
+	}
 
-		int count = getExtractionAmount();
-		IItemHandler inv = capBelow.orElse(null);
+	private void handleInput(IItemHandler inv) {
+		if (inv == null)
+			return;
 		Predicate<ItemStack> canAccept = this::canAcceptItem;
-
-		if (count == 0) {
-			item = ItemHelper.extract(inv, canAccept, ExtractionCountMode.UPTO, canFilterItems ? 64 : 16, false);
-			return;
-		}
-
-		if (!ItemHelper.extract(inv, canAccept, ExtractionCountMode.EXACTLY, count, true)
+		int count = getExtractionAmount();
+		ExtractionCountMode mode = getExtractionMode();
+		if (mode == ExtractionCountMode.UPTO || !ItemHelper.extract(inv, canAccept, mode, count, true)
 			.isEmpty())
-			item = ItemHelper.extract(inv, canAccept, ExtractionCountMode.EXACTLY, count, false);
+			item = ItemHelper.extract(inv, canAccept, mode, count, false);
+
 	}
 
 	private boolean handleDownwardOutput(boolean simulate) {
@@ -477,7 +460,11 @@ public class ChuteTileEntity extends SmartTileEntity implements IHaveGoggleInfor
 	}
 
 	protected int getExtractionAmount() {
-		return 0;
+		return 16;
+	}
+
+	protected ExtractionCountMode getExtractionMode() {
+		return ExtractionCountMode.UPTO;
 	}
 
 	protected boolean canCollectItemsFromBelow() {
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/chute/SmartChuteTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/block/chute/SmartChuteTileEntity.java
index ed0571239..3bd9d7d2d 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/chute/SmartChuteTileEntity.java
+++ b/src/main/java/com/simibubi/create/content/logistics/block/chute/SmartChuteTileEntity.java
@@ -2,6 +2,7 @@ package com.simibubi.create.content.logistics.block.chute;
 
 import java.util.List;
 
+import com.simibubi.create.foundation.item.ItemHelper.ExtractionCountMode;
 import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour;
 import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBehaviour;
 
@@ -17,7 +18,6 @@ public class SmartChuteTileEntity extends ChuteTileEntity {
 
 	public SmartChuteTileEntity(TileEntityType<?> tileEntityTypeIn) {
 		super(tileEntityTypeIn);
-		canFilterItems = true;
 	}
 
 	@Override
@@ -27,7 +27,13 @@ public class SmartChuteTileEntity extends ChuteTileEntity {
 
 	@Override
 	protected int getExtractionAmount() {
-		return filtering.isCountVisible() ? filtering.getAmount() : 0;
+		return filtering.isCountVisible() && !filtering.anyAmount() ? filtering.getAmount() : 64;
+	}
+
+	@Override
+	protected ExtractionCountMode getExtractionMode() {
+		return filtering.isCountVisible() && !filtering.anyAmount() ? ExtractionCountMode.EXACTLY
+			: ExtractionCountMode.UPTO;
 	}
 
 	@Override