made Escape actually remove the key binding on key fields

also made empty key fields display None instead
also made the outline of key fields be yellow when selected

Author: XTerPL

src/main/java/io/github/techstreet/dfscript/screen/CScreen.java

@@ -114,4 +114,15 @@ public double translateMouseY(double mouseY) {
         mouseY += height/2f;
         return mouseY;
     }
+
+    @Override
+    public boolean shouldCloseOnEsc() {
+        for(CWidget widget : widgets) {
+            if(!widget.enableClosingOnEsc()) {
+                return false;
+            }
+        }
+
+        return super.shouldCloseOnEsc();
+    }
 }

src/main/java/io/github/techstreet/dfscript/screen/widget/CKeyField.java

@@ -2,6 +2,7 @@
 
 import io.github.techstreet.dfscript.DFScript;
 import io.github.techstreet.dfscript.util.RenderUtil;
+import io.github.techstreet.dfscript.util.chat.ChatUtil;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawableHelper;
 import net.minecraft.client.util.InputUtil;
@@ -16,6 +17,8 @@ public class CKeyField implements CWidget {
 
     boolean selected;
     boolean editable;
+
+    boolean blockEsc = false;
     public int textColor = 0xFFFFFFFF;
     InputUtil.Key key;
     Runnable changedListener;
@@ -38,7 +41,14 @@ public void render(MatrixStack stack, int mouseX, int mouseY, float tickDelta) {
         stack.push();
         stack.translate(x, y, 0);
 
-        DrawableHelper.fill(stack, 0, 0, width, height, 0xFF888888);
+        int outlineColor = 0xFF888888;
+
+        if(editable && selected)
+        {
+            outlineColor = 0xFFFFFF00;
+        }
+
+        DrawableHelper.fill(stack, 0, 0, width, height, outlineColor);
         DrawableHelper.fill(stack, 1, 1, width - 1, height - 1, 0xFF000000);
 
         Vector4f begin = new Vector4f(0, 0, 1, 1);
@@ -61,12 +71,16 @@ public void render(MatrixStack stack, int mouseX, int mouseY, float tickDelta) {
 
         stack.push();
 
-        String line = null;
+        String line;
         int color = textColor;
 
         if(key != null) {
             line = key.getLocalizedText().getString();
         }
+        else
+        {
+            line = "None";
+        }
 
         if(editable && selected) {
             color = 0xFFFF00;
@@ -89,23 +103,26 @@ public boolean mouseClicked(double x, double y, int button) {
             if (button == 0) {
                 if (x >= this.x && x <= this.x + this.width && y >= this.y && y <= this.y + this.height) {
                     this.selected = true;
+                    blockEsc = true;
                 }
                 else {
                     this.selected = false;
+                    blockEsc = false;
                 }
             }
         }
         else {
             this.selected = false;
+            blockEsc = false;
         }
         return false;
     }
 
     @Override
-    public void keyPressed(int keyCode, int scanCode, int modifiers) { // wth github is having a seizure and is forcing me to make this comment what
+    public void keyPressed(int keyCode, int scanCode, int modifiers) {
         if(editable && selected) {
             if(keyCode != -1) {
-                if(keyCode == 10) {
+                if(keyCode == 256) {
                     key = null;
                 }
                 else
@@ -117,6 +134,10 @@ public void keyPressed(int keyCode, int scanCode, int modifiers) { // wth github
             }
 
             selected = false;
+            blockEsc = true;
+        }
+        else {
+            blockEsc = false;
         }
     }
 
@@ -136,5 +157,9 @@ public InputUtil.Key getKey() {
     public void setKey(InputUtil.Key k) {
         key = k;
     }
-}
 
+    @Override
+    public boolean enableClosingOnEsc() {
+        return !blockEsc;
+    }
+}

src/main/java/io/github/techstreet/dfscript/screen/widget/CPlainPanel.java

@@ -110,4 +110,15 @@ public CWidget[] getChildren() {
         return children.toArray(new CWidget[0]);
     }
 
+    @Override
+    public boolean enableClosingOnEsc() {
+        for(CWidget widget : children) {
+            if(!widget.enableClosingOnEsc())
+            {
+                return false;
+            }
+        }
+
+        return CWidget.super.enableClosingOnEsc();
+    }
 }

src/main/java/io/github/techstreet/dfscript/screen/widget/CScrollPanel.java

@@ -157,4 +157,16 @@ public void setScroll(int s) {
     public void remove(CWidget w) {
         children.remove(w);
     }
+
+    @Override
+    public boolean enableClosingOnEsc() {
+        for(CWidget widget : children) {
+            if(!widget.enableClosingOnEsc())
+            {
+                return false;
+            }
+        }
+
+        return CWidget.super.enableClosingOnEsc();
+    }
 }

src/main/java/io/github/techstreet/dfscript/screen/widget/CWidget.java

@@ -25,4 +25,8 @@ default void renderOverlay(MatrixStack stack, int mouseX, int mouseY, float tick
     }
 
     Rectangle getBounds();
+
+    default boolean enableClosingOnEsc(){
+        return true;
+    }
 }