Merge branch 'master' into 1.15

# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java

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

@@ -56,7 +56,7 @@ public class FileModule implements ModuleInterface
     }
 
     //copied private method from net.minecraft.nbt.NbtIo.read()
-    private static Tag read(File file)
+    public static Tag read(File file)
     {
         try (DataInputStream dataInput_1 = new DataInputStream(new FileInputStream(file)))
         {
@@ -78,7 +78,7 @@ public class FileModule implements ModuleInterface
     }
 
     //copied private method from net.minecraft.nbt.NbtIo.write() and client method safe_write
-    private static void write(Tag tag_1, File file)
+    public static void write(Tag tag_1, File file)
     {
         File file_2 = new File(file.getAbsolutePath() + "_tmp");
         if (file_2.exists()) file_2.delete();
@@ -99,23 +99,4 @@ public class FileModule implements ModuleInterface
         if (file.exists()) file.delete();
         if (!file.exists()) file_2.renameTo(file);
     }
-
-    @Override
-    public Tag getData(String file)
-    {
-        File dataFile =CarpetServer.minecraft_server.getLevelStorage().resolveFile(
-                CarpetServer.minecraft_server.getLevelName(), "scripts/"+name+".data"+(file==null?"":"."+file)+".nbt");
-        if (!(dataFile.isFile()))
-            return null;
-        return read(dataFile);
-    }
-
-    @Override
-    public void saveData(String file, Tag globalState)
-    {
-        File dataFile =CarpetServer.minecraft_server.getLevelStorage().resolveFile(
-                CarpetServer.minecraft_server.getLevelName(), "scripts/"+name+".data"+(file==null?"":"."+file)+".nbt");
-        write(globalState, dataFile);
-
-    }
 }

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

@@ -1,12 +1,44 @@
 package carpet.script.bundled;
 
+import carpet.CarpetServer;
 import net.minecraft.nbt.Tag;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+
+import static carpet.script.bundled.FileModule.read;
+import static carpet.script.bundled.FileModule.write;
+
 public interface ModuleInterface
 {
     String getName();
     String getCode();
     default boolean isInternal() {return true; }
-    default Tag getData(String file) {return null; }
-    default void saveData(String file, Tag globalState) {}
+
+    default Tag getData(String file)
+    {
+        File dataFile = CarpetServer.minecraft_server.getLevelStorage().resolveFile(
+                CarpetServer.minecraft_server.getLevelName(), "scripts/"+getName()+".data"+(file==null?"":"."+file)+".nbt");
+        if (!Files.exists(dataFile.toPath()) || !(dataFile.isFile())) return null;
+        return read(dataFile);
+    }
+
+    default void saveData(String file, Tag globalState)
+    {
+        File dataFile =CarpetServer.minecraft_server.getLevelStorage().resolveFile(
+                CarpetServer.minecraft_server.getLevelName(), "scripts/"+getName()+".data"+(file==null?"":"."+file)+".nbt");
+        if (!Files.exists(dataFile.toPath().getParent()))
+        {
+            try
+            {
+                Files.createDirectory(dataFile.toPath().getParent());
+            }
+            catch (IOException ignored)
+            {
+            }
+        }
+        write(globalState, dataFile);
+
+    }
 }