From 74dfdd74d6a4d4389006c83abb355b2ab54ccafb Mon Sep 17 00:00:00 2001 From: Brianna Date: Sun, 28 Jun 2020 19:32:52 -0500 Subject: [PATCH] Support 1.16. --- pom.xml | 2 +- .../songoda/epicfurnaces/EpicFurnaces.java | 2 +- .../epicfurnaces/commands/CommandBoost.java | 2 +- .../commands/CommandEpicFurnaces.java | 54 ------------------- .../epicfurnaces/commands/CommandGive.java | 2 +- .../epicfurnaces/commands/CommandReload.java | 2 +- .../epicfurnaces/commands/CommandRemote.java | 2 +- .../commands/CommandSettings.java | 2 +- src/main/resources/plugin.yml | 4 +- 9 files changed, 9 insertions(+), 63 deletions(-) delete mode 100644 src/main/java/com/songoda/epicfurnaces/commands/CommandEpicFurnaces.java diff --git a/pom.xml b/pom.xml index 0addbda..62e8ff0 100644 --- a/pom.xml +++ b/pom.xml @@ -93,7 +93,7 @@ org.spigotmc spigot - 1.15 + 1.16.1 com.songoda diff --git a/src/main/java/com/songoda/epicfurnaces/EpicFurnaces.java b/src/main/java/com/songoda/epicfurnaces/EpicFurnaces.java index a4ffd5c..af4da4b 100644 --- a/src/main/java/com/songoda/epicfurnaces/EpicFurnaces.java +++ b/src/main/java/com/songoda/epicfurnaces/EpicFurnaces.java @@ -96,7 +96,7 @@ public class EpicFurnaces extends SongodaPlugin { // Register commands this.commandManager = new CommandManager(this); - this.commandManager.addCommand(new CommandEpicFurnaces(this)) + this.commandManager.addMainCommand("ef") .addSubCommands( new CommandBoost(this), new CommandGive(this), diff --git a/src/main/java/com/songoda/epicfurnaces/commands/CommandBoost.java b/src/main/java/com/songoda/epicfurnaces/commands/CommandBoost.java index 51fbe75..7296e37 100644 --- a/src/main/java/com/songoda/epicfurnaces/commands/CommandBoost.java +++ b/src/main/java/com/songoda/epicfurnaces/commands/CommandBoost.java @@ -79,7 +79,7 @@ public class CommandBoost extends AbstractCommand { @Override public String getSyntax() { - return "/ef boost [duration]"; + return "boost [duration]"; } @Override diff --git a/src/main/java/com/songoda/epicfurnaces/commands/CommandEpicFurnaces.java b/src/main/java/com/songoda/epicfurnaces/commands/CommandEpicFurnaces.java deleted file mode 100644 index 28d833b..0000000 --- a/src/main/java/com/songoda/epicfurnaces/commands/CommandEpicFurnaces.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.songoda.epicfurnaces.commands; - -import com.songoda.core.commands.AbstractCommand; -import com.songoda.epicfurnaces.EpicFurnaces; -import org.bukkit.ChatColor; -import org.bukkit.command.CommandSender; - -import java.util.List; - -public class CommandEpicFurnaces extends AbstractCommand { - - final EpicFurnaces plugin; - - public CommandEpicFurnaces(EpicFurnaces plugin) { - super(false, "EpicFurnaces"); - this.plugin = plugin; - } - - @Override - protected ReturnType runCommand(CommandSender sender, String... args) { - sender.sendMessage(""); - plugin.getLocale().newMessage("&7Version " + plugin.getDescription().getVersion() - + " Created with <3 by &5&l&oSongoda").sendPrefixedMessage(sender); - - for (AbstractCommand command : plugin.getCommandManager().getAllCommands()) { - if (command.getPermissionNode() == null || sender.hasPermission(command.getPermissionNode())) { - sender.sendMessage(ChatColor.translateAlternateColorCodes('&', "&8 - &a" + command.getSyntax() + "&7 - " + command.getDescription())); - } - } - sender.sendMessage(""); - - return ReturnType.SUCCESS; - } - - @Override - protected List onTab(CommandSender commandSender, String... strings) { - return null; - } - - @Override - public String getPermissionNode() { - return null; - } - - @Override - public String getSyntax() { - return "/EpicFurnaces"; - } - - @Override - public String getDescription() { - return "Displays this page."; - } -} diff --git a/src/main/java/com/songoda/epicfurnaces/commands/CommandGive.java b/src/main/java/com/songoda/epicfurnaces/commands/CommandGive.java index 4d7fecb..e735489 100644 --- a/src/main/java/com/songoda/epicfurnaces/commands/CommandGive.java +++ b/src/main/java/com/songoda/epicfurnaces/commands/CommandGive.java @@ -66,7 +66,7 @@ public class CommandGive extends AbstractCommand { @Override public String getSyntax() { - return "/ef give [player] "; + return "give [player] "; } @Override diff --git a/src/main/java/com/songoda/epicfurnaces/commands/CommandReload.java b/src/main/java/com/songoda/epicfurnaces/commands/CommandReload.java index 7151996..84c33a9 100644 --- a/src/main/java/com/songoda/epicfurnaces/commands/CommandReload.java +++ b/src/main/java/com/songoda/epicfurnaces/commands/CommandReload.java @@ -34,7 +34,7 @@ public class CommandReload extends AbstractCommand { @Override public String getSyntax() { - return "/ef reload"; + return "çreload"; } @Override diff --git a/src/main/java/com/songoda/epicfurnaces/commands/CommandRemote.java b/src/main/java/com/songoda/epicfurnaces/commands/CommandRemote.java index 25e8c94..8f76db1 100644 --- a/src/main/java/com/songoda/epicfurnaces/commands/CommandRemote.java +++ b/src/main/java/com/songoda/epicfurnaces/commands/CommandRemote.java @@ -73,7 +73,7 @@ public class CommandRemote extends AbstractCommand { @Override public String getSyntax() { - return "/ef remote [nickname]"; + return "remote [nickname]"; } @Override diff --git a/src/main/java/com/songoda/epicfurnaces/commands/CommandSettings.java b/src/main/java/com/songoda/epicfurnaces/commands/CommandSettings.java index 3863967..e0c3e29 100644 --- a/src/main/java/com/songoda/epicfurnaces/commands/CommandSettings.java +++ b/src/main/java/com/songoda/epicfurnaces/commands/CommandSettings.java @@ -38,7 +38,7 @@ public class CommandSettings extends AbstractCommand { @Override public String getSyntax() { - return "/ef settings"; + return "settings"; } @Override diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 6eae01d..6943047 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -6,8 +6,8 @@ main: com.songoda.epicfurnaces.EpicFurnaces author: songoda api-version: 1.13 commands: - EpicFurnaces: + ef: description: I have no idea. default: true - aliases: [ef] + aliases: [EpicFurnaces] usage: / [reload] \ No newline at end of file