Merge pull request #31 from XTerPL/Refactor

A Heavy Refactor (I didn't test anything (grog))

Author: GeorgeRNG

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

@@ -0,0 +1,41 @@
+package io.github.techstreet.dfscript.screen;
+
+import io.github.techstreet.dfscript.DFScript;
+import io.github.techstreet.dfscript.screen.script.ScriptEditScreen;
+
+public class ContextMenuButton {
+    String name;
+    Runnable onClick;
+
+    boolean reloadOnClick;
+
+    public ContextMenuButton(String name, Runnable onClick) {
+        this.name = name;
+        this.onClick = onClick;
+        this.reloadOnClick = true;
+    }
+
+    public ContextMenuButton(String name, Runnable onClick, boolean reloadOnClick) {
+        this.name = name;
+        this.onClick = onClick;
+        this.reloadOnClick = reloadOnClick;
+    }
+
+    public Runnable getOnClick() {
+        if(reloadOnClick) {
+            return () -> {
+                onClick.run();
+                if(DFScript.MC.currentScreen instanceof ScriptEditScreen editScreen)
+                {
+                    editScreen.reload();
+                }
+            };
+        }
+
+        return onClick;
+    }
+
+    public String getName() {
+        return name;
+    }
+}

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

@@ -5,6 +5,8 @@
 import io.github.techstreet.dfscript.screen.widget.CItem;
 import io.github.techstreet.dfscript.screen.widget.CTextField;
 import io.github.techstreet.dfscript.script.Script;
+import io.github.techstreet.dfscript.script.ScriptParametrizedPart;
+import io.github.techstreet.dfscript.script.ScriptPart;
 import io.github.techstreet.dfscript.script.action.ScriptAction;
 import io.github.techstreet.dfscript.script.argument.ScriptNumberArgument;
 import io.github.techstreet.dfscript.script.argument.ScriptTextArgument;
@@ -17,12 +19,12 @@
 public class ScriptAddArgumentScreen extends CScreen {
 
     private final Script script;
-    private final ScriptAction action;
+    private final ScriptParametrizedPart action;
 
-    public ScriptAddArgumentScreen(Script script, ScriptAction action, int index) {
+    public ScriptAddArgumentScreen(Script script, ScriptParametrizedPart action, int index) {
         this(script,action,index,null);
     }
-    public ScriptAddArgumentScreen(Script script, ScriptAction action, int index, String overwrite) {
+    public ScriptAddArgumentScreen(Script script, ScriptParametrizedPart action, int index, String overwrite) {
         super(100, 50);
         this.script = script;
         this.action = action;
@@ -62,15 +64,15 @@ public ScriptAddArgumentScreen(Script script, ScriptAction action, int index, St
         addText.setClickListener((btn) -> {
             if(overwrite != null) action.getArguments().remove(index);
             action.getArguments().add(index, new ScriptTextArgument(input.getText()));
-            DFScript.MC.setScreen(new ScriptEditActionScreen(action, script));
+            DFScript.MC.setScreen(new ScriptEditPartScreen(action, script));
         });
 
         addNumber.setClickListener((btn) -> {
             try {
                 double number = Double.parseDouble(input.getText());
                 if(overwrite != null) action.getArguments().remove(index);
                 action.getArguments().add(index, new ScriptNumberArgument(number));
-                DFScript.MC.setScreen(new ScriptEditActionScreen(action, script));
+                DFScript.MC.setScreen(new ScriptEditPartScreen(action, script));
             } catch (Exception err) {
                 input.textColor = 0xFF3333;
             }
@@ -79,7 +81,7 @@ public ScriptAddArgumentScreen(Script script, ScriptAction action, int index, St
         addVariable.setClickListener((btn) -> {
             if(overwrite != null) action.getArguments().remove(index);
             action.getArguments().add(index, new ScriptVariableArgument(input.getText()));
-            DFScript.MC.setScreen(new ScriptEditActionScreen(action, script));
+            DFScript.MC.setScreen(new ScriptEditPartScreen(action, script));
         });
 
         addClientValue.setClickListener((btn) -> {
@@ -100,6 +102,6 @@ public ScriptAddArgumentScreen(Script script, ScriptAction action, int index, St
 
     @Override
     public void close() {
-        DFScript.MC.setScreen(new ScriptEditActionScreen(action, script));
+        DFScript.MC.setScreen(new ScriptEditPartScreen(action, script));
     }
 }

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

@@ -4,17 +4,19 @@
 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.ScriptParametrizedPart;
+import io.github.techstreet.dfscript.script.ScriptPart;
 import io.github.techstreet.dfscript.script.action.ScriptAction;
 import io.github.techstreet.dfscript.script.argument.ScriptClientValueArgument;
 
 public class ScriptAddClientValueScreen extends CScreen {
 
     private final Script script;
-    private final ScriptAction action;
+    private final ScriptParametrizedPart action;
     private final int insertIndex;
     private static final int WIDTH = 58;
 
-    public ScriptAddClientValueScreen(ScriptAction action, Script script, int insertIndex, String overwrite) {
+    public ScriptAddClientValueScreen(ScriptParametrizedPart action, Script script, int insertIndex, String overwrite) {
         super(WIDTH, 58);
         this.script = script;
         this.action = action;
@@ -27,7 +29,7 @@ public ScriptAddClientValueScreen(ScriptAction action, Script script, int insert
             item.setClickListener((btn) -> {
                 if(overwrite != null) action.getArguments().remove(insertIndex);
                 action.getArguments().add(insertIndex, arg);
-                DFScript.MC.setScreen(new ScriptEditActionScreen(action, script));
+                DFScript.MC.setScreen(new ScriptEditPartScreen(action, script));
             });
             widgets.add(item);
             x += 10;

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

@@ -5,19 +5,21 @@
 import io.github.techstreet.dfscript.screen.widget.CItem;
 import io.github.techstreet.dfscript.screen.widget.CScrollPanel;
 import io.github.techstreet.dfscript.script.Script;
+import io.github.techstreet.dfscript.script.ScriptParametrizedPart;
+import io.github.techstreet.dfscript.script.ScriptPart;
 import io.github.techstreet.dfscript.script.action.ScriptAction;
 import io.github.techstreet.dfscript.script.argument.ScriptConfigArgument;
 import io.github.techstreet.dfscript.script.options.ScriptNamedOption;
 
 public class ScriptAddConfigValueScreen extends CScreen {
     private final Script script;
-    private final ScriptAction action;
+    private final ScriptParametrizedPart action;
     private final int insertIndex;
 
     private static int WIDTH = 200;
     private static int HEIGHT = 94;
 
-    public ScriptAddConfigValueScreen(ScriptAction action, Script script, int insertIndex, String overwrite) {
+    public ScriptAddConfigValueScreen(ScriptParametrizedPart action, Script script, int insertIndex, String overwrite) {
         super(WIDTH, HEIGHT);
         this.script = script;
         this.action = action;
@@ -32,7 +34,7 @@ public ScriptAddConfigValueScreen(ScriptAction action, Script script, int insert
             CItem item = new CItem(x, y, arg.getIcon());
             item.setClickListener((btn) -> {
                 this.action.getArguments().add(insertIndex, new ScriptConfigArgument(arg.getName(), this.script));
-                DFScript.MC.setScreen(new ScriptEditActionScreen(this.action, this.script));
+                DFScript.MC.setScreen(new ScriptEditPartScreen(this.action, this.script));
             });
             panel.add(item);
             x += 10;

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

@@ -0,0 +1,64 @@
+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.action.ScriptAction;
+import io.github.techstreet.dfscript.script.action.ScriptActionCategory;
+import io.github.techstreet.dfscript.script.action.ScriptActionCategoryExtra;
+import io.github.techstreet.dfscript.script.action.ScriptActionType;
+import io.github.techstreet.dfscript.script.event.ScriptEvent;
+import io.github.techstreet.dfscript.script.event.ScriptEventType;
+import io.github.techstreet.dfscript.script.event.ScriptHeaderCategory;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ScriptAddHeaderScreen extends CScreen {
+
+    private final Script script;
+    private final int insertIndex;
+
+    public ScriptAddHeaderScreen(Script script, int insertIndex, ScriptHeaderCategory category) {
+        super(size(category), size(category));
+        int size = size(category);
+        this.script = script;
+        this.insertIndex = insertIndex;
+
+        int x = 3;
+        int y = 3;
+
+        for (ScriptEventType type : ScriptEventType.values()) {
+            //if (type.getCategory() != category) continue;
+
+            CItem item = new CItem(x, y, type.getIcon());
+            item.setClickListener((btn) -> {
+                ScriptEvent event = new ScriptEvent(type);
+                script.getHeaders().add(insertIndex, event);
+                DFScript.MC.setScreen(new ScriptEditScreen(script));
+            });
+            widgets.add(item);
+            x += 10;
+            if (x >= size-10) {
+                x = 3;
+                y += 10;
+            }
+        }
+    }
+
+    private static int size(ScriptHeaderCategory category) {
+        int amount = 0;
+        for (ScriptEventType type : ScriptEventType.values()) {
+            //if (type.getCategory() != category) continue;
+
+            amount++;
+        }
+        return (int) (Math.ceil(Math.sqrt(amount))*10)+4;
+    }
+
+    @Override
+    public void close() {
+        DFScript.MC.setScreen(new ScriptHeaderCategoryScreen(script, insertIndex));
+    }
+}