From 7bbef49785f594dfe3d6eac0cfc6ee84841aae80 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Sun, 21 Mar 2021 23:29:30 +0800 Subject: Rewrite search engine and expose as API Signed-off-by: shedaniel --- .../shedaniel/rei/impl/OverlaySearchFieldSyntaxHighlighter.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'runtime/src/main/java/me/shedaniel/rei/impl/OverlaySearchFieldSyntaxHighlighter.java') diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/OverlaySearchFieldSyntaxHighlighter.java b/runtime/src/main/java/me/shedaniel/rei/impl/OverlaySearchFieldSyntaxHighlighter.java index c2faf9110..25e92b926 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/OverlaySearchFieldSyntaxHighlighter.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/OverlaySearchFieldSyntaxHighlighter.java @@ -24,7 +24,8 @@ package me.shedaniel.rei.impl; import me.shedaniel.rei.gui.OverlaySearchField; -import me.shedaniel.rei.impl.search.ArgumentsRegistry; +import me.shedaniel.rei.impl.search.ArgumentTypesRegistry; +import me.shedaniel.rei.impl.search.Argument; import net.minecraft.util.IntRange; import org.jetbrains.annotations.ApiStatus; @@ -44,7 +45,7 @@ public class OverlaySearchFieldSyntaxHighlighter implements Consumer { @Override public void accept(String text) { this.highlighted = new byte[text.length()]; - SearchArgument.processSearchTerm(text, new SearchArgument.ProcessedSink() { + Argument.bakeArguments(text, new Argument.ProcessedSink() { @Override public void addQuote(int index) { highlighted[index] = -2; @@ -56,9 +57,9 @@ public class OverlaySearchFieldSyntaxHighlighter implements Consumer { } @Override - public void addPart(SearchArgument argument, boolean usingGrammar, Collection grammarRanges, int index) { + public void addPart(Argument argument, boolean usingGrammar, Collection grammarRanges, int index) { if (usingGrammar) { - int argIndex = ArgumentsRegistry.ARGUMENT_LIST.indexOf(argument.getArgument()) * 2 + 1; + int argIndex = ArgumentTypesRegistry.ARGUMENT_TYPE_LIST.indexOf(argument.getArgument()) * 2 + 1; for (int i = argument.start(); i < argument.end(); i++) { highlighted[i] = (byte) argIndex; } -- cgit