From a016795056409da4feff48d65b0215474e6d7130 Mon Sep 17 00:00:00 2001
From: D-Cysteine <54219287+D-Cysteine@users.noreply.github.com>
Date: Sat, 14 Aug 2021 13:42:11 -0600
Subject: [PATCH] Always show quantity text box (#150)

---
 src/codechicken/nei/ItemPanel.java            | 9 +--------
 src/codechicken/nei/ItemQuantityField.java    | 2 +-
 src/codechicken/nei/LayoutManager.java        | 8 +++-----
 src/codechicken/nei/TextField.java            | 3 ++-
 src/codechicken/nei/ThreadOperationTimer.java | 7 +++++--
 5 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/codechicken/nei/ItemPanel.java b/src/codechicken/nei/ItemPanel.java
index 5f6e5807..0332caac 100644
--- a/src/codechicken/nei/ItemPanel.java
+++ b/src/codechicken/nei/ItemPanel.java
@@ -136,14 +136,7 @@ public class ItemPanel extends Widget {
     }
 
     public int getHeight(GuiContainer gui) {
-        return gui.height - 15 - y + getHightAdjustment();
-    }
-
-    public int getHightAdjustment() {
-        int hAdj = 0;
-        if (!canPerformAction("item"))
-            hAdj += 15;
-        return hAdj;
+        return gui.height - 15 - y;
     }
 
     public int getWidth(GuiContainer gui) {
diff --git a/src/codechicken/nei/ItemQuantityField.java b/src/codechicken/nei/ItemQuantityField.java
index 6ca23f69..2511589b 100644
--- a/src/codechicken/nei/ItemQuantityField.java
+++ b/src/codechicken/nei/ItemQuantityField.java
@@ -7,7 +7,7 @@ public class ItemQuantityField extends TextField
         centered = true;
     }
 
-    // Find a way to work this this back in
+    // Find a way to work this back in
     public boolean isValid(String string) {
         if (string.equals(""))
             return true;
diff --git a/src/codechicken/nei/LayoutManager.java b/src/codechicken/nei/LayoutManager.java
index 969d9bf7..e9d4cb82 100644
--- a/src/codechicken/nei/LayoutManager.java
+++ b/src/codechicken/nei/LayoutManager.java
@@ -673,11 +673,9 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
             addWidget(itemPanel);
             itemPanel.setVisible();
 
-            if (canPerformAction("item")) {
-                addWidget(more);
-                addWidget(less);
-                addWidget(quantity);
-            }
+            addWidget(more);
+            addWidget(less);
+            addWidget(quantity);
         }
 
         if (visiblity.showBookmarkPanel) {
diff --git a/src/codechicken/nei/TextField.java b/src/codechicken/nei/TextField.java
index 8a4193ed..0b7bf494 100644
--- a/src/codechicken/nei/TextField.java
+++ b/src/codechicken/nei/TextField.java
@@ -79,6 +79,7 @@ public abstract class TextField extends Widget
         if (!focused())
             return false;
 
+        String oldText = text();
         boolean handled = field.textboxKeyTyped(keyChar, keyID);
         if(!handled) {
             if (keyID == Keyboard.KEY_RETURN || keyID == Keyboard.KEY_NUMPADENTER || keyID == Keyboard.KEY_ESCAPE) {
@@ -88,7 +89,7 @@ public abstract class TextField extends Widget
         }
 
         if(handled) {
-            onTextChange(text());
+            onTextChange(oldText);
         }
 
         return handled;
diff --git a/src/codechicken/nei/ThreadOperationTimer.java b/src/codechicken/nei/ThreadOperationTimer.java
index 1aa85125..02fe89bb 100644
--- a/src/codechicken/nei/ThreadOperationTimer.java
+++ b/src/codechicken/nei/ThreadOperationTimer.java
@@ -55,8 +55,11 @@ public class ThreadOperationTimer extends Thread
 
         while (thread.isAlive()) {
             synchronized (this) {
-                if (operation != null && System.currentTimeMillis() - opTime > limit)
-                    thread.stop(new TimeoutException("Operation took too long", operation));
+                if (operation != null && System.currentTimeMillis() - opTime > limit) {
+                    // Thread.stop(Throwable) is hard-deprecated and IntelliJ complains about it.
+                    //thread.stop(new TimeoutException("Operation took too long", operation));
+                    thread.stop();
+                }
             }
             try {
                 Thread.sleep(50);