Apify filters

src/main/java/com/simibubi/create/AllItems.java

@@ -48,7 +48,10 @@
 import com.simibubi.create.content.logistics.box.PackageItem;
 import com.simibubi.create.content.logistics.box.PackageStyles;
 import com.simibubi.create.content.logistics.box.PackageStyles.PackageStyle;
+import com.simibubi.create.content.logistics.filter.AttributeFilterItem;
 import com.simibubi.create.content.logistics.filter.FilterItem;
+import com.simibubi.create.content.logistics.filter.ListFilterItem;
+import com.simibubi.create.content.logistics.filter.PackageFilterItem;
 import com.simibubi.create.content.logistics.tableCloth.ShoppingListItem;
 import com.simibubi.create.content.materials.ExperienceNuggetItem;
 import com.simibubi.create.content.processing.burner.BlazeBurnerBlockItem;
@@ -440,14 +443,14 @@ public class AllItems {
 		}
 	}
 
-	public static final ItemEntry<FilterItem> FILTER = REGISTRATE.item("filter", FilterItem::regular)
+	public static final ItemEntry<ListFilterItem> FILTER = REGISTRATE.item("filter", FilterItem::regular)
 		.lang("List Filter")
-		.register(),
+		.register();
 
-	ATTRIBUTE_FILTER = REGISTRATE.item("attribute_filter", FilterItem::attribute)
-		.register(),
+	public static final ItemEntry<AttributeFilterItem> ATTRIBUTE_FILTER = REGISTRATE.item("attribute_filter", FilterItem::attribute)
+		.register();
 
-	PACKAGE_FILTER = REGISTRATE.item("package_filter", FilterItem::address)
+	public static final ItemEntry<PackageFilterItem> PACKAGE_FILTER = REGISTRATE.item("package_filter", FilterItem::address)
 		.register();
 
 	public static final ItemEntry<ScheduleItem> SCHEDULE = REGISTRATE.item("schedule", ScheduleItem::new)

src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintItem.java

@@ -4,7 +4,6 @@
 
 import com.simibubi.create.AllItems;
 import com.simibubi.create.content.logistics.filter.AttributeFilterMenu.WhitelistMode;
-import com.simibubi.create.content.logistics.filter.FilterItem;
 import com.simibubi.create.content.logistics.item.filter.attribute.ItemAttribute;
 import com.simibubi.create.content.logistics.item.filter.attribute.attributes.InTagAttribute;
 
