Reading/Writing JSON, first working version

src/main/java/carpet/script/bundled/FileModule.java

@@ -25,6 +25,9 @@ import java.util.List;
 import java.util.Locale;
 import java.util.stream.Stream;
 
+import carpet.script.api.Auxiliary;
+import carpet.script.value.Value;
+
 public class FileModule extends Module
 {
     private String name;
@@ -137,11 +140,11 @@ public class FileModule extends Module
         return true;
     }
 
-    public static boolean appendText(File filePath, boolean addNewLines, List<String> data)
+    public static boolean appendText(Path filePath, boolean addNewLines, List<String> data)
     {
         try
         {
-            OutputStream out = Files.newOutputStream(filePath.toPath(), StandardOpenOption.APPEND, StandardOpenOption.CREATE);
+            OutputStream out = Files.newOutputStream(filePath, StandardOpenOption.APPEND, StandardOpenOption.CREATE);
             try (BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(out, StandardCharsets.UTF_8)))
             {
                 for (String line: data)
@@ -159,9 +162,9 @@ public class FileModule extends Module
     }
 
 
-    public static List<String> listFileContent(File filePath)
+    public static List<String> listFileContent(Path filePath)
     {
-        try (BufferedReader reader = Files.newBufferedReader(filePath.toPath(), StandardCharsets.UTF_8)) {
+        try (BufferedReader reader = Files.newBufferedReader(filePath, StandardCharsets.UTF_8)) {
             List<String> result = new ArrayList<>();
             for (;;) {
                 String line = reader.readLine();
@@ -176,6 +179,17 @@ public class FileModule extends Module
             return null;
         }
     }
+    
+    public static Value readJsonContent(Path filePath)
+    {
+    	try (BufferedReader reader = Files.newBufferedReader(filePath, StandardCharsets.UTF_8)) {
+            return Auxiliary.gson.fromJson(reader, Value.class);
+        }
+        catch (IOException e)
+        {
+            return null;
+        }
+    }
 
     public static Stream<Path> listFiles(Path dir, String ext)
     {

src/main/java/carpet/script/bundled/Module.java

@@ -1,13 +1,17 @@
 package carpet.script.bundled;
 
 import carpet.CarpetServer;
+import carpet.script.value.Value;
 import net.minecraft.nbt.Tag;
 import net.minecraft.util.WorldSavePath;
 import org.apache.commons.io.FilenameUtils;
 
+import com.google.common.collect.ImmutableMap;
+
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Stream;
 
 public abstract class Module
@@ -16,6 +20,13 @@ public abstract class Module
     public abstract String getCode();
     public abstract boolean isLibrary();
     public final static Object writeIOSync = new Object();
+    public final static Map<String, String> supportedTypes = ImmutableMap.of(
+            "raw", ".txt",
+            "text", ".txt",
+            "nbt", ".nbt",
+            "json", ".json",
+            "folder", "folder"
+    );
 
     private static String getDescriptor(Module module, String file, boolean isShared)
     {
@@ -32,7 +43,7 @@ public abstract class Module
 
     public static Tag getData(Module module, String file, boolean isShared)
     {
-        Path dataFile = resolveResource(module, file, "nbt", isShared);
+        Path dataFile = resolveResource(module, file, ".nbt", isShared);
         if (dataFile == null) return null;
         if (!Files.exists(dataFile) || !(dataFile.toFile().isFile())) return null;
         synchronized (writeIOSync) { return FileModule.read(dataFile.toFile()); }
@@ -40,7 +51,7 @@ public abstract class Module
 
     public static boolean saveData(Module module, String file, Tag globalState, boolean isShared)
     {
-        Path dataFile = resolveResource(module, file, "nbt", isShared);
+        Path dataFile = resolveResource(module, file, ".nbt", isShared);
         if (dataFile == null) return false;
         if (!Files.exists(dataFile.getParent()) && !dataFile.toFile().getParentFile().mkdirs()) return false;
         synchronized (writeIOSync) { return FileModule.write(globalState, dataFile.toFile()); }
@@ -48,30 +59,38 @@ public abstract class Module
 
     public static boolean appendToTextFile(Module module, String resourceName, String type, boolean isShared, List<String> message)
     {
-        Path dataFile = resolveResource(module, resourceName, "txt", isShared);
+        Path dataFile = resolveResource(module, resourceName, supportedTypes.get(type), isShared);
         if (dataFile == null) return false;
         if (!Files.exists(dataFile.getParent()) && !dataFile.toFile().getParentFile().mkdirs()) return false;
-        synchronized (writeIOSync) { return FileModule.appendText(dataFile.toFile(), type.equals("text"), message); }
+        synchronized (writeIOSync) { return FileModule.appendText(dataFile, type.equals("text"), message); }
     }
 
-    public static boolean dropExistingFile(Module module, String resourceName, String ext, boolean isShared)
+    public static boolean dropExistingFile(Module module, String resourceName, String type, boolean isShared)
     {
-        Path dataFile = resolveResource(module, resourceName, ext, isShared);
+        Path dataFile = resolveResource(module, resourceName, supportedTypes.get(type), isShared);
         if (dataFile == null) return false;
         synchronized (writeIOSync) { return dataFile.toFile().delete(); }
     }
 
-    public static List<String> listFile(Module module, String resourceName, String ext, boolean isShared)
+    public static List<String> listFile(Module module, String resourceName, String type, boolean isShared)
     {
-        Path dataFile = resolveResource(module, resourceName, ext, isShared);
+        Path dataFile = resolveResource(module, resourceName, supportedTypes.get(type), isShared);
         if (dataFile == null) return null;
         if (!dataFile.toFile().exists()) return null;
-        synchronized (writeIOSync) { return FileModule.listFileContent(dataFile.toFile()); }
+        synchronized (writeIOSync) { return FileModule.listFileContent(dataFile); }
+    }
+    
+    public static Value readJsonFile(Module module, String resourceName, String type, boolean isShared) {
+        Path dataFile = resolveResource(module, resourceName, supportedTypes.get(type), isShared);
+        if (dataFile == null) return null;
+        if (!dataFile.toFile().exists()) return null;
+        synchronized (writeIOSync) { return FileModule.readJsonContent(dataFile); }
     }
 
-    public static Stream<String> listFolder(Module module, String resourceName, String ext, boolean isShared)
+    public static Stream<String> listFolder(Module module, String resourceName, String type, boolean isShared)
     {
         Path dir = resolveResource(module, resourceName, null, isShared);
+        String ext = supportedTypes.get(type);
         if (dir == null) return null;
         if (!Files.exists(dir)) return null;
         Stream<Path> result;
@@ -87,7 +106,7 @@ public abstract class Module
     private static Path resolveResource(Module module, String resourceName, String ext, boolean isShared)
     {
         if (!isShared && (module == null || module.getName() == null)) return null;
-        return CarpetServer.minecraft_server.getSavePath(WorldSavePath.ROOT).resolve("scripts/"+getDescriptor(module, resourceName, isShared)+(ext==null?"":"."+ext));
+        return CarpetServer.minecraft_server.getSavePath(WorldSavePath.ROOT).resolve("scripts/"+getDescriptor(module, resourceName, isShared)+(ext==null?"":ext));
     }
 
     @Override