Futher work on script configuration

Added a way to add options
Also fixed multiple text fields in a screen all responding to user input

Author: XTerPL

src/main/java/io/github/techstreet/dfscript/screen/script/ScriptAddSettingScreen.java

@@ -0,0 +1,53 @@
+package io.github.techstreet.dfscript.screen.script;
+
+import io.github.techstreet.dfscript.DFScript;
+import io.github.techstreet.dfscript.screen.CScreen;
+import io.github.techstreet.dfscript.screen.widget.CItem;
+import io.github.techstreet.dfscript.script.Script;
+import io.github.techstreet.dfscript.script.options.ScriptOptionEnum;
+import io.github.techstreet.dfscript.util.chat.ChatUtil;
+public class ScriptAddSettingScreen extends CScreen {
+    private static final int size;
+
+    static {
+        size = (int) (Math.ceil(Math.sqrt(ScriptOptionEnum.values().length)) * 10)+4;
+    }
+
+    private final Script script;
+
+    public ScriptAddSettingScreen(Script script, int pos) {
+        super(size, size);
+        this.script = script;
+
+        int x = 3;
+        int y = 3;
+
+        for(ScriptOptionEnum option : ScriptOptionEnum.values())
+        {
+            CItem citem = new CItem(x, y, option.getIcon());
+
+            citem.setClickListener((a) -> {
+                try {
+                    script.addOption(pos, option.getOptionType().getConstructor().newInstance());
+                } catch (Exception e) {
+                    ChatUtil.error(String.valueOf(e.getCause()));
+                }
+
+                DFScript.MC.setScreen(new ScriptSettingsScreen(script));
+            });
+
+            widgets.add(citem);
+
+            x += 10;
+            if (x >= size - 10) {
+                x = 3;
+                y += 10;
+            }
+        }
+    }
+
+    @Override
+    public void close() {
+        DFScript.MC.setScreen(new ScriptSettingsScreen(script));
+    }
+}

src/main/java/io/github/techstreet/dfscript/screen/script/ScriptSettingsScreen.java

@@ -2,6 +2,7 @@
 
 import io.github.techstreet.dfscript.DFScript;
 import io.github.techstreet.dfscript.screen.CScreen;
+import io.github.techstreet.dfscript.screen.widget.CButton;
 import io.github.techstreet.dfscript.screen.widget.CScrollPanel;
 import io.github.techstreet.dfscript.screen.widget.CTextField;
 import io.github.techstreet.dfscript.screen.widget.CWidget;
@@ -42,6 +43,12 @@ public ScriptSettingsScreen(Script script) {
             index++;
         }
 
+        CButton add = new CButton(37, y, 46, 8, "Add", () -> {
+            DFScript.MC.setScreen(new ScriptAddSettingScreen(script, script.getOptions().size()));
+        });
+
+        panel.add(add);
+
         panel.setScroll(scroll);
     }
 

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

@@ -12,6 +12,8 @@
 public class CTextField implements CWidget {
 
     final int x, y, width, height;
+
+    boolean selected;
     boolean editable;
     public int textColor = 0xFFFFFFFF;
     String text;
@@ -28,6 +30,7 @@ public CTextField(String text, int x, int y, int width, int height, boolean edit
         this.width = width;
         this.height = height;
         this.editable = editable;
+        this.selected = false;
     }
 
     @Override
@@ -91,7 +94,7 @@ public void render(MatrixStack stack, int mouseX, int mouseY, float tickDelta) {
         }
         stack.pop();
 
-        if (editable) {
+        if (editable && selected) {
             int cursorLine = getCursorLineIndex();
             int cursorLinePos = getIndexInCursorLine();
 
@@ -111,7 +114,7 @@ public void charTyped(char ch, int keyCode) {
             return;
         }
 
-        if (editable) {
+        if (editable && selected) {
             if (hasSelection) {
                 int selectionStart = Math.min(selectionPos, cursorPos);
                 int selectionEnd = Math.max(selectionPos, cursorPos);
@@ -128,7 +131,7 @@ public void charTyped(char ch, int keyCode) {
 
     @Override
     public void keyPressed(int keyCode, int scanCode, int modifiers) {
-        if (editable) {
+        if (editable && selected) {
             String lastText = text;
             TextRenderer f = DFScript.MC.textRenderer;
             boolean createSelection = modifiers != 0;
@@ -258,6 +261,7 @@ public boolean mouseClicked(double x, double y, int button) {
         if (editable) {
             if (button == 0) {
                 if (x >= this.x && x <= this.x + this.width && y >= this.y && y <= this.y + this.height) {
+                    this.selected = true;
                     TextRenderer f = DFScript.MC.textRenderer;
 
                     x -= 1 + this.x;
@@ -275,16 +279,24 @@ public boolean mouseClicked(double x, double y, int button) {
                     if (hasSelection) {
                         hasSelection = false;
                     }
-                    return true;
+                    //return true;
+                }
+                else
+                {
+                    this.selected = false;
                 }
             }
         }
+        else
+        {
+            this.selected = false;
+        }
         return false;
     }
 
     @Override
     public void mouseScrolled(double mouseX, double mouseY, double amount) {
-        if (editable) {
+        if (editable && selected) {
             scroll += amount * 5;
             TextRenderer f = DFScript.MC.textRenderer;
             scroll = Math.min(0, Math.max(scroll, -(getLines().length + 1) * f.fontHeight / 2 + height - 2));

src/main/java/io/github/techstreet/dfscript/script/Script.java

@@ -266,6 +266,10 @@ public List<ScriptOption> getOptions() {
         return options;
     }
 
+    public void addOption(int pos, ScriptOption option) {
+        options.add(pos, option);
+    }
+
     public static class Serializer implements JsonSerializer<Script>, JsonDeserializer<Script> {
         @Override
         public Script deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {

src/main/java/io/github/techstreet/dfscript/script/options/ScriptOptionEnum.java

@@ -0,0 +1,52 @@
+package io.github.techstreet.dfscript.script.options;
+
+import io.github.techstreet.dfscript.script.Script;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
+import net.minecraft.nbt.NbtElement;
+import net.minecraft.nbt.NbtList;
+import net.minecraft.nbt.NbtString;
+import net.minecraft.text.Style;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
+
+import java.util.function.BiConsumer;
+
+public enum ScriptOptionEnum {
+    TEXT("Text Option", "A single option, no checks.", Items.BOOK, ScriptTextOption.class);
+
+    String name;
+    String description;
+    Item icon;
+    Class<? extends ScriptOption> optionType;
+
+    ScriptOptionEnum(String name, String description, Item icon, Class<? extends ScriptOption> optionType) {
+        this.name = name;
+        this.description = description;
+        this.icon = icon;
+        this.optionType = optionType;
+    }
+
+    public ItemStack getIcon()
+    {
+        ItemStack item = new ItemStack(icon);
+
+        item.setCustomName(Text.literal(name).fillStyle(Style.EMPTY.withColor(Formatting.WHITE).withItalic(false)));
+
+        NbtList lore = new NbtList();
+
+        lore.add(NbtString.of(Text.Serializer.toJson(Text.literal(description)
+                .fillStyle(Style.EMPTY.withColor(Formatting.GRAY).withItalic(false))
+        )));
+
+        item.getSubNbt("display")
+                .put("Lore", lore);
+
+        return item;
+    }
+
+    public Class<? extends ScriptOption> getOptionType() {
+        return optionType;
+    }
+}