From 53f6a49b8df1977bc43e1d68f385fe7e3638a043 Mon Sep 17 00:00:00 2001 From: gnembon Date: Sat, 20 Mar 2021 17:41:17 -0300 Subject: [PATCH] removed sun's import --- src/main/java/carpet/script/argument/FileArgument.java | 6 ++---- src/main/java/carpet/script/bundled/Module.java | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/carpet/script/argument/FileArgument.java b/src/main/java/carpet/script/argument/FileArgument.java index 4b9c865e..f25176e2 100644 --- a/src/main/java/carpet/script/argument/FileArgument.java +++ b/src/main/java/carpet/script/argument/FileArgument.java @@ -15,7 +15,6 @@ import com.google.gson.JsonElement; import com.google.gson.JsonParseException; import com.google.gson.JsonParser; import com.google.gson.stream.JsonReader; -import com.sun.nio.zipfs.ZipPath; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtIo; import net.minecraft.nbt.PositionTracker; @@ -368,7 +367,7 @@ public class FileArgument Path dataFile = toPath(module); if (dataFile == null) return false; createPaths(dataFile); - return writeTagDisk(tag, dataFile); + return writeTagDisk(tag, dataFile, zipContainer != null); } } finally { @@ -377,12 +376,11 @@ public class FileArgument } //copied private method from net.minecraft.nbt.NbtIo.write() and client method safe_write - public static boolean writeTagDisk(Tag tag_1, Path path) + public static boolean writeTagDisk(Tag tag_1, Path path, boolean zipped) { Path original = path; try { - boolean zipped = path instanceof ZipPath; if (!zipped) { path = new File(path.toFile().getAbsolutePath() + "_tmp").toPath(); diff --git a/src/main/java/carpet/script/bundled/Module.java b/src/main/java/carpet/script/bundled/Module.java index f76c4ad8..a6d29d85 100644 --- a/src/main/java/carpet/script/bundled/Module.java +++ b/src/main/java/carpet/script/bundled/Module.java @@ -27,7 +27,7 @@ public abstract class Module Path dataFile = resolveResource(module); if (dataFile == null) return; if (!Files.exists(dataFile.getParent()) && !dataFile.toFile().getParentFile().mkdirs()) return; - synchronized (FileArgument.writeIOSync) { FileArgument.writeTagDisk(globalState, dataFile); } + synchronized (FileArgument.writeIOSync) { FileArgument.writeTagDisk(globalState, dataFile, false); } } private static Path resolveResource(Module module)