lifetime filter supports setting multiple filters with or-relationship

Author: Fallen-Breath

src/main/java/carpettisaddition/commands/lifetime/LifeTimeCommand.java

@@ -28,15 +28,19 @@
 import carpettisaddition.commands.lifetime.utils.LifeTimeTrackerUtil;
 import carpettisaddition.commands.lifetime.utils.SpecificDetailMode;
 import carpettisaddition.utils.CarpetModUtil;
+import carpettisaddition.utils.CommandUtils;
+import com.google.common.collect.Lists;
 import com.mojang.brigadier.builder.ArgumentBuilder;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
-import net.minecraft.commands.arguments.selector.EntitySelector;
+import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.arguments.EntityArgument;
+import net.minecraft.commands.arguments.selector.EntitySelector;
 import net.minecraft.world.entity.EntityType;
-import net.minecraft.commands.CommandSourceStack;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
@@ -89,10 +93,10 @@ private int checkEntityTypeThen(CommandSourceStack source, @Nullable String enti
 		return 1;
 	}
 
-	private int setEntityFilter(CommandSourceStack source, @Nullable String entityTypeName, EntitySelector selector)
+	private int setEntityFilter(CommandSourceStack source, @Nullable String entityTypeName, List<EntitySelector> selectors)
 	{
 		return checkEntityTypeThen(source, entityTypeName, entityType ->
-				EntityFilterManager.getInstance().setEntityFilter(source, entityType, selector)
+				EntityFilterManager.getInstance().setEntityFilter(source, entityType, selectors)
 		);
 	}
 
