Merge remote-tracking branch 'origin/master-1.20-lts' into master-1.21-lts

Author: rubensworks

resources/changelog/1.19.2-1.26.1.txt

@@ -0,0 +1,6 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.20.0 or higher.
+
+Fixes:
+* Fix search hotkey also typing in hotkey in search box
+  Closes CyclopsMC/IntegratedTerminals#168

resources/changelog/1.20.1-1.26.1.txt

@@ -0,0 +1,6 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.20.0 or higher.
+
+Fixes:
+* Fix search hotkey also typing in hotkey in search box
+  Closes CyclopsMC/IntegratedTerminals#168

src/main/java/org/cyclops/integrateddynamics/client/gui/container/ContainerScreenLogicProgrammerBase.java

@@ -52,6 +52,7 @@ public class ContainerScreenLogicProgrammerBase<C extends ContainerLogicProgramm
     protected SubGuiOperatorInfo operatorInfoPattern = null;
     protected boolean firstInit = true;
     protected int relativeStep = -1;
+    protected boolean swallowNextCharacter = false;
 
     public ContainerScreenLogicProgrammerBase(C container, Inventory playerInventory, Component title) {
         super(container, playerInventory, title);
@@ -270,10 +271,12 @@ protected boolean handleKeyCode(int keyCode, int scanCode) {
             if (ClientProxy.FOCUS_LP_SEARCH.isActiveAndMatches(inputCode)) {
                 // Focus search field
                 setSearchFieldFocussed(true);
+                swallowNextCharacter = true;
                 return true;
             } else if (isElementFocused && ClientProxy.FOCUS_LP_RENAME.isActiveAndMatches(inputCode) && hasLabeller()) {
                 // Open labeller gui
                 operatorInfoPattern.onButtonEditClick();
+                swallowNextCharacter = true;
                 return true;
             } else if (GLFW.GLFW_KEY_LEFT == keyCode && (!isElementFocused && isSearchFieldFocussed())) {
                 // Unfocus search field
@@ -311,6 +314,11 @@ protected boolean handleKeyCode(int keyCode, int scanCode) {
 
     @Override
     public boolean charTyped(char keyCode, int scanCode) {
+        if (swallowNextCharacter) {
+            swallowNextCharacter = false;
+            return true;
+        }
+
         return subGuiHolder.charTyped(keyCode, scanCode) || handleKeyCode(keyCode, scanCode) || super.charTyped(keyCode, scanCode);
     }