fix a goddamn stack overflow when serializing a dictionary

also added missing methods to ScriptVariable and fixed wrong serializer used for booleans

Author: XTerPL

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

@@ -21,7 +21,6 @@
 import io.github.techstreet.dfscript.script.options.ScriptNamedOption;
 import io.github.techstreet.dfscript.script.repetitions.ScriptBuiltinRepetition;
 import io.github.techstreet.dfscript.script.repetitions.ScriptWhile;
-import io.github.techstreet.dfscript.script.util.ScriptValueJson;
 import io.github.techstreet.dfscript.script.values.*;
 import io.github.techstreet.dfscript.util.FileUtil;
 import io.github.techstreet.dfscript.util.chat.ChatType;
@@ -77,7 +76,8 @@ public class ScriptManager implements Loadable {
         .registerTypeAdapter(ScriptTextValue.class, new ScriptTextValue.Serializer())
         .registerTypeAdapter(ScriptListValue.class, new ScriptListValue.Serializer())
         .registerTypeAdapter(ScriptDictionaryValue.class, new ScriptDictionaryValue.Serializer())
-        .registerTypeAdapter(ScriptBoolValue.class, new ScriptDictionaryValue.Serializer())
+        .registerTypeAdapter(ScriptBoolValue.class, new ScriptBoolValue.Serializer())
+        .registerTypeAdapter(ScriptVariable.class, new ScriptVariable.Serializer())
         .create();
 
     public ScriptManager() {

src/main/java/io/github/techstreet/dfscript/script/values/ScriptDictionaryValue.java

@@ -3,9 +3,7 @@
 import com.google.gson.*;
 
 import java.lang.reflect.Type;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 public class ScriptDictionaryValue extends ScriptValue {
@@ -89,7 +87,7 @@ public JsonElement serialize(ScriptDictionaryValue scriptValue, Type type, JsonS
                 dictObj.add(key, context.serialize(dict.get(key)));
             }
             JsonObject obj = new JsonObject();
-            obj.add("dict", obj);
+            obj.add("dict", dictObj);
             obj.addProperty("___objectType", "dict");
             return obj;
         }

src/main/java/io/github/techstreet/dfscript/script/values/ScriptVariable.java

@@ -1,12 +1,10 @@
 package io.github.techstreet.dfscript.script.values;
 
-import io.github.techstreet.dfscript.script.values.ScriptUnknownValue;
-import io.github.techstreet.dfscript.script.values.ScriptValue;
+import com.google.gson.*;
 
+import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 public class ScriptVariable extends ScriptValue {
     private ScriptValue value;
@@ -24,6 +22,11 @@ public ScriptValue get() {
         return value;
     }
 
+    @Override
+    public String toString() {
+        return asText();
+    }
+
     public void set(ScriptValue value) {
         this.value = value;
     }
@@ -62,4 +65,26 @@ String typeName() {
     public boolean valueEquals(ScriptValue other) {
         return get().valueEquals(other);
     }
+
+    @Override
+    public ScriptValue getCompareValue() {
+        return get().getCompareValue();
+    }
+
+    @Override
+    public int compare(ScriptValue other) {
+        return get().compare(other);
+    }
+
+    @Override
+    public String formatAsText() {
+        return get().formatAsText();
+    }
+
+    public static class Serializer implements JsonSerializer<ScriptVariable> {
+        @Override
+        public JsonElement serialize(ScriptVariable scriptValue, Type type, JsonSerializationContext context) {
+            return context.serialize(scriptValue.get());
+        }
+    }
 }