From fa474acc36a0f3492f147117a619cedf6b9ed1d6 Mon Sep 17 00:00:00 2001 From: Cameron Martens Date: Wed, 27 Feb 2019 20:37:51 -0600 Subject: [PATCH 1/3] Support nested blacklist fluid filters --- .../java/com/rwtema/extrautils2/items/ItemFilterFluids.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1.10.2/src/main/java/com/rwtema/extrautils2/items/ItemFilterFluids.java b/1.10.2/src/main/java/com/rwtema/extrautils2/items/ItemFilterFluids.java index c28e0d6..2a0c121 100644 --- a/1.10.2/src/main/java/com/rwtema/extrautils2/items/ItemFilterFluids.java +++ b/1.10.2/src/main/java/com/rwtema/extrautils2/items/ItemFilterFluids.java @@ -210,7 +210,7 @@ public boolean matches(@Nonnull ItemStack filterStack, FluidStack target) { Item item = ghostStack.getItem(); if (item instanceof IFluidFilter) { IFluidFilter filter = (IFluidFilter) item; - if (filter.matches(ghostStack, target)) { + if (filter.matches(ghostStack, target) == !inverted) { return !inverted; } } From b2574d39d54ea591d0d7415125acf8f4067685bf Mon Sep 17 00:00:00 2001 From: Cameron Martens Date: Wed, 27 Feb 2019 20:38:38 -0600 Subject: [PATCH 2/3] Fix ore dictionary matching for item filters --- .../main/java/com/rwtema/extrautils2/items/ItemFilterItems.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1.10.2/src/main/java/com/rwtema/extrautils2/items/ItemFilterItems.java b/1.10.2/src/main/java/com/rwtema/extrautils2/items/ItemFilterItems.java index 3770f68..7444076 100644 --- a/1.10.2/src/main/java/com/rwtema/extrautils2/items/ItemFilterItems.java +++ b/1.10.2/src/main/java/com/rwtema/extrautils2/items/ItemFilterItems.java @@ -133,7 +133,7 @@ public boolean matches(@Nonnull ItemStack filterStack, ItemStack target) { if (useOreDic) { int[] ghostOreIDs = OreDictionary.getOreIDs(ghostStack); - int[] targetOreIDs = OreDictionary.getOreIDs(ghostStack); + int[] targetOreIDs = OreDictionary.getOreIDs(target); for (int a : ghostOreIDs) { for (int b : targetOreIDs) { if (a == b) return !inverted; From c834819bbbcb121dddf7b069c8f58d62f5e4de39 Mon Sep 17 00:00:00 2001 From: Cameron Martens Date: Wed, 27 Feb 2019 21:22:38 -0600 Subject: [PATCH 3/3] Enable fluid trash can filters Resolves #194. Filters are processed the same way as in the item trash can. --- .../java/com/rwtema/extrautils2/tile/TileTrashCanFluids.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1.10.2/src/main/java/com/rwtema/extrautils2/tile/TileTrashCanFluids.java b/1.10.2/src/main/java/com/rwtema/extrautils2/tile/TileTrashCanFluids.java index a78ed3c..968bc1b 100644 --- a/1.10.2/src/main/java/com/rwtema/extrautils2/tile/TileTrashCanFluids.java +++ b/1.10.2/src/main/java/com/rwtema/extrautils2/tile/TileTrashCanFluids.java @@ -34,7 +34,7 @@ public IFluidTankProperties[] getTankProperties() { @Override public int fill(FluidStack resource, boolean doFill) { - return resource != null ? resource.amount : 0; + return resource != null && (FILTER.isEmpty() || FILTER.matches(resource)) ? resource.amount : 0; } @Nullable