From abcb991f20c7481f39d888032ee0f910480327d0 Mon Sep 17 00:00:00 2001 From: sms Date: Sun, 9 Jan 2022 10:58:31 -0800 Subject: [PATCH] Cleanup x2 --- .../spigot/SpigotServerScripter.java | 3 - .../spigot/command/CommandScript.java | 129 ------------------ .../spigot/utils/ScriptCommand.java | 1 - 3 files changed, 133 deletions(-) delete mode 100644 Spigot/src/main/java/uwu/smsgamer/serverscripter/spigot/command/CommandScript.java diff --git a/Spigot/src/main/java/uwu/smsgamer/serverscripter/spigot/SpigotServerScripter.java b/Spigot/src/main/java/uwu/smsgamer/serverscripter/spigot/SpigotServerScripter.java index 2477177..0ec1b61 100644 --- a/Spigot/src/main/java/uwu/smsgamer/serverscripter/spigot/SpigotServerScripter.java +++ b/Spigot/src/main/java/uwu/smsgamer/serverscripter/spigot/SpigotServerScripter.java @@ -12,14 +12,11 @@ import uwu.smsgamer.serverscripter.ScriptLoader; import uwu.smsgamer.serverscripter.ScripterLoader; import uwu.smsgamer.serverscripter.commands.CommandManager; -import uwu.smsgamer.serverscripter.commands.SCommand; import uwu.smsgamer.serverscripter.lilliputian.DependencyBuilder; import uwu.smsgamer.serverscripter.senapi.config.ConfigManager; import uwu.smsgamer.serverscripter.shell.ShellManager; -import uwu.smsgamer.serverscripter.spigot.command.CommandScript; import uwu.smsgamer.serverscripter.spigot.command.SpigotCommandManager; import uwu.smsgamer.serverscripter.spigot.shell.ShellListener; -import uwu.smsgamer.serverscripter.spigot.utils.ScriptCommand; import uwu.smsgamer.serverscripter.spigot.utils.ScriptListenerHelper; import java.io.File; diff --git a/Spigot/src/main/java/uwu/smsgamer/serverscripter/spigot/command/CommandScript.java b/Spigot/src/main/java/uwu/smsgamer/serverscripter/spigot/command/CommandScript.java deleted file mode 100644 index d1e3c44..0000000 --- a/Spigot/src/main/java/uwu/smsgamer/serverscripter/spigot/command/CommandScript.java +++ /dev/null @@ -1,129 +0,0 @@ -package uwu.smsgamer.serverscripter.spigot.command; - -import org.bukkit.ChatColor; -import org.bukkit.command.*; -import uwu.smsgamer.serverscripter.spigot.senapi.spigot.SConsolePlayer; -import uwu.smsgamer.serverscripter.*; -import uwu.smsgamer.serverscripter.shell.Shell; -import uwu.smsgamer.serverscripter.shell.ShellManager; - -import java.util.*; - -public class CommandScript implements TabExecutor { - private static CommandScript INSTANCE; - private static String HELP_MESSAGE = "/script [shell name]"; - - { - INSTANCE = this; - } - - public static CommandScript getInstance() { - if (INSTANCE == null) new CommandScript(); - return INSTANCE; - } - - @Override - public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - if (!testPermission(command, sender)) { - return true; - } - if (args.length == 0) { - sender.sendMessage(HELP_MESSAGE); - return true; - } else { - switch (args[0].toLowerCase()) { - case "addons": - if (!testPermission(command, sender, "addons")) { - return true; - } - sender.sendMessage("Addons:"); - Set addons = ScripterLoader.getInstance().getAddons(); - if (addons.size() == 0) { - sender.sendMessage("No addons."); - return true; - } - for (ScriptAddon addon : addons) { - sender.sendMessage(addon.getName() + " version " + addon.getVersion()); - } - return true; - case "reload": - if (!testPermission(command, sender, "reload")) { - return true; - } - ScripterLoader.getInstance().reloadAddons(); - sender.sendMessage("Reloaded."); - return true; - case "shell": - if (!testPermission(command, sender, "shell")) { - return true; - } - if (args.length == 1) { - List names = new ArrayList<>(Arrays.asList(ScripterLoader.getInstance().getShellNames())); - names.add("None"); - sender.sendMessage(String.join(", ", names)); - return true; - } - String shellName = args[1].toLowerCase(); - UUID uuid = SConsolePlayer.getOfflinePlayer(sender).getUniqueId(); - if (shellName.equals("none")) { - ShellManager.removeShell(uuid); - sender.sendMessage("Removed shell."); - } else if (ScripterLoader.getInstance().getShells().containsKey(shellName)) { - Shell shell = ScripterLoader.getInstance().getShells().get(shellName); - shell.setShell(uuid); - sender.sendMessage("Shell " + shellName + " opened."); - } else { - sender.sendMessage("Shell " + args[1] + " not found."); - } - return true; - default: - sender.sendMessage(HELP_MESSAGE); - return true; - } - } - } - - @Override - public List onTabComplete(CommandSender sender, Command command, String alias, String[] args) { - return null; - } - - public boolean testPermission(Command command, CommandSender target, String... addons) { - if (testPermissionSilent(command, target, addons)) { - return true; - } - - String permissionMessage = command.getPermissionMessage(); - - if (permissionMessage == null) { - target.sendMessage(ChatColor.RED + "I'm sorry, but you do not have permission to perform this command. Please contact the server administrators if you believe that this is in error."); - } else if (permissionMessage.length() != 0) { - String permission = command.getPermission(); - if (permission != null) permission += (addons.length > 0 ? "." + String.join(".", addons) : ""); - else permission = ""; - - for (String line : permissionMessage.replace("", permission).split("\n")) { - target.sendMessage(line); - } - } - - return false; - } - - public boolean testPermissionSilent(Command command, CommandSender target, String... addons) { - String permission = command.getPermission(); - if ((permission == null) || (permission.length() == 0)) { - return true; - } - - permission += (addons.length > 0 ? "." + String.join(".", addons) : ""); - - for (String p : permission.split(";")) { - if (target.hasPermission(p)) { - return true; - } - } - - return false; - } -} diff --git a/Spigot/src/main/java/uwu/smsgamer/serverscripter/spigot/utils/ScriptCommand.java b/Spigot/src/main/java/uwu/smsgamer/serverscripter/spigot/utils/ScriptCommand.java index 4fb9c75..9782b19 100644 --- a/Spigot/src/main/java/uwu/smsgamer/serverscripter/spigot/utils/ScriptCommand.java +++ b/Spigot/src/main/java/uwu/smsgamer/serverscripter/spigot/utils/ScriptCommand.java @@ -2,7 +2,6 @@ import org.bukkit.*; import org.bukkit.command.*; -import uwu.smsgamer.serverscripter.scripts.Script; import java.lang.reflect.*; import java.util.*;