From f63adf1ecad67080bd9d628123b45d8aaba68316 Mon Sep 17 00:00:00 2001
From: Sebastian Hartte <sebastian@hartte.de>
Date: Thu, 18 Jun 2020 21:43:49 +0200
Subject: [PATCH] Fix interaction with the search field in interface terminals.

---
 .../implementations/GuiInterfaceTerminal.java | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java b/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java
index 57cd47c28..1780d8586 100644
--- a/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java
+++ b/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java
@@ -23,6 +23,9 @@ import java.util.*;
 import com.google.common.collect.HashMultimap;
 import com.mojang.blaze3d.systems.RenderSystem;
 
+import org.lwjgl.glfw.GLFW;
+
+import net.minecraft.client.util.InputMappings;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
@@ -32,12 +35,14 @@ import net.minecraftforge.fml.client.gui.GuiUtils;
 
 import appeng.api.AEApi;
 import appeng.api.storage.channels.IItemStorageChannel;
+import appeng.client.ActionKey;
 import appeng.client.gui.AEBaseGui;
 import appeng.client.gui.widgets.GuiScrollbar;
 import appeng.client.gui.widgets.MEGuiTextField;
 import appeng.client.me.ClientDCInternalInv;
 import appeng.client.me.SlotDisconnected;
 import appeng.container.implementations.ContainerInterfaceTerminal;
+import appeng.core.AppEng;
 import appeng.core.localization.GuiText;
 import appeng.util.Platform;
 
@@ -164,6 +169,35 @@ public class GuiInterfaceTerminal extends AEBaseGui<ContainerInterfaceTerminal>
         return false;
     }
 
+    @Override
+    public boolean keyPressed(int keyCode, int scanCode, int p_keyPressed_3_) {
+
+        InputMappings.Input input = InputMappings.getInputByCode(keyCode, scanCode);
+
+        if (keyCode != GLFW.GLFW_KEY_ESCAPE) {
+            if (AppEng.proxy.isActionKey(ActionKey.TOGGLE_FOCUS, input)) {
+                this.searchField.setFocused2(!this.searchField.isFocused());
+                return true;
+            }
+
+            // Forward keypresses to the search field
+            if (this.searchField.isFocused()) {
+                if (keyCode == GLFW.GLFW_KEY_ENTER) {
+                    this.searchField.setFocused2(false);
+                    return true;
+                }
+
+                this.searchField.keyPressed(keyCode, scanCode, p_keyPressed_3_);
+
+                // We need to swallow key presses if the field is focused because typing 'e'
+                // would otherwise close the screen
+                return true;
+            }
+        }
+
+        return super.keyPressed(keyCode, scanCode, p_keyPressed_3_);
+    }
+
     public void postUpdate(final CompoundNBT in) {
         if (in.getBoolean("clear")) {
             this.byId.clear();