Merge pull request #3 from GTNewHorizons/new_features

Fixes and stuff
GTNewHorizons · Jan 2, 2020 · 9ed2314 · 9ed2314
2 parents 3a95518 + 9359df3
commit 9ed2314
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 9 deletions.
diff --git a/build/build.properties b/build/build.properties
@@ -2,4 +2,4 @@ mc_version=1.7.10
 forge_version=10.13.4.1614-1.7.10
 ccl_version=1.1.3.138
 ccc_version=1.0.7.+
-mod_version=2.0.0-pre-8-GTNH
+mod_version=2.0.0-pre-9-GTNH
diff --git a/src/codechicken/nei/TextField.java b/src/codechicken/nei/TextField.java
@@ -6,7 +6,7 @@
 
 public abstract class TextField extends Widget
 {
-    protected final GuiTextField field;
+    protected GuiTextField field;
 
     private static final int maxSearchLength = 256;
 
@@ -15,27 +15,45 @@ public abstract class TextField extends Widget
 
     private boolean previousKeyboardRepeatEnabled;
 
-    public TextField(String ident) {
-        identifier = ident;
+    protected void initInternalTextField() {
         field = new GuiTextField(Minecraft.getMinecraft().fontRenderer, 0, 0, 0, 0);
         field.setMaxStringLength(maxSearchLength);
         field.setCursorPositionZero();
+    }
+
+    public TextField(String ident) {
+        identifier = ident;
+        initInternalTextField();
 //        Keyboard.enableRepeatEvents(true);
     }
 
     public int getTextColour() {
         return focused() ? 0xFFE0E0E0 : 0xFF909090;
     }
 
-    @Override
-    public void draw(int mousex, int mousey) {
+    protected void setDimensionsAndColor() {
         field.xPosition = this.x + 2;
         field.yPosition = this.y + 2;
         field.width = this.w - 4;
         field.height = this.h - 4;
         field.setTextColor(getTextColour());
+    }
 
-        field.drawTextBox();
+    @Override
+    public void draw(int mousex, int mousey) {
+        try {
+            setDimensionsAndColor();
+            field.drawTextBox();
+        } catch(NullPointerException npe) {
+            // Hack to deal with a null font renderer... recreate the field and it should work
+            GuiTextField oldField = field;
+
+            initInternalTextField();
+            setDimensionsAndColor();
+
+            field.setText(oldField.getText());
+            field.drawTextBox();
+        }
     }
 
     @Override

diff --git a/src/codechicken/nei/config/OptionTextField.java b/src/codechicken/nei/config/OptionTextField.java
@@ -12,9 +12,8 @@
 public class OptionTextField extends Option
 {
     private boolean focused = false;
-    private final TextField textField = new TextField("")
+    private TextField textField = new TextField("test")
     {
-
         @Override
         public void onTextChange(String oldText) {
             if(focused() && isValidValue(text()))