diff --git a/src/main/java/codechicken/nei/ClientHandler.java b/src/main/java/codechicken/nei/ClientHandler.java index 3b4b6cea..7d1ccab2 100644 --- a/src/main/java/codechicken/nei/ClientHandler.java +++ b/src/main/java/codechicken/nei/ClientHandler.java @@ -225,6 +225,30 @@ public class ClientHandler { } } + public static void loadEnableAutoFocus() { + File file = NEIClientConfig.enableAutoFocusFile; + if (!file.exists()) { + try (FileWriter writer = new FileWriter(file)) { + NEIClientConfig.logger.info("Creating default enable auto focus list {}", file); + URL defaultEnableAutoFocusResource = ClientHandler.class + .getResource("/assets/nei/cfg/enableautofocus.cfg"); + if (defaultEnableAutoFocusResource != null) { + IOUtils.copy(defaultEnableAutoFocusResource.openStream(), writer); + } + } catch (IOException e) { + NEIClientConfig.logger.error("Failed to save default enable auto focus list to file {}", file, e); + } + } + + try (FileReader reader = new FileReader(file)) { + NEIClientConfig.logger.info("Loading enable auto focus from file {}", file); + NEIClientConfig.enableAutoFocusPrefixes = IOUtils.readLines(reader).stream() + .filter((line) -> !line.startsWith("#")).collect(Collectors.toCollection(ArrayList::new)); + } catch (IOException e) { + NEIClientConfig.logger.error("Failed to load enable auto focus from file {}", file, e); + } + } + public static void load() { instance = new ClientHandler(); diff --git a/src/main/java/codechicken/nei/GuiExtendedCreativeInv.java b/src/main/java/codechicken/nei/GuiExtendedCreativeInv.java index 5f76fb4f..8d4c1d7e 100644 --- a/src/main/java/codechicken/nei/GuiExtendedCreativeInv.java +++ b/src/main/java/codechicken/nei/GuiExtendedCreativeInv.java @@ -12,10 +12,11 @@ import org.lwjgl.opengl.GL11; import codechicken.lib.render.CCRenderState; import codechicken.lib.vec.Rectangle4i; +import codechicken.nei.api.INEIAutoFocusSearchEnable; import codechicken.nei.api.INEIGuiHandler; import codechicken.nei.api.TaggedInventoryArea; -public class GuiExtendedCreativeInv extends GuiContainer implements INEIGuiHandler { +public class GuiExtendedCreativeInv extends GuiContainer implements INEIGuiHandler, INEIAutoFocusSearchEnable { public GuiExtendedCreativeInv(Container par1Container) { super(par1Container); diff --git a/src/main/java/codechicken/nei/LayoutManager.java b/src/main/java/codechicken/nei/LayoutManager.java index 7c349c69..cfe89029 100644 --- a/src/main/java/codechicken/nei/LayoutManager.java +++ b/src/main/java/codechicken/nei/LayoutManager.java @@ -52,6 +52,7 @@ import codechicken.lib.gui.GuiDraw; import codechicken.nei.KeyManager.IKeyStateTracker; import codechicken.nei.api.API; import codechicken.nei.api.GuiInfo; +import codechicken.nei.api.INEIAutoFocusSearchEnable; import codechicken.nei.api.IRecipeOverlayRenderer; import codechicken.nei.api.ItemInfo; import codechicken.nei.api.LayoutStyle; @@ -87,6 +88,8 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH public static SubsetWidget dropDown; public static PresetsWidget presetsPanel; public static SearchField searchField; + public static boolean searchInitFocusedCancellable = false; + public static int mousePriorX, mousePriorY; public static ButtonCycled options; public static ButtonCycled bookmarksButton; @@ -163,10 +166,36 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH return getSideWidth(gui); } + public boolean isAllowedGuiAutoSearchFocus(GuiContainer gui) { + if (gui instanceof INEIAutoFocusSearchEnable) { + return true; + } + String guiClassName = gui.getClass().getName(); + for (String prefix : NEIClientConfig.enableAutoFocusPrefixes) { + if (guiClassName.startsWith(prefix)) { + return true; + } + } + return false; + } + + public void searchFocusInitCancelCheck() { + if (searchInitFocusedCancellable) { + if (searchField.isVisible() && NEIClientConfig.isFocusSearchWidgetOnOpen() + && getInputFocused() == searchField) { + searchField.setFocus(false); + setInputFocused(null); + } + searchInitFocusedCancellable = false; + } + } + @Override public void onMouseClicked(GuiContainer gui, int mousex, int mousey, int button) { if (isHidden()) return; + searchFocusInitCancelCheck(); + for (Widget widget : controlWidgets) widget.onGuiClick(mousex, mousey); } @@ -176,6 +205,8 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH if (!isEnabled()) return options.contains(mousex, mousey) && options.handleClick(mousex, mousey, button); + searchFocusInitCancelCheck(); + for (Widget widget : controlWidgets) { widget.onGuiClick(mousex, mousey); if (widget.contains(mousex, mousey) ? widget.handleClick(mousex, mousey, button) @@ -196,6 +227,7 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH public boolean keyTyped(GuiContainer gui, char keyChar, int keyID) { if (isEnabled() && !isHidden()) { + searchInitFocusedCancellable = false; if (inputFocused != null) return inputFocused.handleKeyPress(keyID, keyChar); for (Widget widget : controlWidgets) if (widget.handleKeyPress(keyID, keyChar)) return true; @@ -234,6 +266,7 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH public void onMouseUp(GuiContainer gui, int mx, int my, int button) { if (!isHidden() && isEnabled()) { + searchFocusInitCancelCheck(); for (Widget widget : controlWidgets) widget.mouseUp(mx, my, button); } } @@ -241,6 +274,7 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH @Override public void onMouseDragged(GuiContainer gui, int mx, int my, int button, long heldTime) { if (!isHidden() && isEnabled()) { + searchFocusInitCancelCheck(); for (Widget widget : controlWidgets) widget.mouseDragged(mx, my, button, heldTime); } } @@ -259,6 +293,15 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH public void renderObjects(GuiContainer gui, int mousex, int mousey) { if (!isHidden()) { layout(gui); + if (mousePriorX == -1) { + mousePriorX = mousex; + mousePriorY = mousey; + } + if (mousePriorX != mousex || mousePriorY != mousey) { + searchFocusInitCancelCheck(); + mousePriorX = mousex; + mousePriorY = mousey; + } if (isEnabled()) { getLayoutStyle().drawBackground(GuiContainerManager.getManager(gui)); for (Widget widget : drawWidgets) widget.draw(mousex, mousey); @@ -620,6 +663,15 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH getLayoutStyle().init(); layout(gui); + mousePriorX = -1; + mousePriorY = -1; + + if (searchField.isVisible() && NEIClientConfig.isFocusSearchWidgetOnOpen() + && isAllowedGuiAutoSearchFocus(gui)) { + searchField.setFocus(true); + setInputFocused(searchField); + searchInitFocusedCancellable = true; + } } NEIController.load(gui); @@ -721,6 +773,7 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH @Override public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) { if (isHidden() || !isEnabled()) return false; + searchFocusInitCancelCheck(); for (Widget widget : drawWidgets) if (widget.onMouseWheel(scrolled, mousex, mousey)) return true; diff --git a/src/main/java/codechicken/nei/NEIClientConfig.java b/src/main/java/codechicken/nei/NEIClientConfig.java index a3ee8733..fac54812 100644 --- a/src/main/java/codechicken/nei/NEIClientConfig.java +++ b/src/main/java/codechicken/nei/NEIClientConfig.java @@ -1,6 +1,7 @@ package codechicken.nei; import java.io.File; +import java.util.ArrayList; import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; @@ -76,6 +77,7 @@ public class NEIClientConfig { public static final File heightHackHandlersFile = new File(configDir, "heighthackhandlers.cfg"); public static final File handlerOrderingFile = new File(configDir, "handlerordering.csv"); public static final File hiddenHandlersFile = new File(configDir, "hiddenhandlers.csv"); + public static final File enableAutoFocusFile = new File(configDir, "enableautofocus.cfg"); @Deprecated public static File bookmarkFile; @@ -95,6 +97,9 @@ public class NEIClientConfig { // Any handler not in the map will be assigned to 0, and negative numbers are fine. public static HashMap handlerOrdering = new HashMap<>(); + // List of prefixes of classes that should enable the autofocus search widget on open. + public static ArrayList enableAutoFocusPrefixes = new ArrayList<>(); + // Function that extracts the handler ID from a handler, with special logic for // TemplateRecipeHandler: prefer using the overlay ID if it exists. public static final Function HANDLER_ID_FUNCTION = handler -> Objects @@ -273,6 +278,11 @@ public class NEIClientConfig { 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 on mouse move unless typing has started first") + .getBooleanValue(false); + API.addOption(new OptionToggleButton("inventory.focusSearchWidgetOnOpen", true)); + tag.getTag("inventory.jei_style_tabs").setComment("Enable/disable JEI Style Tabs").getBooleanValue(true); API.addOption(new OptionToggleButtonBoubs("inventory.jei_style_tabs", true)); @@ -615,6 +625,10 @@ public class NEIClientConfig { return getBooleanSetting("inventory.centerSearchWidget"); } + public static boolean isFocusSearchWidgetOnOpen() { + return getBooleanSetting("inventory.focusSearchWidgetOnOpen"); + } + public static boolean areJEIStyleTabsVisible() { return getBooleanSetting("inventory.jei_style_tabs"); } diff --git a/src/main/java/codechicken/nei/api/INEIAutoFocusSearchEnable.java b/src/main/java/codechicken/nei/api/INEIAutoFocusSearchEnable.java new file mode 100644 index 00000000..3f0d6b91 --- /dev/null +++ b/src/main/java/codechicken/nei/api/INEIAutoFocusSearchEnable.java @@ -0,0 +1,8 @@ +package codechicken.nei.api; + +/** + * Implement this interface on a GuiContainer to enable the autofocus search in NEI (if the autofocus option is enabled) + * without needing to add the classname to the config file . + */ +public interface INEIAutoFocusSearchEnable { +} diff --git a/src/main/resources/assets/nei/cfg/enableautofocus.cfg b/src/main/resources/assets/nei/cfg/enableautofocus.cfg new file mode 100644 index 00000000..e1525ca9 --- /dev/null +++ b/src/main/resources/assets/nei/cfg/enableautofocus.cfg @@ -0,0 +1,3 @@ +# Each line in this file should either be a comment (line starts with '#'), or a prefix of a fully-qualified class name +# (that includes the package name) for a Minecraft GUI Container screen. +# If you delete this file, it will be regenerated with the default enable autofocus list. diff --git a/src/main/resources/assets/nei/lang/en_US.lang b/src/main/resources/assets/nei/lang/en_US.lang index f24dd83c..b4ba5a71 100644 --- a/src/main/resources/assets/nei/lang/en_US.lang +++ b/src/main/resources/assets/nei/lang/en_US.lang @@ -179,6 +179,9 @@ nei.options.inventory.showItemQuantityWidget.false=No nei.options.inventory.centerSearchWidget=Center Search Widget nei.options.inventory.centerSearchWidget.true=Yes nei.options.inventory.centerSearchWidget.false=No +nei.options.inventory.focusSearchWidgetOnOpen=Focus Search Widget on Open +nei.options.inventory.focusSearchWidgetOnOpen.true=Yes +nei.options.inventory.focusSearchWidgetOnOpen.false=No nei.options.inventory.creative_tab_style=Creative or JEI tab style nei.options.inventory.creative_tab_style.true=Creative nei.options.inventory.creative_tab_style.false=JEI