file handling cleanup

DenizenScript · Feb 27, 2024 · b526ff9 · b526ff9
1 parent 2d926d3
commit b526ff9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/commands/worldedit/WorldEditCommand.java b/src/main/java/com/denizenscript/depenizen/bukkit/commands/worldedit/WorldEditCommand.java
@@ -1,5 +1,6 @@
 package com.denizenscript.depenizen.bukkit.commands.worldedit;
 
+import com.denizenscript.denizen.Denizen;
 import com.denizenscript.denizen.objects.CuboidTag;
 import com.denizenscript.denizen.objects.LocationTag;
 import com.denizenscript.denizen.objects.PlayerTag;
@@ -31,7 +32,6 @@
 import com.sk89q.worldedit.world.World;
 
 import java.io.*;
-import java.net.URLDecoder;
 
 public class WorldEditCommand extends AbstractCommand {
 
@@ -166,8 +166,7 @@ public void execute(ScriptEntry scriptEntry) {
                 Debug.echoError("Position not specified");
                 return;
             }
-            String directory = URLDecoder.decode(System.getProperty("user.dir"));
-            File fileToLoad = new File(directory + "/plugins/Denizen/schematics/" + file + ".schem");
+            File fileToLoad = new File(Denizen.getInstance().getDataFolder(), "schematics/" + file + ".schem");
             if (!Utilities.canReadFile(fileToLoad)) {
                 Debug.echoError("Cannot read from that file path due to security settings in Denizen/config.yml.");
                 return;
@@ -243,8 +242,7 @@ else if (action.asString().equalsIgnoreCase("create_schematic")) {
                 Debug.echoError("File not specified");
                 return;
             }
-            String directory = URLDecoder.decode(System.getProperty("user.dir"));
-            File fileToSave = new File(directory + "/plugins/Denizen/schematics/" + file + ".schem");
+            File fileToSave = new File(Denizen.getInstance().getDataFolder(), "schematics/" + file + ".schem");
             if (!Utilities.canWriteToFile(fileToSave)) {
                 Debug.echoError("Cannot write to that file path due to security settings in Denizen/config.yml.");
                 return;
@@ -336,8 +334,7 @@ else if (action.asString().equalsIgnoreCase("copy_to_clipboard")) {
                 Debug.echoError("Cuboid or file must be specified.");
                 return;
             }
-            String directory = URLDecoder.decode(System.getProperty("user.dir"));
-            File fileToLoad = new File(directory + "/plugins/Denizen/schematics/" + file + ".schem");
+            File fileToLoad = new File(Denizen.getInstance().getDataFolder(), "schematics/" + file + ".schem");
             if (!Utilities.canReadFile(fileToLoad)) {
                 Debug.echoError("Cannot read from that file path due to security settings in Denizen/config.yml.");
                 return;

diff --git a/...m/denizenscript/depenizen/bukkit/events/noteblockapi/NoteBlockAPISongEndsScriptEvent.java b/...m/denizenscript/depenizen/bukkit/events/noteblockapi/NoteBlockAPISongEndsScriptEvent.java
@@ -1,5 +1,6 @@
 package com.denizenscript.depenizen.bukkit.events.noteblockapi;
 
+import com.denizenscript.denizen.Denizen;
 import com.denizenscript.denizen.events.BukkitScriptEvent;
 import com.denizenscript.denizencore.utilities.debugging.Debug;
 import com.denizenscript.denizen.utilities.implementation.BukkitScriptEntryData;
@@ -11,8 +12,6 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 
-import java.io.File;
-import java.net.URLDecoder;
 import java.nio.file.Path;
 
 public class NoteBlockAPISongEndsScriptEvent extends BukkitScriptEvent implements Listener {
@@ -57,8 +56,7 @@ public ScriptEntryData getScriptEntryData() {
     public String getSongFileName() {
         try {
             Path songPath = event.getSongPlayer().getSong().getPath().toPath();
-            String directory = URLDecoder.decode(System.getProperty("user.dir"));
-            Path denizenPath = new File(directory + "/plugins/Denizen/").toPath();
+            Path denizenPath = Denizen.getInstance().getDataFolder().toPath();
             String finalPath = denizenPath.relativize(songPath).toString();
             if (finalPath.endsWith(".nbs")) {
                 finalPath = finalPath.substring(0, finalPath.length() - ".nbs".length());