Merge branch 'master' into 1.17

src/main/java/carpet/script/CarpetScriptHost.java

@@ -18,6 +18,8 @@ import carpet.script.value.NumericValue;
 import carpet.script.value.StringValue;
 import carpet.script.value.Value;
 import carpet.utils.Messenger;
+
+import com.google.gson.JsonElement;
 import com.mojang.brigadier.builder.ArgumentBuilder;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
@@ -705,7 +707,7 @@ public class CarpetScriptHost extends ScriptHost
     public boolean removeResourceFile(String resource, boolean isShared, String type)
     {
         if (getName() == null && !isShared) return false; //
-        return Module.dropExistingFile(main, resource, type.equals("nbt")?"nbt":"txt", isShared);
+        return Module.dropExistingFile(main, resource, type, isShared);
     }
 
     public boolean appendLogFile(String resource, boolean isShared, String type, List<String> data)
@@ -714,16 +716,22 @@ public class CarpetScriptHost extends ScriptHost
         return Module.appendToTextFile(main, resource, type, isShared, data);
     }
 
-    public List<String> readTextResource(String resource, boolean isShared)
+    public List<String> readTextResource(String resource, String type, boolean isShared)
     {
-        if (getName() == null && !isShared) return null; //
-        return Module.listFile(main, resource, "txt", isShared);
+        if (getName() == null && !isShared) return null;
+        return Module.listFile(main, resource, type, isShared);
+    }
+    
+    public JsonElement readJsonFile(String resource, String type, boolean isShared)
+    {
+        if (getName() == null && !isShared) return null;
+        return Module.readJsonFile(main, resource, type, isShared);
     }
 
-    public Stream<String> listFolder(String resource, String ext, boolean isShared)
+    public Stream<String> listFolder(String resource, String type, boolean isShared)
     {
         if (getName() == null && !isShared) return null; //
-        return Module.listFolder(main, resource, ext, isShared);
+        return Module.listFolder(main, resource, type, isShared);
     }