Lots of bug fixes

Author: TechStreetDev

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

@@ -28,14 +28,14 @@ public class ScriptAddScreen extends CScreen {
     CTextField searchBox;
 
     public ScriptAddScreen() {
-        super(110, 106);
+        super(111, 106);
         open();
     }
 
     private void open() {
-        CPlainPanel root = new CPlainPanel(0, 0, 110, 106);
+        CPlainPanel root = new CPlainPanel(0, 0, 111, 106);
 
-        panel = new CScrollPanel(0, 0, 110, 106);
+        panel = new CScrollPanel(0, 17, 111, 84);
 
         root.add(panel);
 
@@ -99,8 +99,8 @@ public static String readAll(Reader rd) throws IOException {
     }
 
     private void fillPanel(List<VirtualScript> scriptList) {
-        int y = 35;
-        CButton newButton = new CButton(7, 23, 96, 10, "New Script", () -> {
+        int y = 18;
+        CButton newButton = new CButton(7, 6, 96, 10, "New Script", () -> {
             DFScript.MC.setScreen(new ScriptCreationScreen());
         });
 
@@ -119,6 +119,11 @@ private void fillPanel(List<VirtualScript> scriptList) {
         long minutes = (time % 3600) / 60;
         long seconds = time % 60;
 
-        panel.add(new CText(8, 17, Text.literal("Last update: " + minutes + "m " + seconds + "s" + " ago!")));
+        panel.add(new CText(8, 0, Text.literal("Last update: " + minutes + "m " + seconds + "s" + " ago!")));
+    }
+
+    @Override
+    public void close() {
+        DFScript.MC.setScreen(new ScriptListScreen());
     }
 }

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

@@ -35,7 +35,7 @@ protected ScriptCreationScreen() {
             }
 
             ScriptManager.getInstance().createScript(name.getText());
-            io.github.techstreet.dfscript.DFScript.MC.setScreen(new ScriptListScreen());
+            DFScript.MC.setScreen(new ScriptListScreen());
         }));
 
         widgets.add(new CButton(50, 42, 48, 15, "Cancel", () -> {

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

@@ -57,6 +57,7 @@ public ScriptEditActionScreen(ScriptAction action, Script script) {
             } else {
                 throw new IllegalArgumentException("Invalid argument type");
             }
+
             widgets.add(new CItem(5, y, icon));
             widgets.add(new CText(15, y + 2, Text.literal(text)));
 

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

@@ -2,11 +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.CItem;
-import io.github.techstreet.dfscript.screen.widget.CScrollPanel;
-import io.github.techstreet.dfscript.screen.widget.CText;
-import io.github.techstreet.dfscript.screen.widget.CWidget;
+import io.github.techstreet.dfscript.screen.widget.*;
 import io.github.techstreet.dfscript.script.Script;
 import io.github.techstreet.dfscript.script.ScriptManager;
 import io.github.techstreet.dfscript.script.ScriptPart;
@@ -33,9 +29,14 @@ public ScriptEditScreen(Script script) {
         super(125, 100);
         this.script = script;
         panel = new CScrollPanel(0, 3, 120, 94);
+
+        CTextField description = new CTextField(script.getDescription(), 3, 3, 115, 20, true);
+        description.setChangedListener(() -> script.setDescription(description.getText()));
+        panel.add(description);
+
         widgets.add(panel);
 
-        int y = 5;
+        int y = 25;
         int index = 0;
         int indent = 0;
         for (ScriptPart part : script.getParts()) {

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

@@ -5,10 +5,12 @@
 import io.github.techstreet.dfscript.screen.widget.CButton;
 import io.github.techstreet.dfscript.screen.widget.CText;
 import io.github.techstreet.dfscript.screen.widget.CTextField;
+import io.github.techstreet.dfscript.script.Script;
 import io.github.techstreet.dfscript.script.ScriptManager;
 import io.github.techstreet.dfscript.script.VirtualScript;
 import net.minecraft.text.Text;
 
+import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -18,17 +20,34 @@ protected ScriptInstallScreen(VirtualScript script) {
         super(125, 40);
 
         CText name = new CText(5, 5, Text.literal("Name: " + script.getName()));
-        CText owner = new CText(5, 12, Text.literal("Owner: " + script.getOwner()));
+        CText owner = new CText(5, 12, Text.literal("Creator: " + script.getOwner()));
         CText id = new CText(5, 19, Text.literal("ID: " + script.getId()));
 
         widgets.add(name);
         widgets.add(owner);
         widgets.add(id);
 
-        widgets.add(new CButton(80, 26, 40, 10, "Install", () -> {
-            script.download();
-            DFScript.MC.setScreen(new ScriptListScreen());
-        }));
+        if (DFScript.MC.player != null) {
+            for (Script s : ScriptManager.getInstance().getScripts()) {
+                if (Objects.equals(s.getServer(), script.getId())) {
+                    if (Objects.equals(s.getOwner(), script.getOwner())) {
+                        return;
+                    }
+
+                    widgets.add(new CButton(80, 26, 40, 10, "Update", () -> {
+                        script.download(true);
+                        DFScript.MC.setScreen(new ScriptListScreen());
+                    }));
+
+                    return;
+                }
+            }
+
+            widgets.add(new CButton(80, 26, 40, 10, "Install", () -> {
+                script.download(false);
+                DFScript.MC.setScreen(new ScriptListScreen());
+            }));
+        }
     }
 
     @Override

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

@@ -65,17 +65,18 @@ public boolean mouseClicked(double x, double y, int button) {
                         io.github.techstreet.dfscript.DFScript.MC.getSoundManager().play(PositionedSoundInstance.ambient(SoundEvents.UI_BUTTON_CLICK, 1f,1f));
 
                         if (button == 0) {
-                            io.github.techstreet.dfscript.DFScript.MC.setScreen(new ScriptEditScreen(s));
+                            DFScript.MC.setScreen(new ScriptEditScreen(s));
                         } else {
                             CButton delete = new CButton((int) x, (int) y, 40, 8, "Delete", () -> {
-                                io.github.techstreet.dfscript.DFScript.MC.setScreen(new ScriptDeletionScreen(s));
+                                DFScript.MC.setScreen(new ScriptDeletionScreen(s));
                             });
+
                             CButton enableDisable;
                             if (s.disabled()) {
                                 enableDisable = new CButton((int) x, (int) y + 8, 40, 8, "Enable", () -> {
                                     s.setDisabled(false);
                                     ScriptManager.getInstance().saveScript(s);
-                                    io.github.techstreet.dfscript.DFScript.MC.setScreen(new ScriptListScreen());
+                                    DFScript.MC.setScreen(new ScriptListScreen());
                                 });
                             } else {
                                 enableDisable = new CButton((int) x, (int) y + 8, 40, 8, "Disable", () -> {

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

@@ -24,10 +24,11 @@
 import org.apache.logging.log4j.Logger;
 
 public class Script {
-    public static int scriptVersion = 1;
+    public static int scriptVersion = 2;
 
-    private final String name;
+    private String name;
     private String owner;
+    private String description = "N/A";
     private int version = 0;
     private String server;
     private final List<ScriptPart> parts;
@@ -77,6 +78,7 @@ public void execute(ScriptTask task) {
         if (disabled) { // don't run the code if it's disabled obviously
             return;
         }
+
         while (task.stack().peek() < parts.size()) { // check if there is still code to be run
             ScriptPart part = parts.get(task.stack().peek()); // get the script part (action or event who cares)
             if (part instanceof ScriptEvent) { // well maybe we do care?
@@ -199,6 +201,10 @@ public int getVersion() {
         return version;
     }
 
+    public String getDescription() {
+        return description;
+    }
+
     public String getServer() {
         return server;
     }
@@ -211,6 +217,14 @@ public void setDisabled(boolean b) {
         disabled = b;
     }
 
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
     public void setOwner(String owner) {
         this.owner = owner;
     }
@@ -236,7 +250,11 @@ public Script deserialize(JsonElement json, Type typeOfT, JsonDeserializationCon
             String owner = null;
             if (object.get("owner") != null) owner = object.get("owner").getAsString();
 
-            String serverId = object.get("server").getAsString();
+            String serverId = null;
+            if (object.get("server") != null) serverId = object.get("server").getAsString();
+
+            String description = "N/A";
+            if (object.get("description") != null) description = object.get("description").getAsString();
 
             List<ScriptPart> parts = new ArrayList<>();
             for (JsonElement element : object.get("actions").getAsJsonArray()) {
@@ -245,7 +263,9 @@ public Script deserialize(JsonElement json, Type typeOfT, JsonDeserializationCon
             }
 
             boolean disabled = object.has("disabled") && object.get("disabled").getAsBoolean();
-            int version = object.get("version").getAsInt();
+
+            int version = 0;
+            if (object.get("version") != null) version = object.get("version").getAsInt();
 
             return new Script(name, owner, serverId, parts, disabled, version);
         }
@@ -256,6 +276,7 @@ public JsonElement serialize(Script src, Type typeOfSrc, JsonSerializationContex
             object.addProperty("name", src.name);
             object.addProperty("owner", src.owner);
             object.addProperty("server", src.server);
+            object.addProperty("description", src.description);
 
             JsonArray array = new JsonArray();
             for (ScriptPart part : src.getParts()) {

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

@@ -169,10 +169,8 @@ private void loadScript(File file) {
             String content = FileUtil.readFile(file.toPath());
             Script s = GSON.fromJson(content, Script.class);
             s.setFile(file);
-            System.out.println(s.getServer());
 
             ScriptMigrator.migrate(s);
-            System.out.println(s.getServer());
 
             if (s.getVersion() != Script.scriptVersion) throw new RuntimeException("this script uses version " + s.getVersion() + " when this version of DFScript uses version " + Script.scriptVersion + "!");
 

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

@@ -3,16 +3,24 @@
 import io.github.techstreet.dfscript.DFScript;
 
 public class ScriptMigrator {
-    public static Script migrate(Script script) {
+    public static void migrate(Script script) {
+        int previousVer = 0;
+
         if (script.getVersion() == 0) {
-            script.setServer(null);
+            script.setServer("None");
             if (DFScript.MC.player != null) script.setOwner(DFScript.MC.player.getUuid().toString());
 
             script.setVersion(1);
+        }
 
-            ScriptManager.LOGGER.info("Migrated script '" + script.getName() + "' from version " + script.getVersion() + " to version " + script.getVersion());
+        if (script.getVersion() == 1) {
+            script.setDescription("N/A");
+            script.setVersion(2);
         }
 
-        return script;
+        if (previousVer != script.getVersion()) {
+            ScriptManager.LOGGER.info("Migrated script '" + script.getName() + "' from version " + previousVer +" to version " + script.getVersion() + "!");
+            ScriptManager.getInstance().saveScript(script);
+        }
     }
 }

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

@@ -3,6 +3,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import io.github.techstreet.dfscript.util.FileUtil;
+import io.github.techstreet.dfscript.util.chat.ChatUtil;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -11,13 +12,13 @@
 import java.net.URL;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.nio.file.InvalidPathException;
 
 import static io.github.techstreet.dfscript.DFScript.GSON;
 import static io.github.techstreet.dfscript.screen.script.ScriptAddScreen.readAll;
 
 public class VirtualScript {
-
     private final String name;
     private final String owner;
     private final String id;
@@ -40,17 +41,28 @@ public String getId() {
         return id;
     }
 
-    public void download() {
+    public void download(boolean update) {
         try {
             InputStream is = new URL("https://dfscript-server.techstreetdev.repl.co/scripts/get/" + id).openStream();
             BufferedReader rd = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8));
-            Script script = GSON.fromJson(readAll(rd), Script.class);
 
             File file = FileUtil.folder("Scripts").resolve(name + ".json").toFile();
 
-            script.setFile(file);
-            ScriptManager.getInstance().saveScript(script);
-            ScriptManager.getInstance().reload();
+            if (!update) {
+                int count = 1;
+                while (file.exists()) {
+                    file = FileUtil.folder("Scripts").resolve(name + "_" + count + ".json").toFile();
+                    count += 1;
+                }
+            }
+
+            String content = readAll(rd)
+                    .replace("\n", "")
+                    .replace("\"disabled\":true", "\"disabled\":false")
+                    .replace("\"server\":None", "\"server\":" + id + "");
+
+            System.out.println(content);
+            Files.write(file.toPath(), content.getBytes());
         } catch (Exception e) {
             e.printStackTrace();
         }