Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into 306-commands-service

Browse Source 
Conflicts:
- AuthMe
- CommandInitializer
- ConverterCommand
This commit is contained in:
ljacqu
2015-12-26 21:33:25 +01:00
parent f37fc32717 5ab3a1f9ef
commit 103ebb44f0
20 changed files with 254 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/fr/xephi/authme/command/CommandInitializer.java
+10 -10
View File
@@ -1,6 +1,14 @@
package fr.xephi.authme.command;
import static fr.xephi.authme.permission.DefaultPermission.ALLOWED;
import static fr.xephi.authme.permission.DefaultPermission.OP_ONLY;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
import com.google.common.collect.ImmutableSet;
import fr.xephi.authme.command.executable.HelpCommand;
import fr.xephi.authme.command.executable.authme.AccountsCommand;
import fr.xephi.authme.command.executable.authme.AuthMeCommand;
@@ -36,14 +44,6 @@ import fr.xephi.authme.command.executable.unregister.UnregisterCommand;
import fr.xephi.authme.permission.AdminPermission;
import fr.xephi.authme.permission.PlayerPermission;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import static fr.xephi.authme.permission.DefaultPermission.ALLOWED;
import static fr.xephi.authme.permission.DefaultPermission.OP_ONLY;
/**
* Initializes all available AuthMe commands.
*/
@@ -387,8 +387,8 @@ public final class CommandInitializer {
.labels("converter", "convert", "conv")
.description("Converter Command")
.detailedDescription("Converter command for AuthMeReloaded.")
.withArgument("job", "Conversion job: flattosql / flattosqlite /| xauth / crazylogin / rakamak / " +
"royalauth / vauth / sqltoflat / sqlitetosql", false)
.withArgument("job", "Conversion job: xauth / crazylogin / rakamak / " +
"royalauth / vauth / sqlitetosql", false)
.permissions(OP_ONLY, AdminPermission.CONVERTER)
.executableCommand(new ConverterCommand())
.build();
src/main/java/fr/xephi/authme/command/executable/converter/ConverterCommand.java
+5 -15
View File
@@ -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;