#306 Adjust ExecutableCommand implementations to interface

src/main/java/fr/xephi/authme/command/executable/authme/AuthMeCommand.java

@@ -1,6 +1,7 @@
 package fr.xephi.authme.command.executable.authme;
 
 import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
@@ -10,10 +11,10 @@ import java.util.List;
 /**
  * AuthMe base command; shows the version and some command pointers.
  */
-public class AuthMeCommand extends ExecutableCommand {
+public class AuthMeCommand implements ExecutableCommand {
 
     @Override
-    public void executeCommand(CommandSender sender, List<String> arguments) {
+    public void executeCommand(CommandSender sender, List<String> arguments, CommandService commandService) {
         sender.sendMessage(ChatColor.GREEN + "This server is running " + AuthMe.getPluginName() + " v"
             + AuthMe.getPluginVersion() + " b" + AuthMe.getPluginBuildNumber()+ "! " + ChatColor.RED + "<3");
         sender.sendMessage(ChatColor.YELLOW + "Use the command " + ChatColor.GOLD + "/authme help" + ChatColor.YELLOW

src/main/java/fr/xephi/authme/command/executable/authme/ChangePasswordAdminCommand.java

@@ -4,6 +4,7 @@ import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
+import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.output.MessageKey;
 import fr.xephi.authme.output.Messages;
@@ -18,10 +19,10 @@ import java.util.List;
 /**
  * Admin command for changing a player's password.
  */
-public class ChangePasswordAdminCommand extends ExecutableCommand {
+public class ChangePasswordAdminCommand implements ExecutableCommand {
 
     @Override
-    public void executeCommand(final CommandSender sender, List<String> arguments) {
+    public void executeCommand(final CommandSender sender, List<String> arguments, CommandService commandService) {
         final AuthMe plugin = AuthMe.getInstance();
         final Messages m = plugin.getMessages();
 

src/main/java/fr/xephi/authme/command/executable/authme/FirstSpawnCommand.java

@@ -1,6 +1,7 @@
 package fr.xephi.authme.command.executable.authme;
 
 import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Spawn;
 import org.bukkit.command.CommandSender;
@@ -8,10 +9,10 @@ import org.bukkit.entity.Player;
 
 import java.util.List;
 
-public class FirstSpawnCommand extends ExecutableCommand {
+public class FirstSpawnCommand implements ExecutableCommand {
 
     @Override
-    public void executeCommand(CommandSender sender, List<String> arguments) {
+    public void executeCommand(CommandSender sender, List<String> arguments, CommandService commandService) {
         // Make sure the command executor is a player
         try {
             if (sender instanceof Player) {

src/main/java/fr/xephi/authme/command/executable/authme/ForceLoginCommand.java

@@ -1,6 +1,7 @@
 package fr.xephi.authme.command.executable.authme;
 
 import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.permission.PlayerPermission;
 import org.bukkit.Bukkit;
@@ -11,10 +12,10 @@ import java.util.List;
 
 /**
  */
-public class ForceLoginCommand extends ExecutableCommand {
+public class ForceLoginCommand implements ExecutableCommand {
 
     @Override
-    public void executeCommand(CommandSender sender, List<String> arguments) {
+    public void executeCommand(CommandSender sender, List<String> arguments, CommandService commandService) {
         // AuthMe plugin instance
         final AuthMe plugin = AuthMe.getInstance();
 

src/main/java/fr/xephi/authme/command/executable/authme/GetEmailCommand.java

@@ -2,6 +2,7 @@ package fr.xephi.authme.command.executable.authme;
 
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerAuth;
+import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.output.MessageKey;
 import fr.xephi.authme.output.Messages;
@@ -9,10 +10,10 @@ import org.bukkit.command.CommandSender;
 
 import java.util.List;
 
-public class GetEmailCommand extends ExecutableCommand {
+public class GetEmailCommand implements ExecutableCommand {
 
     @Override
-    public void executeCommand(CommandSender sender, List<String> arguments) {
+    public void executeCommand(CommandSender sender, List<String> arguments, CommandService commandService) {
         String playerName = arguments.isEmpty() ? sender.getName() : arguments.get(0);
 
         // Get the authenticated user

src/main/java/fr/xephi/authme/command/executable/authme/GetIpCommand.java

@@ -1,6 +1,7 @@
 package fr.xephi.authme.command.executable.authme;
 
 import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
@@ -8,10 +9,10 @@ import org.bukkit.entity.Player;
 
 import java.util.List;
 
-public class GetIpCommand extends ExecutableCommand {
+public class GetIpCommand implements ExecutableCommand {
 
     @Override
-    public void executeCommand(CommandSender sender, List<String> arguments) {
+    public void executeCommand(CommandSender sender, List<String> arguments, CommandService commandService) {
         final AuthMe plugin = AuthMe.getInstance();
 
         // Get the player query

src/main/java/fr/xephi/authme/command/executable/authme/LastLoginCommand.java

@@ -2,6 +2,7 @@ package fr.xephi.authme.command.executable.authme;
 
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerAuth;
+import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.output.MessageKey;
 import fr.xephi.authme.output.Messages;
@@ -12,10 +13,10 @@ import java.util.List;
 
 /**
  */
-public class LastLoginCommand extends ExecutableCommand {
+public class LastLoginCommand implements ExecutableCommand {
 
     @Override
-    public void executeCommand(CommandSender sender, List<String> arguments) {
+    public void executeCommand(CommandSender sender, List<String> arguments, CommandService commandService) {
         // Get the player
         String playerName = (arguments.size() >= 1) ? arguments.get(0) : sender.getName();
 

src/main/java/fr/xephi/authme/command/executable/authme/PurgeBannedPlayersCommand.java

@@ -1,6 +1,7 @@
 package fr.xephi.authme.command.executable.authme;
 
 import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Settings;
 import org.bukkit.OfflinePlayer;
@@ -9,10 +10,10 @@ import org.bukkit.command.CommandSender;
 import java.util.ArrayList;
 import java.util.List;
 
-public class PurgeBannedPlayersCommand extends ExecutableCommand {
+public class PurgeBannedPlayersCommand implements ExecutableCommand {
 
     @Override
-    public void executeCommand(CommandSender sender, List<String> arguments) {
+    public void executeCommand(CommandSender sender, List<String> arguments, CommandService commandService) {
         // AuthMe plugin instance
         final AuthMe plugin = AuthMe.getInstance();
 

src/main/java/fr/xephi/authme/command/executable/authme/PurgeCommand.java

@@ -1,6 +1,7 @@
 package fr.xephi.authme.command.executable.authme;
 
 import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Settings;
 import org.bukkit.ChatColor;
@@ -9,10 +10,10 @@ import org.bukkit.command.CommandSender;
 import java.util.Calendar;
 import java.util.List;
 
-public class PurgeCommand extends ExecutableCommand {
+public class PurgeCommand implements ExecutableCommand {
 
     @Override
-    public void executeCommand(CommandSender sender, List<String> arguments) {
+    public void executeCommand(CommandSender sender, List<String> arguments, CommandService commandService) {
         // AuthMe plugin instance
         AuthMe plugin = AuthMe.getInstance();
 

src/main/java/fr/xephi/authme/command/executable/authme/PurgeLastPositionCommand.java

@@ -3,6 +3,7 @@ package fr.xephi.authme.command.executable.authme;
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
+import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.output.MessageKey;
 import fr.xephi.authme.output.Messages;
@@ -11,10 +12,10 @@ import org.bukkit.entity.Player;
 
 import java.util.List;
 
-public class PurgeLastPositionCommand extends ExecutableCommand {
+public class PurgeLastPositionCommand implements ExecutableCommand {
 
     @Override
-    public void executeCommand(final CommandSender sender, List<String> arguments) {
+    public void executeCommand(final CommandSender sender, List<String> arguments, CommandService commandService) {
         final AuthMe plugin = AuthMe.getInstance();
         final Messages m = plugin.getMessages();
 

src/main/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommand.java

@@ -3,6 +3,7 @@ package fr.xephi.authme.command.executable.authme;
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
+import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.output.MessageKey;
 import fr.xephi.authme.output.Messages;
@@ -17,10 +18,10 @@ import java.util.List;
 /**
  * Admin command to register a user.
  */
-public class RegisterAdminCommand extends ExecutableCommand {
+public class RegisterAdminCommand implements ExecutableCommand {
 
     @Override
-    public void executeCommand(final CommandSender sender, List<String> arguments) {
+    public void executeCommand(final CommandSender sender, List<String> arguments, CommandService commandService) {
         // AuthMe plugin instance
         final AuthMe plugin = AuthMe.getInstance();
 

src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java

@@ -2,6 +2,7 @@ package fr.xephi.authme.command.executable.authme;
 
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.output.MessageKey;
 import fr.xephi.authme.output.Messages;
@@ -11,10 +12,10 @@ import org.bukkit.command.CommandSender;
 
 import java.util.List;
 
-public class ReloadCommand extends ExecutableCommand {
+public class ReloadCommand implements ExecutableCommand {
 
     @Override
-    public void executeCommand(CommandSender sender, List<String> arguments) {
+    public void executeCommand(CommandSender sender, List<String> arguments, CommandService commandService) {
         // Profile the reload process
         Profiler p = new Profiler(true);
 

src/main/java/fr/xephi/authme/command/executable/authme/SetEmailCommand.java

@@ -3,6 +3,7 @@ package fr.xephi.authme.command.executable.authme;
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
+import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.output.MessageKey;
 import fr.xephi.authme.output.Messages;
@@ -11,10 +12,10 @@ import org.bukkit.command.CommandSender;
 
 import java.util.List;
 
-public class SetEmailCommand extends ExecutableCommand {
+public class SetEmailCommand implements ExecutableCommand {
 
     @Override
-    public void executeCommand(final CommandSender sender, List<String> arguments) {
+    public void executeCommand(final CommandSender sender, List<String> arguments, CommandService commandService) {
         // AuthMe plugin instance
         final AuthMe plugin = AuthMe.getInstance();
 

src/main/java/fr/xephi/authme/command/executable/authme/SetFirstSpawnCommand.java

@@ -1,6 +1,7 @@
 package fr.xephi.authme.command.executable.authme;
 
 import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Spawn;
 import org.bukkit.command.CommandSender;
@@ -8,10 +9,10 @@ import org.bukkit.entity.Player;
 
 import java.util.List;
 
-public class SetFirstSpawnCommand extends ExecutableCommand {
+public class SetFirstSpawnCommand implements ExecutableCommand {
 
     @Override
-    public void executeCommand(CommandSender sender, List<String> arguments) {
+    public void executeCommand(CommandSender sender, List<String> arguments, CommandService commandService) {
         try {
             if (sender instanceof Player) {
                 if (Spawn.getInstance().setFirstSpawn(((Player) sender).getLocation()))

src/main/java/fr/xephi/authme/command/executable/authme/SetSpawnCommand.java

@@ -1,6 +1,7 @@
 package fr.xephi.authme.command.executable.authme;
 
 import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Spawn;
 import org.bukkit.command.CommandSender;
@@ -8,10 +9,10 @@ import org.bukkit.entity.Player;
 
 import java.util.List;
 
-public class SetSpawnCommand extends ExecutableCommand {
+public class SetSpawnCommand implements ExecutableCommand {
 
     @Override
-    public void executeCommand(CommandSender sender, List<String> arguments) {
+    public void executeCommand(CommandSender sender, List<String> arguments, CommandService commandService) {
         // Make sure the command executor is a player
         try {
             if (sender instanceof Player) {

src/main/java/fr/xephi/authme/command/executable/authme/SpawnCommand.java

@@ -1,6 +1,7 @@
 package fr.xephi.authme.command.executable.authme;
 
 import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Spawn;
 import org.bukkit.command.CommandSender;
@@ -8,10 +9,10 @@ import org.bukkit.entity.Player;
 
 import java.util.List;
 
-public class SpawnCommand extends ExecutableCommand {
+public class SpawnCommand implements ExecutableCommand {
 
     @Override
-    public void executeCommand(CommandSender sender, List<String> arguments) {
+    public void executeCommand(CommandSender sender, List<String> arguments, CommandService commandService) {
         // Make sure the command executor is a player
         try {
             if (sender instanceof Player) {

src/main/java/fr/xephi/authme/command/executable/authme/UnregisterAdminCommand.java

@@ -4,6 +4,7 @@ import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.cache.limbo.LimboCache;
+import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.output.MessageKey;
 import fr.xephi.authme.output.Messages;
@@ -23,11 +24,11 @@ import java.util.List;
 /**
  * Admin command to unregister a player.
  */
-public class UnregisterAdminCommand extends ExecutableCommand {
+public class UnregisterAdminCommand implements ExecutableCommand {
 
 
     @Override
-    public void executeCommand(final CommandSender sender, List<String> arguments) {
+    public void executeCommand(final CommandSender sender, List<String> arguments, CommandService commandService) {
         // AuthMe plugin instance
         final AuthMe plugin = AuthMe.getInstance();
 

src/main/java/fr/xephi/authme/command/executable/authme/VersionCommand.java

@@ -1,6 +1,7 @@
 package fr.xephi.authme.command.executable.authme;
 
 import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Settings;
 import org.bukkit.Bukkit;
@@ -10,10 +11,10 @@ import org.bukkit.entity.Player;
 
 import java.util.List;
 
-public class VersionCommand extends ExecutableCommand {
+public class VersionCommand implements ExecutableCommand {
 
     @Override
-    public void executeCommand(CommandSender sender, List<String> arguments) {
+    public void executeCommand(CommandSender sender, List<String> arguments, CommandService commandService) {
         // Show some version info
         sender.sendMessage(ChatColor.GOLD + "==========[ " + Settings.helpHeader.toUpperCase() + " ABOUT ]==========");
         sender.sendMessage(ChatColor.GOLD + "Version: " + ChatColor.WHITE + AuthMe.getPluginName() + " v" + AuthMe.getPluginVersion() + ChatColor.GRAY + " (build: " + AuthMe.getPluginBuildNumber() + ")");

src/main/java/fr/xephi/authme/command/executable/captcha/CaptchaCommand.java

@@ -2,6 +2,7 @@ package fr.xephi.authme.command.executable.captcha;
 
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerCache;
+import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.output.MessageKey;
 import fr.xephi.authme.output.Messages;
@@ -13,10 +14,10 @@ import org.bukkit.entity.Player;
 
 import java.util.List;
 
-public class CaptchaCommand extends ExecutableCommand {
+public class CaptchaCommand implements ExecutableCommand {
 
     @Override
-    public void executeCommand(CommandSender sender, List<String> arguments) {
+    public void executeCommand(CommandSender sender, List<String> arguments, CommandService commandService) {
         // Make sure the current command executor is a player
         if (!(sender instanceof Player)) {
             return;

src/main/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommand.java

@@ -2,6 +2,7 @@ package fr.xephi.authme.command.executable.changepassword;
 
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerCache;
+import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.output.MessageKey;
 import fr.xephi.authme.output.Messages;
@@ -16,10 +17,10 @@ import java.util.List;
 /**
  * The command for a player to change his password with.
  */
-public class ChangePasswordCommand extends ExecutableCommand {
+public class ChangePasswordCommand implements ExecutableCommand {
 
     @Override
-    public void executeCommand(CommandSender sender, List<String> arguments) {
+    public void executeCommand(CommandSender sender, List<String> arguments, CommandService commandService) {
         // Make sure the current command executor is a player
         if (!(sender instanceof Player)) {
             return;

src/main/java/fr/xephi/authme/command/executable/converter/ConverterCommand.java

@@ -1,6 +1,7 @@
 package fr.xephi.authme.command.executable.converter;
 
 import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.converter.Converter;
 import fr.xephi.authme.converter.CrazyLoginConverter;
@@ -19,10 +20,10 @@ import org.bukkit.command.CommandSender;
 
 import java.util.List;
 
-public class ConverterCommand extends ExecutableCommand {
+public class ConverterCommand implements ExecutableCommand {
 
     @Override
-    public void executeCommand(CommandSender sender, List<String> arguments) {
+    public void executeCommand(CommandSender sender, List<String> arguments, CommandService commandService) {
         // AuthMe plugin instance
         final AuthMe plugin = AuthMe.getInstance();
 

src/main/java/fr/xephi/authme/command/executable/email/AddEmailCommand.java

@@ -1,6 +1,7 @@
 package fr.xephi.authme.command.executable.email;
 
 import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.util.Wrapper;
 import org.bukkit.command.CommandSender;
@@ -8,10 +9,10 @@ import org.bukkit.entity.Player;
 
 import java.util.List;
 
-public class AddEmailCommand extends ExecutableCommand {
+public class AddEmailCommand implements ExecutableCommand {
 
     @Override
-    public void executeCommand(CommandSender sender, List<String> arguments) {
+    public void executeCommand(CommandSender sender, List<String> arguments, CommandService commandService) {
         // Make sure the current command executor is a player
         if (!(sender instanceof Player)) {
             return;

src/main/java/fr/xephi/authme/command/executable/email/ChangeEmailCommand.java

@@ -1,6 +1,7 @@
 package fr.xephi.authme.command.executable.email;
 
 import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.util.Wrapper;
 import org.bukkit.command.CommandSender;
@@ -10,10 +11,10 @@ import java.util.List;
 
 /**
  */
-public class ChangeEmailCommand extends ExecutableCommand {
+public class ChangeEmailCommand implements ExecutableCommand {
 
     @Override
-    public void executeCommand(CommandSender sender, List<String> arguments) {
+    public void executeCommand(CommandSender sender, List<String> arguments, CommandService commandService) {
         // Make sure the current command executor is a player
         if (!(sender instanceof Player)) {
             return;

src/main/java/fr/xephi/authme/command/executable/email/RecoverEmailCommand.java

@@ -4,6 +4,7 @@ import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
+import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.output.MessageKey;
 import fr.xephi.authme.output.Messages;
@@ -17,10 +18,10 @@ import org.bukkit.entity.Player;
 import java.security.NoSuchAlgorithmException;
 import java.util.List;
 
-public class RecoverEmailCommand extends ExecutableCommand {
+public class RecoverEmailCommand implements ExecutableCommand {
 
     @Override
-    public void executeCommand(CommandSender sender, List<String> arguments) {
+    public void executeCommand(CommandSender sender, List<String> arguments, CommandService commandService) {
         // Make sure the current command executor is a player
         if (!(sender instanceof Player)) {
             return;

src/main/java/fr/xephi/authme/command/executable/login/LoginCommand.java

@@ -1,6 +1,7 @@
 package fr.xephi.authme.command.executable.login;
 
 import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.util.Wrapper;
 import org.bukkit.command.CommandSender;
@@ -8,10 +9,10 @@ import org.bukkit.entity.Player;
 
 import java.util.List;
 
-public class LoginCommand extends ExecutableCommand {
+public class LoginCommand implements ExecutableCommand {
 
     @Override
-    public void executeCommand(CommandSender sender, List<String> arguments) {
+    public void executeCommand(CommandSender sender, List<String> arguments, CommandService commandService) {
         // Make sure the current command executor is a player
         if (!(sender instanceof Player)) {
             return;

src/main/java/fr/xephi/authme/command/executable/logout/LogoutCommand.java

@@ -1,6 +1,7 @@
 package fr.xephi.authme.command.executable.logout;
 
 import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.util.Wrapper;
 import org.bukkit.command.CommandSender;
@@ -10,10 +11,10 @@ import java.util.List;
 
 /**
  */
-public class LogoutCommand extends ExecutableCommand {
+public class LogoutCommand implements ExecutableCommand {
 
     @Override
-    public void executeCommand(CommandSender sender, List<String> arguments) {
+    public void executeCommand(CommandSender sender, List<String> arguments, CommandService commandService) {
         // Make sure the current command executor is a player
         if (!(sender instanceof Player)) {
             return;

src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java

@@ -1,6 +1,7 @@
 package fr.xephi.authme.command.executable.register;
 
 import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.output.MessageKey;
 import fr.xephi.authme.output.Messages;
@@ -13,10 +14,10 @@ import org.bukkit.entity.Player;
 
 import java.util.List;
 
-public class RegisterCommand extends ExecutableCommand {
+public class RegisterCommand implements ExecutableCommand {
 
     @Override
-    public void executeCommand(CommandSender sender, List<String> arguments) {
+    public void executeCommand(CommandSender sender, List<String> arguments, CommandService commandService) {
         // Make sure the sender is a player
         if (!(sender instanceof Player)) {
             sender.sendMessage("Player Only! Use 'authme register <playername> <password>' instead");

src/main/java/fr/xephi/authme/command/executable/unregister/UnregisterCommand.java

@@ -2,6 +2,7 @@ package fr.xephi.authme.command.executable.unregister;
 
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerCache;
+import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.output.MessageKey;
 import fr.xephi.authme.output.Messages;
@@ -10,10 +11,10 @@ import org.bukkit.entity.Player;
 
 import java.util.List;
 
-public class UnregisterCommand extends ExecutableCommand {
+public class UnregisterCommand implements ExecutableCommand {
 
     @Override
-    public void executeCommand(CommandSender sender, List<String> arguments) {
+    public void executeCommand(CommandSender sender, List<String> arguments, CommandService commandService) {
         // Make sure the current command executor is a player
         if (!(sender instanceof Player)) {
             return;