From 9b5e09d3908d199c74d61caa1d554bf95eca1375 Mon Sep 17 00:00:00 2001 From: Jos van 't Hof Date: Tue, 5 Jun 2012 08:58:37 +0200 Subject: [PATCH] Migrated to new commands handling. --- .../AbstractCommand.java} | 22 ++++---- .../RandomSpawn/Commands/BedsCommand.java | 6 ++- .../RandomSpawn/Commands/DisableCommand.java | 8 +-- .../RandomSpawn/Commands/EnableCommand.java | 8 +-- .../Commands/FirstJoinCommand.java | 9 ++-- ...SpawnHelpCommand.java => HelpCommand.java} | 8 +-- .../RandomSpawn/Commands/InfoCommand.java | 8 +-- ...wnsCommand.java => KeepSpawnsCommand.java} | 8 +-- ...nReloadCommand.java => ReloadCommand.java} | 8 +-- ...etAreaCommand.java => SetAreaCommand.java} | 8 +-- ...Command.java => SetFirstSpawnCommand.java} | 8 +-- ...nCommand.java => TpFirstSpawnCommand.java} | 8 +-- ...mmand.java => UnsetFirstSpawnCommand.java} | 8 +-- .../RandomSpawn/Handlers/CommandHandler.java | 54 +++++++++---------- 14 files changed, 87 insertions(+), 84 deletions(-) rename plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/{RandomSpawnCommandExecutor.java => Commands/AbstractCommand.java} (72%) rename plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/{RandomSpawnHelpCommand.java => HelpCommand.java} (90%) rename plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/{RandomSpawnKeepSpawnsCommand.java => KeepSpawnsCommand.java} (84%) rename plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/{RandomSpawnReloadCommand.java => ReloadCommand.java} (79%) rename plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/{RandomSpawnSetAreaCommand.java => SetAreaCommand.java} (92%) rename plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/{RandomSpawnSetFirstSpawnCommand.java => SetFirstSpawnCommand.java} (81%) rename plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/{RandomSpawnTpFirstSpawnCommand.java => TpFirstSpawnCommand.java} (82%) rename plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/{RandomSpawnUnsetFirstSpawnCommand.java => UnsetFirstSpawnCommand.java} (74%) diff --git a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/RandomSpawnCommandExecutor.java b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/AbstractCommand.java similarity index 72% rename from plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/RandomSpawnCommandExecutor.java rename to plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/AbstractCommand.java index 222de6ec3..af59b0d57 100644 --- a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/RandomSpawnCommandExecutor.java +++ b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/AbstractCommand.java @@ -1,18 +1,21 @@ -package me.Josvth.RandomSpawn; +package me.Josvth.RandomSpawn.Commands; import java.util.List; +import me.Josvth.RandomSpawn.RandomSpawn; + import org.bukkit.command.CommandSender; -public abstract class RandomSpawnCommandExecutor { +public abstract class AbstractCommand { - protected RandomSpawn plugin; - protected String name; + protected final RandomSpawn plugin; + protected final String name; - public void setPlugin(RandomSpawn instance) { - plugin = instance; - } - + public AbstractCommand(RandomSpawn instance, String commandName){ + plugin = instance; + name = commandName; + } + public abstract boolean onCommand(CommandSender sender, List args); public boolean onConsoleCommand(CommandSender sender, List args){ @@ -22,8 +25,7 @@ public abstract class RandomSpawnCommandExecutor { public String getName() { return name; } - - + public String getDescription() { try { return plugin.getCommand("rs " + name).getDescription(); diff --git a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/BedsCommand.java b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/BedsCommand.java index 9d25fa64a..4fd63749b 100644 --- a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/BedsCommand.java +++ b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/BedsCommand.java @@ -2,13 +2,15 @@ package me.Josvth.RandomSpawn.Commands; import java.util.List; +import me.Josvth.RandomSpawn.RandomSpawn; + import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; public class BedsCommand extends AbstractCommand{ - public BedsCommand(){ - name = "usebeds"; + public BedsCommand(RandomSpawn instance){ + super(instance,"usebeds"); } public boolean onCommand(CommandSender sender, List args){ diff --git a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/DisableCommand.java b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/DisableCommand.java index 472a327dd..ecf1fd1a4 100644 --- a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/DisableCommand.java +++ b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/DisableCommand.java @@ -2,15 +2,15 @@ package me.Josvth.RandomSpawn.Commands; import java.util.List; -import me.Josvth.RandomSpawn.RandomSpawnCommandExecutor; +import me.Josvth.RandomSpawn.RandomSpawn; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -public class DisableCommand extends RandomSpawnCommandExecutor{ +public class DisableCommand extends AbstractCommand{ - public DisableCommand(){ - name = "disable"; + public DisableCommand(RandomSpawn instance){ + super(instance,"disable"); } public boolean onCommand(CommandSender sender, List args){ diff --git a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/EnableCommand.java b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/EnableCommand.java index 5126039b1..f9235efc5 100644 --- a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/EnableCommand.java +++ b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/EnableCommand.java @@ -2,15 +2,15 @@ package me.Josvth.RandomSpawn.Commands; import java.util.List; -import me.Josvth.RandomSpawn.RandomSpawnCommandExecutor; +import me.Josvth.RandomSpawn.RandomSpawn; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -public class EnableCommand extends RandomSpawnCommandExecutor{ +public class EnableCommand extends AbstractCommand{ - public EnableCommand(){ - this.name = "enable"; + public EnableCommand(RandomSpawn instance){ + super(instance,"enable"); } public boolean onCommand(CommandSender sender, List args){ diff --git a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/FirstJoinCommand.java b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/FirstJoinCommand.java index c368510e3..9014d2be4 100644 --- a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/FirstJoinCommand.java +++ b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/FirstJoinCommand.java @@ -5,13 +5,12 @@ import java.util.List; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import me.Josvth.RandomSpawn.RandomSpawnCommandExecutor; +import me.Josvth.RandomSpawn.RandomSpawn; +public class FirstJoinCommand extends AbstractCommand{ -public class FirstJoinCommand extends RandomSpawnCommandExecutor{ - - public FirstJoinCommand(){ - this.name = "firstjoin"; + public FirstJoinCommand(RandomSpawn instance){ + super(instance, "firstjoin"); } public boolean onCommand(CommandSender sender, List args){ diff --git a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/RandomSpawnHelpCommand.java b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/HelpCommand.java similarity index 90% rename from plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/RandomSpawnHelpCommand.java rename to plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/HelpCommand.java index 7d5ee2c36..532a28413 100644 --- a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/RandomSpawnHelpCommand.java +++ b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/HelpCommand.java @@ -3,16 +3,16 @@ package me.Josvth.RandomSpawn.Commands; import java.util.List; -import me.Josvth.RandomSpawn.RandomSpawnCommandExecutor; +import me.Josvth.RandomSpawn.RandomSpawn; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -public class RandomSpawnHelpCommand extends RandomSpawnCommandExecutor{ +public class HelpCommand extends AbstractCommand{ - public RandomSpawnHelpCommand(){ - this.name = "help"; + public HelpCommand(RandomSpawn instance){ + super(instance, "help"); } public boolean onCommand(CommandSender sender, List args){ diff --git a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/InfoCommand.java b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/InfoCommand.java index 88ac343e0..5cbe0e109 100644 --- a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/InfoCommand.java +++ b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/InfoCommand.java @@ -2,16 +2,16 @@ package me.Josvth.RandomSpawn.Commands; import java.util.List; -import me.Josvth.RandomSpawn.RandomSpawnCommandExecutor; +import me.Josvth.RandomSpawn.RandomSpawn; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -public class InfoCommand extends RandomSpawnCommandExecutor { +public class InfoCommand extends AbstractCommand { - public InfoCommand(){ - this.name = "info"; + public InfoCommand(RandomSpawn instance){ + super(instance, "info"); } public boolean onCommand(CommandSender sender, List args){ diff --git a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/RandomSpawnKeepSpawnsCommand.java b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/KeepSpawnsCommand.java similarity index 84% rename from plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/RandomSpawnKeepSpawnsCommand.java rename to plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/KeepSpawnsCommand.java index 8d88c4452..bded310fc 100644 --- a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/RandomSpawnKeepSpawnsCommand.java +++ b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/KeepSpawnsCommand.java @@ -2,15 +2,15 @@ package me.Josvth.RandomSpawn.Commands; import java.util.List; -import me.Josvth.RandomSpawn.RandomSpawnCommandExecutor; +import me.Josvth.RandomSpawn.RandomSpawn; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -public class RandomSpawnKeepSpawnsCommand extends RandomSpawnCommandExecutor { +public class KeepSpawnsCommand extends AbstractCommand { - public RandomSpawnKeepSpawnsCommand(){ - this.name = "keepfirstspawns"; + public KeepSpawnsCommand(RandomSpawn instance){ + super(instance, "keepfirstspawns"); } public boolean onCommand(CommandSender sender, List args){ diff --git a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/RandomSpawnReloadCommand.java b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/ReloadCommand.java similarity index 79% rename from plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/RandomSpawnReloadCommand.java rename to plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/ReloadCommand.java index 729ceda0e..1f3965f0e 100644 --- a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/RandomSpawnReloadCommand.java +++ b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/ReloadCommand.java @@ -2,15 +2,15 @@ package me.Josvth.RandomSpawn.Commands; import java.util.List; -import me.Josvth.RandomSpawn.RandomSpawnCommandExecutor; +import me.Josvth.RandomSpawn.RandomSpawn; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -public class RandomSpawnReloadCommand extends RandomSpawnCommandExecutor { +public class ReloadCommand extends AbstractCommand { - public RandomSpawnReloadCommand(){ - this.name = "reload"; + public ReloadCommand(RandomSpawn instance){ + super(instance, "reload"); } public boolean onCommand(CommandSender sender, List args){ diff --git a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/RandomSpawnSetAreaCommand.java b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/SetAreaCommand.java similarity index 92% rename from plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/RandomSpawnSetAreaCommand.java rename to plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/SetAreaCommand.java index 022f264b9..c50174e04 100644 --- a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/RandomSpawnSetAreaCommand.java +++ b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/SetAreaCommand.java @@ -2,16 +2,16 @@ package me.Josvth.RandomSpawn.Commands; import java.util.List; -import me.Josvth.RandomSpawn.RandomSpawnCommandExecutor; +import me.Josvth.RandomSpawn.RandomSpawn; import org.bukkit.Location; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -public class RandomSpawnSetAreaCommand extends RandomSpawnCommandExecutor{ +public class SetAreaCommand extends AbstractCommand{ - public RandomSpawnSetAreaCommand(){ - this.name = "setarea"; + public SetAreaCommand(RandomSpawn instance){ + super(instance,"setarea"); } public boolean onCommand(CommandSender sender, List args){ diff --git a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/RandomSpawnSetFirstSpawnCommand.java b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/SetFirstSpawnCommand.java similarity index 81% rename from plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/RandomSpawnSetFirstSpawnCommand.java rename to plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/SetFirstSpawnCommand.java index 9790dcbd6..4cfc0d77a 100644 --- a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/RandomSpawnSetFirstSpawnCommand.java +++ b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/SetFirstSpawnCommand.java @@ -2,15 +2,15 @@ package me.Josvth.RandomSpawn.Commands; import java.util.List; -import me.Josvth.RandomSpawn.RandomSpawnCommandExecutor; +import me.Josvth.RandomSpawn.RandomSpawn; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -public class RandomSpawnSetFirstSpawnCommand extends RandomSpawnCommandExecutor{ +public class SetFirstSpawnCommand extends AbstractCommand{ - public RandomSpawnSetFirstSpawnCommand(){ - this.name = "setfirstspawn"; + public SetFirstSpawnCommand(RandomSpawn instance){ + super(instance,"setfirstspawn"); } public boolean onCommand(CommandSender sender, List args){ diff --git a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/RandomSpawnTpFirstSpawnCommand.java b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/TpFirstSpawnCommand.java similarity index 82% rename from plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/RandomSpawnTpFirstSpawnCommand.java rename to plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/TpFirstSpawnCommand.java index a6230dcb0..4dca8faf2 100644 --- a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/RandomSpawnTpFirstSpawnCommand.java +++ b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/TpFirstSpawnCommand.java @@ -2,16 +2,16 @@ package me.Josvth.RandomSpawn.Commands; import java.util.List; -import me.Josvth.RandomSpawn.RandomSpawnCommandExecutor; +import me.Josvth.RandomSpawn.RandomSpawn; import org.bukkit.Location; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -public class RandomSpawnTpFirstSpawnCommand extends RandomSpawnCommandExecutor{ +public class TpFirstSpawnCommand extends AbstractCommand{ - public RandomSpawnTpFirstSpawnCommand(){ - this.name = "tpfirstspawn"; + public TpFirstSpawnCommand(RandomSpawn instance){ + super(instance,"tpfirstspawn"); } @Override diff --git a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/RandomSpawnUnsetFirstSpawnCommand.java b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/UnsetFirstSpawnCommand.java similarity index 74% rename from plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/RandomSpawnUnsetFirstSpawnCommand.java rename to plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/UnsetFirstSpawnCommand.java index 8005aa3b9..7e9a6efdf 100644 --- a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/RandomSpawnUnsetFirstSpawnCommand.java +++ b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Commands/UnsetFirstSpawnCommand.java @@ -2,15 +2,15 @@ package me.Josvth.RandomSpawn.Commands; import java.util.List; -import me.Josvth.RandomSpawn.RandomSpawnCommandExecutor; +import me.Josvth.RandomSpawn.RandomSpawn; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -public class RandomSpawnUnsetFirstSpawnCommand extends RandomSpawnCommandExecutor{ +public class UnsetFirstSpawnCommand extends AbstractCommand{ - public RandomSpawnUnsetFirstSpawnCommand(){ - this.name = "unsetfirstspawn"; + public UnsetFirstSpawnCommand(RandomSpawn instance){ + super(instance,"unsetfirstspawn"); } public boolean onCommand(CommandSender sender, List args){ diff --git a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Handlers/CommandHandler.java b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Handlers/CommandHandler.java index 2fe702c46..0cede70cd 100644 --- a/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Handlers/CommandHandler.java +++ b/plugins/randomspawn-paper/Random Spawn/src/me/Josvth/RandomSpawn/Handlers/CommandHandler.java @@ -2,6 +2,7 @@ package me.Josvth.RandomSpawn.Handlers; import java.util.Arrays; import java.util.HashMap; +import java.util.List; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; @@ -9,14 +10,13 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import me.Josvth.RandomSpawn.RandomSpawn; -import me.Josvth.RandomSpawn.RandomSpawnCommandExecutor; import me.Josvth.RandomSpawn.Commands.*; public class CommandHandler implements CommandExecutor{ - RandomSpawn plugin; + final RandomSpawn plugin; - HashMap commands = new HashMap(); + HashMap commands = new HashMap(); public CommandHandler(RandomSpawn instance) { plugin = instance; @@ -24,30 +24,30 @@ public class CommandHandler implements CommandExecutor{ plugin.getCommand("randomspawn").setExecutor(this); plugin.getCommand("rs").setExecutor(this); - registerCommands(new RandomSpawnCommandExecutor[]{ - new BedsCommand(), - new DisableCommand(), - new EnableCommand(), - new FirstJoinCommand(), - new RandomSpawnHelpCommand(), - new InfoCommand(), - new RandomSpawnKeepSpawnsCommand(), - new RandomSpawnReloadCommand(), - new RandomSpawnSetAreaCommand(), - new RandomSpawnSetFirstSpawnCommand(), - new RandomSpawnTpFirstSpawnCommand(), - new RandomSpawnUnsetFirstSpawnCommand(), + registerCommands(new AbstractCommand[]{ + new BedsCommand(plugin), + new DisableCommand(plugin), + new EnableCommand(plugin), + new FirstJoinCommand(plugin), + new HelpCommand(plugin), + new InfoCommand(plugin), + new KeepSpawnsCommand(plugin), + new ReloadCommand(plugin), + new SetAreaCommand(plugin), + new SetFirstSpawnCommand(plugin), + new TpFirstSpawnCommand(plugin), + new UnsetFirstSpawnCommand(plugin), }); } - private void registerCommands(RandomSpawnCommandExecutor[] executors) { + private void registerCommands(AbstractCommand[] abstractCommands) { - for(RandomSpawnCommandExecutor executor : executors){ - executor.setPlugin(plugin); - commands.put(executor.getName(), executor); - if (executor.getAliases() != null){ - for(String alias : executor.getAliases()){ - commands.put(alias, executor); + for(AbstractCommand abstractCommand : abstractCommands){ + commands.put(abstractCommand.getName(), abstractCommand); + List aliases = abstractCommand.getAliases(); + if (abstractCommand.getAliases() != null){ + for(String alias: aliases){ + commands.put(alias, abstractCommand); } } } @@ -58,20 +58,20 @@ public class CommandHandler implements CommandExecutor{ if (args.length == 0 || !commands.containsKey(args[0])) return false; - RandomSpawnCommandExecutor commandExecutor = commands.get(args[0]); + AbstractCommand abstractCommand = commands.get(args[0]); if (!(sender instanceof Player)){ sender.sendMessage("This command can only be used in game!"); return true; } - if (commandExecutor.getPermission() != null && !sender.hasPermission(commandExecutor.getPermission())){ + if (abstractCommand.getPermission() != null && !sender.hasPermission(abstractCommand.getPermission())){ sender.sendMessage("You don't have the permission to use this command!"); return true; } - if (commandExecutor.onCommand(sender, Arrays.asList(args).subList(1, args.length)) == false && commandExecutor.getUsage() != null){ - sender.sendMessage(commandExecutor.getUsage()); + if (abstractCommand.onCommand(sender, Arrays.asList(args).subList(1, args.length)) == false && abstractCommand.getUsage() != null){ + sender.sendMessage(abstractCommand.getUsage()); } return true;