From 40a83d43660548d5da716de8ffc8b3999a0adddd Mon Sep 17 00:00:00 2001 From: ljacqu Date: Sat, 5 Dec 2015 21:17:16 +0100 Subject: [PATCH] Revert permission nodes from "authme.command" back to simple "authme" --- .../authme/permission/AdminPermission.java | 40 +++++++++---------- .../authme/permission/PlayerPermission.java | 26 ++++++------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/main/java/fr/xephi/authme/permission/AdminPermission.java b/src/main/java/fr/xephi/authme/permission/AdminPermission.java index dc3cf7044..470d3a4bb 100644 --- a/src/main/java/fr/xephi/authme/permission/AdminPermission.java +++ b/src/main/java/fr/xephi/authme/permission/AdminPermission.java @@ -8,102 +8,102 @@ public enum AdminPermission implements PermissionNode { /** * Administrator command to register a new user. */ - REGISTER("authme.command.admin.register"), + REGISTER("authme.admin.register"), /** * Administrator command to unregister an existing user. */ - UNREGISTER("authme.command.admin.unregister"), + UNREGISTER("authme.admin.unregister"), /** * Administrator command to force-login an existing user. */ - FORCE_LOGIN("authme.command.admin.forcelogin"), + FORCE_LOGIN("authme.admin.forcelogin"), /** * Administrator command to change the password of a user. */ - CHANGE_PASSWORD("authme.command.admin.changepassword"), + CHANGE_PASSWORD("authme.admin.changepassword"), /** * Administrator command to see the last login date and time of a user. */ - LAST_LOGIN("authme.command.admin.lastlogin"), + LAST_LOGIN("authme.admin.lastlogin"), /** * Administrator command to see all accounts associated with a user. */ - ACCOUNTS("authme.command.admin.accounts"), + ACCOUNTS("authme.admin.accounts"), /** * Administrator command to get the email address of a user, if set. */ - GET_EMAIL("authme.command.admin.getemail"), + GET_EMAIL("authme.admin.getemail"), /** * Administrator command to set or change the email address of a user. */ - CHANGE_EMAIL("authme.command.admin.changemail"), + CHANGE_EMAIL("authme.admin.changemail"), /** * Administrator command to get the last known IP of a user. */ - GET_IP("authme.command.admin.getip"), + GET_IP("authme.admin.getip"), /** * Administrator command to teleport to the AuthMe spawn. */ - SPAWN("authme.command.admin.spawn"), + SPAWN("authme.admin.spawn"), /** * Administrator command to set the AuthMe spawn. */ - SET_SPAWN("authme.command.admin.setspawn"), + SET_SPAWN("authme.admin.setspawn"), /** * Administrator command to teleport to the first AuthMe spawn. */ - FIRST_SPAWN("authme.command.admin.firstspawn"), + FIRST_SPAWN("authme.admin.firstspawn"), /** * Administrator command to set the first AuthMe spawn. */ - SET_FIRST_SPAWN("authme.command.admin.setfirstspawn"), + SET_FIRST_SPAWN("authme.admin.setfirstspawn"), /** * Administrator command to purge old user data. */ - PURGE("authme.command.admin.purge"), + PURGE("authme.admin.purge"), /** * Administrator command to purge the last position of a user. */ - PURGE_LAST_POSITION("authme.command.admin.purgelastpos"), + PURGE_LAST_POSITION("authme.admin.purgelastpos"), /** * Administrator command to purge all data associated with banned players. */ - PURGE_BANNED_PLAYERS("authme.command.admin.purgebannedplayers"), + PURGE_BANNED_PLAYERS("authme.admin.purgebannedplayers"), /** * Administrator command to toggle the AntiBot protection status. */ - SWITCH_ANTIBOT("authme.command.admin.switchantibot"), + SWITCH_ANTIBOT("authme.admin.switchantibot"), /** * Administrator command to convert old or other data to AuthMe data. */ - CONVERTER("authme.command.admin.converter"), + CONVERTER("authme.admin.converter"), /** * Administrator command to reload the plugin configuration. */ - RELOAD("authme.command.admin.reload"), + RELOAD("authme.admin.reload"), /** * Give access to all admin commands. */ - ALL("authme.command.admin.*"); + ALL("authme.admin.*"); /** * Permission node. diff --git a/src/main/java/fr/xephi/authme/permission/PlayerPermission.java b/src/main/java/fr/xephi/authme/permission/PlayerPermission.java index 38fef5137..4ef0aca2e 100644 --- a/src/main/java/fr/xephi/authme/permission/PlayerPermission.java +++ b/src/main/java/fr/xephi/authme/permission/PlayerPermission.java @@ -18,47 +18,47 @@ public enum PlayerPermission implements PermissionNode { /** * Command permission to login. */ - LOGIN("authme.command.player.login"), + LOGIN("authme.player.login"), /** * Command permission to logout. */ - LOGOUT("authme.command.player.logout"), + LOGOUT("authme.player.logout"), /** * Command permission to register. */ - REGISTER("authme.command.player.register"), + REGISTER("authme.player.register"), /** * Command permission to unregister. */ - UNREGISTER("authme.command.player.unregister"), + UNREGISTER("authme.player.unregister"), /** * Command permission to change the password. */ - CHANGE_PASSWORD("authme.command.player.changepassword"), + CHANGE_PASSWORD("authme.player.changepassword"), /** * Command permission to add an email address. */ - ADD_EMAIL("authme.command.player.email.add"), + ADD_EMAIL("authme.player.email.add"), /** * Command permission to change the email address. */ - CHANGE_EMAIL("authme.command.player.email.change"), + CHANGE_EMAIL("authme.player.email.change"), /** * Command permission to recover an account using it's email address. */ - RECOVER_EMAIL("authme.command.player.email.recover"), + RECOVER_EMAIL("authme.player.email.recover"), /** * Command permission to use captcha. */ - CAPTCHA("authme.command.player.captcha"), + CAPTCHA("authme.player.captcha"), /** * Permission for users a login can be forced to. @@ -68,22 +68,22 @@ public enum PlayerPermission implements PermissionNode { /** * Permission for users to bypass force-survival mode. */ - BYPASS_FORCE_SURVIVAL("authme.command.player.bypassforcesurvival"), + BYPASS_FORCE_SURVIVAL("authme.player.bypassforcesurvival"), /** * Permission for users to allow two accounts. */ - ALLOW_MULTIPLE_ACCOUNTS("authme.command.player.allow2accounts"), + ALLOW_MULTIPLE_ACCOUNTS("authme.player.allow2accounts"), /** * Permission for user to see other accounts. */ - SEE_OTHER_ACCOUNTS("authme.command.player.seeotheraccounts"), + SEE_OTHER_ACCOUNTS("authme.player.seeotheraccounts"), /** * */ - ALL_COMMANDS("authme.command.player.*"); + ALL_COMMANDS("authme.player.*"); /** * Permission node.