From 6bd2e8204194d8c72cf4c89ec214956aaedcd3b5 Mon Sep 17 00:00:00 2001 From: Paldiu Date: Fri, 5 Feb 2021 17:58:43 -0600 Subject: [PATCH] minor updates --- .../simplexcore/command/SimplexCommand.java | 2 ++ .../simplexcore/config/JsonFactory.java | 4 +-- .../simplexcore/config/YamlFactory.java | 2 +- .../compile/default-compile/createdFiles.lst | 27 ++++++++++++------- .../compile/default-compile/inputFiles.lst | 21 +++++++++------ 5 files changed, 35 insertions(+), 21 deletions(-) diff --git a/src/main/java/io/github/paldiu/simplexcore/command/SimplexCommand.java b/src/main/java/io/github/paldiu/simplexcore/command/SimplexCommand.java index 51ff47c..ef00b23 100644 --- a/src/main/java/io/github/paldiu/simplexcore/command/SimplexCommand.java +++ b/src/main/java/io/github/paldiu/simplexcore/command/SimplexCommand.java @@ -19,10 +19,12 @@ public abstract class SimplexCommand implements CommandExecutor, TabCompleter { return sender instanceof Player; } + @Nullable public Player getPlayer(String name) { return Constants.getServer().getPlayer(name); } + @Nullable public Player getPlayer(UUID uuid) { return Constants.getServer().getPlayer(uuid); } diff --git a/src/main/java/io/github/paldiu/simplexcore/config/JsonFactory.java b/src/main/java/io/github/paldiu/simplexcore/config/JsonFactory.java index 978accf..431ece6 100644 --- a/src/main/java/io/github/paldiu/simplexcore/config/JsonFactory.java +++ b/src/main/java/io/github/paldiu/simplexcore/config/JsonFactory.java @@ -24,10 +24,10 @@ public final class JsonFactory { } public JsonFactory setDefaultPathways() { - return setPathways("config.yml", plugin.getDataFolder(), "config.yml"); + return setPathways("data.json", plugin.getDataFolder(), "data.json"); } - public Trio getPathways() { + public Trio pathways() { return new Trio<>(resourcePath, directory, fileName); } } \ No newline at end of file diff --git a/src/main/java/io/github/paldiu/simplexcore/config/YamlFactory.java b/src/main/java/io/github/paldiu/simplexcore/config/YamlFactory.java index b7f6004..fce5905 100644 --- a/src/main/java/io/github/paldiu/simplexcore/config/YamlFactory.java +++ b/src/main/java/io/github/paldiu/simplexcore/config/YamlFactory.java @@ -26,7 +26,7 @@ public final class YamlFactory { return setPathways("config.yml", plugin.getDataFolder(), "config.yml"); } - public Trio getPathways() { + public Trio pathways() { return new Trio<>(resourcePath, directory, fileName); } } diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index 5caf416..8f6ed4b 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -1,23 +1,30 @@ -io\github\paldiu\simplexcore\command\SimplexCommand.class io\github\paldiu\simplexcore\command\defaults\Command_info.class io\github\paldiu\simplexcore\listener\ServerPluginListener.class io\github\paldiu\simplexcore\command\CommandLoader.class -io\github\paldiu\simplexcore\math\Size.class io\github\paldiu\simplexcore\command\CommandInfo.class +io\github\paldiu\simplexcore\future\Announcer$1.class io\github\paldiu\simplexcore\plugin\AddonRegistry.class io\github\paldiu\simplexcore\command\CommandLoader$Registry.class +io\github\paldiu\simplexcore\CoreState$1.class io\github\paldiu\simplexcore\utils\Constants$TimeValues.class -io\github\paldiu\simplexcore\utils\Bean.class -io\github\paldiu\simplexcore\utils\Constants.class +io\github\paldiu\simplexcore\CoreState.class io\github\paldiu\simplexcore\config\YamlFactory.class -io\github\paldiu\simplexcore\future\SimplexTask.class -io\github\paldiu\simplexcore\config\JsonFactory.class io\github\paldiu\simplexcore\plugin\SimplexAddon.class -io\github\paldiu\simplexcore\SimplexCore.class -io\github\paldiu\simplexcore\utils\Trio.class -io\github\paldiu\simplexcore\listener\SimplexListener.class +io\github\paldiu\simplexcore\chat\Messages.class io\github\paldiu\simplexcore\plugin\AddonManager.class -io\github\paldiu\simplexcore\math\Cuboid.class +io\github\paldiu\simplexcore\chat\ChatUtils.class io\github\paldiu\simplexcore\command\defaults\DefaultCommand.class io\github\paldiu\simplexcore\utils\Utilities.class io\github\paldiu\simplexcore\chat\TextComponentFactory.class +io\github\paldiu\simplexcore\command\SimplexCommand.class +io\github\paldiu\simplexcore\math\Size.class +io\github\paldiu\simplexcore\utils\Bean.class +io\github\paldiu\simplexcore\utils\Constants.class +io\github\paldiu\simplexcore\future\SimplexTask.class +io\github\paldiu\simplexcore\config\JsonFactory.class +io\github\paldiu\simplexcore\SimplexCore.class +io\github\paldiu\simplexcore\utils\Trio.class +io\github\paldiu\simplexcore\listener\SimplexListener.class +io\github\paldiu\simplexcore\future\Announcer.class +io\github\paldiu\simplexcore\math\Cuboid.class +io\github\paldiu\simplexcore\CoreState$State.class diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index db78614..88de7f3 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,20 +1,25 @@ C:\Users\Samantha\IdeaProjects\SimplexCore\src\main\java\io\github\paldiu\simplexcore\listener\ServerPluginListener.java -C:\Users\Samantha\IdeaProjects\SimplexCore\src\main\java\io\github\paldiu\simplexcore\utils\Utilities.java +C:\Users\Samantha\IdeaProjects\SimplexCore\src\main\java\io\github\paldiu\simplexcore\CoreState.java C:\Users\Samantha\IdeaProjects\SimplexCore\src\main\java\io\github\paldiu\simplexcore\command\CommandInfo.java -C:\Users\Samantha\IdeaProjects\SimplexCore\src\main\java\io\github\paldiu\simplexcore\plugin\AddonManager.java -C:\Users\Samantha\IdeaProjects\SimplexCore\src\main\java\io\github\paldiu\simplexcore\command\defaults\DefaultCommand.java C:\Users\Samantha\IdeaProjects\SimplexCore\src\main\java\io\github\paldiu\simplexcore\math\Size.java C:\Users\Samantha\IdeaProjects\SimplexCore\src\main\java\io\github\paldiu\simplexcore\plugin\SimplexAddon.java -C:\Users\Samantha\IdeaProjects\SimplexCore\src\main\java\io\github\paldiu\simplexcore\future\SimplexTask.java -C:\Users\Samantha\IdeaProjects\SimplexCore\src\main\java\io\github\paldiu\simplexcore\utils\Trio.java +C:\Users\Samantha\IdeaProjects\SimplexCore\src\main\java\io\github\paldiu\simplexcore\chat\Messages.java C:\Users\Samantha\IdeaProjects\SimplexCore\src\main\java\io\github\paldiu\simplexcore\config\YamlFactory.java -C:\Users\Samantha\IdeaProjects\SimplexCore\src\main\java\io\github\paldiu\simplexcore\config\JsonFactory.java C:\Users\Samantha\IdeaProjects\SimplexCore\src\main\java\io\github\paldiu\simplexcore\plugin\AddonRegistry.java C:\Users\Samantha\IdeaProjects\SimplexCore\src\main\java\io\github\paldiu\simplexcore\command\SimplexCommand.java -C:\Users\Samantha\IdeaProjects\SimplexCore\src\main\java\io\github\paldiu\simplexcore\listener\SimplexListener.java C:\Users\Samantha\IdeaProjects\SimplexCore\src\main\java\io\github\paldiu\simplexcore\utils\Bean.java C:\Users\Samantha\IdeaProjects\SimplexCore\src\main\java\io\github\paldiu\simplexcore\command\CommandLoader.java -C:\Users\Samantha\IdeaProjects\SimplexCore\src\main\java\io\github\paldiu\simplexcore\command\defaults\Command_info.java C:\Users\Samantha\IdeaProjects\SimplexCore\src\main\java\io\github\paldiu\simplexcore\SimplexCore.java +C:\Users\Samantha\IdeaProjects\SimplexCore\src\main\java\io\github\paldiu\simplexcore\chat\ChatUtils.java C:\Users\Samantha\IdeaProjects\SimplexCore\src\main\java\io\github\paldiu\simplexcore\math\Cuboid.java +C:\Users\Samantha\IdeaProjects\SimplexCore\src\main\java\io\github\paldiu\simplexcore\chat\TextComponentFactory.java +C:\Users\Samantha\IdeaProjects\SimplexCore\src\main\java\io\github\paldiu\simplexcore\utils\Utilities.java +C:\Users\Samantha\IdeaProjects\SimplexCore\src\main\java\io\github\paldiu\simplexcore\plugin\AddonManager.java +C:\Users\Samantha\IdeaProjects\SimplexCore\src\main\java\io\github\paldiu\simplexcore\future\Announcer.java +C:\Users\Samantha\IdeaProjects\SimplexCore\src\main\java\io\github\paldiu\simplexcore\command\defaults\DefaultCommand.java +C:\Users\Samantha\IdeaProjects\SimplexCore\src\main\java\io\github\paldiu\simplexcore\future\SimplexTask.java +C:\Users\Samantha\IdeaProjects\SimplexCore\src\main\java\io\github\paldiu\simplexcore\utils\Trio.java +C:\Users\Samantha\IdeaProjects\SimplexCore\src\main\java\io\github\paldiu\simplexcore\config\JsonFactory.java +C:\Users\Samantha\IdeaProjects\SimplexCore\src\main\java\io\github\paldiu\simplexcore\listener\SimplexListener.java +C:\Users\Samantha\IdeaProjects\SimplexCore\src\main\java\io\github\paldiu\simplexcore\command\defaults\Command_info.java C:\Users\Samantha\IdeaProjects\SimplexCore\src\main\java\io\github\paldiu\simplexcore\utils\Constants.java