From 45de49569904273505f0695a8afb5fa5a83a0df3 Mon Sep 17 00:00:00 2001 From: Jikoo Date: Sun, 15 Nov 2020 12:26:36 -0500 Subject: [PATCH] Simplify command executor assignment a little more --- .../main/java/com/lishid/openinv/OpenInv.java | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/plugin/src/main/java/com/lishid/openinv/OpenInv.java b/plugin/src/main/java/com/lishid/openinv/OpenInv.java index b8b524f..ba33e94 100644 --- a/plugin/src/main/java/com/lishid/openinv/OpenInv.java +++ b/plugin/src/main/java/com/lishid/openinv/OpenInv.java @@ -352,17 +352,11 @@ public class OpenInv extends JavaPlugin implements IOpenInv { pm.registerEvents(new InventoryListener(this), this); // Register commands to their executors - OpenInvCommand openInv = new OpenInvCommand(this); - this.setCommandExecutor("openinv", openInv); - this.setCommandExecutor("openender", openInv); - this.setCommandExecutor("searchcontainer", new SearchContainerCommand(this)); - SearchInvCommand searchInv = new SearchInvCommand(this); - this.setCommandExecutor("searchinv", searchInv); - this.setCommandExecutor("searchender", searchInv); - this.setCommandExecutor("searchenchant", new SearchEnchantCommand(this)); - ContainerSettingCommand settingCommand = new ContainerSettingCommand(this); - this.setCommandExecutor("silentcontainer", settingCommand); - this.setCommandExecutor("anycontainer", settingCommand); + this.setCommandExecutor(new OpenInvCommand(this), "openinv", "openender"); + this.setCommandExecutor(new SearchContainerCommand(this), "searchcontainer"); + this.setCommandExecutor(new SearchInvCommand(this), "searchinv", "searchender"); + this.setCommandExecutor(new SearchEnchantCommand(this), "searchenchant"); + this.setCommandExecutor(new ContainerSettingCommand(this), "silentcontainer", "anycontainer"); } else { this.sendVersionError(this.getLogger()::warning); @@ -375,10 +369,12 @@ public class OpenInv extends JavaPlugin implements IOpenInv { messageMethod.accept("Please obtain an appropriate version here: " + accessor.getReleasesLink()); } - private void setCommandExecutor(String commandName, CommandExecutor executor) { - PluginCommand command = this.getCommand(commandName); - if (command != null) { - command.setExecutor(executor); + private void setCommandExecutor(CommandExecutor executor, String... commands) { + for (String commandName : commands) { + PluginCommand command = this.getCommand(commandName); + if (command != null) { + command.setExecutor(executor); + } } }