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

Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded

Browse Source
This commit is contained in:
ljacqu 2015-12-05 21:00:55 +01:00
commit f265622a11
3 changed files with 84 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138
src/main/java/fr/xephi/authme/command/CommandInitializer.java
View File

@ -90,7 +90,7 @@ public final class CommandInitializer {
.detailedDescription("Register the specified player with the specified password.") .detailedDescription("Register the specified player with the specified password.")
.withArgument("player", "Player name", false) .withArgument("player", "Player name", false)
.withArgument("password", "Password", false) .withArgument("password", "Password", false)
.permissions(OP_ONLY, AdminPermission.REGISTER) .permissions(OP_ONLY, AdminPermission.REGISTER, AdminPermission.ALL)
.executableCommand(new RegisterAdminCommand()) .executableCommand(new RegisterAdminCommand())
.build(); .build();
@ -101,7 +101,7 @@ public final class CommandInitializer {
.description("Unregister a player") .description("Unregister a player")
.detailedDescription("Unregister the specified player.") .detailedDescription("Unregister the specified player.")
.withArgument("player", "Player name", false) .withArgument("player", "Player name", false)
.permissions(OP_ONLY, AdminPermission.UNREGISTER) .permissions(OP_ONLY, AdminPermission.UNREGISTER, AdminPermission.ALL)
.executableCommand(new UnregisterAdminCommand()) .executableCommand(new UnregisterAdminCommand())
.build(); .build();
@ -112,7 +112,7 @@ public final class CommandInitializer {
.description("Enforce login player") .description("Enforce login player")
.detailedDescription("Enforce the specified player to login.") .detailedDescription("Enforce the specified player to login.")
.withArgument("player", "Online player name", true) .withArgument("player", "Online player name", true)
.permissions(OP_ONLY, PlayerPermission.CAN_LOGIN_BE_FORCED) .permissions(OP_ONLY, PlayerPermission.CAN_LOGIN_BE_FORCED, AdminPermission.ALL)
.executableCommand(new ForceLoginCommand()) .executableCommand(new ForceLoginCommand())
.build(); .build();
@ -124,7 +124,7 @@ public final class CommandInitializer {
.detailedDescription("Change the password of a player.") .detailedDescription("Change the password of a player.")
.withArgument("player", "Player name", false) .withArgument("player", "Player name", false)
.withArgument("pwd", "New password", false) .withArgument("pwd", "New password", false)
.permissions(OP_ONLY, AdminPermission.CHANGE_PASSWORD) .permissions(OP_ONLY, AdminPermission.CHANGE_PASSWORD, AdminPermission.ALL)
.executableCommand(new ChangePasswordAdminCommand()) .executableCommand(new ChangePasswordAdminCommand())
.build(); .build();
@ -135,7 +135,7 @@ public final class CommandInitializer {
.description("Player's last login") .description("Player's last login")
.detailedDescription("View the date of the specified players last login.") .detailedDescription("View the date of the specified players last login.")
.withArgument("player", "Player name", true) .withArgument("player", "Player name", true)
.permissions(OP_ONLY, AdminPermission.LAST_LOGIN) .permissions(OP_ONLY, AdminPermission.LAST_LOGIN, AdminPermission.ALL)
.executableCommand(new LastLoginCommand()) .executableCommand(new LastLoginCommand())
.build(); .build();
@ -146,7 +146,7 @@ public final class CommandInitializer {
.description("Display player accounts") .description("Display player accounts")
.detailedDescription("Display all accounts of a player by his player name or IP.") .detailedDescription("Display all accounts of a player by his player name or IP.")
.withArgument("player", "Player name or IP", true) .withArgument("player", "Player name or IP", true)
.permissions(OP_ONLY, AdminPermission.ACCOUNTS) .permissions(OP_ONLY, AdminPermission.ACCOUNTS, AdminPermission.ALL)
.executableCommand(new AccountsCommand()) .executableCommand(new AccountsCommand())
.build(); .build();
@ -156,7 +156,7 @@ public final class CommandInitializer {
.labels("getemail", "getmail", "email", "mail") .labels("getemail", "getmail", "email", "mail")
.description("Display player's email") .description("Display player's email")
.detailedDescription("Display the email address of the specified player if set.") .detailedDescription("Display the email address of the specified player if set.")
.permissions(OP_ONLY, AdminPermission.GET_EMAIL) .permissions(OP_ONLY, AdminPermission.GET_EMAIL, AdminPermission.ALL)
.withArgument("player", "Player name", true) .withArgument("player", "Player name", true)
.executableCommand(new GetEmailCommand()) .executableCommand(new GetEmailCommand())
.build(); .build();
@ -168,80 +168,86 @@ public final class CommandInitializer {
.labels("chgemail", "chgmail", "setemail", "setmail") .labels("chgemail", "chgmail", "setemail", "setmail")
.description("Change player's email") .description("Change player's email")
.detailedDescription("Change the email address of the specified player.") .detailedDescription("Change the email address of the specified player.")
.permissions(OP_ONLY, AdminPermission.CHANGE_EMAIL) .permissions(OP_ONLY, AdminPermission.CHANGE_EMAIL, AdminPermission.ALL)
.withArgument("player", "Player name", false) .withArgument("player", "Player name", false)
.withArgument("email", "Player email", false) .withArgument("email", "Player email", false)
.build(); .build();
// Register the getip command // Register the getip command
CommandDescription getIpCommand = new CommandDescription(new GetIpCommand(), new ArrayList<String>() { CommandDescription getIpCommand = CommandDescription.builder()
{ .executableCommand(new GetIpCommand())
add("getip"); .parent(AUTHME_BASE)
add("ip"); .labels("getip", "ip")
} .description("Get player's IP")
}, "Get player's IP", "Get the IP address of the specified online player.", AUTHME_BASE); .detailedDescription("Get the IP address of the specified online player.")
getIpCommand.setCommandPermissions(AdminPermission.GET_IP, OP_ONLY); .permissions(OP_ONLY, AdminPermission.GET_IP, AdminPermission.ALL)
getIpCommand.addArgument(new CommandArgumentDescription("player", "Online player name", true)); .withArgument("player", "Player Name", false)
.build();
// Register the spawn command // Register the spawn command
CommandDescription spawnCommand = new CommandDescription(new SpawnCommand(), new ArrayList<String>() { CommandDescription spawnCommand = CommandDescription.builder()
{ .executableCommand(new SpawnCommand())
add("spawn"); .parent(AUTHME_BASE)
add("home"); .labels("spawn", "home")
} .description("Teleport to spawn")
}, "Teleport to spawn", "Teleport to the spawn.", AUTHME_BASE); .detailedDescription("Teleport to the spawn")
spawnCommand.setCommandPermissions(AdminPermission.SPAWN, OP_ONLY); .permissions(OP_ONLY, AdminPermission.SPAWN, AdminPermission.ALL)
.withArgument("player", "Player Name", false)
.build();
// Register the setspawn command // Register the setspawn command
CommandDescription setSpawnCommand = new CommandDescription(new SetSpawnCommand(), new ArrayList<String>() { CommandDescription setSpawnCommand = CommandDescription.builder()
{ .executableCommand(new SetSpawnCommand())
add("setspawn"); .parent(AUTHME_BASE)
add("chgspawn"); .labels("setspawn", "chgspawn")
} .description("Change the spawn")
}, "Change the spawn", "Change the player's spawn to your current position.", AUTHME_BASE); .detailedDescription("Change the player's spawn to your current position.")
setSpawnCommand.setCommandPermissions(AdminPermission.SET_SPAWN, OP_ONLY); .permissions(OP_ONLY, AdminPermission.SET_SPAWN, AdminPermission.ALL)
.build();
// Register the firstspawn command // Register the firstspawn command
CommandDescription firstSpawnCommand = new CommandDescription(new FirstSpawnCommand(), new ArrayList<String>() { CommandDescription firstSpawnCommand = CommandDescription.builder()
{ .executableCommand(new FirstSpawnCommand())
add("firstspawn"); .parent(AUTHME_BASE)
add("firsthome"); .labels("firstspawn", "firsthome")
} .description("Teleport to first spawn")
}, "Teleport to first spawn", "Teleport to the first spawn.", AUTHME_BASE); .detailedDescription("Teleport to the first spawn.")
firstSpawnCommand.setCommandPermissions(AdminPermission.FIRST_SPAWN, OP_ONLY); .permissions(OP_ONLY, AdminPermission.FIRST_SPAWN, AdminPermission.ALL)
.build();
// Register the setfirstspawn command // Register the setfirstspawn command
CommandDescription setFirstSpawnCommand = new CommandDescription(new SetFirstSpawnCommand(), new ArrayList<String>() { CommandDescription setFirstSpawnCommand = CommandDescription.builder()
{ .executableCommand(new SetFirstSpawnCommand())
add("setfirstspawn"); .parent(AUTHME_BASE)
add("chgfirstspawn"); .labels("setfirstspawn", "chgfirstspawn")
} .description("Change the first spawn")
}, "Change the first spawn", "Change the first player's spawn to your current position.", AUTHME_BASE); .detailedDescription("Change the first player's spawn to your current position.")
setFirstSpawnCommand.setCommandPermissions(AdminPermission.SET_FIRST_SPAWN, OP_ONLY); .permissions(OP_ONLY, AdminPermission.SET_FIRST_SPAWN, AdminPermission.ALL)
.build();
// Register the purge command // Register the purge command
CommandDescription purgeCommand = new CommandDescription(new PurgeCommand(), new ArrayList<String>() { CommandDescription purgeCommand = CommandDescription.builder()
{ .executableCommand(new PurgeCommand())
add("purge"); .parent(AUTHME_BASE)
add("delete"); .labels("purge", "delete")
} .description("Purge old data")
}, "Purge old data", "Purge old AuthMeReloaded data longer than the specified amount of days ago.", AUTHME_BASE); .detailedDescription("Purge old AuthMeReloaded data longer than the specified amount of days ago.")
purgeCommand.setCommandPermissions(AdminPermission.PURGE, OP_ONLY); .permissions(OP_ONLY, AdminPermission.PURGE, AdminPermission.ALL)
purgeCommand.addArgument(new CommandArgumentDescription("days", "Number of days", false)); .withArgument("days", "Number of days", false)
.build();
// Register the purgelastposition command // Register the purgelastposition command
CommandDescription purgeLastPositionCommand = new CommandDescription(new PurgeLastPositionCommand(), new ArrayList<String>() { CommandDescription purgeLastPositionCommand = CommandDescription.builder()
{ .executableCommand(new PurgeLastPositionCommand())
add("resetpos"); .parent(AUTHME_BASE)
add("purgelastposition"); .labels("resetpos", "purgelastposition", "purgelastpos", "resetposition", "resetlastposition", "resetlastpos")
add("purgelastpos"); .description("Purge player's last position")
add("resetposition"); .detailedDescription("Purge the last know position of the specified player.")
add("resetlastposition"); .permissions(OP_ONLY, AdminPermission.PURGE_LAST_POSITION, AdminPermission.ALL)
add("resetlastpos"); .withArgument("player", "Player name", false)
} .build();
}, "Purge player's last position", "Purge the last know position of the specified player.", AUTHME_BASE);
purgeLastPositionCommand.setCommandPermissions(AdminPermission.PURGE_LAST_POSITION, OP_ONLY);
purgeLastPositionCommand.addArgument(new CommandArgumentDescription("player", "Player name", true));
// Register the purgebannedplayers command // Register the purgebannedplayers command
CommandDescription purgeBannedPlayersCommand = new CommandDescription(new PurgeBannedPlayersCommand(), new ArrayList<String>() { CommandDescription purgeBannedPlayersCommand = new CommandDescription(new PurgeBannedPlayersCommand(), new ArrayList<String>() {
@ -304,7 +310,7 @@ public final class CommandInitializer {
.description("Login command") .description("Login command")
.detailedDescription("Command to log in using AuthMeReloaded.") .detailedDescription("Command to log in using AuthMeReloaded.")
.parent(null) .parent(null)
.permissions(ALLOWED, PlayerPermission.LOGIN) .permissions(ALLOWED, PlayerPermission.LOGIN, PlayerPermission.ALL_COMMANDS)
.withArgument("password", "Login password", false) .withArgument("password", "Login password", false)
.build(); .build();
@ -334,7 +340,7 @@ public final class CommandInitializer {
.detailedDescription("Command to register using AuthMeReloaded.") .detailedDescription("Command to register using AuthMeReloaded.")
.withArgument("password", "Password", false) .withArgument("password", "Password", false)
.withArgument("verifyPassword", "Verify password", false) .withArgument("verifyPassword", "Verify password", false)
.permissions(ALLOWED, PlayerPermission.REGISTER) .permissions(ALLOWED, PlayerPermission.REGISTER, PlayerPermission.ALL_COMMANDS)
.executableCommand(new RegisterCommand()) .executableCommand(new RegisterCommand())
.build(); .build();

7
src/main/java/fr/xephi/authme/permission/AdminPermission.java
View File

@ -98,7 +98,12 @@ public enum AdminPermission implements PermissionNode {
/** /**
* Administrator command to reload the plugin configuration. * Administrator command to reload the plugin configuration.
*/ */
RELOAD("authme.command.admin.reload"); RELOAD("authme.command.admin.reload"),
/**
* Give access to all admin commands
*/
ALL("authme.command.admin.*");
/** /**
* Permission node. * Permission node.

7
src/main/java/fr/xephi/authme/permission/PlayerPermission.java
View File

@ -78,7 +78,12 @@ public enum PlayerPermission implements PermissionNode {
/** /**
* Permission for user to see other accounts. * Permission for user to see other accounts.
*/ */
SEE_OTHER_ACCOUNTS("authme.command.player.seeotheraccounts"); SEE_OTHER_ACCOUNTS("authme.command.player.seeotheraccounts"),
/**
*
*/
ALL_COMMANDS("authme.command.player.*");
/** /**
* Permission node. * Permission node.