From 297d5b25f08de7af99108ad21e2dc992709958b1 Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 11 Aug 2022 18:54:01 +0200 Subject: [PATCH 1/2] Fix default wz location --- launch.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launch.bat b/launch.bat index bed9d39b83..4ff91dcc0d 100644 --- a/launch.bat +++ b/launch.bat @@ -1,4 +1,4 @@ @echo off @title Cosmic -java -Xmx2048m -Dwz-path= -jar target\Cosmic.jar +java -Xmx2048m -Dwz-path=wz -jar target\Cosmic.jar pause \ No newline at end of file From d691dc1e1866376a73959e4ab56d5a713e29e24f Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 11 Aug 2022 19:01:40 +0200 Subject: [PATCH 2/2] Prefer Path.of() over Paths.get() --- README.md | 2 +- src/main/java/client/command/commands/gm2/IdCommand.java | 4 ++-- src/main/java/client/command/commands/gm3/PeCommand.java | 4 ++-- src/main/java/config/YamlConfig.java | 4 ++-- src/main/java/constants/string/CharsetConstants.java | 4 ++-- src/main/java/net/server/channel/Channel.java | 3 +-- src/main/java/provider/wz/WZFiles.java | 5 ++--- src/main/java/provider/wz/XMLWZFile.java | 9 ++++----- src/main/java/scripting/AbstractScriptManager.java | 4 +--- src/main/java/server/SkillbookInformationProvider.java | 3 +-- src/main/java/tools/mapletools/DojoUpdate.java | 8 +++++--- src/main/java/tools/mapletools/ReactorDropFetcher.java | 3 +-- src/main/java/tools/mapletools/ToolConstants.java | 5 ++--- 13 files changed, 26 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index 42caba62e7..d3b21a93ed 100644 --- a/README.md +++ b/README.md @@ -177,7 +177,7 @@ To launch the server, you may either: * If you already have Maven installed, simply run the command "mvn clean install" to create the jar file. * IntelliJ also comes with built-in Maven support. Open a new terminal window inside IntelliJ, type "mvn clean install" (your command should now be marked green), then Ctrl+Enter to build the jar file. 2. Launch the jar file - * Double click on "launch.bat" (need to have Java 16 installed) + * Double click on "launch.bat" (need to have Java 17 installed) #### Run as containers with Docker 1. Start Docker diff --git a/src/main/java/client/command/commands/gm2/IdCommand.java b/src/main/java/client/command/commands/gm2/IdCommand.java index 7b56f6bd21..75d08cdff2 100644 --- a/src/main/java/client/command/commands/gm2/IdCommand.java +++ b/src/main/java/client/command/commands/gm2/IdCommand.java @@ -10,7 +10,7 @@ import tools.exceptions.IdTypeNotSupportedException; import java.io.BufferedReader; import java.io.IOException; import java.nio.file.Files; -import java.nio.file.Paths; +import java.nio.file.Path; import java.util.Arrays; import java.util.HashMap; import java.util.Map; @@ -76,7 +76,7 @@ public class IdCommand extends Command { throw new IdTypeNotSupportedException(); } itemMap.put(type, new HashMap<>()); - try (BufferedReader reader = Files.newBufferedReader(Paths.get(handbookDirectory.get(type)))) { + try (BufferedReader reader = Files.newBufferedReader(Path.of(handbookDirectory.get(type)))) { String line; while ((line = reader.readLine()) != null) { String[] row = line.split(" - ", 2); diff --git a/src/main/java/client/command/commands/gm3/PeCommand.java b/src/main/java/client/command/commands/gm3/PeCommand.java index ed2a4efa4a..6ee35f394a 100644 --- a/src/main/java/client/command/commands/gm3/PeCommand.java +++ b/src/main/java/client/command/commands/gm3/PeCommand.java @@ -38,7 +38,7 @@ import tools.HexTool; import java.io.BufferedReader; import java.io.IOException; import java.nio.file.Files; -import java.nio.file.Paths; +import java.nio.file.Path; import java.util.Properties; public class PeCommand extends Command { @@ -52,7 +52,7 @@ public class PeCommand extends Command { public void execute(Client c, String[] params) { Character player = c.getPlayer(); String packet = ""; - try (BufferedReader br = Files.newBufferedReader(Paths.get("pe.txt"))) { + try (BufferedReader br = Files.newBufferedReader(Path.of("pe.txt"))) { Properties packetProps = new Properties(); packetProps.load(br); packet = packetProps.getProperty("pe"); diff --git a/src/main/java/config/YamlConfig.java b/src/main/java/config/YamlConfig.java index 51401c3c3b..2263eb664e 100644 --- a/src/main/java/config/YamlConfig.java +++ b/src/main/java/config/YamlConfig.java @@ -6,7 +6,7 @@ import constants.string.CharsetConstants; import java.io.FileNotFoundException; import java.io.IOException; import java.nio.file.Files; -import java.nio.file.Paths; +import java.nio.file.Path; import java.util.List; @@ -19,7 +19,7 @@ public class YamlConfig { private static YamlConfig loadConfig() { try { - YamlReader reader = new YamlReader(Files.newBufferedReader(Paths.get(CONFIG_FILE_NAME), CharsetConstants.CHARSET)); + YamlReader reader = new YamlReader(Files.newBufferedReader(Path.of(CONFIG_FILE_NAME), CharsetConstants.CHARSET)); YamlConfig config = reader.read(YamlConfig.class); reader.close(); return config; diff --git a/src/main/java/constants/string/CharsetConstants.java b/src/main/java/constants/string/CharsetConstants.java index c64c9a1972..5a1243f29d 100644 --- a/src/main/java/constants/string/CharsetConstants.java +++ b/src/main/java/constants/string/CharsetConstants.java @@ -23,7 +23,7 @@ import java.io.IOException; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.nio.file.Files; -import java.nio.file.Paths; +import java.nio.file.Path; import java.util.Arrays; import java.util.Optional; @@ -62,7 +62,7 @@ public class CharsetConstants { private static String loadCharsetFromConfig() { try { - YamlReader reader = new YamlReader(Files.newBufferedReader(Paths.get(YamlConfig.CONFIG_FILE_NAME), StandardCharsets.US_ASCII)); + YamlReader reader = new YamlReader(Files.newBufferedReader(Path.of(YamlConfig.CONFIG_FILE_NAME), StandardCharsets.US_ASCII)); reader.getConfig().readConfig.setIgnoreUnknownProperties(true); StrippedYamlConfig charsetConfig = reader.read(StrippedYamlConfig.class); reader.close(); diff --git a/src/main/java/net/server/channel/Channel.java b/src/main/java/net/server/channel/Channel.java index 9a508a8e9d..98c3151953 100644 --- a/src/main/java/net/server/channel/Channel.java +++ b/src/main/java/net/server/channel/Channel.java @@ -49,7 +49,6 @@ import java.io.IOException; import java.nio.file.DirectoryStream; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.*; import java.util.Map.Entry; import java.util.concurrent.ScheduledFuture; @@ -437,7 +436,7 @@ public final class Channel { private static String[] getEvents() { List events = new ArrayList<>(); - try (DirectoryStream stream = Files.newDirectoryStream(Paths.get("scripts/event"))) { + try (DirectoryStream stream = Files.newDirectoryStream(Path.of("scripts/event"))) { for (Path path : stream) { String fileName = path.getFileName().toString(); events.add(fileName.substring(0, fileName.length() - 3)); diff --git a/src/main/java/provider/wz/WZFiles.java b/src/main/java/provider/wz/WZFiles.java index af90f8d27d..f1621cab29 100644 --- a/src/main/java/provider/wz/WZFiles.java +++ b/src/main/java/provider/wz/WZFiles.java @@ -2,7 +2,6 @@ package provider.wz; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; public enum WZFiles { QUEST("Quest"), @@ -28,7 +27,7 @@ public enum WZFiles { } public Path getFile() { - return Paths.get(DIRECTORY).resolve(fileName); + return Path.of(DIRECTORY, fileName); } public String getFilePath() { @@ -38,7 +37,7 @@ public enum WZFiles { private static String getWzDirectory() { // Either provide a custom directory path through the "wz-path" property when launching the .jar, or don't provide one to use the default "wz" directory String propertyPath = System.getProperty("wz-path"); - if (propertyPath != null && Files.isDirectory(Paths.get(propertyPath))) { + if (propertyPath != null && Files.isDirectory(Path.of(propertyPath))) { return propertyPath; } diff --git a/src/main/java/provider/wz/XMLWZFile.java b/src/main/java/provider/wz/XMLWZFile.java index b493658bd4..20bb25e49a 100644 --- a/src/main/java/provider/wz/XMLWZFile.java +++ b/src/main/java/provider/wz/XMLWZFile.java @@ -21,6 +21,8 @@ */ package provider.wz; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import provider.Data; import provider.DataDirectoryEntry; import provider.DataProvider; @@ -32,9 +34,6 @@ import java.nio.file.DirectoryStream; import java.nio.file.Files; import java.nio.file.Path; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - public class XMLWZFile implements DataProvider { private static final Logger log = LoggerFactory.getLogger(DataProvider.class); private final Path root; @@ -60,7 +59,7 @@ public class XMLWZFile implements DataProvider { } } } catch (IOException e) { - log.warn("Can not open file/directory at " + lroot); + log.warn("Can not open file/directory at " + lroot.toAbsolutePath().toString()); } } @@ -69,7 +68,7 @@ public class XMLWZFile implements DataProvider { Path dataFile = root.resolve(path + ".xml"); Path imageDataDir = root.resolve(path); if (!Files.exists(dataFile)) { - return null;// bitches + return null; } final XMLDomMapleData domMapleData; try (FileInputStream fis = new FileInputStream(dataFile.toString())) { diff --git a/src/main/java/scripting/AbstractScriptManager.java b/src/main/java/scripting/AbstractScriptManager.java index 3e3ed86ba2..017e30cecc 100644 --- a/src/main/java/scripting/AbstractScriptManager.java +++ b/src/main/java/scripting/AbstractScriptManager.java @@ -28,12 +28,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.script.*; - import java.io.BufferedReader; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; /** * @author Matze @@ -47,7 +45,7 @@ public abstract class AbstractScriptManager { } protected ScriptEngine getInvocableScriptEngine(String path) { - Path scriptFile = Paths.get("scripts").resolve(path); + Path scriptFile = Path.of("scripts", path); if (!Files.exists(scriptFile)) { return null; } diff --git a/src/main/java/server/SkillbookInformationProvider.java b/src/main/java/server/SkillbookInformationProvider.java index 6a3d4a4acc..b493233b16 100644 --- a/src/main/java/server/SkillbookInformationProvider.java +++ b/src/main/java/server/SkillbookInformationProvider.java @@ -33,7 +33,6 @@ import java.io.IOException; import java.nio.file.DirectoryStream; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -189,7 +188,7 @@ public class SkillbookInformationProvider { } private static void listFiles(String directoryName, ArrayList files) { - Path directory = Paths.get(directoryName); + Path directory = Path.of(directoryName); // get all the files from a directory try (DirectoryStream stream = Files.newDirectoryStream(directory)) { diff --git a/src/main/java/tools/mapletools/DojoUpdate.java b/src/main/java/tools/mapletools/DojoUpdate.java index 584682cc75..e644c406b2 100644 --- a/src/main/java/tools/mapletools/DojoUpdate.java +++ b/src/main/java/tools/mapletools/DojoUpdate.java @@ -2,11 +2,13 @@ package tools.mapletools; import provider.wz.WZFiles; -import java.io.*; +import java.io.BufferedReader; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.PrintWriter; import java.nio.file.DirectoryStream; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.time.Duration; import java.time.Instant; @@ -23,7 +25,7 @@ import java.time.Instant; public class DojoUpdate { private static final Path INPUT_DIRECTORY = WZFiles.MAP.getFile().resolve("Map").resolve("Map9"); private static final Path OUTPUT_DIRECTORY = ToolConstants.getOutputFile("dojo-maps"); - private static final Path WORKING_DIRECTORY = Paths.get("").toAbsolutePath(); + private static final Path WORKING_DIRECTORY = Path.of("").toAbsolutePath(); private static final int DOJO_MIN_MAP_ID = 925_020_100; private static final int DOJO_MAX_MAP_ID = 925_033_804; private static final int INITIAL_STRING_LENGTH = 250; diff --git a/src/main/java/tools/mapletools/ReactorDropFetcher.java b/src/main/java/tools/mapletools/ReactorDropFetcher.java index 3c88abcc06..795d85c9b9 100644 --- a/src/main/java/tools/mapletools/ReactorDropFetcher.java +++ b/src/main/java/tools/mapletools/ReactorDropFetcher.java @@ -5,7 +5,6 @@ import java.io.PrintWriter; import java.nio.file.DirectoryStream; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -41,7 +40,7 @@ public class ReactorDropFetcher { } private static void removeScriptedReactorids(String directoryName) { - try (DirectoryStream stream = Files.newDirectoryStream(Paths.get(directoryName))) { + try (DirectoryStream stream = Files.newDirectoryStream(Path.of(directoryName))) { for (Path path : stream) { if (Files.isRegularFile(path)) { reactors.remove(getReactorIdFromFilename(path.getFileName().toString())); diff --git a/src/main/java/tools/mapletools/ToolConstants.java b/src/main/java/tools/mapletools/ToolConstants.java index b14a896d4f..04dcb6e292 100644 --- a/src/main/java/tools/mapletools/ToolConstants.java +++ b/src/main/java/tools/mapletools/ToolConstants.java @@ -1,11 +1,10 @@ package tools.mapletools; import java.nio.file.Path; -import java.nio.file.Paths; class ToolConstants { - static final Path INPUT_DIRECTORY = Paths.get("tools/input"); - static final Path OUTPUT_DIRECTORY = Paths.get("tools/output"); + static final Path INPUT_DIRECTORY = Path.of("tools/input"); + static final Path OUTPUT_DIRECTORY = Path.of("tools/output"); static final String SCRIPTS_PATH = "scripts"; static final String HANDBOOK_PATH = "handbook";