Skip to content
This repository was archived by the owner on May 15, 2025. It is now read-only.

Fixes to filters and fluid trash can #284

Open
camerondm9 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixes to filters and fluid trash can #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa474ac
Support nested blacklist fluid filters
camerondm9 Feb 28, 2019
b2574d3
Fix ore dictionary matching for item filters
camerondm9 Feb 28, 2019
c834819
Enable fluid trash can filters
camerondm9 Feb 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 1.10.2/src/main/java/com/rwtema/extrautils2/items/ItemFilterFluids.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down
2 changes: 1 addition & 1 deletion 1.10.2/src/main/java/com/rwtema/extrautils2/items/ItemFilterItems.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion 1.10.2/src/main/java/com/rwtema/extrautils2/tile/TileTrashCanFluids.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down