From 6e8cc066373f44a74f3c7d10da0785723b773a58 Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Tue, 6 Apr 2021 18:30:29 +0200 Subject: [PATCH] Address a few deprecations --- .../sk89q/worldedit/bukkit/WorldEditPlugin.java | 2 +- .../main/java/com/boydti/fawe/web/SchemSync.java | 2 +- .../sk89q/worldedit/command/ChunkCommands.java | 5 ++--- .../worldedit/command/SchematicCommands.java | 16 ++++++++-------- .../worldedit/command/ScriptingCommands.java | 4 ++-- .../extent/clipboard/io/ClipboardFormats.java | 4 ++-- 6 files changed, 16 insertions(+), 17 deletions(-) diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java index f40151e3f..4bc7c9636 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java @@ -279,7 +279,7 @@ public class WorldEditPlugin extends JavaPlugin { //implements TabCompleter config.load(); // Create schematics folder WorldEdit worldEdit = WorldEdit.getInstance(); - File dir = worldEdit.getWorkingDirectoryFile(worldEdit.getConfiguration().saveDir); + File dir = worldEdit.getWorkingDirectoryPath(worldEdit.getConfiguration().saveDir).toFile(); dir.mkdirs(); } diff --git a/worldedit-core/src/main/java/com/boydti/fawe/web/SchemSync.java b/worldedit-core/src/main/java/com/boydti/fawe/web/SchemSync.java index 2f0467306..f87e8cd15 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/web/SchemSync.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/web/SchemSync.java @@ -46,7 +46,7 @@ public class SchemSync implements Runnable { .getFile(Fawe.imp().getDirectory(), Settings.IMP.PATHS.TOKENS, "tokens.txt"); this.worldEdit = WorldEdit.getInstance(); LocalConfiguration config = worldEdit.getConfiguration(); - this.working = worldEdit.getWorkingDirectoryFile(config.saveDir); + this.working = worldEdit.getWorkingDirectoryPath(config.saveDir).toFile(); } private void loadTokens() { diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ChunkCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ChunkCommands.java index b9bad4442..8ff69d254 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ChunkCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ChunkCommands.java @@ -121,12 +121,11 @@ public class ChunkCommands { throw new StopExecutionException(TextComponent.of("Couldn't find world folder for this world.")); } - File chunkFile = worldEdit.getWorkingDirectoryFile(DELCHUNKS_FILE_NAME); - Path chunkPath = chunkFile.toPath(); + Path chunkPath = worldEdit.getWorkingDirectoryPath(DELCHUNKS_FILE_NAME); ChunkDeletionInfo currentInfo = null; if (Files.exists(chunkPath)) { try { - currentInfo = ChunkDeleter.readInfo(chunkFile.toPath()); + currentInfo = ChunkDeleter.readInfo(chunkPath); } catch (IOException e) { throw new StopExecutionException(TextComponent.of("Error reading existing chunk file.")); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java index b934b3f8e..94b300ddf 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java @@ -189,7 +189,7 @@ public class SchematicCommands { uri = URI.create(fileName); } else { final LocalConfiguration config = this.worldEdit.getConfiguration(); - File working = this.worldEdit.getWorkingDirectoryFile(config.saveDir); + File working = this.worldEdit.getWorkingDirectoryPath(config.saveDir).toFile(); File root = Settings.IMP.PATHS.PER_PLAYER_SCHEMATICS ? new File(working, player.getUniqueId().toString()) : working; uri = new File(root, fileName).toURI(); } @@ -248,7 +248,7 @@ public class SchematicCommands { in = Channels.newInputStream(byteChannel); uri = url.toURI(); } else { - File saveDir = worldEdit.getWorkingDirectoryFile(config.saveDir); + File saveDir = worldEdit.getWorkingDirectoryPath(config.saveDir).toFile(); File dir = Settings.IMP.PATHS.PER_PLAYER_SCHEMATICS ? new File(saveDir, actor.getUniqueId().toString()) : saveDir; File file; if (filename.startsWith("#")) { @@ -279,7 +279,7 @@ public class SchematicCommands { } if (file == null || !file.exists()) { if (!filename.contains("../")) { - dir = this.worldEdit.getWorkingDirectoryFile(config.saveDir); + dir = this.worldEdit.getWorkingDirectoryPath(config.saveDir).toFile(); file = MainUtil.resolve(dir, filename, format, false); } } @@ -330,7 +330,7 @@ public class SchematicCommands { boolean global) throws WorldEditException { LocalConfiguration config = worldEdit.getConfiguration(); - File dir = worldEdit.getWorkingDirectoryFile(config.saveDir); + File dir = worldEdit.getWorkingDirectoryPath(config.saveDir).toFile(); if (!global && Settings.IMP.PATHS.PER_PLAYER_SCHEMATICS) { dir = new File(dir, actor.getUniqueId().toString()); @@ -350,7 +350,7 @@ public class SchematicCommands { return; } if (filename.startsWith("../")) { - dir = worldEdit.getWorkingDirectoryFile(config.saveDir); + dir = worldEdit.getWorkingDirectoryPath(config.saveDir).toFile(); filename = filename.substring(3); } } @@ -402,7 +402,7 @@ public class SchematicCommands { @CommandPermissions({"worldedit.schematic.move", "worldedit.schematic.move.other"}) public void move(Player player, LocalSession session, String directory) throws WorldEditException, IOException { LocalConfiguration config = worldEdit.getConfiguration(); - File working = worldEdit.getWorkingDirectoryFile(config.saveDir); + File working = worldEdit.getWorkingDirectoryPath(config.saveDir).toFile(); File dir = Settings.IMP.PATHS.PER_PLAYER_SCHEMATICS ? new File(working, player.getUniqueId().toString()) : working; File destDir = new File(dir, directory); if (!MainUtil.isInSubDirectory(working, destDir)) { @@ -510,7 +510,7 @@ public class SchematicCommands { } String pageCommand = "/" + arguments.get(); LocalConfiguration config = worldEdit.getConfiguration(); - File dir = worldEdit.getWorkingDirectoryFile(config.saveDir); + File dir = worldEdit.getWorkingDirectoryPath(config.saveDir).toFile(); String schemCmd = "//schematic"; String loadSingle = schemCmd + " load"; @@ -628,7 +628,7 @@ public class SchematicCommands { @Arg(desc = "File name.") String filename) throws WorldEditException, IOException { LocalConfiguration config = worldEdit.getConfiguration(); - File working = worldEdit.getWorkingDirectoryFile(config.saveDir); + File working = worldEdit.getWorkingDirectoryPath(config.saveDir).toFile(); File dir = Settings.IMP.PATHS.PER_PLAYER_SCHEMATICS ? new File(working, actor.getUniqueId().toString()) : working; List files = new ArrayList<>(); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ScriptingCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ScriptingCommands.java index 678a95bb6..4fce96645 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ScriptingCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ScriptingCommands.java @@ -76,7 +76,7 @@ public class ScriptingCommands { session.setLastScript(filename); - File dir = worldEdit.getWorkingDirectoryFile(worldEdit.getConfiguration().scriptsDir); + File dir = worldEdit.getWorkingDirectoryPath(worldEdit.getConfiguration().scriptsDir).toFile(); File f = worldEdit.getSafeOpenFile(player, dir, filename, "js", "js"); worldEdit.runScript(player, f, Stream.concat(Stream.of(filename), args.stream()) @@ -106,7 +106,7 @@ public class ScriptingCommands { return; } - File dir = worldEdit.getWorkingDirectoryFile(worldEdit.getConfiguration().scriptsDir); + File dir = worldEdit.getWorkingDirectoryPath(worldEdit.getConfiguration().scriptsDir).toFile(); File f = worldEdit.getSafeOpenFile(player, dir, lastScript, "js", "js"); worldEdit.runScript(player, f, Stream.concat(Stream.of(lastScript), args.stream()) diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/ClipboardFormats.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/ClipboardFormats.java index 86d3285b9..7d2c29d78 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/ClipboardFormats.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/ClipboardFormats.java @@ -195,7 +195,7 @@ public class ClipboardFormats { player.print(Caption.of("fawe.error.no-perm", "worldedit.schematic.load.other")); return null; } - File working = worldEdit.getWorkingDirectoryFile(config.saveDir); + File working = worldEdit.getWorkingDirectoryPath(config.saveDir).toFile(); File dir = Settings.IMP.PATHS.PER_PLAYER_SCHEMATICS ? new File(working, player.getUniqueId().toString()) : working; File f; @@ -230,7 +230,7 @@ public class ClipboardFormats { } if (f == null || !f.exists()) { if (!input.contains("../")) { - dir = worldEdit.getWorkingDirectoryFile(config.saveDir); + dir = worldEdit.getWorkingDirectoryPath(config.saveDir).toFile(); f = MainUtil.resolve(dir, input, format, true); } }