add subfilter

This commit is contained in:
slprime committed 2024-05-30 19:24:20 +03:00
1 parent 8dd9014109
commit 178021a8e8
1 file changed
+30 -30
+30 -30
View File
@@ -91,17 +91,21 @@ public class SearchField extends TextField implements ItemFilterProvider {
public static class SearchParserProvider implements ISearchParserProvider {
protected final Function<Pattern, ItemFilter> createFilter;
protected final List<Function<Pattern, ItemFilter>> subFilters = new ArrayList<>();
protected final String name;
protected final char prefix;
protected final EnumChatFormatting highlightedColor;
public SearchParserProvider(char prefix, String name, EnumChatFormatting highlightedColor,
Function<Pattern, ItemFilter> createFilter) {
this.createFilter = createFilter;
this.prefix = prefix;
this.name = name;
this.highlightedColor = highlightedColor;
this.addSubFilter(createFilter);
}
public void addSubFilter(Function<Pattern, ItemFilter> 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<ItemFilter> filters = new ArrayList<>();
for (Function<Pattern, ItemFilter> 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();
}