From e1b05af2dfe573e650ab1918ed7a2a1664128c9b Mon Sep 17 00:00:00 2001 From: Brianna <bri@songoda.com> Date: Sat, 19 Oct 2019 15:46:28 -0400 Subject: [PATCH] Fixed command syntax issue. --- .../epicbosses/commands/CommandBoss.java | 54 ------------------- .../epicbosses/commands/CommandCreate.java | 2 +- .../epicbosses/commands/CommandDebug.java | 2 +- .../epicbosses/commands/CommandDropTable.java | 2 +- .../epicbosses/commands/CommandEdit.java | 2 +- .../epicbosses/commands/CommandGiveEgg.java | 2 +- .../epicbosses/commands/CommandInfo.java | 2 +- .../epicbosses/commands/CommandItems.java | 2 +- .../epicbosses/commands/CommandKillAll.java | 2 +- .../epicbosses/commands/CommandList.java | 2 +- .../epicbosses/commands/CommandMenu.java | 2 +- .../epicbosses/commands/CommandNearby.java | 2 +- .../commands/CommandNewAutoSpawn.java | 2 +- .../commands/CommandNewCommand.java | 2 +- .../commands/CommandNewDropTable.java | 2 +- .../commands/CommandNewMessage.java | 2 +- .../epicbosses/commands/CommandNewSkill.java | 2 +- .../epicbosses/commands/CommandReload.java | 2 +- .../epicbosses/commands/CommandShop.java | 2 +- .../epicbosses/commands/CommandSkills.java | 2 +- .../epicbosses/commands/CommandSpawn.java | 2 +- .../epicbosses/commands/CommandTime.java | 2 +- 22 files changed, 21 insertions(+), 75 deletions(-) delete mode 100644 plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandBoss.java diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandBoss.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandBoss.java deleted file mode 100644 index c96c520..0000000 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandBoss.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.songoda.epicbosses.commands; - -import com.songoda.core.commands.AbstractCommand; -import com.songoda.core.utils.TextUtils; -import com.songoda.epicbosses.EpicBosses; -import org.bukkit.command.CommandSender; - -import java.util.List; - -public class CommandBoss extends AbstractCommand { - - EpicBosses instance; - - public CommandBoss() { - super(false, "Boss"); - instance = EpicBosses.getInstance(); - } - - @Override - protected ReturnType runCommand(CommandSender sender, String... args) { - sender.sendMessage(""); - sender.sendMessage(TextUtils.formatText("&b&lEpicBosses &8ยป &7Version " + instance.getDescription().getVersion() - + " Created with <3 by &5&l&oSongoda")); - - for (AbstractCommand command : instance.getCommandManager().getAllCommands()) { - if (command.getPermissionNode() == null || sender.hasPermission(command.getPermissionNode())) { - sender.sendMessage(TextUtils.formatText("&8 - &a" + command.getSyntax() + "&7 - " + command.getDescription())); - } - } - sender.sendMessage(""); - - return ReturnType.SUCCESS; - } - - @Override - protected List<String> onTab(CommandSender cs, String... args) { - return null; - } - - @Override - public String getPermissionNode() { - return null; - } - - @Override - public String getSyntax() { - return "/boss"; - } - - @Override - public String getDescription() { - return "Displays this page."; - } -} diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandCreate.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandCreate.java index 3a4fc8f..df85405 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandCreate.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandCreate.java @@ -88,7 +88,7 @@ public class CommandCreate extends AbstractCommand { @Override public String getSyntax() { - return "/boss create <[>name> <entity>"; + return "create <[>name> <entity>"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandDebug.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandDebug.java index c2241cd..719061f 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandDebug.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandDebug.java @@ -52,7 +52,7 @@ public class CommandDebug extends AbstractCommand { @Override public String getSyntax() { - return "/boss reload"; + return "reload"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandDropTable.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandDropTable.java index e21e16d..88091b7 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandDropTable.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandDropTable.java @@ -40,7 +40,7 @@ public class CommandDropTable extends AbstractCommand { @Override public String getSyntax() { - return "/boss droptable"; + return "droptable"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandEdit.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandEdit.java index 297b89f..c9966cd 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandEdit.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandEdit.java @@ -71,7 +71,7 @@ public class CommandEdit extends AbstractCommand { @Override public String getSyntax() { - return "/boss edit <name>"; + return "edit <name>"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandGiveEgg.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandGiveEgg.java index f50a6d0..b38fd62 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandGiveEgg.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandGiveEgg.java @@ -105,7 +105,7 @@ public class CommandGiveEgg extends AbstractCommand { @Override public String getSyntax() { - return "/boss giveegg <name> <player> [amount]"; + return "giveegg <name> <player> [amount]"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandInfo.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandInfo.java index e42e396..0b3755d 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandInfo.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandInfo.java @@ -64,7 +64,7 @@ public class CommandInfo extends AbstractCommand { @Override public String getSyntax() { - return "/boss info <name>"; + return "info <name>"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandItems.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandItems.java index f82a1d5..0fa0353 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandItems.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandItems.java @@ -39,7 +39,7 @@ public class CommandItems extends AbstractCommand { @Override public String getSyntax() { - return "/boss items"; + return "items"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandKillAll.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandKillAll.java index 150d501..1261495 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandKillAll.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandKillAll.java @@ -61,7 +61,7 @@ public class CommandKillAll extends AbstractCommand { @Override public String getSyntax() { - return "/boss killall [world]"; + return "killall [world]"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandList.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandList.java index 4ab1a00..2c81c89 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandList.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandList.java @@ -39,7 +39,7 @@ public class CommandList extends AbstractCommand { @Override public String getSyntax() { - return "/boss list"; + return "list"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandMenu.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandMenu.java index 9da9e8f..cb02167 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandMenu.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandMenu.java @@ -34,7 +34,7 @@ public class CommandMenu extends AbstractCommand { @Override public String getPermissionNode() { - return "/boss menu"; + return "menu"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNearby.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNearby.java index c36ee5f..f53eb54 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNearby.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNearby.java @@ -81,7 +81,7 @@ public class CommandNearby extends AbstractCommand { @Override public String getSyntax() { - return "/boss nearby [radius]"; + return "nearby [radius]"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewAutoSpawn.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewAutoSpawn.java index 3c54541..63a0486 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewAutoSpawn.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewAutoSpawn.java @@ -60,7 +60,7 @@ public class CommandNewAutoSpawn extends AbstractCommand { @Override public String getSyntax() { - return "/boss new autospawn <name>"; + return "new autospawn <name>"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewCommand.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewCommand.java index cfd2ce9..f3d2655 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewCommand.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewCommand.java @@ -54,7 +54,7 @@ public class CommandNewCommand extends AbstractCommand { @Override public String getSyntax() { - return "/boss new command <name> <commands...>"; + return "new command <name> <commands...>"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewDropTable.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewDropTable.java index bd9be00..149847a 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewDropTable.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewDropTable.java @@ -80,7 +80,7 @@ public class CommandNewDropTable extends AbstractCommand { @Override public String getSyntax() { - return "/boss new droptable <name> <type>"; + return "new droptable <name> <type>"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewMessage.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewMessage.java index 51e3add..76068c1 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewMessage.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewMessage.java @@ -58,7 +58,7 @@ public class CommandNewMessage extends AbstractCommand { @Override public String getSyntax() { - return "/boss new message <name> <message...>"; + return "new message <name> <message...>"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewSkill.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewSkill.java index 5ea1339..14cb02d 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewSkill.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewSkill.java @@ -94,7 +94,7 @@ public class CommandNewSkill extends AbstractCommand { @Override public String getSyntax() { - return "/boss new skill <name> <type> <mods>"; + return "new skill <name> <type> <mods>"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandReload.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandReload.java index 16c3c47..06393b7 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandReload.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandReload.java @@ -47,7 +47,7 @@ public class CommandReload extends AbstractCommand { @Override public String getSyntax() { - return "/boss reload"; + return "reload"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandShop.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandShop.java index 12e3247..fd79b30 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandShop.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandShop.java @@ -46,7 +46,7 @@ public class CommandShop extends AbstractCommand { @Override public String getSyntax() { - return "/boss shop"; + return "shop"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandSkills.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandSkills.java index ad4fd90..3bc1eeb 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandSkills.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandSkills.java @@ -39,7 +39,7 @@ public class CommandSkills extends AbstractCommand { @Override public String getSyntax() { - return "/boss skills"; + return "skills"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandSpawn.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandSpawn.java index 89ef65b..58c48ab 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandSpawn.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandSpawn.java @@ -84,7 +84,7 @@ public class CommandSpawn extends AbstractCommand { @Override public String getSyntax() { - return "/boss spawn <name> [location]"; + return "spawn <name> [location]"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandTime.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandTime.java index 3b3c422..e06d0ea 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandTime.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandTime.java @@ -82,7 +82,7 @@ public class CommandTime extends AbstractCommand { @Override public String getSyntax() { - return "/boss time <section>"; + return "time <section>"; } @Override