From 178021a8e855bf35c5eff1e8159bab2b0cf4e0bf Mon Sep 17 00:00:00 2001 From: slprime Date: Thu, 30 May 2024 19:24:20 +0300 Subject: [PATCH] add subfilter --- .../java/codechicken/nei/SearchField.java | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/src/main/java/codechicken/nei/SearchField.java b/src/main/java/codechicken/nei/SearchField.java index 723e6007..c09a0f2d 100644 --- a/src/main/java/codechicken/nei/SearchField.java +++ b/src/main/java/codechicken/nei/SearchField.java @@ -91,17 +91,21 @@ public class SearchField extends TextField implements ItemFilterProvider { public static class SearchParserProvider implements ISearchParserProvider { - protected final Function createFilter; + protected final List> subFilters = new ArrayList<>(); protected final String name; protected final char prefix; protected final EnumChatFormatting highlightedColor; public SearchParserProvider(char prefix, String name, EnumChatFormatting highlightedColor, Function createFilter) { - this.createFilter = createFilter; this.prefix = prefix; this.name = name; this.highlightedColor = highlightedColor; + this.addSubFilter(createFilter); + } + + public void addSubFilter(Function subFilter) { + this.subFilters.add(subFilter); } @Override @@ -116,7 +120,17 @@ public class SearchField extends TextField implements ItemFilterProvider { } protected ItemFilter createFilter(Pattern pattern) { - return this.createFilter.apply(pattern); + final List filters = new ArrayList<>(); + + for (Function createFilter : this.subFilters) { + ItemFilter filter = createFilter.apply(pattern); + if (filter != null) { + filters.add(filter); + } + + } + + return filters.isEmpty() ? null : new AnyMultiItemFilter(filters); } @Override @@ -135,31 +149,6 @@ public class SearchField extends TextField implements ItemFilterProvider { } } - private static class DefaultParserProvider implements ISearchParserProvider { - - public ItemFilter getFilter(String searchText) { - Pattern pattern = SearchField.getPattern(searchText); - - if (pattern != null) { - return new PatternItemFilter(pattern); - } - - return null; - } - - public char getPrefix() { - return '\0'; - } - - public EnumChatFormatting getHighlightedColor() { - return EnumChatFormatting.RESET; - } - - public SearchMode getSearchMode() { - return SearchMode.ALWAYS; - } - } - public static class SearchTextFormatter implements TextFormatter { public String format(String text) { @@ -233,7 +222,19 @@ public class SearchField extends TextField implements ItemFilterProvider { public SearchField(String ident) { super(ident); API.addItemFilter(this); - API.addSearchProvider(new DefaultParserProvider()); + API.addSearchProvider( + new SearchParserProvider( + '\0', + "default", + EnumChatFormatting.RESET, + (pattern) -> new PatternItemFilter(pattern)) { + + @Override + public SearchMode getSearchMode() { + return SearchMode.ALWAYS; + } + + }); API.addSearchProvider( new SearchParserProvider( '@', @@ -496,7 +497,6 @@ public class SearchField extends TextField implements ItemFilterProvider { return filters.isEmpty() ? new NothingItemFilter() : new AnyMultiItemFilter(filters); } else { - // $ore | spaw | #speed | slab | stairs | @mine"c | %blo"ck | "pickaxe" cc ItemFilter filter = provider.getFilter(token); return filter != null ? filter : new NothingItemFilter(); }