From b919714e6ff2e544a0ca2ef269530ca64f18bac1 Mon Sep 17 00:00:00 2001 From: hiroscho Date: Mon, 12 Aug 2024 20:10:36 +0200 Subject: [PATCH] Add FluidCraftingInventoryHandler so that fluid crafting isn't handled in Pass 2 --- .../common/tile/TileFluidDiscretizer.java | 36 +++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java b/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java index 8291f1ef..e2173a12 100644 --- a/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java +++ b/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java @@ -264,13 +264,45 @@ public class TileFluidDiscretizer extends AENetworkTile implements IPriorityHost } } + private class FluidCraftingInventoryHandler extends MEInventoryHandler { + + public FluidCraftingInventoryHandler(IMEInventory i, StorageChannel channel) { + super(i, channel); + } + + @Override + public boolean isPrioritized(IAEFluidStack input) { + return true; + } + + @Override + public boolean canAccept(IAEFluidStack input) { + ICraftingGrid craftingGrid; + try { + craftingGrid = getProxy().getGrid().getCache(ICraftingGrid.class); + } catch (GridAccessException e) { + return false; + } + if (craftingGrid instanceof CraftingGridCache craftingGridCache) { + return craftingGridCache.canAccept(ItemFluidDrop.newAeStack(input)); + } + return false; + } + + @Override + public boolean isAutoCraftingInventory() { + return true; + } + } + private class FluidCraftingInventory implements IMEInventory { - private final MEInventoryHandler invHandler = new MEInventoryHandler<>(this, getChannel()); + private final MEInventoryHandler invHandler = new FluidCraftingInventoryHandler( + this, + getChannel()); FluidCraftingInventory() { invHandler.setPriority(Integer.MAX_VALUE); - invHandler.setIsAutoCraftingInventory(true); } @Override