@@ -93,7 +92,7 @@ public static void assignCompleteRecipe(Level level, ItemStackHandler inv, Recip
 	}
 
 	private static ItemStack convertIngredientToFilter(Ingredient ingredient) {
-		Ingredient.Value[] acceptedItems = ingredient.values;
+		Value[] acceptedItems = ingredient.values;
 		if (acceptedItems == null || acceptedItems.length > 18)
 			return ItemStack.EMPTY;
 		if (acceptedItems.length == 0)
@@ -102,7 +101,7 @@ private static ItemStack convertIngredientToFilter(Ingredient ingredient) {
 			return convertIItemListToFilter(acceptedItems[0]);
 
 		ItemStack result = AllItems.FILTER.asStack();
-		ItemStackHandler filterItems = FilterItem.getFilterItems(result);
+		ItemStackHandler filterItems = AllItems.FILTER.get().getFilterItemHandler(result);
 		for (int i = 0; i < acceptedItems.length; i++)
 			filterItems.setStackInSlot(i, convertIItemListToFilter(acceptedItems[i]));
 		result.getOrCreateTag()
@@ -133,7 +132,7 @@ private static ItemStack convertIItemListToFilter(Value itemList) {
 
 		if (itemList instanceof MultiItemValue) {
 			ItemStack result = AllItems.FILTER.asStack();
-			ItemStackHandler filterItems = FilterItem.getFilterItems(result);
+			ItemStackHandler filterItems = AllItems.FILTER.get().getFilterItemHandler(result);
 			int i = 0;
 			for (ItemStack itemStack : stacks) {
 				if (i >= 18)

src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintOverlayRenderer.java

@@ -12,18 +12,14 @@
 import com.simibubi.create.content.equipment.blueprint.BlueprintEntity.BlueprintCraftingInventory;
 import com.simibubi.create.content.equipment.blueprint.BlueprintEntity.BlueprintSection;
 import com.simibubi.create.content.logistics.BigItemStack;
-import com.simibubi.create.content.logistics.filter.AttributeFilterMenu.WhitelistMode;
 import com.simibubi.create.content.logistics.filter.FilterItem;
 import com.simibubi.create.content.logistics.filter.FilterItemStack;
-import com.simibubi.create.content.logistics.item.filter.attribute.ItemAttribute;
-import com.simibubi.create.content.logistics.item.filter.attribute.attributes.InTagAttribute;
 import com.simibubi.create.content.logistics.packager.InventorySummary;
 import com.simibubi.create.content.logistics.tableCloth.BlueprintOverlayShopContext;
 import com.simibubi.create.content.logistics.tableCloth.ShoppingListItem.ShoppingList;
 import com.simibubi.create.content.logistics.tableCloth.TableClothBlockEntity;
 import com.simibubi.create.content.trains.track.TrackPlacement.PlacementInfo;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
-import com.simibubi.create.foundation.item.ItemHelper;
 
 import net.createmod.catnip.animation.AnimationTickHolder;
 import net.createmod.catnip.data.Couple;
@@ -35,7 +31,6 @@
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.inventory.tooltip.TooltipRenderUtil;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.ListTag;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.CraftingContainer;
@@ -54,9 +49,6 @@
 import net.minecraftforge.client.gui.overlay.IGuiOverlay;
 import net.minecraftforge.items.ItemHandlerHelper;
 import net.minecraftforge.items.ItemStackHandler;
-import net.minecraftforge.registries.ForgeRegistries;
-import net.minecraftforge.registries.tags.ITag;
-import net.minecraftforge.registries.tags.ITagManager;
 
 public class BlueprintOverlayRenderer {
 
@@ -438,34 +430,8 @@ public static void drawItemStack(GuiGraphics graphics, Minecraft mc, int x, int
 
 	private static ItemStack[] getItemsMatchingFilter(ItemStack filter) {
 		return cachedRenderedFilters.computeIfAbsent(filter, itemStack -> {
-			CompoundTag tag = itemStack.getOrCreateTag();
-
-			if (AllItems.FILTER.isIn(itemStack) && !tag.getBoolean("Blacklist")) {
-				ItemStackHandler filterItems = FilterItem.getFilterItems(itemStack);
-				return ItemHelper.getNonEmptyStacks(filterItems).toArray(ItemStack[]::new);
-			}
-
-			if (AllItems.ATTRIBUTE_FILTER.isIn(itemStack)) {
-				WhitelistMode whitelistMode = WhitelistMode.values()[tag.getInt("WhitelistMode")];
-				ListTag attributes = tag.getList("MatchedAttributes", net.minecraft.nbt.Tag.TAG_COMPOUND);
-				if (whitelistMode == WhitelistMode.WHITELIST_DISJ && attributes.size() == 1) {
-					ItemAttribute fromNBT = ItemAttribute.loadStatic((CompoundTag) attributes.get(0));
-					if (fromNBT instanceof InTagAttribute inTag) {
-						ITagManager<Item> tagManager = ForgeRegistries.ITEMS.tags();
-						if (tagManager.isKnownTagName(inTag.tag)) {
-							ITag<Item> taggedItems = tagManager.getTag(inTag.tag);
-							if (!taggedItems.isEmpty()) {
-								ItemStack[] stacks = new ItemStack[taggedItems.size()];
-								int i = 0;
-								for (Item item : taggedItems) {
-									stacks[i] = new ItemStack(item);
-									i++;
-								}
-								return stacks;
-							}
-						}
-					}
-				}
+			if (itemStack.getItem() instanceof FilterItem filterItem) {
+				return filterItem.getFilterItems(itemStack);
 			}
 
 			return new ItemStack[0];

src/main/java/com/simibubi/create/content/logistics/filter/AbstractFilterScreen.java

@@ -6,7 +6,6 @@
 import java.util.List;
 
 import com.google.common.collect.ImmutableList;
-import com.simibubi.create.AllItems;
 import com.simibubi.create.AllPackets;
 import com.simibubi.create.content.logistics.filter.FilterScreenPacket.Option;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
@@ -73,16 +72,18 @@ protected void renderBg(GuiGraphics graphics, float partialTicks, int mouseX, in
 
 		background.render(graphics, x, y);
 		graphics.drawString(font, title, x + (background.getWidth() - 8) / 2 - font.width(title) / 2, y + 4,
-			AllItems.PACKAGE_FILTER.isIn(menu.contentHolder) ? 0x3D3C48
-				: AllItems.FILTER.isIn(menu.contentHolder) ? 0x303030 : 0x592424,
-			false);
+			getTitleColor(), false);
 
 		GuiGameElement.of(menu.contentHolder).<GuiGameElement
 			.GuiRenderBuilder>at(x + background.getWidth() + 8, y + background.getHeight() - 52, -200)
 			.scale(4)
 			.render(graphics);
 	}
 
+	protected int getTitleColor() {
+		return 0x592424;
+	}
+
 	@Override
 	protected void containerTick() {
 		if (!menu.player.getMainHandItem()

src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterItem.java

@@ -0,0 +1,109 @@
+package com.simibubi.create.content.logistics.filter;
+
+import com.simibubi.create.content.logistics.filter.AttributeFilterMenu.WhitelistMode;
+import com.simibubi.create.content.logistics.filter.FilterItemStack.AttributeFilterItemStack;
+import com.simibubi.create.content.logistics.item.filter.attribute.ItemAttribute;
+import com.simibubi.create.content.logistics.item.filter.attribute.attributes.InTagAttribute;
+import com.simibubi.create.foundation.utility.CreateLang;
+
+import net.minecraft.ChatFormatting;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.ListTag;
+import net.minecraft.nbt.Tag;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.AbstractContainerMenu;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+
+import net.minecraftforge.registries.ForgeRegistries;
+import net.minecraftforge.registries.tags.ITag;
+import net.minecraftforge.registries.tags.ITagManager;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class AttributeFilterItem extends FilterItem {
+	protected AttributeFilterItem(Properties properties) {
+		super(properties);
+	}
+
+	@Override
+	public List<Component> makeSummary(ItemStack filter) {
+		if (!filter.hasTag()) return Collections.emptyList();
+
+		List<Component> list = new ArrayList<>();
+
+		WhitelistMode whitelistMode = WhitelistMode.values()[filter.getOrCreateTag()
+			.getInt("WhitelistMode")];
+		list.add((whitelistMode == WhitelistMode.WHITELIST_CONJ
+			? CreateLang.translateDirect("gui.attribute_filter.allow_list_conjunctive")
+			: whitelistMode == WhitelistMode.WHITELIST_DISJ
+			? CreateLang.translateDirect("gui.attribute_filter.allow_list_disjunctive")
+			: CreateLang.translateDirect("gui.attribute_filter.deny_list")).withStyle(ChatFormatting.GOLD));
+
+		int count = 0;
+		ListTag attributes = filter.getOrCreateTag()
+			.getList("MatchedAttributes", Tag.TAG_COMPOUND);
+		for (Tag inbt : attributes) {
+			CompoundTag compound = (CompoundTag) inbt;
+			ItemAttribute attribute = ItemAttribute.loadStatic(compound);
+			if (attribute == null)
+				continue;
+			boolean inverted = compound.getBoolean("Inverted");
+			if (count > 3) {
+				list.add(Component.literal("- ...")
+					.withStyle(ChatFormatting.DARK_GRAY));
+				break;
+			}
+			list.add(Component.literal("- ")
+				.append(attribute.format(inverted)));
+			count++;
+		}
+
+		if (count == 0)
+			return Collections.emptyList();
+
+		return list;
+	}
+
+	@Override
+	public AbstractContainerMenu createMenu(int id, Inventory inv, Player player) {
+		return AttributeFilterMenu.create(id, inv, player.getMainHandItem());
+	}
+
+	@Override
+	public FilterItemStack makeStackWrapper(ItemStack filter) {
+		return new AttributeFilterItemStack(filter);
+	}
+
+	@Override
+	public ItemStack[] getFilterItems(ItemStack itemStack) {
+		CompoundTag tag = itemStack.getOrCreateTag();
+
+		WhitelistMode whitelistMode = WhitelistMode.values()[tag.getInt("WhitelistMode")];
+		ListTag attributes = tag.getList("MatchedAttributes", net.minecraft.nbt.Tag.TAG_COMPOUND);
+
+		if (whitelistMode == WhitelistMode.WHITELIST_DISJ && attributes.size() == 1) {
+			ItemAttribute fromNBT = ItemAttribute.loadStatic((CompoundTag) attributes.get(0));
+			if (fromNBT instanceof InTagAttribute inTag) {
+				ITagManager<Item> tagManager = ForgeRegistries.ITEMS.tags();
+				if (tagManager.isKnownTagName(inTag.tag)) {
+					ITag<Item> taggedItems = tagManager.getTag(inTag.tag);
+					if (!taggedItems.isEmpty()) {
+						ItemStack[] stacks = new ItemStack[taggedItems.size()];
+						int i = 0;
+						for (Item item : taggedItems) {
+							stacks[i] = new ItemStack(item);
+							i++;
+						}
+						return stacks;
+					}
+				}
+			}
+		}
+		return new ItemStack[0];
+	}
+}