add matching language to searh parser

GTNewHorizons · Jun 13, 2024 · 28d653a · 28d653a
1 parent 34734a6
commit 28d653a
Show file tree

Hide file tree

Showing 12 changed files with 353 additions and 290 deletions.
diff --git a/src/main/java/codechicken/nei/LayoutManager.java b/src/main/java/codechicken/nei/LayoutManager.java
@@ -185,7 +185,7 @@ protected boolean isAllowedGuiAutoSearchFocus(GuiContainer gui) {
 
     protected void searchFocusInitCancelCheck() {
         if (searchInitFocusedCancellable) {
-            if (searchField.isVisible() && NEIClientConfig.isFocusSearchWidgetOnOpen()
+            if (searchField.isVisible() && NEIClientConfig.searchWidgetAutofocus()
                     && getInputFocused() == searchField) {
                 searchField.setFocus(false);
                 setInputFocused(null);
@@ -676,7 +676,7 @@ public void load(GuiContainer gui) {
             mousePriorX = -1;
             mousePriorY = -1;
 
-            if (searchField.isVisible() && NEIClientConfig.isFocusSearchWidgetOnOpen()
+            if (searchField.isVisible() && NEIClientConfig.searchWidgetAutofocus()
                     && isAllowedGuiAutoSearchFocus(gui)) {
                 searchField.setFocus(true);
                 setInputFocused(searchField);

diff --git a/src/main/java/codechicken/nei/NEIClientConfig.java b/src/main/java/codechicken/nei/NEIClientConfig.java
@@ -173,7 +173,8 @@ public boolean optionValid(int index) {
         API.addOption(new OptionToggleButton("inventory.search.widgetPosition", true));
 
         tag.getTag("inventory.search.widgetAutofocus")
-                .setComment("Focus Search Widget on Open, blurs on mouse move unless typing has started first")
+                .setComment(
+                        "Focus Search Widget on Open, blurs/unfocuses on mouse move unless typing has started first")
                 .getBooleanValue(false);
         API.addOption(new OptionToggleButton("inventory.search.widgetAutofocus", true));
 
@@ -342,15 +343,6 @@ public boolean onClick(int button) {
         tag.getTag("inventory.showItemQuantityWidget").setComment("Show Item Quantity Widget").getBooleanValue(true);
         API.addOption(new OptionToggleButton("inventory.showItemQuantityWidget", true));
 
-        tag.getTag("inventory.centerSearchWidget").setComment("Center Search Widget").getBooleanValue(true);
-        API.addOption(new OptionToggleButton("inventory.centerSearchWidget", true));
-
-        tag.getTag("inventory.focusSearchWidgetOnOpen")
-                .setComment(
-                        "Focus Search Widget on Open, blurs/unfocuses on mouse move unless typing has started first")
-                .getBooleanValue(false);
-        API.addOption(new OptionToggleButton("inventory.focusSearchWidgetOnOpen", true));
-
         tag.getTag("inventory.firstInvCloseClosesInSearch").setComment(
                 "Pressing the open inventory key when the inventory was just opened when the search is focused will close it instead of typing in the search")
                 .getBooleanValue(true);
@@ -698,7 +690,7 @@ public static boolean isSearchWidgetCentered() {
         return getBooleanSetting("inventory.search.widgetPosition");
     }
 
-    public static boolean isFocusSearchWidgetOnOpen() {
+    public static boolean searchWidgetAutofocus() {
         return getBooleanSetting("inventory.search.widgetAutofocus");
     }
 

diff --git a/src/main/java/codechicken/nei/RecipeSearchField.java b/src/main/java/codechicken/nei/RecipeSearchField.java
@@ -3,7 +3,6 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.EnumChatFormatting;
 
-import codechicken.nei.SearchField.SearchTextFormatter;
 import codechicken.nei.api.ItemFilter;
 import codechicken.nei.util.TextHistory;
 
@@ -19,7 +18,7 @@ public RecipeSearchField(String ident) {
     @Override
     protected void initInternalTextField() {
         field = new FormattedTextField(Minecraft.getMinecraft().fontRenderer, 0, 0, 0, 0);
-        ((FormattedTextField) field).setFormatter(new SearchTextFormatter());
+        ((FormattedTextField) field).setFormatter(new SearchTextFormatter(SearchField.searchParser));
         field.setMaxStringLength(maxSearchLength);
         field.setCursorPositionZero();
     }