You can now rename options by left clicking the name.

XTerPL · XTerPL · commit fdfd80dd9b64 · 2022-09-05T23:57:37.000+02:00
Also separated the name property from the ScriptOption into ScriptNamedOption
diff --git a/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptAddSettingScreen.java b/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptAddSettingScreen.java
@@ -4,6 +4,7 @@
 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.ScriptNamedOption;
 import io.github.techstreet.dfscript.script.options.ScriptOptionEnum;
 import io.github.techstreet.dfscript.util.chat.ChatUtil;
 public class ScriptAddSettingScreen extends CScreen {
@@ -28,7 +29,7 @@ public ScriptAddSettingScreen(Script script, int pos) {
 
             citem.setClickListener((a) -> {
                 try {
-                    script.addOption(pos, option.getOptionType().getConstructor().newInstance());
+                    script.addOption(pos, new ScriptNamedOption(option.getOptionType().getConstructor().newInstance(), script.getUnnamedOption()));
                 } catch (Exception e) {
                     ChatUtil.error(String.valueOf(e.getCause()));
                 }
diff --git a/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptEditSettingScreen.java b/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptEditSettingScreen.java
@@ -0,0 +1,47 @@
+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.CButton;
+import io.github.techstreet.dfscript.screen.widget.CTextField;
+import io.github.techstreet.dfscript.script.Script;
+import io.github.techstreet.dfscript.script.options.ScriptNamedOption;
+
+public class ScriptEditSettingScreen extends CScreen {
+    private final Script script;
+    private final ScriptNamedOption option;
+
+    public ScriptEditSettingScreen(Script script, ScriptNamedOption o) {
+        super(100, 50);
+        this.script = script;
+        option = o;
+
+        CTextField input = new CTextField(option.getName(), 2, 2, 96, 35, true);
+
+        input.setChangedListener(() -> input.textColor = 0xFFFFFF);
+
+        CButton confirm = new CButton(0, 35, 50, 15, "Confirm Rename", () -> {
+            if(option.getName() != input.getText()) {
+                if(script.optionExists(input.getText())) {
+                    input.textColor = 0xFF3333;
+                } else {
+                    option.setName(input.getText());
+                    close();
+                }
+            } else {
+                close();
+            }
+        });
+
+        CButton cancel = new CButton(50, 35, 50, 15, "Cancel", this::close);
+
+        widgets.add(input);
+        widgets.add(confirm);
+        widgets.add(cancel);
+    }
+
+    @Override
+    public void close() {
+        DFScript.MC.setScreen(new ScriptSettingsScreen(script));
+    }
+}
diff --git a/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptSettingsScreen.java b/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptSettingsScreen.java
@@ -6,6 +6,7 @@
 import io.github.techstreet.dfscript.script.Script;
 import io.github.techstreet.dfscript.script.ScriptManager;
 import io.github.techstreet.dfscript.script.action.ScriptActionType;
+import io.github.techstreet.dfscript.script.options.ScriptNamedOption;
 import io.github.techstreet.dfscript.script.options.ScriptOption;
 import io.github.techstreet.dfscript.util.chat.ChatUtil;
 import net.minecraft.client.gui.DrawableHelper;
@@ -48,9 +49,9 @@ public ScriptSettingsScreen(Script script) {
 
         y += 22;
 
-        for(ScriptOption option : script.getOptions())
+        for(ScriptNamedOption option : script.getOptions())
         {
-            String name = option.getName() + ":";
+            String name = option.getFullName();
 
             Text text = Text.of(name);
 
@@ -95,6 +96,10 @@ public boolean mouseClicked(double x, double y, int button) {
                                 contextMenu.add(delete);
                             });
                         }
+                        else
+                        {
+                            DFScript.MC.setScreen(new ScriptEditSettingScreen(script, option));
+                        }
                         return true;
                     }
                     return false;
@@ -104,7 +109,7 @@ public boolean mouseClicked(double x, double y, int button) {
             y += height;
             y++;
 
-            y = option.create(panel, 5, y, 105);
+            y = option.create(panel, 5, y);
 
             index++;
         }
diff --git a/src/main/java/io/github/techstreet/dfscript/script/Script.java b/src/main/java/io/github/techstreet/dfscript/script/Script.java
@@ -12,18 +12,22 @@
 import io.github.techstreet.dfscript.event.system.Event;
 import io.github.techstreet.dfscript.script.action.ScriptAction;
 import io.github.techstreet.dfscript.script.action.ScriptActionType;
+import io.github.techstreet.dfscript.script.options.ScriptNamedOption;
 import io.github.techstreet.dfscript.script.options.ScriptOption;
 import io.github.techstreet.dfscript.script.event.ScriptEvent;
 import io.github.techstreet.dfscript.script.execution.ScriptContext;
 import io.github.techstreet.dfscript.script.execution.ScriptPosStack;
 import io.github.techstreet.dfscript.script.execution.ScriptScopeVariables;
 import io.github.techstreet.dfscript.script.execution.ScriptTask;
+import io.github.techstreet.dfscript.script.values.ScriptUnknownValue;
+import io.github.techstreet.dfscript.script.values.ScriptValue;
 import io.github.techstreet.dfscript.util.chat.ChatType;
 import io.github.techstreet.dfscript.util.chat.ChatUtil;
 import java.io.File;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.function.Consumer;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -38,7 +42,7 @@ public class Script {
     private String server;
     private final List<ScriptPart> parts;
 
-    private final List<ScriptOption> options;
+    private final List<ScriptNamedOption> options;
     private final Logger LOGGER;
     private final ScriptContext context = new ScriptContext();
     private File file;
@@ -262,14 +266,47 @@ public void replaceAction(ScriptActionType oldAction, ScriptActionType newAction
         }
     }
 
-    public List<ScriptOption> getOptions() {
+    public List<ScriptNamedOption> getOptions() {
         return options;
     }
 
-    public void addOption(int pos, ScriptOption option) {
+    public void addOption(int pos, ScriptNamedOption option) {
         options.add(pos, option);
     }
 
+    public boolean optionExists(String option) {
+        for(ScriptNamedOption o : getOptions())
+        {
+            if(Objects.equals(o.getName(), option)) return true;
+        }
+
+        return false;
+    }
+
+    public ScriptValue getOption(String option) {
+        for(ScriptNamedOption o : getOptions())
+        {
+            if(Objects.equals(o.getName(), option)) return o.getValue();
+        }
+
+        return new ScriptUnknownValue();
+    }
+
+    public String getUnnamedOption() {
+        for(int i = 1; ; i++) {
+
+            String name = "Option";
+
+            if(i != 1) {
+                name = name + " " + i;
+            }
+
+            if(!optionExists(name)) {
+                return name;
+            }
+        }
+    }
+
     public static class Serializer implements JsonSerializer<Script>, JsonDeserializer<Script> {
         @Override
         public Script deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
diff --git a/src/main/java/io/github/techstreet/dfscript/script/options/ScriptNamedOption.java b/src/main/java/io/github/techstreet/dfscript/script/options/ScriptNamedOption.java
@@ -0,0 +1,34 @@
+package io.github.techstreet.dfscript.script.options;
+
+import io.github.techstreet.dfscript.screen.widget.CScrollPanel;
+import io.github.techstreet.dfscript.script.values.ScriptValue;
+
+public class ScriptNamedOption {
+    String name;
+    ScriptOption option;
+
+    public ScriptNamedOption(ScriptOption option, String name) {
+        this.name = name;
+        this.option = option;
+    }
+
+    public String getFullName() {
+        return getName() + " (" + option.getName() + "):";
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public ScriptValue getValue() {
+        return option.getValue();
+    }
+
+    public int create(CScrollPanel panel, int x, int y) {
+        return option.create(panel, x, y, 105);
+    }
+
+    public void setName(String text) {
+        name = text;
+    }
+}
diff --git a/src/main/java/io/github/techstreet/dfscript/script/options/ScriptOption.java b/src/main/java/io/github/techstreet/dfscript/script/options/ScriptOption.java
@@ -5,8 +5,6 @@
 import net.minecraft.text.Text;
 
 public interface ScriptOption {
-    String name = "Default Config Option Name";
-
     ScriptValue getValue();
 
     String getName();
diff --git a/src/main/java/io/github/techstreet/dfscript/script/options/ScriptTextOption.java b/src/main/java/io/github/techstreet/dfscript/script/options/ScriptTextOption.java
@@ -15,7 +15,7 @@ public ScriptValue getValue() {
     }
 
     @Override
-    public String getName() { return name; }
+    public String getName() { return "Text"; }
 
     @Override
     public int create(CScrollPanel panel, int x, int y, int width) {

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public ScriptValue getValue() {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`@Override`
`18`		`- public String getName() { return name; }`
	`18`	`+ public String getName() { return "Text"; }`
`19`	`19`
`20`	`20`	`@Override`
`21`	`21`	`public int create(CScrollPanel panel, int x, int y, int width) {`