Skip to content

Fix filter inconsistencies when filtering filters #9294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: mc1.20.1/dev
Choose a base branch
from
Open

Fix filter inconsistencies when filtering filters #9294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff5a99e
fix: list/attribute filters wiping unrelated nbt, filter consistencie…
VoidLeech Sep 26, 2025
f49fbf5
fix: attribute filter with empty attribute list not matching descript…
VoidLeech Sep 30, 2025
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
3 changes: 0 additions & 3 deletions src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,6 @@ protected void saveData(ItemStack filterItem) {
});
filterItem.getOrCreateTag()
.put("MatchedAttributes", attributes);

if (attributes.isEmpty() && whitelistMode == WhitelistMode.WHITELIST_DISJ)
filterItem.setTag(null);
}

}
5 changes: 1 addition & 4 deletions src/main/java/com/simibubi/create/content/logistics/filter/FilterItemStack.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,6 @@ public boolean test(Level world, FluidStack stack, boolean matchNBT) {

@Override
public boolean test(Level world, ItemStack stack, boolean matchNBT) {
if (attributeTests.isEmpty())
return super.test(world, stack, matchNBT);
for (Pair<ItemAttribute, Boolean> test : attributeTests) {
ItemAttribute attribute = test.getFirst();
boolean inverted = test.getSecond();
Expand Down Expand Up @@ -248,8 +246,7 @@ public PackageFilterItemStack(ItemStack filter) {

@Override
public boolean test(Level world, ItemStack stack, boolean matchNBT) {
return (filterString.isBlank() && super.test(world, stack, matchNBT))
|| PackageItem.isPackage(stack) && PackageItem.matchAddress(stack, filterString);
return PackageItem.isPackage(stack) && PackageItem.matchAddress(stack, filterString);
}

@Override
Expand Down
8 changes: 0 additions & 8 deletions src/main/java/com/simibubi/create/content/logistics/filter/FilterMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,6 @@ protected void saveData(ItemStack filterItem) {
CompoundTag tag = filterItem.getOrCreateTag();
tag.putBoolean("RespectNBT", respectNBT);
tag.putBoolean("Blacklist", blacklist);

if (respectNBT || blacklist)
return;
for (int i = 0; i < ghostInventory.getSlots(); i++)
if (!ghostInventory.getStackInSlot(i)
.isEmpty())
return;
filterItem.setTag(null);
}

}