From cc6bcd2ab7cf5847749d650439078ca3710be71b Mon Sep 17 00:00:00 2001
From: Kogepan229 <73163994+Kogepan229@users.noreply.github.com>
Date: Fri, 2 Oct 2026 00:46:54 +0900
Subject: [PATCH] Fix pattern terminal focus (#1673)

---
 .../gui/implementations/GuiMEMonitorable.java | 12 +++++++
 .../modules/NEIHelpers/NEIInputHandler.java   | 31 +++++++++++++++++--
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java b/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java
index 913cfd698..eda78b808 100644
--- a/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java
+++ b/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java
@@ -843,6 +843,8 @@ public class GuiMEMonitorable extends AEBaseGui
     public void onGuiClosed() {
         super.onGuiClosed();
         memoryText = this.searchField.getText();
+        // Reacquire focus on reopening so native text input restarts after a screen change.
+        this.searchField.setFocused(false);
         Keyboard.enableRepeatEvents(false);
     }
 
@@ -905,11 +907,21 @@ public class GuiMEMonitorable extends AEBaseGui
         s.yDisplayPosition = s.getY() + this.ySize - 78 - 5;
     }
 
+    public boolean isSearchFieldManuallyFocused() {
+        return searchField.isFocused() && !isAutoFocused;
+    }
+
     @Override
     protected void keyTyped(final char character, final int key) {
+        // Opening NEI can leave text events queued for this now-hidden terminal.
+        if (this.mc.currentScreen != this) {
+            return;
+        }
+
         if (!searchField.isFocused() && (!NEI.searchField.existsSearchField() || !NEI.searchField.focused())
                 && CommonHelper.proxy.isActionKey(ActionKey.TOGGLE_FOCUS, key)) {
             searchField.setFocused(true);
+            isAutoFocused = false;
             return;
         }
 
diff --git a/src/main/java/appeng/integration/modules/NEIHelpers/NEIInputHandler.java b/src/main/java/appeng/integration/modules/NEIHelpers/NEIInputHandler.java
index 4bd7672df..4e627c6e8 100644
--- a/src/main/java/appeng/integration/modules/NEIHelpers/NEIInputHandler.java
+++ b/src/main/java/appeng/integration/modules/NEIHelpers/NEIInputHandler.java
@@ -8,11 +8,18 @@ import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
+import org.jetbrains.annotations.NotNull;
+import org.lwjgl.input.Keyboard;
+
 import appeng.api.implementations.ICraftingPatternItem;
 import appeng.api.networking.crafting.ICraftingPatternDetails;
 import appeng.client.gui.implementations.GuiCellWorkbench;
+import appeng.client.gui.implementations.GuiPatternTerm;
 import appeng.client.gui.implementations.GuiStorageBus;
+import appeng.client.gui.slots.VirtualMEPatternSlot;
+import appeng.integration.modules.NEI;
 import codechicken.nei.ItemPanels;
+import codechicken.nei.KeyManager;
 import codechicken.nei.NEIClientConfig;
 import codechicken.nei.bookmark.BookmarkItem;
 import codechicken.nei.bookmark.SortableGroup;
@@ -26,8 +33,28 @@ public class NEIInputHandler implements IContainerInputHandler {
     private List<ItemStack> draggedBookmarkGroup;
 
     @Override
-    public boolean keyTyped(GuiContainer gui, char keyChar, int keyCode) {
-        return false;
+    public boolean keyTyped(@NotNull GuiContainer gui, char keyChar, int keyCode) {
+        if (!(gui instanceof GuiPatternTerm terminal) || !NEIClientConfig.isLoaded()
+                || terminal.isSearchFieldManuallyFocused()
+                || NEI.searchField.focused()) {
+            return false;
+        }
+
+        if (!(terminal.getVirtualMESlotUnderMouse() instanceof VirtualMEPatternSlot slot)
+                || slot.getAEStack() == null) {
+            return false;
+        }
+
+        if (keyCode == Keyboard.KEY_NONE || keyCode == Keyboard.KEY_ESCAPE
+                || (keyCode != KeyManager.getKeyCode("recipe.recipe")
+                        && keyCode != KeyManager.getKeyCode("recipe.usage"))) {
+            return false;
+        }
+
+        // Run the normal NEI handlers before the terminal's search field can consume the key.
+        GuiContainerManager.getManager(gui).lastKeyTyped(keyCode, keyChar);
+        // A missing recipe must not turn the shortcut into search text either.
+        return true;
     }
 
     @Override