@@ -109,14 +113,38 @@ private int printEntityFilter(CommandSourceStack source, @Nullable String entity
 	 * ------------------
 	 */
 
+	private static final int MAX_FILTER_NUM = 16;
+
+	private static String makeFilterNodeName(int idx)
+	{
+		return idx > 1 ? ("filter" + idx) : "filter";
+	}
+
 	private ArgumentBuilder<CommandSourceStack, ?> createFilterNode(ArgumentBuilder<CommandSourceStack, ?> node, Function<CommandContext<CommandSourceStack>, @Nullable String> entityTypeNameSupplier)
 	{
+		ArgumentBuilder<CommandSourceStack, ?> prevFilter = null;
+		for (int i = MAX_FILTER_NUM; i >= 1; i--)  // 16 filters should be enough
+		{
+			ArgumentBuilder<CommandSourceStack, ?> currentFilter = argument(makeFilterNodeName(i), EntityArgument.entities()).
+					executes(c -> {
+						List<EntitySelector> selectors = Lists.newArrayList();
+						for (int j = 1; j <= MAX_FILTER_NUM; j++)
+						{
+							final int finalJ = j;
+							CommandUtils.getOptArg(() -> c.getArgument(makeFilterNodeName(finalJ), EntitySelector.class)).ifPresent(selectors::add);
+						}
+						return setEntityFilter(c.getSource(), entityTypeNameSupplier.apply(c), selectors);
+					});
+			if (prevFilter != null)
+			{
+				currentFilter.then(prevFilter);
+			}
+			prevFilter = currentFilter;
+		}
+
 		return node.
 				executes(c -> printEntityFilter(c.getSource(), entityTypeNameSupplier.apply(c))).
-				then(literal("set").then(
-						argument("filter", EntityArgument.entities()).
-						executes(c -> setEntityFilter(c.getSource(), entityTypeNameSupplier.apply(c), c.getArgument("filter", EntitySelector.class)))
-				)).
+				then(literal("set").then(Objects.requireNonNull(prevFilter))).
 				then(literal("clear").executes(c -> setEntityFilter(c.getSource(), entityTypeNameSupplier.apply(c), null)));
 	}
 

src/main/java/carpettisaddition/commands/lifetime/filter/EntityFilterManager.java

@@ -26,15 +26,18 @@
 import carpettisaddition.translations.TranslationContext;
 import carpettisaddition.utils.Messenger;
 import carpettisaddition.utils.entityfilter.EntityFilter;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import net.minecraft.ChatFormatting;
 import net.minecraft.commands.arguments.selector.EntitySelector;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.network.chat.BaseComponent;
-import net.minecraft.network.chat.ClickEvent;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
 import java.util.Map;
 import java.util.function.Predicate;
 
@@ -44,7 +47,7 @@ public class EntityFilterManager extends TranslationContext
 	private static final Predicate<Entity> DEFAULT_FILTER = entity -> true;
 
 	// key null is for global filter
-	private final Map<EntityType<?>, Predicate<Entity>> entityFilter = Maps.newLinkedHashMap();
+	private final Map<EntityType<?>, Predicate<Entity>> entityFilters = Maps.newLinkedHashMap();
 
 	public EntityFilterManager()
 	{
@@ -56,9 +59,10 @@ public static EntityFilterManager getInstance()
 		return INSTANCE;
 	}
 
+	@NotNull
 	public Predicate<Entity> getFilter(@Nullable EntityType<?> entityType)
 	{
-		return this.entityFilter.getOrDefault(entityType, DEFAULT_FILTER);
+		return this.entityFilters.getOrDefault(entityType, DEFAULT_FILTER);
 	}
 
 	/**
@@ -71,30 +75,35 @@ public boolean test(Entity entity)
 		return this.getFilter(null).test(entity) && this.getFilter(entity.getType()).test(entity);
 	}
 
-	public void setEntityFilter(CommandSourceStack source, @Nullable EntityType<?> entityType, @Nullable EntitySelector entitySelector)
+	public void setEntityFilter(CommandSourceStack source, @Nullable EntityType<?> entityType, @Nullable List<EntitySelector> selectors)
 	{
 		BaseComponent typeName = this.getEntityTypeText(entityType);
-		if (entitySelector != null)
+		if (selectors != null && !selectors.isEmpty())
 		{
-			if (!entitySelector.includesEntities() || ((EntitySelectorAccessor)entitySelector).getPlayerName() != null)
+			List<EntityFilter> entityFilters = Lists.newArrayList();
+			for (int i = 0; i < selectors.size(); i++)
 			{
-				Messenger.tell(source, tr("unsupported.0"));
-				Messenger.tell(source, tr("unsupported.1"));
-			}
-			else
-			{
-				EntityFilter entityFilter = new EntityFilter(source, entitySelector);
-				this.entityFilter.put(entityType, entityFilter);
-				Messenger.tell(source, tr(
-						"filter_set",
-						typeName,
-						entityFilter.toText()
-				));
+				EntitySelector entitySelector = selectors.get(i);
+				if (!entitySelector.includesEntities() || ((EntitySelectorAccessor)entitySelector).getPlayerName() != null)
+				{
+					Messenger.tell(source, tr("unsupported.0", i + 1));
+					Messenger.tell(source, tr("unsupported.1"));
+					return;
+				}
+				entityFilters.add(new EntityFilter(source, entitySelector));
 			}
+
+			LifetimeEntityFilter entityFilter = new LifetimeEntityFilter(entityFilters);
+			this.entityFilters.put(entityType, entityFilter);
+			Messenger.tell(source, tr(
+					"filter_set",
+					typeName,
+					entityFilter.toText()
+			));
 		}
 		else
 		{
-			this.entityFilter.remove(entityType);
+			this.entityFilters.remove(entityType);
 			Messenger.tell(source, tr(
 					"filter_removed",
 					typeName
@@ -105,7 +114,23 @@ public void setEntityFilter(CommandSourceStack source, @Nullable EntityType<?> e
 	public BaseComponent getEntityFilterText(@Nullable EntityType<?> entityType)
 	{
 		Predicate<Entity> entityPredicate = this.getFilter(entityType);
-		return entityPredicate instanceof EntityFilter ? ((EntityFilter)entityPredicate).toText() : tr("none");
+		if (entityPredicate == DEFAULT_FILTER)
+		{
+			return tr("none");
+		}
+		else if (entityPredicate instanceof EntityFilter)
+		{
+			return ((EntityFilter)entityPredicate).toText();
+		}
+		else if (entityPredicate instanceof LifetimeEntityFilter)
+		{
+			return ((LifetimeEntityFilter)entityPredicate).toText();
+		}
+		// unexpected predicate type
+		return Messenger.hover(
+				Messenger.s("?", ChatFormatting.RED),
+				Messenger.s(entityPredicate.getClass().getSimpleName())
+		);
 	}
 
 	public BaseComponent getEntityTypeText(@Nullable EntityType<?> entityType)
@@ -124,8 +149,8 @@ public void displayFilter(CommandSourceStack source, @Nullable EntityType<?> ent
 
 	public int displayAllFilters(CommandSourceStack source)
 	{
-		Messenger.tell(source, tr("display_total", this.entityFilter.size()));
-		this.entityFilter.keySet().forEach(entityType -> Messenger.tell(
+		Messenger.tell(source, tr("display_total", this.entityFilters.size()));
+		this.entityFilters.keySet().forEach(entityType -> Messenger.tell(
 				source,
 				Messenger.c(
 						"f - ",

src/main/java/carpettisaddition/commands/lifetime/filter/LifetimeEntityFilter.java

@@ -0,0 +1,70 @@
+/*
+ * This file is part of the Carpet TIS Addition project, licensed under the
+ * GNU Lesser General Public License v3.0
+ *
+ * Copyright (C) 2026  Fallen_Breath and contributors
+ *
+ * Carpet TIS Addition is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Carpet TIS Addition is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Carpet TIS Addition.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package carpettisaddition.commands.lifetime.filter;
+
+import carpettisaddition.utils.Messenger;
+import carpettisaddition.utils.entityfilter.EntityFilter;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.BaseComponent;
+import net.minecraft.world.entity.Entity;
+
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+public class LifetimeEntityFilter implements Predicate<Entity>
+{
+	private final List<EntityFilter> filters;  // "or" relationship
+
+	public LifetimeEntityFilter(List<EntityFilter> filters)
+	{
+		if (filters.isEmpty())
+		{
+			throw new IllegalArgumentException("Must have at least one selector");
+		}
+		this.filters = ImmutableList.copyOf(filters);
+	}
+
+	@Override
+	public boolean test(Entity entity)
+	{
+		for (EntityFilter filter : this.filters)
+		{
+			if (filter.test(entity))
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public BaseComponent toText()
+	{
+		return Messenger.join(
+				Messenger.hover(
+						Messenger.s(" || ", ChatFormatting.DARK_GRAY),
+						EntityFilterManager.getInstance().getTranslator().tr("or")
+				),
+				this.filters.stream().map(EntityFilter::toText).collect(Collectors.toList())
+		);
+	}
+}

src/main/resources/assets/carpettisaddition/lang/en_us.yml

@@ -716,14 +716,15 @@ carpettisaddition:
       filter:
         global: Global
         unsupported:
-          '0': "Unsupported entity filter"
+          '0': "Unsupported entity filter (no. %1$s)"
           '1': "Please enter a @e style entity selector"
         filter_set: 'Entity filter of %1$s is set to %2$s'
         filter_removed: 'Entity filter of %1$s removed'
         display: "Entity filter of %1$s is %2$s"
         display_total: "There are %1$s activated filters"
         none: None
         click_to_clear: "Click to clear filter"
+        or: or
       recorder:
         enabled: Lifetime data recorder enabled
         already_enabled: Lifetime data recorder is already enabled

src/main/resources/assets/carpettisaddition/lang/zh_cn.yml

@@ -716,14 +716,15 @@ carpettisaddition:
       filter:
         global: 全局
         unsupported:
-          '0': 不支持的实体筛选器
+          '0': 不支持的实体筛选器（第%1$s个）
           '1': 请输入一个@e类型的实体选择器
         filter_set: '%1$s的筛选器已设置为%2$s'
         filter_removed: '%1$s的筛选器已移除'
         display: '%1$s的筛选器为%2$s'
         display_total: 共有%1$s个激活的筛选器
         none: 无
         click_to_clear: 点击以清除筛选器
+        or: 或
       recorder:
         enabled: 存活时间数据记录器已启用
         already_enabled: 存活时间数据记录器已经处于启用状态了

website/docs/commands.md

@@ -116,6 +116,7 @@ For example, `/lifetime creeper` shows all statistic of creeper in detail, and `
 
 ```
 /lifetime filter <entity_type> set <entity_selector>
+/lifetime filter <entity_type> set <entity_selector> [<entity_selector2> [<entity_selector3> [<entity_selector4> ...]]]
 /lifetime filter <entity_type> clear
 ```
 
@@ -125,6 +126,9 @@ Entities need to be accepted by the related filter to be record by the lifetime
 
 Filter is input as an `@e` style Minecraft entity selector. e.g. `@e[distance=..100,nbt={Item:{id:"minecraft:oak_sapling"}}]`
 
+Supports passing multiple `<entity_selector>` parameters (up to 16). An entity passes the filter if it matches any entity selector.
+In other words, the relationship between multiple entity selectors is OR
+
 Use `/lifetime filter` to display current activated filters
 
 ### recorder

website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/commands.md

@@ -116,6 +116,7 @@ sidebar_position: 3
 
 ```
 /lifetime filter <实体类型> set <实体选择器>
+/lifetime filter <实体类型> set <实体选择器> [<实体选择器2> [<实体选择器3> [<实体选择器4> ...]]]
 /lifetime filter <实体类型> clear
 ```
 
@@ -125,6 +126,9 @@ sidebar_position: 3
 
 使用 `@e` 类型的 Minecraft 实体选择器来输入实体筛选器，如：`@e[distance=..100,nbt={Item:{id:"minecraft:oak_sapling"}}]`
 
+支持传入多个 `<实体选择器>` 参数（最多 16 个）。实体只要满足任一实体选择器的条件，即可通过筛选。
+也即多个实体选择器之间是 **或** 的关系
+
 使用 `/lifetime filter` 来显示激活的实体筛选器
 
 ### recorder