Merge master into 306-commands-service

Conflicts:
- AuthMe
- CommandInitializer
- ConverterCommand

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

@@ -1,15 +1,17 @@
 package fr.xephi.authme.command.executable.converter;
 
+import java.util.List;
+
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+
 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;
-import fr.xephi.authme.converter.FlatToSql;
-import fr.xephi.authme.converter.FlatToSqlite;
 import fr.xephi.authme.converter.RakamakConverter;
 import fr.xephi.authme.converter.RoyalAuthConverter;
-import fr.xephi.authme.converter.SqlToFlat;
 import fr.xephi.authme.converter.SqliteToSql;
 import fr.xephi.authme.converter.vAuthConverter;
 import fr.xephi.authme.converter.xAuthConverter;
@@ -38,12 +40,6 @@ public class ConverterCommand implements ExecutableCommand {
         // Get the proper converter instance
         Converter converter = null;
         switch (jobType) {
-            case FTSQL:
-                converter = new FlatToSql();
-                break;
-            case FTSQLITE:
-                converter = new FlatToSqlite(sender);
-                break;
             case XAUTH:
                 converter = new xAuthConverter(plugin, sender);
                 break;
@@ -59,9 +55,6 @@ public class ConverterCommand implements ExecutableCommand {
             case VAUTH:
                 converter = new vAuthConverter(plugin, sender);
                 break;
-            case SQLTOFLAT:
-                converter = new SqlToFlat(plugin, sender);
-                break;
             case SQLITETOSQL:
             	converter = new SqliteToSql(plugin, sender);
             	break;
@@ -77,14 +70,11 @@ public class ConverterCommand implements ExecutableCommand {
     }
 
     public enum ConvertType {
-        FTSQL("flattosql"),
-        FTSQLITE("flattosqlite"),
         XAUTH("xauth"),
         CRAZYLOGIN("crazylogin"),
         RAKAMAK("rakamak"),
         ROYALAUTH("royalauth"),
         VAUTH("vauth"),
-        SQLTOFLAT("sqltoflat"),
         SQLITETOSQL("sqlitetosql");
 
         final String name;