API changes for 3.1

.locale/en_US.yml

@@ -1,80 +1,74 @@
 # LuckPerms Language File
-# Locale: en_US
+# Locale: en_US (English)
 # Author: Luck
 
 prefix: "&7&l[&b&lL&3&lP&7&l] &c"
+log-info: "&7&l[&bL&3P&7&l] &3{0}"
+log-warn: "&7&l[&bLuck&3Perms&7&l] &c[WARN] {0}"
+log-error: "&7&l[&bLuck&3Perms&7&l] &4[ERROR] {0}"
 empty: "{0}"
 player-online: "&aOnline"
 player-offline: "&cOffline"
-loading-error: "Permissions data could not be loaded. Please contact an administrator."
+loading-error: "Permissions data could not be loaded. Please try again later."
 op-disabled: "&bThe vanilla OP system is disabled on this server."
 op-disabled-sponge: "&2Server Operator status has no effect when a permission plugin is installed. Please edit user data directly."
 log: "&3LOG &3&l> {0}"
-
+export-log: "&3EXPORT &3&l> &f{0}"
+export-log-progress: "&3EXPORT &3&l> &7{0}"
+migration-log: "&3MIGRATION &7[&3{0}&7] &3&l> &f{1}"
+migration-log-progress: "&3MIGRATION &7[&3{0}&7] &3&l> &7{1}"
 command-not-recognised: "Command not recognised."
 command-no-permission: "You do not have permission to use this command!"
-
 already-haspermission: "{0} already has this permission!"
 does-not-havepermission: "{0} does not have this permission set."
 already-has-temp-permission: "{0} already has this permission set temporarily!"
 does-not-have-temp-permission: "{0} does not have this permission set temporarily."
-
-
-
 user-not-found: "&bUser could not be found."
+user-not-online: "&bUser &a{0}&b is not online."
+user-no-data: "&bUser &a{0}&b does not have any data loaded."
 user-save-success: "&7(User data was saved to storage)"
 user-save-error: "There was an error whilst saving the user."
 user-create-fail: "There was an error whilst creating a new user."
-
 group-not-found: "&bGroup could not be found."
 group-save-success: "&7(Group data was saved to storage)"
 group-save-error: "There was an error whilst saving the group."
-
 track-not-found: "&bTrack could not be found."
 track-save-success: "&7(Track data was saved to storage)"
 track-save-error: "There was an error whilst saving the track."
-
-
-
 user-invalid-entry: "&d{0}&c is not a valid username/uuid."
 group-invalid-entry: "Group names can only contain alphanumeric characters."
 track-invalid-entry: "Track names can only contain alphanumeric characters."
 server-invalid-entry: "Server names can only contain alphanumeric characters."
-
-use-inherit-command: "Use the 'parent add' command instead of specifying the node."
-
-
-
+use-inherit-command: "Use the 'parent add' and 'parent remove' commands instead of specifying the node."
+verbose-invalid-filter: "&cInvalid verbose filter: &f{0}"
 verbose-on: "&bVerbose checking output set to &aTRUE &bfor all permissions."
-verbose-on_query: "&bVerbose checking output set to &aTRUE &bfor permissions matching the following filters: &f{0}"
+verbose-on-query: "&bVerbose checking output set to &aTRUE &bfor permissions matching the following filters: &f{0}"
 verbose-off: "&bVerbose checking output set to &cFALSE&b."
-
 verbose-recording-on: "&bVerbose recording set to &aTRUE &bfor all permissions."
 verbose-recording-on-query: "&bVerbose recording set to &aTRUE &bfor permissions matching the following filters: &f{0}"
 verbose-recording-upload-start: "&bVerbose recording was disabled. Uploading results..."
-verbose-recording-url: "&aVerbose results URL: {0}"
-
+verbose-recording-url: "&aVerbose results URL:"
+tree-upload-start: "&bGenerating permission tree..."
+tree-empty: "&aUnable to generate tree. No results were found."
+tree-url: "&aPermission Tree URL:"
 search-searching: "&aSearching for users and groups with &b{0}&a..."
 search-result: "&aFound &b{0}&a entries from &b{1}&a users and &b{2}&a groups."
 search-showing-users: "&bShowing user entries:"
 search-showing-groups: "&bShowing group entries:"
 search-showing-users-with-page: "&bShowing user entries:  {0}"
 search-showing-groups-with-page: "&bShowing group entries:  {0}"
-
+check-result: "&aPermission check result on user &b{0}&a for permission &b{1}&a: &f{2}"
 create-success: "&b{0}&a was successfully created."
 delete-success: "&b{0}&a was successfully deleted."
 rename-success: "&b{0}&a was successfully renamed to &b{1}&a."
-clone-success: "&b{0}&a was successfully cloned to &b{1}&a."
-
+clone-success: "&b{0}&a was successfully cloned onto &b{1}&a."
 already-inherits: "{0} already inherits '{1}'."
 does-not-inherit: "{0} does not inherit '{1}'."
 already-temp-inherits: "{0} already temporarily inherits '{1}'."
 does-not-temp-inherit: "{0} does not temporarily inherit '{1}'."
-
 track-already-contains: "Track {0} already contains the group '{1}'."
 track-does-not-contain: "Track {0} does not contain the group '{1}'."
 track-ambiguous-call: "The user specified is a member of multiple groups on this track. Unable to determine their location."
-
 group-already-exists: "That group already exists!"
 group-does-not-exist: "That group does not exist!"
 group-load-error: "An unexpected error occurred. Group not loaded."
@@ -83,87 +77,86 @@ track-already-exists: "That track already exists!"
 track-does-not-exist: "That track does not exist!"
 track-load-error: "An unexpected error occurred. Track not loaded."
 tracks-load-error: "An unexpected error occurred. Unable to load all tracks."
-
 track-empty: "The track cannot be used as it is empty or contains only one group."
-
 update-task-request: "&bUpdate task scheduled."
 update-task-complete: "&aUpdate task finished."
 update-task-complete-network: "&aUpdate task finished. Now attempting to push to other servers."
-update-task-push-success: "&aOther servers were notified successfully."
-update-task-push-failure: "&cError whilst pushing changes to other servers. Is Redis enabled?"
+update-task-push-success: "&aOther servers were notified via &b{0} Messaging &asuccessfully."
+update-task-push-failure: "&cError whilst pushing changes to other servers."
+update-task-push-failure-not-setup: "&cError whilst pushing changes to other servers. A messaging service has not been configured."
+reload-config-success: "&aThe configuration file was reloaded. &7(some options will only apply after the server has restarted.)"
 info: >
   {PREFIX}&2Running &bLuckPerms v{0}&2 by &bLuck&2.\n
   {PREFIX}&f-  &3Platform: &f{1}\n
   {PREFIX}&f-  &3Storage Method: &f{2}\n
   {PREFIX}&f-  &3Server Name: &f{3}\n
   {PREFIX}&f-  &3Sync Interval: &a{4} &fminutes\n
+  {PREFIX}&f-  &3Messaging Service: &f{5}\n
   {PREFIX}&f-  &bCounts:\n
-  {PREFIX}&f-     &3Online Players: &a{5}\n
-  {PREFIX}&f-     &3Loaded Users: &a{6}\n
-  {PREFIX}&f-     &3Loaded Groups: &a{7}\n
-  {PREFIX}&f-     &3Loaded Tracks: &a{8}\n
-  {PREFIX}&f-     &3Log size: &a{9}\n
-  {PREFIX}&f-     &3UUID Cache size: &a{10}\n
-  {PREFIX}&f-     &3Translations loaded: &a{11}\n
-  {PREFIX}&f-     &3Pre-process contexts: &a{12}\n
-  {PREFIX}&f-     &3Context Calculators: &a{13}\n
+  {PREFIX}&f-     &3Online Players: &a{6}\n
+  {PREFIX}&f-     &3Loaded Users: &a{7}\n
+  {PREFIX}&f-     &3Loaded Groups: &a{8}\n
+  {PREFIX}&f-     &3Loaded Tracks: &a{9}\n
+  {PREFIX}&f-     &3Log size: &a{10}\n
+  {PREFIX}&f-     &3UUID Cache size: &a{11}\n
+  {PREFIX}&f-     &3Translations loaded: &a{12}\n
+  {PREFIX}&f-     &3Pre-process contexts: &a{13}\n
+  {PREFIX}&f-     &3Context Calculators: &a{14}\n
+  {PREFIX}&f-     &3Unique permissions: &a{15}\n
   {PREFIX}&f-  &bConfiguration:\n
-  {PREFIX}&f-     &3Online Mode: {14}\n
-  {PREFIX}&f-     &3Redis Enabled: {15}\n
+  {PREFIX}&f-     &3Use Server UUIDs: {16}\n
   {PREFIX}&f-     &bPermission Calculation:\n
-  {PREFIX}&f-        &3Including Global: {16}\n
-  {PREFIX}&f-        &3Including Global World: {17}\n
-  {PREFIX}&f-        &3Applying Global Groups: {18}\n
-  {PREFIX}&f-        &3Applying Global World Groups: {19}\n
-  {PREFIX}&f-        &3Applying Wildcards: {20}\n
-  {PREFIX}&f-        &3Applying Regex: {21}\n
-  {PREFIX}&f-        &3Applying Shorthand: {22}"
+  {PREFIX}&f-        &3Including Global: {17}\n
+  {PREFIX}&f-        &3Including Global World: {18}\n
+  {PREFIX}&f-        &3Applying Global Groups: {19}\n
+  {PREFIX}&f-        &3Applying Global World Groups: {20}\n
+  {PREFIX}&f-        &3Applying Wildcards: {21}\n
+  {PREFIX}&f-        &3Applying Regex: {22}\n
+  {PREFIX}&f-        &3Applying Shorthand: {23}
 create-group-error: "There was an error whilst creating the group."
 delete-group-error: "There was an error whilst deleting the group."
 delete-group-error-default: "You cannot delete the default group."
 groups-list: "&aGroups: {0}"
-
 create-track-error: "There was an error whilst creating the track."
 delete-track-error: "There was an error whilst deleting the track."
 tracks-list: "&aTracks: {0}"
-
 listnodes: "&b{0}'s Nodes:"
 listnodes-with-page: "&b{0}'s Nodes:  {1}"
-listnodes-temp: "&b{0}'s Temporary Nodes:\n{1}"
-listparents: "&b{0}'s Parent Groups:\n{1}"
-listparents-temp: "&b{0}'s Temporary Parent Groups:\n{1}"
-listgroups: "&b{0}'s Groups:\n{1}"
-listgroups-temp: "&b{0}'s Temporary Groups:\n{1}"
-list-tracks: "&b{0}'s Tracks:\n{1}"
+listnodes-temp: >
+  &b{0}'s Temporary Nodes:\n
+  {1}
+listparents: >
+  &b{0}'s Parent Groups:\n
+  {1}
+listparents-temp: >
+  &b{0}'s Temporary Parent Groups:\n
+  {1}
+listgroups: >
+  &b{0}'s Groups:\n
+  {1}
+listgroups-temp: >
+  &b{0}'s Temporary Groups:\n
+  {1}
+list-tracks: >
+  &b{0}'s Tracks:\n
+  {1}
 list-tracks-empty: "{0} is not on any tracks."
-
-setpermission-success: "&aSet &b{0}&a to &b{1}&a for &b{2}&a."
-setpermission-server-success: "&aSet &b{0}&a to &b{1}&a for &b{2}&a on server &b{3}&a."
-setpermission-server-world-success: "&aSet &b{0}&a to &b{1}&a for &b{2}&a on server &b{3}&a, world &b{4}&a."
-setpermission-temp-success: "&aSet &b{0}&a to &b{1}&a for &b{2}&a for a duration of &b{3}&a."
-setpermission-temp-server-success: "&aSet &b{0}&a to &b{1}&a for &b{2}&a on server &b{3}&a for a duration of &b{4}&a."
-setpermission-temp-server-world-success: "&aSet &b{0}&a to &b{1}&a for &b{2}&a on server &b{3}&a, world &b{4}&a, for a duration of &b{5}&a."
-unsetpermission-success: "&aUnset &b{0}&a for &b{1}&a."
-unsetpermission-server-success: "&aUnset &b{0}&a for &b{1}&a on server &b{2}&a."
-unsetpermission-server-world-success: "&aUnset &b{0}&a for &b{1}&a on server &b{2}&a, world &b{3}&a."
-unset-temp-permission-success: "&aUnset temporary permission &b{0}&a for &b{1}&a."
-unset-temp-permission-server-success: "&aUnset temporary permission &b{0}&a for &b{1}&a on server &b{2}&a."
-unset-temp-permission-server-world-success: "&aUnset temporary permission &b{0}&a for &b{1}&a on server &b{2}&a, world &b{3}&a."
-set-inherit-success: "&b{0}&a now inherits permissions from &b{1}&a."
-set-inherit-server-success: "&b{0}&a now inherits permissions from &b{2}&a on server &b{3}&a."
-set-inherit-server-world-success: "&b{0}&a now inherits permissions from &b{1}&a on server &b{2}&a, world &b{3}&a."
-set-parent-success: "&b{0}&a had their existing parent groups cleared, and now only inherits &b{1}&a."
-set-parent-server-success: "&b{0}&a had their existing parent groups cleared, and now only inherits &b{1}&a on server &b{2}&a."
-set-parent-server-world-success: "&b{0}&a had their existing parent groups cleared, and now only inherits &b{1}&a on server &b{2}&a, world &b{3}&a."
-set-temp-inherit-success: "&b{0}&a now inherits permissions from &b{1}&a for a duration of &b{2}&a."
-set-temp-inherit-server-success: "&b{0}&a now inherits permissions from &b{1}&a on server &b{2}&a for a duration of &b{3}&a."
-set-temp-inherit-server-world-success: "&b{0}&a now inherits permissions from &b{1}&a on server &b{2}&a, world &b{3}&a, for a duration of &b{4}&a."
-unset-inherit-success: "&b{0}&a no longer inherits permissions from &b{1}&a."
-unset-inherit-server-success: "&b{0}&a no longer inherits permissions from &b{1}&a on server &b{2}&a."
-unset-inherit-server-world-success: "&b{0}&a no longer inherits permissions from &b{1}&a on server &b{2}&a, world &b{3}&a."
-unset-temp-inherit-success: "&b{0}&a no longer temporarily inherits permissions from &b{1}&a."
-unset-temp-inherit-server-success: "&b{0}&a no longer temporarily inherits permissions from &b{1}&a on server &b{2}&a."
-unset-temp-inherit-server-world-success: "&b{0}&a no longer temporarily inherits permissions from &b{1}&a on server &b{2}&a, world &b{3}&a."
+context-pair-inline: "&3{0}=&b{1}"
+context-pair--global-inline: "&eglobal"
+context-pair-end: "&a."
+context-pair-sep: "&a, "
+context-pair: "&8(&7{0}=&f{1}&8)"
+check-permission: "&b{0}&a has permission &b{1}&a set to {2}&a in context {3}&a."
+check-permission-inherited: "&b{0}&a has permission &b{1}&a set to {2}&a in context {3}&a, inherited from &b{4}&a."
+setpermission-success: "&aSet &b{0}&a to &b{1}&a for &b{2}&a in context {3}&a."
+setpermission-temp-success: "&aSet &b{0}&a to &b{1}&a for &b{2}&a for a duration of &b{3}&a in context {4}&a."
+unsetpermission-success: "&aUnset &b{0}&a for &b{1}&a in context {2}&a."
+unset-temp-permission-success: "&aUnset temporary permission &b{0}&a for &b{1}&a in context {2}&a."
+set-inherit-success: "&b{0}&a now inherits permissions from &b{1}&a in context {2}&a."
+set-temp-inherit-success: "&b{0}&a now inherits permissions from &b{1}&a for a duration of &b{2}&a in context {3}&a."
+set-parent-success: "&b{0}&a had their existing parent groups cleared, and now only inherits &b{1}&a in context {2}&a."
+unset-inherit-success: "&b{0}&a no longer inherits permissions from &b{1}&a in context {2}&a."
+unset-temp-inherit-success: "&b{0}&a no longer temporarily inherits permissions from &b{1}&a in context {2}&a."
 clear-success: "&b{0}&a's permissions were cleared. (&b{1}&a nodes were removed.)"
 clear-success-singular: "&b{0}&a's permissions were cleared. (&b{1}&a node was removed.)"
 parent-clear-success: "&b{0}&a's parents were cleared. (&b{1}&a nodes were removed.)"
@@ -172,7 +165,6 @@ meta-clear-success: "&b{0}&a's meta was cleared. (&b{1}&a nodes were removed.)"
 meta-clear-success-singular: "&b{0}&a's meta was cleared. (&b{1}&a node was removed.)"
 illegal-date-error: "Could not parse date '{0}'."
 past-date-error: "You cannot set a date in the past!"
-
 chat-meta-prefix-header: "&b{0}'s Prefixes"
 chat-meta-suffix-header: "&b{0}'s Suffixes"
 meta-header: "&b{0}'s Meta"
@@ -183,59 +175,22 @@ meta-entry-with-context: "&b-> &a{0} &f= &f\"{1}&f\" &8(&7inherited from &a{2}&8
 chat-meta-prefix-none: "&b{0} has no prefixes."
 chat-meta-suffix-none: "&b{0} has no suffixes."
 meta-none: "&b{0} has no meta."
-
 meta-invalid-priority: "Invalid priority '{0}'. Expected a number."
-already-has-prefix: "{0} already has that prefix set."
-already-has-suffix: "{0} already has that suffix set."
-does-not-have-prefix: "{0} doesn't have that prefix set."
-does-not-have-suffix: "{0} doesn't have that suffix set."
-
-addprefix-success: "&b{0}&a had prefix &f\"{1}&f\"&a set at a priority of &b{2}&a."
-addprefix-server-success: "&b{0}&a had prefix &f\"{1}&f\"&a set at a priority of &b{2}&a on server &b{3}&a."
-addprefix-server-world-success: "&b{0}&a had prefix &f\"{1}&f\"&a set at a priority of &b{2}&a on server &b{3}&a, world &b{4}&a."
-removeprefix-success: "&b{0}&a had prefix &f\"{1}&f\"&a at priority &b{2}&a removed."
-removeprefix-server-success: "&b{0}&a had prefix &f\"{1}&f\"&a at priority &b{2}&a removed on server &b{3}&a."
-removeprefix-server-world-success: "&b{0}&a had prefix &f\"{1}&f\"&a at priority &b{2}&a removed on server &b{3}&a, world &b{4}&a."
-
-addsuffix-success: "&b{0}&a had suffix &f\"{1}&f\"&a set at a priority of &b{2}&a."
-addsuffix-server-success: "&b{0}&a had suffix &f\"{1}&f\"&a set at a priority of &b{2}&a on server &b{3}&a."
-addsuffix-server-world-success: "&b{0}&a had suffix &f\"{1}&f\"&a set at a priority of &b{2}&a on server &b{3}&a, world &b{4}&a."
-removesuffix-success: "&b{0}&a had suffix &f\"{1}&f\"&a at priority &b{2}&a removed."
-removesuffix-server-success: "&b{0}&a had suffix &f\"{1}&f\"&a at priority &b{2}&a removed on server &b{3}&a."
-removesuffix-server-world-success: "&b{0}&a had suffix &f\"{1}&f\"&a at priority &b{2}&a removed on server &b{3}&a, world &b{4}&a."
-
-add-temp-prefix-success: "&b{0}&a had prefix &f\"{1}&f\"&a set at a priority of &b{2}&a for a duration of &b{3}&a."
-add-temp-prefix-server-success: "&b{0}&a had prefix &f\"{1}&f\"&a set at a priority of &b{2}&a on server &b{3}&a, for a duration of &b{4}&a."
-add-temp-prefix-server-world-success: "&b{0}&a had prefix &f\"{1}&f\"&a set at a priority of &b{2}&a on server &b{3}&a, world &b{4}&a, for a duration of &b{5}&a."
-remove-temp-prefix-success: "&b{0}&a had temporary prefix &f\"{1}&f\"&a at priority &b{2}&a removed."
-remove-temp-prefix-server-success: "&b{0}&a had temporary prefix &f\"{1}&f\"&a at priority &b{2}&a removed on server &b{3}&a."
-remove-temp-prefix-server-world-success: "&b{0}&a had temporary prefix &f\"{1}&f\"&a at priority &b{2}&a removed on server &b{3}&a, world &b{4}&a."
-
-add-temp-suffix-success: "&b{0}&a had suffix &f\"{1}&f\"&a set at a priority of &b{2}&a for a duration of &b{3}&a."
-add-temp-suffix-server-success: "&b{0}&a had suffix &f\"{1}&f\"&a set at a priority of &b{2}&a on server &b{3}&a, for a duration of &b{4}&a."
-add-temp-suffix-server-world-success: "&b{0}&a had suffix &f\"{1}&f\"&a set at a priority of &b{2}&a on server &b{3}&a, world &b{4}&a, for a duration of &b{5}&a."
-remove-temp-suffix-success: "&b{0}&a had temporary suffix &f\"{1}&f\"&a at priority &b{1}&a removed."
-remove-temp-suffix-server-success: "&b{0}&a had temporary suffix &f\"{1}&f\"&a at priority &b{2}&a removed on server &b{3}&a."
-remove-temp-suffix-server-world-success: "&b{0}&a had temporary suffix &f\"{1}&f\"&a at priority &b{2}&a removed on server &b{3}&a, world &b{4}&a."
-
+already-has-chat-meta: "{0} already has that {1} set."
+does-not-have-chat-meta: "{0} doesn't have that {1} set."
+add-chatmeta-success: "&b{0}&a had {1} &f\"{2}&f\"&a set at a priority of &b{3}&a in context {4}&a."
+add-temp-chatmeta-success: "&b{0}&a had {1} &f\"{2}&f\"&a set at a priority of &b{3}&a for a duration of &b{4}&a in context {5}&a."
+remove-chatmeta-success: "&b{0}&a had {1} &f\"{2}&f\"&a at priority &b{3}&a removed in context {4}&a."
+bulk-remove-chatmeta-success: "&b{0}&a had all {1}es at priority &b{3}&a removed in context {4}&a."
+remove-temp-chatmeta-success: "&b{0}&a had temporary {1} &f\"{2}&f\"&a at priority &b{3}&a removed in context {4}&a."
+bulk-remove-temp-chatmeta-success: "&b{0}&a had all temporary {1}es at priority &b{3}&a removed in context {4}&a."
 already-has-meta: "{0} already has that meta key value pair set."
-set-meta-success: "&aSet meta value for key &f\"{0}&f\"&a to &f\"{1}&f\"&a for &b{2}&a."
-set-meta-server-success: "&aSet meta value for key &f\"{0}&f\"&a to &f\"{1}&f\"&a for &b{2}&a on server &b{3}&a."
-set-meta-server-world-success: "&aSet meta value for key &f\"{0}&f\"&a to &f\"{1}&f\"&a for &b{2}&a on server &b{3}&a, world &b{4}&a."
-set-meta-temp-success: "&aSet meta value for key &f\"{0}&f\"&a to &f\"{1}&f\"&a for &b{2}&a for a duration of &b{3}&a."
-set-meta-temp-server-success: "&aSet meta value for key &f\"{0}&f\"&a to &f\"{1}&f\"&a for &b{2}&a on server &b{3}&a for a duration of &b{4}&a."
-set-meta-temp-server-world-success: "&aSet meta value for key &f\"{0}&f\"&a to &f\"{1}&f\"&a for &b{2}&a on server &b{3}&a, world &b{4}&a, for a duration of &b{5}&a."
-
-unset-meta-success: "&aUnset meta value with key &f\"{0}&f\"&a for &b{1}&a."
-unset-meta-server-success: "&aUnset meta value with key &f\"{0}&f\"&a for &b{1}&a on server &b{2}&a."
-unset-meta-server-world-success: "&aUnset meta value with key &f\"{0}&f\"&a for &b{1}&a on server &b{2}&a, world &b{3}&a."
-unset-meta-temp-success: "&aUnset temporary meta value with key &f\"{0}&f\"&a for &b{1}&a."
-unset-meta-temp-server-success: "&aUnset temporary meta value with key &f\"{0}&f\"&a for &b{1}&a on server &b{2}&a."
-unset-meta-temp-server-world-success: "&aUnset temporary meta value with key &f\"{0}&f\"&a for &b{1}&a on server &b{2}&a, world &b{3}&a."
-
+set-meta-success: "&aSet meta value for key &f\"{0}&f\"&a to &f\"{1}&f\"&a for &b{2}&a in context {3}&a."
+set-meta-temp-success: "&aSet meta value for key &f\"{0}&f\"&a to &f\"{1}&f\"&a for &b{2}&a for a duration of &b{3}&a in context {4}&a."
+unset-meta-success: "&aUnset meta value with key &f\"{0}&f\"&a for &b{1}&a in context {2}&a."
+unset-meta-temp-success: "&aUnset temporary meta value with key &f\"{0}&f\"&a for &b{1}&a in context {2}&a."
 bulk-change-type-error: "Invalid type. Was expecting 'server' or 'world'."
 bulk-change-success: "&aApplied bulk change successfully. {0} records were changed."
-
 user-info-general: >
   {PREFIX}&b&l> &bUser Info: &f{0}\n
   {PREFIX}&f- &3UUID: &f{1}\n
@@ -258,6 +213,7 @@ info-temp-parent-header: "&f- &aTemporary Parent Groups:"
 user-getuuid: "&bThe UUID of &b{0}&b is &b{1}&b."
 user-removegroup-error-primary: "You cannot remove a user from their primary group."
 user-primarygroup-success: "&b{0}&a's primary group was set to &b{1}&a."
+user-primarygroup-warn-option: "&cWarning: The primary group calculation method being used by this server &7({0}) &cmay not reflect this change."
 user-primarygroup-error-alreadyhas: "The user already has this group set as their primary group."
 user-primarygroup-error-notmember: "&b{0}&a was not already a member of &b{1}&a, adding them now."
 user-track-error-not-contain-group: "The user specified isn't already in any groups on this track."
@@ -269,7 +225,7 @@ user-promote-success-server: "&aPromoting user along track &b{0}&a from &b{1}&a
 user-promote-success-server-world: "&aPromoting user along track &b{0}&a from &b{1}&a to &b{2}&a on server &b{3}&a, world &b{4}&a."
 user-promote-error-endoftrack: "The end of track &4{0}&c was reached. Unable to promote user."
 user-promote-error-malformed: >
-  {PREFIX}The next group on the track, {0}, no longer exists. Unable to promote user.
+  {PREFIX}The next group on the track, {0}, no longer exists. Unable to promote user.\n
   {PREFIX}Either create the group, or remove it from the track and try again.
 user-demote-success: "&aDemoting user along track &b{0}&a from &b{1}&a to &b{2}&a."
 user-demote-success-server: "&aDemoting user along track &b{0}&a from &b{1}&a to &b{2}&a on server &b{3}&a."
@@ -278,9 +234,9 @@ user-demote-endoftrack: "The end of track &4{0}&c was reached, so &4{1}&c was re
 user-demote-error-malformed: >
   {PREFIX}The previous group on the track, {0}, no longer exists. Unable to demote user.\n
   {PREFIX}Either create the group, or remove it from the track and try again.
-user-demote-error-not-contain-group: "Demotions are done based on primary groups. The users primary group is not on the track specified."
-user-showpos: "&aShowing &b{0}&a's position on track &b{1}&a.{2}"
-
+user-showpos: >
+  &aShowing &b{0}&a's position on track &b{1}&a.\n
+  {2}
 group-info-general: >
   {PREFIX}&b&l> &bGroup Info: &f{0}\n
   {PREFIX}&f- &3Display Name: &f{1}\n
@@ -292,7 +248,6 @@ group-info-general: >
   {PREFIX}&f-    &3Suffixes: &a{6}\n
   {PREFIX}&f-    &3Meta: &a{7}
 group-set-weight: "&aSet weight to &b{0}&a for group &b{1}&a."
-
 track-info: >
   {PREFIX}&b&l> &bShowing Track: &f{0}\n
   {PREFIX}&f- &7Path: &f{1}
@@ -302,55 +257,43 @@ track-insert-success: "&aGroup &b{0}&a was successfully inserted into track &b{1
 track-insert-error-number: "Expected number but instead received: {0}"
 track-insert-error-invalid-pos: "Unable to insert at position {0}. Index out of bounds."
 track-remove-success: "&aGroup &b{0}&a was successfully removed from track &b{1}&a."
-
 log-load-error: "The log could not be loaded."
 log-invalid-page: "Invalid page number."
 log-invalid-page-range: "Invalid page number. Please enter a value between 1 and {0}."
 log-no-entries: "&bNo log entries to show."
 log-entry: "&b#{0} -> &8(&7{1} ago&8) {2}"
-
 log-notify-toggle-on: "&aEnabled&b logging output."
 log-notify-toggle-off: "&cDisabled&b logging output."
 log-notify-already-on: "You are already receiving notifications."
 log-notify-already-off: "You aren't currently receiving notifications."
 log-notify-unknown: "State unknown. Expecting \"on\" or \"off\"."
-
 log-search-header: "&aShowing recent actions for query &b{0} &a(page &f{1}&a of &f{2}&a)"
-
 log-recent-header: "&aShowing recent actions (page &f{0}&a of &f{1}&a)"
 log-recent-by-header: "&aShowing recent actions by &b{0} &a(page &f{1}&a of &f{2}&a)"
-
 log-history-user-header: "&aShowing history for user &b{0} &a(page &f{1}&a of &f{2}&a)"
 log-history-group-header: "&aShowing history for group &b{0} &a(page &f{1}&a of &f{2}&a)"
 log-history-track-header: "&aShowing history for track &b{0} &a(page &f{1}&a of &f{2}&a)"
-
 log-export-already-exists: "Error: File {0} already exists."
 log-export-not-writable: "Error: File {0} is not writable."
 log-export-empty: "The log is empty and therefore cannot be exported."
 log-export-failure: "An unexpected error occured whilst writing to the file."
 log-export-success: "&aSuccessfully exported the log to &b{0}&a."
-
 import-already-running: "Another import process is already running. Please wait for it to finish and try again."
+export-already-running: "Another export process is already running. Please wait for it to finish and try again."
 import-log-doesnt-exist: "Error: File {0} does not exist."
 import-log-not-readable: "Error: File {0} is not readable."
 import-log-failure: "An unexpected error occured whilst reading from the log file."
-
 import-progress: "&b(Import) &b-> &f{0} &fpercent complete &7- &b{1}&f/&b{2} &foperations complete with &c{3} &ferrors."
 import-progress-sin: "&b(Import) &b-> &f{0} &fpercent complete &7- &b{1}&f/&b{2} &foperations complete with &c{3} &ferror."
 import-start: "&b(Import) &b-> &fStarting import process."
-
 import-end-complete: "&b(Import) &a&lCOMPLETED &7- took &b{0} &7seconds - &7No errors."
 import-end-complete-err: "&b(Import) &a&lCOMPLETED &7- took &b{0} &7seconds - &c{1} errors."
 import-end-complete-err-sin: "&b(Import) &a&lCOMPLETED &7- took &b{0} &7seconds - &c{1} error."
-
 import-end-error-header: >
   {PREFIX}&b(Import) &7------------> &fShowing Error #&b{0} &7<------------\n
   {PREFIX}&b(Import) &fWhilst executing: &3Command #{1}\n
   {PREFIX}&b(Import) &fCommand: &7{2}\n
   {PREFIX}&b(Import) &fType: &3{3}\n
   {PREFIX}&b(Import) &fOutput:
-
 import-end-error-content: "&b(Import) &b-> &c{0}"
 import-end-error-footer: "&b(Import) &7<------------------------------------------>"
-
-migration-not-console: "Migration must be performed from the Console."

.locale/es_ES.yml

@@ -0,0 +1,338 @@
+# LuckPerms Language File
+# Locale: es_ES (Spanish)
+# Author: Jose Chavez (Twitter: @JoCHav3z)
+
+prefix: "&7&l[&b&lL&3&lP&7&l] &c"
+log-info: "&7&l[&bL&3P&7&l] &3{0}"
+log-warn: "&7&l[&bLuck&3Perms&7&l] &c[ADVERTENCIA] {0}"
+log-error: "&7&l[&bLuck&3Perms&7&l] &4[ERROR] {0}"
+empty: "{0}"
+player-online: "&aConectado"
+player-offline: "&cDesconectado"
+loading-error: "La Informacion de los permisos no pudo ser cargada. Por favor contacte al administrador."
+op-disabled: "&bEl sistema OP de Vanilla esta deshabilitado en este servidor."
+op-disabled-sponge: "&2El estado de operador del servidor no tiene efecto cuando un plugin de permisos esta instalado. Por favor edite la informacion de usuario directamente."
+log: "&3LOG &3&l> {0}"
+export-log: "&3EXPORTAR &3&l> &f{0}"
+export-log-progress: "&3EXPORTADO &3&l> &7{0}"
+migration-log: "&3MIGRACION &7[&3{0}&7] &3&l> &f{1}"
+migration-log-progress: "&3MIGRADO &7[&3{0}&7] &3&l> &7{1}"
+command-not-recognised: "Comando no reconocido."
+command-no-permission: "¡No tienes permiso de usar este comando!"
+already-haspermission: "{0} ¡Ya tienes este permiso!"
+does-not-havepermission: "{0} No tienes este permiso establecido."
+already-has-temp-permission: "{0} ¡Ya tienes este permiso establecido temporalmente!"
+does-not-have-temp-permission: "{0} No tienes este permiso establecido temporalmente."
+user-not-found: "&bNo se pudo encontrar al usuario."
+user-not-online: "&bUsuario &a{0}&b no esta conectado."
+user-no-data: "&bUsuario &a{0}&b no tiene ningún dato cargado."
+user-save-success: "&7(Los datos del usuario se guardaron en el almacenamiento)"
+user-save-error: "Se ha producido un error al guardar el usuario."
+user-create-fail: "Se produjo un error al crear un nuevo usuario."
+group-not-found: "&bEl Grupo no se pudo encontrar."
+group-save-success: "&7(Los datos del grupo se guardaron en el almacenamiento)"
+group-save-error: "Se ha producido un error al guardar el grupo."
+track-not-found: "&bNo se pudo encontrar la pista."
+track-save-success: "&7(Los datos de la pista se guardaron en el almacenamiento)"
+track-save-error: "Se ha producido un error al guardar la pista."
+user-invalid-entry: "&d{0}&c El username/uuid no es valido."
+group-invalid-entry: "Los nombres de grupo sólo pueden contener caracteres alfanuméricos."
+track-invalid-entry: "Los nombres de pista sólo pueden contener caracteres alfanuméricos."
+server-invalid-entry: "Los nombres de servidor sólo pueden contener caracteres alfanuméricos."
+use-inherit-command: "Usa el comando 'parent add' y 'parent remove' en vez de especificar el nodo."
+verbose-invalid-filter: "&cFiltro Verbose invalido: &f{0}"
+verbose-on: "&bEl chequeo Verbose de salida se ha establecido en &aTRUE &bpara todos los permisos."
+verbose-on-query: "&bEl chequeo Verbose de salida que se establecio en &aTRUE &bpara los permisos se ha pareado con los siguientes filtros: &f{0}"
+verbose-off: "&bEl chequeo Verbose de salida que se establecio en &cFALSE&b."
+verbose-recording-on: "&bGrabacion de Verbose establecida en &aTRUE &bpara todos los permisos."
+verbose-recording-on-query: "&bGrabacion de Verbose establecida en &aTRUE &bpara los permisos se ha pareado con los siguientes filtros: &f{0}"
+verbose-recording-upload-start: "&bGrabacion de Verbose se ha deshabilitado. Cargando resultados..."
+verbose-recording-url: "&aURL de resultados de Verbose:"
+tree-upload-start: "&bGenerando arbol de permisos..."
+tree-empty: "&aNo se puede generar el árbol. No se encontraron resultados."
+tree-url: "&aURL de arbol de permisos:"
+search-searching: "&aBúsqueda de usuarios y grupos con &b{0}&a..."
+search-result: "&aEncontradas &b{0}&a entradas por parte de &b{1}&a usuarios y &b{2}&a grupos."
+search-showing-users: "&bMostrando entradas del usuario:"
+search-showing-groups: "&bMostrando entradas del grupo:"
+search-showing-users-with-page: "&bMostrando entradas del usuario:  {0}"
+search-showing-groups-with-page: "&bMostrando entradas del grupo:  {0}"
+check-result: "&aResultado de la comprobación del permiso en el usuario &b{0}&a para permiso &b{1}&a: &f{2}"
+create-success: "&b{0}&a se creó correctamente."
+delete-success: "&b{0}&a fue eliminado correctamente."
+rename-success: "&b{0}&a fue exitosamente renombrado a &b{1}&a."
+clone-success: "&b{0}&a fue clonado con éxito en &b{1}&a."
+already-inherits: "{0} ya hereda '{1}'."
+does-not-inherit: "{0} no hereda '{1}'."
+already-temp-inherits: "{0} ya lo heredo temporalmente a '{1}'."
+does-not-temp-inherit: "{0} no lo heredo temporalmente a '{1}'."
+track-already-contains: "La pista {0} ya contiene el grupo '{1}'."
+track-does-not-contain: "La pista {0} no contiene el grupo '{1}'."
+track-ambiguous-call: "El usuario especificado es miembro de varios grupos en esta pista. No se puede determinar su ubicación."
+group-already-exists: "¡Ese grupo ya existe!"
+group-does-not-exist: "¡Ese grupo no existe!"
+group-load-error: "Ocurrió un error inesperado. No se pudo cargar el grupo."
+groups-load-error: "Ocurrió un error inesperado. No se pueden cargar todos los grupos."
+track-already-exists: "¡La pista ya existe!"
+track-does-not-exist: "¡La pista no existe!"
+track-load-error: "Ocurrió un error inesperado. No se pudo cargar la pista."
+tracks-load-error: "Ocurrió un error inesperado. No se pueden cargar todas las pistas."
+track-empty: "La pista no se puede utilizar porque está vacía o contiene sólo un grupo."
+update-task-request: "&bActualizar tarea programada."
+update-task-complete: "&aLa actualizacion de la tarea a finalizado."
+update-task-complete-network: "&aLa actualizacion de la tarea a finalizado. Ahora intentando enviar a otros servidores."
+update-task-push-success: "&aOtros servidores fueron notificados vía &b{0} Mensajería &aexitoxamente."
+update-task-push-failure: "&cError al empujar cambios a otros servidores."
+update-task-push-failure-not-setup: "&cError al presionar los cambios a otros servidores. No se ha configurado un servicio de mensajería."
+reload-config-success: "&aSe ha vuelto a cargar el archivo de configuración. &7(Algunas opciones sólo se aplicarán después de que el servidor se haya reiniciado.)"
+info: >
+  {PREFIX}&2Running &bLuckPerms v{0}&2 by &bLuck&2.\n
+  {PREFIX}&f-  &3Platform: &f{1}\n
+  {PREFIX}&f-  &3Storage Method: &f{2}\n
+  {PREFIX}&f-  &3Server Name: &f{3}\n
+  {PREFIX}&f-  &3Sync Interval: &a{4} &fminutes\n
+  {PREFIX}&f-  &3Messaging Service: &f{5}\n
+  {PREFIX}&f-  &bCounts:\n
+  {PREFIX}&f-     &3Online Players: &a{6}\n
+  {PREFIX}&f-     &3Loaded Users: &a{7}\n
+  {PREFIX}&f-     &3Loaded Groups: &a{8}\n
+  {PREFIX}&f-     &3Loaded Tracks: &a{9}\n
+  {PREFIX}&f-     &3Log size: &a{10}\n
+  {PREFIX}&f-     &3UUID Cache size: &a{11}\n
+  {PREFIX}&f-     &3Translations loaded: &a{12}\n
+  {PREFIX}&f-     &3Pre-process contexts: &a{13}\n
+  {PREFIX}&f-     &3Context Calculators: &a{14}\n
+  {PREFIX}&f-     &3Unique permissions: &a{15}\n
+  {PREFIX}&f-  &bConfiguration:\n
+  {PREFIX}&f-     &3Use Server UUIDs: {16}\n
+  {PREFIX}&f-     &bPermission Calculation:\n
+  {PREFIX}&f-        &3Including Global: {17}\n
+  {PREFIX}&f-        &3Including Global World: {18}\n
+  {PREFIX}&f-        &3Applying Global Groups: {19}\n
+  {PREFIX}&f-        &3Applying Global World Groups: {20}\n
+  {PREFIX}&f-        &3Applying Wildcards: {21}\n
+  {PREFIX}&f-        &3Applying Regex: {22}\n
+  {PREFIX}&f-        &3Applying Shorthand: {23}
+create-group-error: "Se produjo un error al crear el grupo."
+delete-group-error: "Se produjo un error al eliminar el grupo."
+delete-group-error-default: "No puede eliminar el grupo predeterminado."
+groups-list: "&aGrupos: {0}"
+create-track-error: "Se produjo un error al crear la pista."
+delete-track-error: "Se produjo un error al eliminar la pista."
+tracks-list: "&aPistas: {0}"
+listnodes: "&b{0}'s Nodos:"
+listnodes-with-page: "&b{0}'s Nodos:  {1}"
+listnodes-temp: >
+  &b{0}'s Temporary Nodes:\n
+  {1}
+listparents: >
+  &b{0}'s Parent Groups:\n
+  {1}
+listparents-temp: >
+  &b{0}'s Temporary Parent Groups:\n
+  {1}
+listgroups: >
+  &b{0}'s Groups:\n
+  {1}
+listgroups-temp: >
+  &b{0}'s Temporary Groups:\n
+  {1}
+list-tracks: >
+  &b{0}'s Tracks:\n
+  {1}
+list-tracks-empty: "{0} no está en ninguna pista."
+setpermission-success: "&aEstablecer &b{0}&a a &b{1}&a para &b{2}&a."
+setpermission-server-success: "&aEstablecer &b{0}&a a &b{1}&a para &b{2}&a en el servidor &b{3}&a."
+setpermission-server-world-success: "&aEstablecer &b{0}&a a &b{1}&a para &b{2}&a en el servidor &b{3}&a, mundo &b{4}&a."
+setpermission-temp-success: "&aEstablecer &b{0}&a a &b{1}&a para &b{2}&a por una duracion de &b{3}&a."
+setpermission-temp-server-success: "&aEstablecer &b{0}&a a &b{1}&a para &b{2}&a en el servidor &b{3}&a por una duracion de &b{4}&a."
+setpermission-temp-server-world-success: "&aEstablecer &b{0}&a a &b{1}&a para &b{2}&a en el servidor &b{3}&a, mundo &b{4}&a, por una duracion de &b{5}&a."
+unsetpermission-success: "&aDesestablecer &b{0}&a para &b{1}&a."
+unsetpermission-server-success: "&aDesestablecer &b{0}&a para &b{1}&a en el servidor &b{2}&a."
+unsetpermission-server-world-success: "&aDesestablecer &b{0}&a para &b{1}&a en el servidor &b{2}&a, mundo &b{3}&a."
+unset-temp-permission-success: "&aDesestablecer temporalmente el permiso &b{0}&a para &b{1}&a."
+unset-temp-permission-server-success: "&aDesestablecer temporalmente el permiso &b{0}&a para &b{1}&a en el servidor &b{2}&a."
+unset-temp-permission-server-world-success: "&aDesestablecer temporalmente el permiso &b{0}&a para &b{1}&a en el servidor &b{2}&a, mundo &b{3}&a."
+set-inherit-success: "&b{0}&a ahora hereda los permisos de &b{1}&a."
+set-inherit-server-success: "&b{0}&a ahora hereda los permisos de &b{1}&a en el servidor &b{2}&a."
+set-inherit-server-world-success: "&b{0}&a ahora hereda los permisos de &b{1}&a en el servidor &b{2}&a, mundo &b{3}&a."
+set-parent-success: "&b{0}&a sus grupos parentales existentes han sido borrados, y ahora solo heredan &b{1}&a."
+set-parent-server-success: "&b{0}&a sus grupos parentales existentes han sido borrados, y ahora solo heredan &b{1}&a en el servidor &b{2}&a."
+set-parent-server-world-success: "&b{0}&a sus grupos parentales existentes han sido borrados, y ahora solo heredan &b{1}&a en el servidor &b{2}&a, mundo &b{3}&a."
+set-temp-inherit-success: "&b{0}&a ahora heredan permisos de &b{1}&a por una duracion de &b{2}&a."
+set-temp-inherit-server-success: "&b{0}&a ahora heredan permisos de &b{1}&a en el servidor &b{2}&a por una duracion de &b{3}&a."
+set-temp-inherit-server-world-success: "&b{0}&a ahora heredan permisos de &b{1}&a en el servidor &b{2}&a, mundo &b{3}&a, por una duracion de &b{4}&a."
+unset-inherit-success: "&b{0}&a ya no hereda los permisos de &b{1}&a."
+unset-inherit-server-success: "&b{0}&a ya no hereda los permisos de &b{1}&a en el servidor &b{2}&a."
+unset-inherit-server-world-success: "&b{0}&a ya no hereda los permisos de &b{1}&a en el servidor &b{2}&a, mundo &b{3}&a."
+unset-temp-inherit-success: "&b{0}&a ya no hereda temporalmente los permisos de &b{1}&a."
+unset-temp-inherit-server-success: "&b{0}&a ya no hereda temporalmente los permisos &b{1}&a en el servidor &b{2}&a."
+unset-temp-inherit-server-world-success: "&b{0}&a ya no hereda temporalmente los permisos &b{1}&a en el servidor &b{2}&a, mundo &b{3}&a."
+clear-success: "&b{0}&a's permisos fueron borrados. (&b{1}&a nodos fueron removidos.)"
+clear-success-singular: "&b{0}&a's permisos fueron borrados. (&b{1}&a nodo fue removido.)"
+parent-clear-success: "&b{0}&a's los padres fueron eliminados. (&b{1}&a nodos fueron removidos.)"
+parent-clear-success-singular: "&b{0}&a's los padres fueron eliminados. (&b{1}&a nodo fue removido.)"
+meta-clear-success: "&b{0}&a's meta fue eliminada. (&b{1}&a nodos fueron removidos.)"
+meta-clear-success-singular: "&b{0}&a's meta fue eliminada. (&b{1}&a nodo fue removido.)"
+illegal-date-error: "No se pudo analizar la fecha '{0}'."
+past-date-error: "¡No puedes fijar una fecha en el pasado!"
+chat-meta-prefix-header: "&b{0}'s Prefijos"
+chat-meta-suffix-header: "&b{0}'s Sufijos"
+meta-header: "&b{0}'s Meta"
+chat-meta-entry: "&b-> {0} &f- &f\"{1}&f\" &8(&7heredado de &a{2}&8)"
+chat-meta-entry-with-context: "&b-> {0} &f- &f\"{1}&f\" &8(&7heredado de &a{2}&8){3}"
+meta-entry: "&b-> &a{0} &f= &f\"{1}&f\" &8(&7heredado de &a{2}&8)"
+meta-entry-with-context: "&b-> &a{0} &f= &f\"{1}&f\" &8(&7heredado de &a{2}&8){3}"
+chat-meta-prefix-none: "&b{0} no tiene prefijos."
+chat-meta-suffix-none: "&b{0} no tiene sufijos."
+meta-none: "&b{0} no tiene meta."
+meta-invalid-priority: "Prioridad no válida '{0}'. Se esperaba un número."
+already-has-prefix: "{0} ya tiene ese prefijo establecido."
+already-has-suffix: "{0} ya tiene ese sufijo establecido."
+does-not-have-prefix: "{0} no tiene ese prefijo establecido."
+does-not-have-suffix: "{0} no tiene ese sufijo establecido."
+addprefix-success: "&b{0}&a tiene el prefijo &f\"{1}&f\"&a establecido como prioridad de &b{2}&a."
+addprefix-server-success: "&b{0}&a tiene el prefijo &f\"{1}&f\"&a establecido como prioridad de &b{2}&a en el servidor &b{3}&a."
+addprefix-server-world-success: "&b{0}&a tiene el prefijo &f\"{1}&f\"&a establecido como prioridad de &b{2}&a en el servidor &b{3}&a, mundo &b{4}&a."
+removeprefix-success: "&b{0}&a tiene el prefijo &f\"{1}&f\"&a en prioridad de &b{2}&a removido."
+removeprefix-server-success: "&b{0}&a tiene el prefijo &f\"{1}&f\"&a en prioridad de &b{2}&a removido en el servidor &b{3}&a."
+removeprefix-server-world-success: "&b{0}&a tiene el prefijo &f\"{1}&f\"&a en prioridad de &b{2}&a removido en el servidor &b{3}&a, mundo &b{4}&a."
+addsuffix-success: "&b{0}&a tiene el sufijo &f\"{1}&f\"&a establecido en prioridad de &b{2}&a."
+addsuffix-server-success: "&b{0}&a tiene el sufijo &f\"{1}&f\"&a establecido en prioridad de &b{2}&a en el servidor &b{3}&a."
+addsuffix-server-world-success: "&b{0}&a tiene el sufijo &f\"{1}&f\"&a establecido en prioridad de &b{2}&a en el servidor &b{3}&a, mundo &b{4}&a."
+removesuffix-success: "&b{0}&a tiene el sufijo &f\"{1}&f\"&a en prioridad de &b{2}&a removido."
+removesuffix-server-success: "&b{0}&a tiene el sufijo &f\"{1}&f\"&a en prioridad de &b{2}&a removido en el servidor &b{3}&a."
+removesuffix-server-world-success: "&b{0}&a tiene el sufijo &f\"{1}&f\"&a en prioridad de &b{2}&a removido en el servidor &b{3}&a, mundo &b{4}&a."
+add-temp-prefix-success: "&b{0}&a tiene el prefijo &f\"{1}&f\"&a en prioridad de &b{2}&a por una duracion de &b{3}&a."
+add-temp-prefix-server-success: "&b{0}&a tiene el prefijo &f\"{1}&f\"&a establecido en prioridad de &b{2}&a en el servidor &b{3}&a, por una duracion de &b{4}&a."
+add-temp-prefix-server-world-success: "&b{0}&a tiene el prefijo &f\"{1}&f\"&a establecido en prioridad de &b{2}&a en el servidor &b{3}&a, mundo &b{4}&a, por una duracion de &b{5}&a."
+remove-temp-prefix-success: "&b{0}&a tiene temporalmente el prefijo &f\"{1}&f\"&a en prioridad de &b{2}&a removido."
+remove-temp-prefix-server-success: "&b{0}&a tiene temporalmente el prefijo &f\"{1}&f\"&a en prioridad de &b{2}&a removido en el servidor &b{3}&a."
+remove-temp-prefix-server-world-success: "&b{0}&a tiene temporalmente el prefijo &f\"{1}&f\"&a en prioridad de &b{2}&a removido en el servidor &b{3}&a, mundo &b{4}&a."
+add-temp-suffix-success: "&b{0}&a tiene el sufijo &f\"{1}&f\"&a establecido en prioridad de &b{2}&a por una duracion de &b{3}&a."
+add-temp-suffix-server-success: "&b{0}&a tiene el sufijo &f\"{1}&f\"&a establecido en prioridad de &b{2}&a en el servidor &b{3}&a, por una duracion de &b{4}&a."
+add-temp-suffix-server-world-success: "&b{0}&a tiene el sufijo &f\"{1}&f\"&a establecido en prioridad de &b{2}&a en el servidor &b{3}&a, mundo &b{4}&a, por una duracion de &b{5}&a."
+remove-temp-suffix-success: "&b{0}&a tiene temporalmente el sufijo &f\"{1}&f\"&a en prioridad de &b{1}&a removido."
+remove-temp-suffix-server-success: "&b{0}&a tiene temporalmente el sufijo &f\"{1}&f\"&a en prioridad de &b{2}&a removido en el servidor &b{3}&a."
+remove-temp-suffix-server-world-success: "&b{0}&a tiene temporalmente el sufijo &f\"{1}&f\"&a en prioridad de &b{2}&a removido en el servidor &b{3}&a, mundo &b{4}&a."
+already-has-meta: "{0} ya tiene ese par de valores de llave meta establecido."
+set-meta-success: "&aEstablecer el valor meta para la llave &f\"{0}&f\"&a a &f\"{1}&f\"&a para &b{2}&a."
+set-meta-server-success: "&aEstablecer el valor meta para la llave &f\"{0}&f\"&a a &f\"{1}&f\"&a para &b{2}&a en el servidor &b{3}&a."
+set-meta-server-world-success: "&aEstablecer el valor meta para la llave &f\"{0}&f\"&a a &f\"{1}&f\"&a para &b{2}&a en el servidor &b{3}&a, mundo &b{4}&a."
+set-meta-temp-success: "&aEstablecer el valor meta para la llave &f\"{0}&f\"&a a &f\"{1}&f\"&a para &b{2}&a por una duracion de &b{3}&a."
+set-meta-temp-server-success: "&aEstablecer el valor meta para la llave &f\"{0}&f\"&a a &f\"{1}&f\"&a para &b{2}&a en el servidor &b{3}&a por una duracion de &b{4}&a."
+set-meta-temp-server-world-success: "&aEstablecer el valor meta para la llave &f\"{0}&f\"&a a &f\"{1}&f\"&a para &b{2}&a en el servidor &b{3}&a, mundo &b{4}&a, por una duracion de &b{5}&a."
+unset-meta-success: "&aDesestablecer el valor meta con la llave &f\"{0}&f\"&a para &b{1}&a."
+unset-meta-server-success: "&aDesestablecer el valor meta con la llave &f\"{0}&f\"&a para &b{1}&a en el servidor &b{2}&a."
+unset-meta-server-world-success: "&aDesestablecer el valor meta con la llave &f\"{0}&f\"&a for &b{1}&a en el servidor &b{2}&a, mundo &b{3}&a."
+unset-meta-temp-success: "&aDesestablecer temporalmente el valor meta con la llave &f\"{0}&f\"&a para &b{1}&a."
+unset-meta-temp-server-success: "&aDesestablecer temporalmente el valor meta con la llave &f\"{0}&f\"&a para &b{1}&a en el servidor &b{2}&a."
+unset-meta-temp-server-world-success: "&aDesestablecer temporalmente el valor meta con la llave &f\"{0}&f\"&a para &b{1}&a en el servidor &b{2}&a, mundo &b{3}&a."
+bulk-change-type-error: "Tipo no válido. Se estaba esperando 'server' o 'world'."
+bulk-change-success: "&aEl cambio masivo fue aplicado correctamente. {0} los registros fueron cambiados."
+user-info-general: >
+  {PREFIX}&b&l> &bUser Info: &f{0}\n
+  {PREFIX}&f- &3UUID: &f{1}\n
+  {PREFIX}&f- &3Status: {2}\n
+  {PREFIX}&f- &3Primary Group: &f{3}\n
+  {PREFIX}&f- &aCounts:\n
+  {PREFIX}&f-    &3Permissions: &a{4}\n
+  {PREFIX}&f-    &3Temporary Permissions: &a{5}\n
+  {PREFIX}&f-    &3Prefixes: &a{6}\n
+  {PREFIX}&f-    &3Suffixes: &a{7}\n
+  {PREFIX}&f-    &3Meta: &a{8}
+user-info-data: >
+  {PREFIX}&f- &aCached Data:\n
+  {PREFIX}&f-    &3Is Loaded: {0}\n
+  {PREFIX}&f-    &3Current Contexts: {1}\n
+  {PREFIX}&f-    &3Current Prefix: {2}\n
+  {PREFIX}&f-    &3Current Suffix: {3}
+info-parent-header: "&f- &aGrupos Parentales:"
+info-temp-parent-header: "&f- &aGrupos Temporalmente Parentales:"
+user-getuuid: "&bEl UUID de &b{0}&b es &b{1}&b."
+user-removegroup-error-primary: "No puede eliminar un usuario de su grupo principal."
+user-primarygroup-success: "&b{0}&a's grupo primario se estableció &b{1}&a."
+user-primarygroup-warn-option: "&cAdvertencia: El método de cálculo de grupo primario utilizado por este servidor &7({0}) &cpuede no reflejar este cambio."
+user-primarygroup-error-alreadyhas: "El usuario ya tiene este grupo configurado como su grupo principal."
+user-primarygroup-error-notmember: "&b{0}&a ya no era miembro de &b{1}&a, agregándolos ahora."
+user-track-error-not-contain-group: "El usuario especificado ya no está en ningún grupo de esta pista."
+user-track-added-to-first: "&b{0}&a no está en ningún grupo en esta pista, por lo que se agregaron al primer grupo, &b{1}&a."
+user-track-added-to-first-server: "&b{0}&a no está en ningún grupo en esta pista, por lo que se agregaron al primer grupo, &b{1}&a, en el servidor &b{2}&a."
+user-track-added-to-first-server-world: "&b{0}&a no está en ningún grupo en esta pista, por lo que se agregaron al primer grupo, &b{1}&a, en el servidor &b{2}&a, mundo &b{3}&a."
+user-promote-success: "&aPromover al usuario a lo largo de la pista &b{0}&a desde &b{1}&a a &b{2}&a."
+user-promote-success-server: "&aPromover al usuario a lo largo de la pista &b{0}&a desde &b{1}&a a &b{2}&a en el servidor &b{3}&a."
+user-promote-success-server-world: "&aPromover al usuario a lo largo de la pista &b{0}&a desde &b{1}&a a &b{2}&a en el servidor &b{3}&a, mundo &b{4}&a."
+user-promote-error-endoftrack: "El final de la pista &4{0}&c fue alcanzado. No se puede promover al usuario."
+user-promote-error-malformed: >
+  {PREFIX}The next group on the track, {0}, no longer exists. Unable to promote user.\n
+  {PREFIX}Either create the group, or remove it from the track and try again.
+user-demote-success: "&aDegradando al usuario a lo largo de la pista &b{0}&a desde &b{1}&a a &b{2}&a."
+user-demote-success-server: "&aDegradando al usuario a lo largo de la pista &b{0}&a desde &b{1}&a a &b{2}&a en el servidor &b{3}&a."
+user-demote-success-server-world: "&aDegradando al usuario a lo largo de la pista &b{0}&a desde &b{1}&a a &b{2}&a en el servidor &b{3}&a, mundo &b{4}&a."
+user-demote-endoftrack: "El final de la pista &4{0}&c fue alcanzado, asi que &4{1}&c fue removido de &4{2}&c."
+user-demote-error-malformed: >
+  {PREFIX}The previous group on the track, {0}, no longer exists. Unable to demote user.\n
+  {PREFIX}Either create the group, or remove it from the track and try again.
+user-showpos: >
+  &aShowing &b{0}&a's position on track &b{1}&a.\n
+  {2}
+group-info-general: >
+  {PREFIX}&b&l> &bGroup Info: &f{0}\n
+  {PREFIX}&f- &3Display Name: &f{1}\n
+  {PREFIX}&f- &3Weight: &f{2}\n
+  {PREFIX}&f- &aCounts:\n
+  {PREFIX}&f-    &3Permissions: &a{3}\n
+  {PREFIX}&f-    &3Temporary Permissions: &a{4}\n
+  {PREFIX}&f-    &3Prefixes: &a{5}\n
+  {PREFIX}&f-    &3Suffixes: &a{6}\n
+  {PREFIX}&f-    &3Meta: &a{7}
+group-set-weight: "&aEstablesca el peso a &b{0}&a para el grupo &b{1}&a."
+track-info: >
+  {PREFIX}&b&l> &bShowing Track: &f{0}\n
+  {PREFIX}&f- &7Path: &f{1}
+track-clear: "&b{0}&a's pista de grupos fue borrada."
+track-append-success: "&aGrupo &b{0}&a fue añadido con éxito a la pista &b{1}&a."
+track-insert-success: "&aGrupo &b{0}&a fue insertado con éxito en la pista &b{1}&a en la posicion &b{2}&a."
+track-insert-error-number: "Numero esperado en lugar de recibido: {0}"
+track-insert-error-invalid-pos: "No se puede insertar en la posición {0}. Indice fuera de los limites."
+track-remove-success: "&aGrupo &b{0}&a se eliminó correctamente de la pista &b{1}&a."
+log-load-error: "No se pudo cargar el registro."
+log-invalid-page: "Número de página no válido."
+log-invalid-page-range: "Número de página no válido. Por favor introduzca un valor entre 1 y {0}."
+log-no-entries: "&bNo hay entradas de registro que mostrar."
+log-entry: "&b#{0} -> &8(&7{1} hace&8) {2}"
+log-notify-toggle-on: "&aHabilitada&b salida de registro."
+log-notify-toggle-off: "&cDeshabilitada&b salida de registro."
+log-notify-already-on: "Ya está recibiendo notificaciones."
+log-notify-already-off: "Actualmente no estás recibiendo notificaciones."
+log-notify-unknown: "Estado desconocido. Esperando \"on\" o \"off\"."
+log-search-header: "&aMostrar acciones recientes para la consulta &b{0} &a(pagina &f{1}&a de &f{2}&a)"
+log-recent-header: "&aMostrando acciones recientes (pagina &f{0}&a de &f{1}&a)"
+log-recent-by-header: "&aMostrando las acciones recientes por &b{0} &a(pagina &f{1}&a de &f{2}&a)"
+log-history-user-header: "&aMostrando el historial del usuario &b{0} &a(pagina &f{1}&a de &f{2}&a)"
+log-history-group-header: "&aMostrando la historia del grupo &b{0} &a(pagina &f{1}&a de &f{2}&a)"
+log-history-track-header: "&aMostrando la historia de la pista &b{0} &a(pagina &f{1}&a de &f{2}&a)"
+log-export-already-exists: "Error: Archivo {0} ya existe."
+log-export-not-writable: "Error: Archivo {0} no se puede escribir."
+log-export-empty: "El registro está vacío y por lo tanto no puede ser exportado."
+log-export-failure: "Se ha producido un error inesperado al escribir en el archivo."
+log-export-success: "&aExitosamente exportó el registro a &b{0}&a."
+import-already-running: "Ya se está ejecutando otro proceso de importación. Por favor espere a que finalice e inténtelo de nuevo."
+export-already-running: "Ya se está ejecutando otro proceso de exportación. Por favor espere a que finalice e inténtelo de nuevo."
+import-log-doesnt-exist: "Error: Archivo {0} no existe."
+import-log-not-readable: "Error: Archivo {0} no es legible."
+import-log-failure: "Se ha producido un error inesperado al leer del archivo de registro."
+import-progress: "&b(Import) &b-> &f{0} &fporcentaje completado &7- &b{1}&f/&b{2} &fOperaciones completas con &c{3} &ferrores."
+import-progress-sin: "&b(Import) &b-> &f{0} &fporcentaje completado &7- &b{1}&f/&b{2} &fOperaciones completas con &c{3} &ferrores."
+import-start: "&b(Import) &b-> &fInicio del proceso de importación."
+import-end-complete: "&b(Import) &a&lCOMPLETADO &7- tomo &b{0} &7segundos - &7No errores."
+import-end-complete-err: "&b(Import) &a&lCOMPLETADO &7- tomo &b{0} &7segundos - &c{1} errores."
+import-end-complete-err-sin: "&b(Import) &a&lCOMPLETADO &7- tomo &b{0} &7segundos - &c{1} errores."
+import-end-error-header: >
+  {PREFIX}&b(Import) &7------------> &fShowing Error #&b{0} &7<------------\n
+  {PREFIX}&b(Import) &fWhilst executing: &3Command #{1}\n
+  {PREFIX}&b(Import) &fCommand: &7{2}\n
+  {PREFIX}&b(Import) &fType: &3{3}\n
+  {PREFIX}&b(Import) &fOutput:
+import-end-error-content: "&b(Import) &b-> &c{0}"
+import-end-error-footer: "&b(Import) &7<------------------------------------------>"

.locale/ru_RU.yml

@@ -0,0 +1,338 @@
+# LuckPerms Language File
+# Locale: ru_RU
+# Author: Pixelmon.PRO
+
+prefix: "&7&l[&b&lL&3&lP&7&l] &c"
+log-info: "&7&l[&bL&3P&7&l] &3{0}"
+log-warn: "&7&l[&bLuck&3Perms&7&l] &c[WARN] {0}"
+log-error: "&7&l[&bLuck&3Perms&7&l] &4[ERROR] {0}"
+empty: "{0}"
+player-online: "&aОнлайн"
+player-offline: "&cОффлайн"
+loading-error: "Не удалось загрузить данные разрешений (пермов). Пожалуйста обратитесь к администратору."
+op-disabled: "&bНа этом сервере отключена ванильная система OP."
+op-disabled-sponge: "&2Статус оператора сервера не влияет на установленный плагин разрешений (пермов). Пожалуйста отредактируйте данные пользователя напрямую."
+log: "&3LOG &3&l> {0}"
+export-log: "&3ЭКСПОРТ &3&l> &f{0}"
+export-log-progress: "&3ЭКСПОРТ &3&l> &7{0}"
+migration-log: "&3ПЕРЕМЕЩЕНИЕ &7[&3{0}&7] &3&l> &f{1}"
+migration-log-progress: "&3ПЕРЕМЕЩЕНИЕ &7[&3{0}&7] &3&l> &7{1}"
+command-not-recognised: "Команда не распознана."
+command-no-permission: "У вас нет разрешения на использование этой команды!"
+already-haspermission: "{0} уже имеет такое разрешение (перм)!"
+does-not-havepermission: "{0} не имеет этого набора разрешений (пермов)."
+already-has-temp-permission: "{0} уже имеет этот набор временных разрешений (пермов)!"
+does-not-have-temp-permission: "{0} не имеет этого набора временных разрешений (пермов)."
+user-not-found: "&bНе удалось найти пользователя."
+user-not-online: "&bПользователь &a{0}&b не онлайн."
+user-no-data: "&bПользователь &a{0}&b не имеет загруженных данных."
+user-save-success: "&7(Пользовательские данные были сохранены на хранение)"
+user-save-error: "При сохранении пользователя произошла ошибка."
+user-create-fail: "При создании нового пользователя возникла ошибка."
+group-not-found: "&bНе удалось найти группу."
+group-save-success: "&7(Групповые данные были сохранены на хранение)"
+group-save-error: "При сохранении группы произошла ошибка."
+track-not-found: "&bНе удалось найти путь (track)."
+track-save-success: "&7(Данные о путе (track) сохранены на хранение)"
+track-save-error: "При сохранении пути (track) произошла ошибка."
+user-invalid-entry: "&d{0}&c не является допустимым именем пользователя/uuid."
+group-invalid-entry: "Имена групп могут содержать только буквенно-цифровые символы."
+track-invalid-entry: "Имена путей (track) могут содержать только буквенно-цифровые символы."
+server-invalid-entry: "Имена серверов могут содержать только буквенно-цифровые символы."
+use-inherit-command: "Используйте команды «parent add» и «parent remove» вместо указания узла (node)."
+verbose-invalid-filter: "&cНедопустимый подробный (verbose) фильтр: &f{0}"
+verbose-on: "&Запись подробной проверки установлена на &aВЕРНЫЙ &bдля всех разрешений (пермов)."
+verbose-on-query: "&Запись подробной проверки установлена на &aВЕРНЫЙ &bДля разрешений, соответствующих следующим фильтрам: &f{0}"
+verbose-off: "&Запись подробной проверки установлена на &cНЕВЕРНЫЙ&b."
+verbose-recording-on: "&Запись подробной записи установлена ​​на &aВЕРНЫЙ &bдля всех разрешений."
+verbose-recording-on-query: "&Запись подробной записи установлена ​​на &aВЕРНЫЙ &bДля разрешений, соответствующих следующим фильтрам: &f{0}"
+verbose-recording-upload-start: "&bЗапись подробной информации была отключена. Загрузка результатов..."
+verbose-recording-url: "&aПодробный URL результатов:"
+tree-upload-start: "&bСоздание дерева разрешений..."
+tree-empty: "&aНе удалось создать дерево. Ничего не найдено."
+tree-url: "&aURL дерева разрешений:"
+search-searching: "&aПоиск пользователей и групп с помощью &b{0}&a..."
+search-result: "&aНайдено &b{0}&a записи из &b{1}&a пользователей и &b{2}&a групп."
+search-showing-users: "&bПросмотр записей пользователя:"
+search-showing-groups: "&bПросмотр записей в группах:"
+search-showing-users-with-page: "&bПросмотр записей пользователя:  {0}"
+search-showing-groups-with-page: "&bПросмотр записей в группах:  {0}"
+check-result: "&aРезультат проверки разрешения (перма) на пользователя &b{0}&a на разрешение (перма) &b{1}&a: &f{2}"
+create-success: "&b{0}&a было успешно создано."
+delete-success: "&b{0}&a успешно удален."
+rename-success: "&b{0}&a был успешно переименован в &b{1}&a."
+clone-success: "&b{0}&a был успешно клонирован на &b{1}&a."
+already-inherits: "{0} уже наследует '{1}'."
+does-not-inherit: "{0} не наследует '{1}'."
+already-temp-inherits: "{0} уже временно наследует '{1}'."
+does-not-temp-inherit: "{0} временно не наследует '{1}'."
+track-already-contains: "Путь (Track) {0} уже содержит группу '{1}'."
+track-does-not-contain: "Путь (Track) {0} не содержит группу '{1}'."
+track-ambiguous-call: "Указанный пользователь является членом нескольких групп на этом пути (track). Невозможно определить их местоположение."
+group-already-exists: "Эта группа уже существует!"
+group-does-not-exist: "Эта группа не существует!"
+group-load-error: "Произошла непредвиденная ошибка. Группа не загружена."
+groups-load-error: "Произошла непредвиденная ошибка. Не удалось загрузить все группы."
+track-already-exists: "Этот путь (track) уже существует!"
+track-does-not-exist: "Этот путь (track) не существует!"
+track-load-error: "Произошла непредвиденная ошибка. Путь (track) не загружен."
+tracks-load-error: "Произошла непредвиденная ошибка. Не удалось загрузить все пути (tracks)."
+track-empty: "Путь (track) нельзя использовать, так как он пуст или содержит только одну группу."
+update-task-request: "&bОбновление задачи запланировано."
+update-task-complete: "&aОбновление задачи завершено."
+update-task-complete-network: "&aОбновление задачи завершено. Теперь пытаемся подключиться к другим серверам."
+update-task-push-success: "&aДругие серверы были уведомлены через &b{0} Сообщения и удаленный доступ."
+update-task-push-failure: "&cОшибка при нажатии изменений на других серверах."
+update-task-push-failure-not-setup: "&cОшибка при нажатии изменений на других серверах. Служба обмена сообщениями не настроена."
+reload-config-success: "&aФайл конфигурации был перезагружен. &7(Некоторые параметры будут применяться только после перезапуска сервера.)"
+info: >
+  {PREFIX}&2Выполнение &bLuckPerms v{0}&2 by &bLuck&2.\n
+  {PREFIX}&f-  &3Платформа: &f{1}\n
+  {PREFIX}&f-  &3Способ Хранения: &f{2}\n
+  {PREFIX}&f-  &3Имя Сервера: &f{3}\n
+  {PREFIX}&f-  &3Интервал Синхронизации: &a{4} &fминут\n
+  {PREFIX}&f-  &3Служба обмена сообщениями: &f{5}\n
+  {PREFIX}&f-  &bГрафы:\n
+  {PREFIX}&f-     &3Игроки Онлайн: &a{6}\n
+  {PREFIX}&f-     &3Загруженные пользователи: &a{7}\n
+  {PREFIX}&f-     &3Загруженные группы: &a{8}\n
+  {PREFIX}&f-     &3Загруженные пути (tracks): &a{9}\n
+  {PREFIX}&f-     &3Размер лога: &a{10}\n
+  {PREFIX}&f-     &3UUID Размер кеша: &a{11}\n
+  {PREFIX}&f-     &3Переводы загружены: &a{12}\n
+  {PREFIX}&f-     &3Контексты перед обработкой: &a{13}\n
+  {PREFIX}&f-     &3Счетчик контекста: &a{14}\n
+  {PREFIX}&f-     &3Уникальные разрешения (пермы): &a{15}\n
+  {PREFIX}&f-  &bКонфигурация:\n
+  {PREFIX}&f-     &3Использует сервер UUIDs: {16}\n
+  {PREFIX}&f-     &bСчетчик разрешений (Пермов):\n
+  {PREFIX}&f-        &3Включая глобальные: {17}\n
+  {PREFIX}&f-        &3Включая глобальный мир: {18}\n
+  {PREFIX}&f-        &3Применения глобальных групп: {19}\n
+  {PREFIX}&f-        &3Применения глобальных групп мира: {20}\n
+  {PREFIX}&f-        &3Применения подстановочных знаков (Wildcards): {21}\n
+  {PREFIX}&f-        &3Применение регулярных выражений: {22}\n
+  {PREFIX}&f-        &3Применение стенографии (Shorthand): {23}
+create-group-error: "При создании группы произошла ошибка."
+delete-group-error: "При удалении группы произошла ошибка."
+delete-group-error-default: "Вы не можете удалить группу по умолчанию."
+groups-list: "&aГруппы: {0}"
+create-track-error: "При создании пути (track) произошла ошибка."
+delete-track-error: "При удалении пути (Track) произошла ошибка."
+tracks-list: "&aGenb (Tracks): {0}"
+listnodes: "&b{0}'s Узлы:"
+listnodes-with-page: "&b{0}'s Узлы:  {1}"
+listnodes-temp: >
+  &b{0}'s Временные узлы:\n
+  {1}
+listparents: >
+  &b{0}'s Родительские группы:\n
+  {1}
+listparents-temp: >
+  &b{0}'s Временные родительские группы:\n
+  {1}
+listgroups: >
+  &b{0}'s Группы:\n
+  {1}
+listgroups-temp: >
+  &b{0}'s Временные группы:\n
+  {1}
+list-tracks: >
+  &b{0}'s Пути (Tracks):\n
+  {1}
+list-tracks-empty: "{0} Не на каких-либо путях (tracks)."
+setpermission-success: "&aУстановить &b{0}&a к &b{1}&a для &b{2}&a."
+setpermission-server-success: "&aУстановить &b{0}&a к &b{1}&a для &b{2}&a на сервер &b{3}&a."
+setpermission-server-world-success: "&aУстановить &b{0}&a к &b{1}&a для &b{2}&a на сервер &b{3}&a, мир &b{4}&a."
+setpermission-temp-success: "&aУстановить &b{0}&a к &b{1}&a для &b{2}&a На срок &b{3}&a."
+setpermission-temp-server-success: "&aУстановить &b{0}&a к &b{1}&a для &b{2}&a на сервер &b{3}&a на срок &b{4}&a."
+setpermission-temp-server-world-success: "&aУстановить &b{0}&a к &b{1}&a для &b{2}&a на сервер &b{3}&a, мир &b{4}&a, на срок &b{5}&a."
+unsetpermission-success: "&aСбросить &b{0}&a для &b{1}&a."
+unsetpermission-server-success: "&aСбросить &b{0}&a для &b{1}&a on server &b{2}&a."
+unsetpermission-server-world-success: "&aСбросить &b{0}&a для &b{1}&a on server &b{2}&a, world &b{3}&a."
+unset-temp-permission-success: "&aСбросить временное разрешение &b{0}&a для &b{1}&a."
+unset-temp-permission-server-success: "&aСбросить временное разрешение &b{0}&a для &b{1}&a на сервере &b{2}&a."
+unset-temp-permission-server-world-success: "&aСбросить временное разрешение &b{0}&a для &b{1}&a на сервере &b{2}&a, мире &b{3}&a."
+set-inherit-success: "&b{0}&a теперь наследует разрешения от &b{1}&a."
+set-inherit-server-success: "&b{0}&a теперь наследует разрешения от &b{1}&a на сервере &b{2}&a."
+set-inherit-server-world-success: "&b{0}&a теперь наследует разрешения от &b{1}&a на сервере &b{2}&a, мире &b{3}&a."
+set-parent-success: "&b{0}&a их существующие родительские группы очищены, и теперь только наследуют &b{1}&a."
+set-parent-server-success: "&b{0}&a их существующие родительские группы очищены, и теперь только наследуют &b{1}&a на сервере &b{2}&a."
+set-parent-server-world-success: "&b{0}&a их существующие родительские группы очищены, и теперь только наследуют &b{1}&a на сервере &b{2}&a, мире &b{3}&a."
+set-temp-inherit-success: "&b{0}&a теперь наследует разрешения (пермы) от &b{1}&a на срок &b{2}&a."
+set-temp-inherit-server-success: "&b{0}&a теперь наследует разрешения (пермы) от &b{1}&a на сервере &b{2}&a for a duration of &b{3}&a."
+set-temp-inherit-server-world-success: "&b{0}&a теперь наследует разрешения (пермы) от &b{1}&a на сервере &b{2}&a, мире &b{3}&a, на срок &b{4}&a."
+unset-inherit-success: "&b{0}&a больше не наследует разрешения (пермы) от &b{1}&a."
+unset-inherit-server-success: "&b{0}&a больше не наследует разрешения (пермы) &b{1}&a на сервере &b{2}&a."
+unset-inherit-server-world-success: "&b{0}&a больше не наследует разрешения (пермы) &b{1}&a на сервере &b{2}&a, мире &b{3}&a."
+unset-temp-inherit-success: "&b{0}&a больше не наследует временные разрешения (пермы) &b{1}&a."
+unset-temp-inherit-server-success: "&b{0}&a больше не наследует временные разрешения (пермы) &b{1}&a на сервере &b{2}&a."
+unset-temp-inherit-server-world-success: "&b{0}&a больше не наследует временные разрешения (пермы) &b{1}&a на сервере &b{2}&a, мире &b{3}&a."
+clear-success: "&b{0}&a's разрешения (пермы) были очищены. (&b{1}&a узлы были удалены.)"
+clear-success-singular: "&b{0}&a's разрешения (пермы) были очищены. (&b{1}&a узел удален.)"
+parent-clear-success: "&b{0}&a's родители очищены. (&b{1}&a узлы были удалены.)"
+parent-clear-success-singular: "&b{0}&a's родители очищены. (&b{1}&a узел удален.)"
+meta-clear-success: "&b{0}&a's Meta очищена. (&b{1}&a узлы были удалены.)"
+meta-clear-success-singular: "&b{0}&a's Meta очищена. (&b{1}&a узел удален.)"
+illegal-date-error: "Не удалось выполнить синтаксический анализ даты '{0}'."
+past-date-error: "Вы не можете установить дату в прошлом!"
+chat-meta-prefix-header: "&b{0}'s Префиксы"
+chat-meta-suffix-header: "&b{0}'s Суффиксы"
+meta-header: "&b{0}'s Meta"
+chat-meta-entry: "&b-> {0} &f- &f\"{1}&f\" &8(&7унаследованный от &a{2}&8)"
+chat-meta-entry-with-context: "&b-> {0} &f- &f\"{1}&f\" &8(&7унаследованный от &a{2}&8){3}"
+meta-entry: "&b-> &a{0} &f= &f\"{1}&f\" &8(&7унаследованный от &a{2}&8)"
+meta-entry-with-context: "&b-> &a{0} &f= &f\"{1}&f\" &8(&7унаследованный от &a{2}&8){3}"
+chat-meta-prefix-none: "&b{0} не имеет префиксов."
+chat-meta-suffix-none: "&b{0} не имеет суффиксов."
+meta-none: "&b{0} не имеет meta."
+meta-invalid-priority: "Недопустимый приоритет '{0}'. Ожидается число."
+already-has-prefix: "{0} Уже имеет этот набор префиксов."
+already-has-suffix: "{0} Уже имеет этот набор суффиксов."
+does-not-have-prefix: "{0} Не имеет этого набора префиксов."
+does-not-have-suffix: "{0} Не имеет этого набора суффиксов."
+addprefix-success: "&b{0}&a имеет префикс &f\"{1}&f\"&a установленный в приоритете &b{2}&a."
+addprefix-server-success: "&b{0}&a имеет префикс &f\"{1}&f\"&a установленный в приоритете &b{2}&a на сервере &b{3}&a."
+addprefix-server-world-success: "&b{0}&a имеет префикс &f\"{1}&f\"&a установленный в приоритете &b{2}&a на сервере &b{3}&a, мире &b{4}&a."
+removeprefix-success: "&b{0}&a имеет префикс &f\"{1}&f\"&a в приоритете &b{2}&a удалено."
+removeprefix-server-success: "&b{0}&a имеет префикс &f\"{1}&f\"&a в приоритете &b{2}&a удалено на сервере &b{3}&a."
+removeprefix-server-world-success: "&b{0}&a имеет префикс &f\"{1}&f\"&a в приоритете &b{2}&a удалено на сервере &b{3}&a, мире &b{4}&a."
+addsuffix-success: "&b{0}&a имеет суффикс &f\"{1}&f\"&a установленный в приоритете &b{2}&a."
+addsuffix-server-success: "&b{0}&a имеет суффикс &f\"{1}&f\"&a установленный в приоритете &b{2}&a на сервере &b{3}&a."
+addsuffix-server-world-success: "&b{0}&a имеет суффикс &f\"{1}&f\"&a установленный в приоритете &b{2}&a on server &b{3}&a, мире &b{4}&a."
+removesuffix-success: "&b{0}&a имеет суффикс &f\"{1}&f\"&a в приоритете &b{2}&a удалено."
+removesuffix-server-success: "&b{0}&a имеет суффикс &f\"{1}&f\"&a в приоритете &b{2}&a удалено на сервере &b{3}&a."
+removesuffix-server-world-success: "&b{0}&a имеет суффикс &f\"{1}&f\"&a в приоритете &b{2}&a удалено на сервере &b{3}&a, мире &b{4}&a."
+add-temp-prefix-success: "&b{0}&a имеет префикс &f\"{1}&f\"&a установленный в приоритете &b{2}&a на срок &b{3}&a."
+add-temp-prefix-server-success: "&b{0}&a имеет префикс &f\"{1}&f\"&a установленный в приоритете of &b{2}&a на сервере &b{3}&a, на срок &b{4}&a."
+add-temp-prefix-server-world-success: "&b{0}&a имеет префикс &f\"{1}&f\"&a установленный в приоритете of &b{2}&a на сервере &b{3}&a, мире &b{4}&a, на срок &b{5}&a."
+remove-temp-prefix-success: "&b{0}&a Имел временный префикс &f\"{1}&f\"&a в приоритете &b{2}&a удалено."
+remove-temp-prefix-server-success: "&b{0}&a Имел временный префикс &f\"{1}&f\"&a в приоритете &b{2}&a удалено на сервере &b{3}&a."
+remove-temp-prefix-server-world-success: "&b{0}&a Имел временный префикс &f\"{1}&f\"&a в приоритете &b{2}&a удалено на сервере &b{3}&a, мире &b{4}&a."
+add-temp-suffix-success: "&b{0}&a имел суффикс &f\"{1}&f\"&a установленный в приоритете &b{2}&a на срок &b{3}&a."
+add-temp-suffix-server-success: "&b{0}&a имел суффикс &f\"{1}&f\"&a установленный в приоритете &b{2}&a на сервере &b{3}&a, на срок &b{4}&a."
+add-temp-suffix-server-world-success: "&b{0}&a имел суффикс &f\"{1}&f\"&a установленный в приоритете &b{2}&a на сервере &b{3}&a, мире &b{4}&a, на срок &b{5}&a."
+remove-temp-suffix-success: "&b{0}&a Имел временный суффикс &f\"{1}&f\"&a в приоритете &b{1}&a удалено."
+remove-temp-suffix-server-success: "&b{0}&a Имел временный суффикс &f\"{1}&f\"&a в приоритете &b{2}&a удалено на сервере &b{3}&a."
+remove-temp-suffix-server-world-success: "&b{0}&a Имел временный суффикс &f\"{1}&f\"&a в приоритете &b{2}&a удалено на сервере &b{3}&a, мире &b{4}&a."
+already-has-meta: "{0} Уже установлено, что установлена ​​пара мета-значения ключа."
+set-meta-success: "&aУстановить метазначение для ключа &f\"{0}&f\"&a к &f\"{1}&f\"&a для &b{2}&a."
+set-meta-server-success: "&aУстановить метазначение для ключа &f\"{0}&f\"&a к &f\"{1}&f\"&a для &b{2}&a на сервере &b{3}&a."
+set-meta-server-world-success: "&aУстановить метазначение для ключа &f\"{0}&f\"&a к &f\"{1}&f\"&a для &b{2}&a на сервере &b{3}&a, мире &b{4}&a."
+set-meta-temp-success: "&aУстановить метазначение для ключа &f\"{0}&f\"&a к &f\"{1}&f\"&a для &b{2}&a на срок &b{3}&a."
+set-meta-temp-server-success: "&aУстановить метазначение для ключа &f\"{0}&f\"&a к &f\"{1}&f\"&a для &b{2}&a на сервере &b{3}&a на срок &b{4}&a."
+set-meta-temp-server-world-success: "&aУстановить метазначение для ключа &f\"{0}&f\"&a к &f\"{1}&f\"&a для &b{2}&a на сервере &b{3}&a, мире &b{4}&a, на срок &b{5}&a."
+unset-meta-success: "&aСбросить метазначение с помощью ключа &f\"{0}&f\"&a для &b{1}&a."
+unset-meta-server-success: "&aСбросить метазначение с помощью ключа &f\"{0}&f\"&a для &b{1}&a на сервере &b{2}&a."
+unset-meta-server-world-success: "&aСбросить метазначение с помощью ключа &f\"{0}&f\"&a для &b{1}&a на сервере &b{2}&a, мире &b{3}&a."
+unset-meta-temp-success: "&aUnset temporary meta value with key &f\"{0}&f\"&a для &b{1}&a."
+unset-meta-temp-server-success: "&aСбросить временное мета-значение с помощью ключа &f\"{0}&f\"&a для &b{1}&a на сервере &b{2}&a."
+unset-meta-temp-server-world-success: "&aСбросить временное мета-значение с помощью ключа &f\"{0}&f\"&a для &b{1}&a на сервере &b{2}&a, мире &b{3}&a."
+bulk-change-type-error: "Недопустимый тип. ожидание 'server' или 'world'."
+bulk-change-success: "&aПрименение изменения успешно. {0} записей изменено."
+user-info-general: >
+  {PREFIX}&b&l> &bИнформация о пользователе: &f{0}\n
+  {PREFIX}&f- &3UUID: &f{1}\n
+  {PREFIX}&f- &3Статус: {2}\n
+  {PREFIX}&f- &3Первичная группа: &f{3}\n
+  {PREFIX}&f- &aГрафы:\n
+  {PREFIX}&f-    &3Разрешения (пермы): &a{4}\n
+  {PREFIX}&f-    &3Временные разрешения (пермы): &a{5}\n
+  {PREFIX}&f-    &3Префиксы: &a{6}\n
+  {PREFIX}&f-    &3Суффиксы: &a{7}\n
+  {PREFIX}&f-    &3Meta: &a{8}
+user-info-data: >
+  {PREFIX}&f- &aКэшированные данные:\n
+  {PREFIX}&f-    &3Загружается: {0}\n
+  {PREFIX}&f-    &3Текущие контексты: {1}\n
+  {PREFIX}&f-    &3Текущие префиксы: {2}\n
+  {PREFIX}&f-    &3Текущие суффиксы: {3}
+info-parent-header: "&f- &aРодительские группы:"
+info-temp-parent-header: "&f- &aВременные родительские группы:"
+user-getuuid: "&bUUID для &b{0}&b это &b{1}&b."
+user-removegroup-error-primary: "Вы не можете удалить пользователя из своей основной группы."
+user-primarygroup-success: "&b{0}&a's для основной группы установил значение &b{1}&a."
+user-primarygroup-warn-option: "&cВнимание: метод расчета основной группы, используемый этим сервером &7({0}) &cМожет не отражать это изменение."
+user-primarygroup-error-alreadyhas: "Пользователь уже установил эту группу в качестве основной группы."
+user-primarygroup-error-notmember: "&b{0}&a еще не был членом &b{1}&a, Добавить его сейчас."
+user-track-error-not-contain-group: "Указанный пользователь не находится ни в каких группах на этом  пути (track)."
+user-track-added-to-first: "&b{0}&a Не находится ни в каких группах на этом пути (track), поэтому они были добавлены в первую группу, &b{1}&a."
+user-track-added-to-first-server: "&b{0}&a Не находится ни в каких группах на этом пути (track), поэтому они были добавлены в первую группу, &b{1}&a, на сервере &b{2}&a."
+user-track-added-to-first-server-world: "&b{0}&a Не находится ни в каких группах на этом пути (track), поэтому они были добавлены в первую группу, &b{1}&a, на сервере &b{2}&a, мире &b{3}&a."
+user-promote-success: "&aПродвижение пользователя по пути (track) &b{0}&a от &b{1}&a к &b{2}&a."
+user-promote-success-server: "&aПродвижение пользователя по пути (track) &b{0}&a от &b{1}&a к &b{2}&a на сервере &b{3}&a."
+user-promote-success-server-world: "&aПродвижение пользователя по пути (track) &b{0}&a от &b{1}&a к &b{2}&a на сервере &b{3}&a, мире &b{4}&a."
+user-promote-error-endoftrack: "Конец пути (track) &4{0}&c ,был достигнут. Не удалось продвинуть пользователя."
+user-promote-error-malformed: >
+  {PREFIX}Следующая группа на пути (track), {0}, более не существует. Не удалось продвинуть пользователя.\n
+  {PREFIX}Создайте группу или удалите ее с пути (track) и повторите попытку.
+user-demote-success: "&aПонижение пользователя по пути (track) &b{0}&a от &b{1}&a к &b{2}&a."
+user-demote-success-server: "&aПонижение пользователя по пути (track) &b{0}&a от &b{1}&a к &b{2}&a на сервере &b{3}&a."
+user-demote-success-server-world: "&aПонижение пользователя по пути (track) &b{0}&a от &b{1}&a к &b{2}&a на сервере &b{3}&a, мире &b{4}&a."
+user-demote-endoftrack: "Конец пути (track) &4{0}&c был достингут, поэтому &4{1}&c был удален из &4{2}&c."
+user-demote-error-malformed: >
+  {PREFIX}Предыдущая группа на пути (track), {0}, более не существуют. Невозможно понизить рейтинг пользователя.\n
+  {PREFIX}Создайте группу или удалите ее с пути (track) и повторите попытку.
+user-showpos: >
+  &aпоказывает &b{0}&a's позицию на пути (track) &b{1}&a.\n
+  {2}
+group-info-general: >
+  {PREFIX}&b&l> &bИнфо о группе: &f{0}\n
+  {PREFIX}&f- &3Отображаемое имя: &f{1}\n
+  {PREFIX}&f- &3Значение: &f{2}\n
+  {PREFIX}&f- &aГрафы:\n
+  {PREFIX}&f-    &3Разрешения (пермы): &a{3}\n
+  {PREFIX}&f-    &3Временные разрешения (пермы): &a{4}\n
+  {PREFIX}&f-    &3Префиксы: &a{5}\n
+  {PREFIX}&f-    &3Суффиксы: &a{6}\n
+  {PREFIX}&f-    &3Meta: &a{7}
+group-set-weight: "&aУстановить значение &b{0}&a для группы &b{1}&a."
+track-info: >
+  {PREFIX}&b&l> &bпоказать путь (track): &f{0}\n
+  {PREFIX}&f- &7Путь: &f{1}
+track-clear: "&b{0}&a's путь (track) групп был очищен."
+track-append-success: "&aГруппа &b{0}&a успешно добавлен в путь (track) &b{1}&a."
+track-insert-success: "&aГруппа &b{0}&a был успешно добавлен в путь (track) &b{1}&a на позиции &b{2}&a."
+track-insert-error-number: "Ожидаемое число, но вместо этого получено: {0}"
+track-insert-error-invalid-pos: "Невозможно вставить в позицию {0}. Индекс вне пределов."
+track-remove-success: "&aгруппа &b{0}&a Успешно удален с пути (track) &b{1}&a."
+log-load-error: "Не удалось загрузить лог."
+log-invalid-page: "Недействительный номер страницы."
+log-invalid-page-range: "Недопустимый номер страницы. Введите значение от 1 до {0}."
+log-no-entries: "&bНет логов для отображения."
+log-entry: "&b#{0} -> &8(&7{1} ago&8) {2}"
+log-notify-toggle-on: "&aВключен&b вывод лога."
+log-notify-toggle-off: "&cОтключен&b вывод лога."
+log-notify-already-on: "Вы уже получаете оповещения."
+log-notify-already-off: "Вы не получаете оповещений."
+log-notify-unknown: "Состояние неизвестно. Ожидание \"on\" или \"off\"."
+log-search-header: "&aПросмотр недавних действий для запроса &b{0} &a(page &f{1}&a of &f{2}&a)"
+log-recent-header: "&aПоследние действия (page &f{0}&a of &f{1}&a)"
+log-recent-by-header: "&aПоказывать последние действия &b{0} &a(page &f{1}&a of &f{2}&a)"
+log-history-user-header: "&aОтображение истории для пользователя &b{0} &a(page &f{1}&a of &f{2}&a)"
+log-history-group-header: "&aОтображение истории для группы &b{0} &a(page &f{1}&a of &f{2}&a)"
+log-history-track-header: "&aОтображение истории для пути (track) &b{0} &a(page &f{1}&a of &f{2}&a)"
+log-export-already-exists: "Ошибка: файл {0} уже существует."
+log-export-not-writable: "Ошибка: файл {0} недоступен для записи."
+log-export-empty: "Журнал пуст и поэтому не может быть экспортирован."
+log-export-failure: "Произошла непредвиденная ошибка во время записи в файл."
+log-export-success: "&aФайл журнала успешно экспортирован в &b{0}&a."
+import-already-running: "Другой процесс импорта уже запущен. Дождитесь завершения и повторите попытку."
+export-already-running: "Еще один процесс экспорта уже запущен. Дождитесь завершения и повторите попытку."
+import-log-doesnt-exist: "Ошибка: файл {0} не существует."
+import-log-not-readable: "Ошибка: файл {0} не читается."
+import-log-failure: "Произошла непредвиденная ошибка при чтении лога."
+import-progress: "&b(Импортировать) &b-> &f{0} &fПроцент завершен &7- &b{1}&f/&b{2} &fОперации в комплекте с &c{3} &fошибками."
+import-progress-sin: "&b(Импортировать) &b-> &f{0} &fПроцент завершен &7- &b{1}&f/&b{2} &fОперации в комплекте с &c{3} &fошибками."
+import-start: "&b(Импортировать) &b-> &fЗапуск процесса импорта."
+import-end-complete: "&b(Импортировать) &a&lЗАВЕРШЕНО &7- заняло &b{0} &7секунд - &7Нет ошибок."
+import-end-complete-err: "&b(Импортировать) &a&lЗАВЕРШЕНО &7- заняло &b{0} &7секунд - &c{1} ошибок."
+import-end-complete-err-sin: "&b(Импортировать) &a&lЗАВЕРШЕНО &7- заняло &b{0} &7секунд - &c{1} ошибок."
+import-end-error-header: >
+  {PREFIX}&b(Import) &7------------> &fОтображение ошибки #&b{0} &7<------------\n
+  {PREFIX}&b(Import) &fВыполняя: &3Команду #{1}\n
+  {PREFIX}&b(Import) &fКоманда: &7{2}\n
+  {PREFIX}&b(Import) &fТип: &3{3}\n
+  {PREFIX}&b(Import) &fВывод:
+import-end-error-content: "&b(Импортировать) &b-> &c{0}"
+import-end-error-footer: "&b(Импортировать) &7<------------------------------------------>"

README.md

@@ -1,34 +1,44 @@
 ![alt text](https://i.imgur.com/7TwJZ5e.png "Banner")
 # LuckPerms [![Build Status](https://ci.lucko.me/job/LuckPerms/badge/icon)](https://ci.lucko.me/job/LuckPerms/)
-An advanced permissions implementation for Bukkit/Spigot, BungeeCord and Sponge.
-
-## Links
-* **Development Builds** - <https://ci.lucko.me/job/LuckPerms>
-* **Javadocs** - <https://jd.lucko.me/LuckPerms>
-* **Wiki** - <https://github.com/lucko/LuckPerms/wiki>
-
-## Description
 LuckPerms is an advanced permissions implementation aiming to be a fast, reliable and flexible alternative to existing permission plugins. The project's main goals are centered around high performance and a wide feature set, filling the gaps of functionality and building upon existing features found in other plugins.
 
 LuckPerms also includes an extensive API for developers, and support for a variety of Minecraft server software & data storage options.
 
-See the charts below for a partial list of features & comparison with other providers.
+[See the charts below](https://github.com/lucko/LuckPerms#luckperms-vs-other-plugins) for a partial list of features & comparison with other providers.
 
 * [Spigot Plugin Release Page](https://www.spigotmc.org/resources/luckperms-an-advanced-permissions-system.28140/ "Spigot Plugin Page")
 * [Sponge Plugin Release Page](https://forums.spongepowered.org/t/luckperms-an-advanced-permissions-system/14274 "Sponge Plugin Page")
 
-## LuckPerms vs Other Plugins
-### Bukkit
-![alt text](https://static.lucko.me/luckperms-compare-copy.png "Feature comparison")
-_Features checked on 23rd Aug 2016. If you find any inaccuracies, please do let me know. I tried to be as fair as possible, and copy all major features from the respective plugin pages._
-### Sponge
-![alt text](https://static.lucko.me/luckperms-compare-sponge.png "Feature comparison")
-_Features checked on 8th Oct 2016. If you find any inaccuracies, please do let me know. I tried to be as fair as possible, and copy all major features from the respective plugin pages._
+## Useful Links
+* **Development Builds** - <https://ci.lucko.me/job/LuckPerms>
+* **Javadocs** - <https://luckperms.lucko.me/javadocs/>
+* **Wiki** - <https://github.com/lucko/LuckPerms/wiki>
+
+## Building
+LuckPerms uses Maven to handle dependencies.
+
+#### Requirements
+* Maven 3.3.x (the older versions will not work.)
+* Git
+
+#### Then run
+```sh
+git clone https://github.com/lucko/LuckPerms.git
+mvn clean package
+```
 
 ## License
-LuckPerms is licensed under the permissive MIT license. See LICENSE.md for more info.
+LuckPerms is licensed under the permissive MIT license. Please see [`LICENSE.txt`](https://github.com/lucko/LuckPerms/blob/master/LICENSE.txt) for more info.
 
-## Sponsor
+## LuckPerms vs Other Plugins
+### Bukkit
+![alt text](https://luckperms.lucko.me/assets/bukkit-compare.png "Feature comparison")
+
+### Sponge
+![alt text](https://luckperms.lucko.me/assets/sponge-compare.png "Feature comparison")
+
+
+## Thanks
 [![JProfiler](https://www.ej-technologies.com/images/product_banners/jprofiler_large.png)](http://www.ej-technologies.com/products/jprofiler/overview.html)
 
 Thanks to ej-technologies for granting LuckPerms an open source licence to their [Java Profiling Software](http://www.ej-technologies.com/products/jprofiler/overview.html "Java Profiler").

api/pom.xml

@@ -5,17 +5,18 @@
     <parent>
         <artifactId>luckperms</artifactId>
         <groupId>me.lucko.luckperms</groupId>
-        <version>2.17-SNAPSHOT</version>
+        <version>3.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>luckperms-api</artifactId>
     <build>
+        <finalName>LuckPerms-API-${release.version}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>${compiler.version}</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>

api/src/main/java/me/lucko/luckperms/LuckPerms.java

@@ -29,8 +29,8 @@ import java.util.Optional;
 /**
  * Singleton for the {@link LuckPermsApi}.
  *
- * <p> Ideally, the ServiceManager for the platform should be used to obtain and cache an instance, however, this can be
- * used if you need static access.
+ * <p>Ideally, the ServiceManager for the platform should be used to obtain and cache an instance, however, this can be
+ * used if you need static access.</p>
  */
 public final class LuckPerms {
     private static LuckPermsApi api = null;

api/src/main/java/me/lucko/luckperms/api/Contexts.java

@@ -24,12 +24,10 @@ package me.lucko.luckperms.api;
 
 import me.lucko.luckperms.api.context.ContextSet;
 
-import java.util.Map;
-
 /**
  * Context and options for a permission lookup.
  *
- * <p> All values are immutable.
+ * <p>All values are immutable.</p>
  *
  * @since 2.11
  */
@@ -51,18 +49,6 @@ public class Contexts {
         return new Contexts(context, includeGlobal, includeGlobalWorld, applyGroups, applyGlobalGroups, applyGlobalWorldGroups, op);
     }
 
-    @SuppressWarnings("deprecation")
-    @Deprecated
-    public static Contexts of(Map<String, String> context, boolean includeGlobal, boolean includeGlobalWorld, boolean applyGroups, boolean applyGlobalGroups, boolean applyGlobalWorldGroups) {
-        return new Contexts(context, includeGlobal, includeGlobalWorld, applyGroups, applyGlobalGroups, applyGlobalWorldGroups);
-    }
-
-    @SuppressWarnings("deprecation")
-    @Deprecated
-    public static Contexts of(Map<String, String> context, boolean includeGlobal, boolean includeGlobalWorld, boolean applyGroups, boolean applyGlobalGroups, boolean applyGlobalWorldGroups, boolean op) {
-        return new Contexts(context, includeGlobal, includeGlobalWorld, applyGroups, applyGlobalGroups, applyGlobalWorldGroups, op);
-    }
-
     /**
      * The contexts that apply for this lookup
      * The keys for servers and worlds are defined as static values.
@@ -115,17 +101,6 @@ public class Contexts {
         this.op = op;
     }
 
-    @Deprecated
-    public Contexts(Map<String, String> context, boolean includeGlobal, boolean includeGlobalWorld, boolean applyGroups, boolean applyGlobalGroups, boolean applyGlobalWorldGroups, boolean op) {
-        this(context == null ? null : ContextSet.fromMap(context), includeGlobal, includeGlobalWorld, applyGroups, applyGlobalGroups, applyGlobalWorldGroups, op);
-    }
-
-    @SuppressWarnings("deprecation")
-    @Deprecated
-    public Contexts(Map<String, String> context, boolean includeGlobal, boolean includeGlobalWorld, boolean applyGroups, boolean applyGlobalGroups, boolean applyGlobalWorldGroups) {
-        this(context, includeGlobal, includeGlobalWorld, applyGroups, applyGlobalGroups, applyGlobalWorldGroups, false);
-    }
-
     /**
      * Gets the contexts that apply for this lookup
      *
@@ -136,17 +111,6 @@ public class Contexts {
         return this.context;
     }
 
-    /**
-     * Gets the contexts that apply for this lookup
-     *
-     * @return an immutable map of context key value pairs
-     * @deprecated in favour of {@link #getContexts()}
-     */
-    @Deprecated
-    public Map<String, String> getContext() {
-        return this.context.toMap();
-    }
-
     /**
      * Gets if OP defaults should be included
      *
@@ -228,16 +192,13 @@ public class Contexts {
         if (o == this) return true;
         if (!(o instanceof Contexts)) return false;
         final Contexts other = (Contexts) o;
-        final Object this$context = this.getContexts();
-        final Object other$context = other.getContexts();
-        if (this$context == null ? other$context != null : !this$context.equals(other$context)) return false;
-        if (this.isOp() != other.isOp()) return false;
-        if (this.isIncludeGlobal() != other.isIncludeGlobal()) return false;
-        if (this.isIncludeGlobalWorld() != other.isIncludeGlobalWorld()) return false;
-        if (this.isApplyGroups() != other.isApplyGroups()) return false;
-        if (this.isApplyGlobalGroups() != other.isApplyGlobalGroups()) return false;
-        if (this.isApplyGlobalWorldGroups() != other.isApplyGlobalWorldGroups()) return false;
-        return true;
+        return (this.getContexts() == null ? other.getContexts() == null : this.getContexts().equals(other.getContexts())) &&
+                this.isOp() == other.isOp() &&
+                this.isIncludeGlobal() == other.isIncludeGlobal() &&
+                this.isIncludeGlobalWorld() == other.isIncludeGlobalWorld() &&
+                this.isApplyGroups() == other.isApplyGroups() &&
+                this.isApplyGlobalGroups() == other.isApplyGlobalGroups() &&
+                this.isApplyGlobalWorldGroups() == other.isApplyGlobalWorldGroups();
     }
 
     /**
@@ -249,8 +210,8 @@ public class Contexts {
     public int hashCode() {
         final int PRIME = 59;
         int result = 1;
-        final Object $context = this.getContexts();
-        result = result * PRIME + ($context == null ? 43 : $context.hashCode());
+        final Object contexts = this.getContexts();
+        result = result * PRIME + (contexts == null ? 43 : contexts.hashCode());
         result = result * PRIME + (this.isOp() ? 79 : 97);
         result = result * PRIME + (this.isIncludeGlobal() ? 79 : 97);
         result = result * PRIME + (this.isIncludeGlobalWorld() ? 79 : 97);

api/src/main/java/me/lucko/luckperms/api/DataMutateResult.java

@@ -20,40 +20,46 @@
  *  SOFTWARE.
  */
 
-package me.lucko.luckperms.api.event.events;
+package me.lucko.luckperms.api;
 
-import me.lucko.luckperms.api.PermissionHolder;
-import me.lucko.luckperms.api.event.AbstractPermissionAddEvent;
+import me.lucko.luckperms.exceptions.ObjectAlreadyHasException;
+import me.lucko.luckperms.exceptions.ObjectLacksException;
 
-import java.util.AbstractMap;
-import java.util.Map;
+import java.util.function.Supplier;
 
-/**
- * Called whenever a user or group has a permission set.
- *
- * @deprecated in favour of {@link PermissionNodeSetEvent}
- */
-@Deprecated
-public class PermissionSetEvent extends AbstractPermissionAddEvent {
+public enum DataMutateResult {
 
-    private final String node;
-    private final boolean value;
+    SUCCESS(true, null),
+    ALREADY_HAS(false, ObjectAlreadyHasException::new),
+    LACKS(false, ObjectLacksException::new),
+    FAIL(false, RuntimeException::new);
 
-    public PermissionSetEvent(PermissionHolder target, String node, boolean value, String server, String world, long expiry) {
-        super("Permission Set Event", target, server, world, expiry);
-        this.node = node;
+    private boolean value;
+    private final Supplier<? extends Exception> exceptionSupplier;
+
+    DataMutateResult(boolean value, Supplier<? extends Exception> exceptionSupplier) {
         this.value = value;
+        this.exceptionSupplier = exceptionSupplier;
     }
 
-    public String getNode() {
-        return node;
+    public void throwException() {
+        if (exceptionSupplier != null) {
+            sneakyThrow(exceptionSupplier.get());
+        }
     }
 
-    public boolean getValue() {
+    public boolean asBoolean() {
         return value;
     }
 
-    public Map.Entry<String, Boolean> getEntry() {
-        return new AbstractMap.SimpleEntry<>(node, value);
+    // allows us to throw checked exceptions without declaring it, as #throwException throws a number of
+    // exception types.
+    private static void sneakyThrow(Throwable t) {
+        sneakyThrow0(t);
     }
+
+    private static <T extends Throwable> void sneakyThrow0(Throwable t) throws T {
+        throw (T) t;
+    }
+
 }

api/src/main/java/me/lucko/luckperms/api/Datastore.java

@@ -1,185 +0,0 @@
-/*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included in all
- *  copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
- */
-
-package me.lucko.luckperms.api;
-
-import me.lucko.luckperms.api.data.Callback;
-
-import java.util.Set;
-import java.util.UUID;
-
-/**
- * Deprecated Storage interface. Use {@link Storage} instead.
- *
- * @deprecated as of version 2.14 in favour of {@link Storage}.
- */
-@Deprecated
-public interface Datastore {
-
-    String getName();
-
-    boolean isAcceptingLogins();
-
-    @Deprecated
-    Sync sync();
-
-    @Deprecated
-    Async async();
-
-    @Deprecated
-    Future future();
-
-    @Deprecated
-    interface Sync {
-        boolean logAction(LogEntry entry);
-
-        Log getLog();
-
-        @Deprecated
-        boolean loadOrCreateUser(UUID uuid, String username);
-
-        @Deprecated
-        boolean loadUser(UUID uuid);
-
-        boolean loadUser(UUID uuid, String username);
-
-        boolean saveUser(User user);
-
-        boolean cleanupUsers();
-
-        Set<UUID> getUniqueUsers();
-
-        boolean createAndLoadGroup(String name);
-
-        boolean loadGroup(String name);
-
-        boolean loadAllGroups();
-
-        boolean saveGroup(Group group);
-
-        boolean deleteGroup(Group group);
-
-        boolean createAndLoadTrack(String name);
-
-        boolean loadTrack(String name);
-
-        boolean loadAllTracks();
-
-        boolean saveTrack(Track track);
-
-        boolean deleteTrack(Track track);
-
-        boolean saveUUIDData(String username, UUID uuid);
-
-        UUID getUUID(String username);
-    }
-
-    @Deprecated
-    interface Async {
-        void logAction(LogEntry entry, Callback<Boolean> callback);
-
-        void getLog(Callback<Log> callback);
-
-        @Deprecated
-        void loadOrCreateUser(UUID uuid, String username, Callback<Boolean> callback);
-
-        @Deprecated
-        void loadUser(UUID uuid, Callback<Boolean> callback);
-
-        void loadUser(UUID uuid, String username, Callback<Boolean> callback);
-
-        void saveUser(User user, Callback<Boolean> callback);
-
-        void cleanupUsers(Callback<Boolean> callback);
-
-        void getUniqueUsers(Callback<Set<UUID>> callback);
-
-        void createAndLoadGroup(String name, Callback<Boolean> callback);
-
-        void loadGroup(String name, Callback<Boolean> callback);
-
-        void loadAllGroups(Callback<Boolean> callback);
-
-        void saveGroup(Group group, Callback<Boolean> callback);
-
-        void deleteGroup(Group group, Callback<Boolean> callback);
-
-        void createAndLoadTrack(String name, Callback<Boolean> callback);
-
-        void loadTrack(String name, Callback<Boolean> callback);
-
-        void loadAllTracks(Callback<Boolean> callback);
-
-        void saveTrack(Track track, Callback<Boolean> callback);
-
-        void deleteTrack(Track track, Callback<Boolean> callback);
-
-        void saveUUIDData(String username, UUID uuid, Callback<Boolean> callback);
-
-        void getUUID(String username, Callback<UUID> callback);
-    }
-
-    @Deprecated
-    interface Future {
-        java.util.concurrent.Future<Boolean> logAction(LogEntry entry);
-
-        java.util.concurrent.Future<Log> getLog();
-
-        @Deprecated
-        java.util.concurrent.Future<Boolean> loadOrCreateUser(UUID uuid, String username);
-
-        @Deprecated
-        java.util.concurrent.Future<Boolean> loadUser(UUID uuid);
-
-        java.util.concurrent.Future<Boolean> loadUser(UUID uuid, String username);
-
-        java.util.concurrent.Future<Boolean> saveUser(User user);
-
-        java.util.concurrent.Future<Boolean> cleanupUsers();
-
-        java.util.concurrent.Future<Set<UUID>> getUniqueUsers();
-
-        java.util.concurrent.Future<Boolean> createAndLoadGroup(String name);
-
-        java.util.concurrent.Future<Boolean> loadGroup(String name);
-
-        java.util.concurrent.Future<Boolean> loadAllGroups();
-
-        java.util.concurrent.Future<Boolean> saveGroup(Group group);
-
-        java.util.concurrent.Future<Boolean> deleteGroup(Group group);
-
-        java.util.concurrent.Future<Boolean> createAndLoadTrack(String name);
-
-        java.util.concurrent.Future<Boolean> loadTrack(String name);
-
-        java.util.concurrent.Future<Boolean> loadAllTracks();
-
-        java.util.concurrent.Future<Boolean> saveTrack(Track track);
-
-        java.util.concurrent.Future<Boolean> deleteTrack(Track track);
-
-        java.util.concurrent.Future<Boolean> saveUUIDData(String username, UUID uuid);
-
-        java.util.concurrent.Future<UUID> getUUID(String username);
-    }
-}

api/src/main/java/me/lucko/luckperms/api/Group.java

@@ -82,7 +82,9 @@ public interface Group extends PermissionHolder {
      * @throws ObjectAlreadyHasException if the group already inherits the group
      * @throws NullPointerException      if the group is null
      * @throws IllegalStateException     if the group instance was not obtained from LuckPerms.
+     * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
+    @Deprecated
     void setInheritGroup(Group group) throws ObjectAlreadyHasException;
 
     /**
@@ -94,7 +96,9 @@ public interface Group extends PermissionHolder {
      * @throws NullPointerException      if the group or server is null
      * @throws IllegalStateException     if the group instance was not obtained from LuckPerms.
      * @throws IllegalArgumentException  if the server is invalid
+     * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
+    @Deprecated
     void setInheritGroup(Group group, String server) throws ObjectAlreadyHasException;
 
     /**
@@ -107,7 +111,9 @@ public interface Group extends PermissionHolder {
      * @throws NullPointerException      if the group, server or world is null
      * @throws IllegalStateException     if the group instance was not obtained from LuckPerms.
      * @throws IllegalArgumentException  if the server or world is invalid
+     * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
+    @Deprecated
     void setInheritGroup(Group group, String server, String world) throws ObjectAlreadyHasException;
 
     /**
@@ -119,7 +125,9 @@ public interface Group extends PermissionHolder {
      * @throws NullPointerException      if the group is null
      * @throws IllegalStateException     if the group instance was not obtained from LuckPerms.
      * @throws IllegalArgumentException  if the expiry time is in the past
+     * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
+    @Deprecated
     void setInheritGroup(Group group, long expireAt) throws ObjectAlreadyHasException;
 
     /**
@@ -132,7 +140,9 @@ public interface Group extends PermissionHolder {
      * @throws NullPointerException      if the group or server is null
      * @throws IllegalStateException     if the group instance was not obtained from LuckPerms.
      * @throws IllegalArgumentException  if the expiry time is in the past or the server is invalid
+     * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
+    @Deprecated
     void setInheritGroup(Group group, String server, long expireAt) throws ObjectAlreadyHasException;
 
     /**
@@ -146,7 +156,9 @@ public interface Group extends PermissionHolder {
      * @throws NullPointerException      if the group, server or world is null
      * @throws IllegalStateException     if the group instance was not obtained from LuckPerms.
      * @throws IllegalArgumentException  if the expiry time is in the past or the server/world is invalid
+     * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
+    @Deprecated
     void setInheritGroup(Group group, String server, String world, long expireAt) throws ObjectAlreadyHasException;
 
     /**
@@ -156,7 +168,9 @@ public interface Group extends PermissionHolder {
      * @throws ObjectLacksException  if the group does not already inherit the group
      * @throws NullPointerException  if the group is null
      * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
+     * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
+    @Deprecated
     void unsetInheritGroup(Group group) throws ObjectLacksException;
 
     /**
@@ -167,7 +181,9 @@ public interface Group extends PermissionHolder {
      * @throws ObjectLacksException  if the group does not already inherit the group
      * @throws NullPointerException  if the group is null
      * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
+     * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
+    @Deprecated
     void unsetInheritGroup(Group group, boolean temporary) throws ObjectLacksException;
 
     /**
@@ -179,7 +195,9 @@ public interface Group extends PermissionHolder {
      * @throws NullPointerException     if the group or server is null
      * @throws IllegalStateException    if the group instance was not obtained from LuckPerms.
      * @throws IllegalArgumentException if the server is invalid
+     * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
+    @Deprecated
     void unsetInheritGroup(Group group, String server) throws ObjectLacksException;
 
     /**
@@ -192,7 +210,9 @@ public interface Group extends PermissionHolder {
      * @throws NullPointerException     if the group, server or world is null
      * @throws IllegalStateException    if the group instance was not obtained from LuckPerms.
      * @throws IllegalArgumentException if the server or world is invalid
+     * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
+    @Deprecated
     void unsetInheritGroup(Group group, String server, String world) throws ObjectLacksException;
 
     /**
@@ -205,7 +225,9 @@ public interface Group extends PermissionHolder {
      * @throws NullPointerException     if the group or server is null
      * @throws IllegalStateException    if the group instance was not obtained from LuckPerms.
      * @throws IllegalArgumentException if the expiry time is in the past or the server is invalid
+     * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
+    @Deprecated
     void unsetInheritGroup(Group group, String server, boolean temporary) throws ObjectLacksException;
 
     /**
@@ -219,7 +241,9 @@ public interface Group extends PermissionHolder {
      * @throws NullPointerException     if the group, server or world is null
      * @throws IllegalStateException    if the group instance was not obtained from LuckPerms.
      * @throws IllegalArgumentException if the expiry time is in the past or the server/world is invalid
+     * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
+    @Deprecated
     void unsetInheritGroup(Group group, String server, String world, boolean temporary) throws ObjectLacksException;
 
     /**

api/src/main/java/me/lucko/luckperms/api/LPConfiguration.java

@@ -23,7 +23,6 @@
 package me.lucko.luckperms.api;
 
 import me.lucko.luckperms.api.data.DatastoreConfiguration;
-import me.lucko.luckperms.api.data.MySQLConfiguration;
 
 import java.util.Map;
 
@@ -44,22 +43,6 @@ public interface LPConfiguration {
      */
     int getSyncTime();
 
-    /**
-     * Returns the default group, in a node representation
-     * @return the default group, in a node representation
-     * @deprecated as of 2.6, the default group is always "default"
-     */
-    @Deprecated
-    String getDefaultGroupNode();
-
-    /**
-     * Returns the name of the default group
-     * @return the name of the default group
-     * @deprecated as of 2.6, the default group is always "default"
-     */
-    @Deprecated
-    String getDefaultGroupName();
-
     /**
      * Returns if the users on this server will have their global permissions applied
      * @return if the users on this server will have their global permissions applied
@@ -118,15 +101,6 @@ public interface LPConfiguration {
      */
     boolean getLogNotify();
 
-    /**
-     * Returns true if permission checks are being recorded / debugged
-     * @return true if permission checks are being recorded / debugged
-     * @since 2.9
-     * @deprecated as this value is now always false. Functionality was replaced by the verbose command.
-     */
-    @Deprecated
-    boolean getDebugPermissionChecks();
-
     /**
      * Returns true if the vanilla op system is enabled
      * @return true if the vanilla op system is enabled
@@ -162,15 +136,6 @@ public interface LPConfiguration {
      */
     boolean getVaultIncludeGlobal();
 
-    /**
-     * Returns the database values set in the configuration
-     * @return the database values set in the configuration
-     * @deprecated use {@link #getDatastoreConfig()}
-     */
-    @SuppressWarnings("deprecation")
-    @Deprecated
-    MySQLConfiguration getDatabaseValues();
-
     /**
      * Returns the values set for data storage in the configuration
      * @return the values set for data storage in the configuration

api/src/main/java/me/lucko/luckperms/api/Log.java

@@ -29,8 +29,8 @@ import java.util.UUID;
 /**
  * Represents the internal LuckPerms log.
  *
- * <p> The returned instance provides a copy of the data at the time of retrieval. Any changes made to log entries will
- * only apply to this instance of the log. You can add to the log using the {@link Storage}, and then request an updated copy.
+ * <p>The returned instance provides a copy of the data at the time of retrieval. Any changes made to log entries will
+ * only apply to this instance of the log. You can add to the log using the {@link Storage}, and then request an updated copy.</p>
  */
 public interface Log {
 

api/src/main/java/me/lucko/luckperms/api/LogEntry.java

@@ -27,7 +27,7 @@ import java.util.UUID;
 /**
  * A single entry in the log
  *
- * <p> Implements {@link Comparable} ordering based upon the timestamp of the entry.
+ * <p>Implements {@link Comparable} ordering based upon the timestamp of the entry.</p>
  */
 public class LogEntry implements Comparable<LogEntry> {
     private static final String FORMAT = "&8(&e%s&8) [&a%s&8] (&b%s&8) &7--> &f%s";
@@ -90,7 +90,7 @@ public class LogEntry implements Comparable<LogEntry> {
 
     public String getFormatted() {
         return String.format(FORMAT,
-                actorName,
+                String.valueOf(actorName).equals("null") ? actor.toString() : actorName,
                 Character.toString(type),
                 actedName,
                 action
@@ -171,13 +171,13 @@ public class LogEntry implements Comparable<LogEntry> {
         if (o == this) return true;
         if (!(o instanceof LogEntry)) return false;
         final LogEntry other = (LogEntry) o;
-        if (this.getTimestamp() != other.getTimestamp()) return false;
-        if (this.getActor() == null ? other.getActor() != null : !this.getActor().equals(other.getActor())) return false;
-        if (this.getActorName() == null ? other.getActorName() != null : !this.getActorName().equals(other.getActorName())) return false;
-        if (this.getType() != other.getType()) return false;
-        if (this.getActed() == null ? other.getActed() != null : !this.getActed().equals(other.getActed())) return false;
-        if (this.getActedName() == null ? other.getActedName() != null : !this.getActedName().equals(other.getActedName())) return false;
-        return this.getAction() == null ? other.getAction() == null : this.getAction().equals(other.getAction());
+        return this.getTimestamp() == other.getTimestamp() &&
+                (this.getActor() == null ? other.getActor() == null : this.getActor().equals(other.getActor())) &&
+                (this.getActorName() == null ? other.getActorName() == null : this.getActorName().equals(other.getActorName())) &&
+                this.getType() == other.getType() &&
+                (this.getActed() == null ? other.getActed() == null : this.getActed().equals(other.getActed())) &&
+                (this.getActedName() == null ? other.getActedName() == null : this.getActedName().equals(other.getActedName())) &&
+                (this.getAction() == null ? other.getAction() == null : this.getAction().equals(other.getAction()));
     }
 
     @Override

api/src/main/java/me/lucko/luckperms/api/Logger.java

@@ -25,8 +25,8 @@ package me.lucko.luckperms.api;
 /**
  * A wrapper interface for platform logger instances
  *
- * <p> Bukkit/Bungee both use java.util.logging, and Sponge uses org.slf4j. This class wraps those classes so the
- * commons module can access a logger.
+ * <p>Bukkit/Bungee both use java.util.logging, and Sponge uses org.slf4j. This class wraps those classes so the
+ * commons module can access a logger.</p>
  */
 public interface Logger {
 

api/src/main/java/me/lucko/luckperms/api/LuckPermsApi.java

@@ -22,10 +22,9 @@
 
 package me.lucko.luckperms.api;
 
-import me.lucko.luckperms.api.context.ContextListener;
+import me.lucko.luckperms.api.context.ContextCalculator;
 import me.lucko.luckperms.api.context.ContextSet;
-import me.lucko.luckperms.api.context.IContextCalculator;
-import me.lucko.luckperms.api.event.LPListener;
+import me.lucko.luckperms.api.event.EventBus;
 
 import java.util.Optional;
 import java.util.Set;
@@ -42,37 +41,31 @@ public interface LuckPermsApi {
     void runUpdateTask();
 
     /**
+     * Gets the API version
      * @return the version of the API running on the platform
      * @since 2.6
      */
     double getApiVersion();
 
     /**
+     * Gets the plugin version
      * @return the version of the plugin running on the platform
      */
     String getVersion();
 
     /**
+     * Gets the platform LuckPerms is running on
      * @return the platform LuckPerms is running on
      * @since 2.7
      */
     PlatformType getPlatformType();
 
     /**
-     * Registers a listener to be sent LuckPerms events
-     *
-     * @param listener the listener instance
-     * @throws NullPointerException if the listener is null
+     * Gets the event bus, used for subscribing to events
+     * @return the event bus
+     * @since 3.0
      */
-    void registerListener(LPListener listener);
-
-    /**
-     * Unregisters a previously registered listener from the EventBus
-     *
-     * @param listener the listener instance to unregister
-     * @throws NullPointerException if the listener is null
-     */
-    void unregisterListener(LPListener listener);
+    EventBus getEventBus();
 
     /**
      * Gets a wrapped {@link LPConfiguration} instance, with read only access
@@ -89,16 +82,6 @@ public interface LuckPermsApi {
      */
     Storage getStorage();
 
-    /**
-     * Gets a wrapped Datastore instance.
-     *
-     * @return a datastore instance
-     * @deprecated in favour of {@link #getStorage()}
-     */
-    @SuppressWarnings("deprecation")
-    @Deprecated
-    Datastore getDatastore();
-
     /**
      * Gets the messaging service in use on the platform, if present.
      *
@@ -130,7 +113,9 @@ public interface LuckPermsApi {
     User getUser(UUID uuid);
 
     /**
-     * Gets a wrapped user object from the user storage. This method does not return null, unlike {@link #getUser(UUID)}
+     * Gets a wrapped user object from the user storage.
+     *
+     * <p>This method does not return null, unlike {@link #getUser(UUID)}</p>
      *
      * @param uuid the uuid of the user to get
      * @return an optional {@link User} object
@@ -148,8 +133,9 @@ public interface LuckPermsApi {
     User getUser(String name);
 
     /**
-     * Gets a wrapped user object from the user storage. This method does not return null, unlike {@link
-     * #getUser(String)}
+     * Gets a wrapped user object from the user storage.
+     *
+     * <p>This method does not return null, unlike {@link #getUser(String)}</p>
      *
      * @param name the username of the user to get
      * @return an optional {@link User} object
@@ -192,7 +178,9 @@ public interface LuckPermsApi {
     Group getGroup(String name);
 
     /**
-     * Gets a wrapped group object from the group storage. This method does not return null, unlike {@link #getGroup}
+     * Gets a wrapped group object from the group storage.
+     *
+     * <p>This method does not return null, unlike {@link #getGroup}</p>
      *
      * @param name the name of the group to get
      * @return an optional {@link Group} object
@@ -226,7 +214,9 @@ public interface LuckPermsApi {
     Track getTrack(String name);
 
     /**
-     * Gets a wrapped track object from the track storage. This method does not return null, unlike {@link #getTrack}
+     * Gets a wrapped track object from the track storage.
+     *
+     * <p>This method does not return null, unlike {@link #getTrack}</p>
      *
      * @param name the name of the track to get
      * @return an optional {@link Track} object
@@ -274,15 +264,7 @@ public interface LuckPermsApi {
      * @param contextCalculator the context calculator to register. The type MUST be the player class of the platform.
      * @throws ClassCastException if the type is not the player class of the platform.
      */
-    void registerContextCalculator(IContextCalculator<?> contextCalculator);
-
-    /**
-     * Registers a custom context listener to the server,
-     *
-     * @param contextListener the context listener to register. The type MUST be the player class of the platform.
-     * @throws ClassCastException if the type is not the player class of the platform.
-     */
-    void registerContextListener(ContextListener<?> contextListener);
+    void registerContextCalculator(ContextCalculator<?> contextCalculator);
 
     /**
      * Gets a calculated context instance for the user using the rules of the platform.
@@ -295,7 +277,7 @@ public interface LuckPermsApi {
     Optional<Contexts> getContextForUser(User user);
 
     /**
-     * Gets set of contexts applicable to a player using the platforms {@link IContextCalculator}s.
+     * Gets set of contexts applicable to a player using the platforms {@link ContextCalculator}s.
      *
      * @param player the player to calculate for. Must be the player instance for the platform.
      * @return a set of contexts.

api/src/main/java/me/lucko/luckperms/api/MessagingService.java

@@ -32,8 +32,8 @@ public interface MessagingService {
     /**
      * Uses the messaging service to inform other servers about changes.
      *
-     * <p> This will push the update asynchronously, and this method will return immediately. Calling this method is
-     * equivalent to running "/lp networksync", except will not sync this server.
+     * <p>This will push the update asynchronously, and this method will return immediately. Calling this method is
+     * equivalent to running "/lp networksync", except will not sync this server.</p>
      */
     void pushUpdate();
 

api/src/main/java/me/lucko/luckperms/api/MetaUtils.java

@@ -34,9 +34,25 @@ import java.util.Set;
  * A collection of utilities to help retrieve meta values for {@link PermissionHolder}s
  *
  * @since 2.7
+ * @deprecated in favour of using {@link NodeFactory#makeMetaNode(String, String)} or {@link me.lucko.luckperms.api.caching.MetaData}.
  */
+@Deprecated
 public class MetaUtils {
 
+    private static String escapeDelimiters(String s, String... delims) {
+        for (String delim : delims) {
+            s = s.replace(delim, "\\" + delim);
+        }
+        return s;
+    }
+
+    private static String unescapeDelimiters(String s, String... delims) {
+        for (String delim : delims) {
+            s = s.replace("\\" + delim, delim);
+        }
+        return s;
+    }
+
     /**
      * Escapes special characters used within LuckPerms, so the string can be saved without issues
      *
@@ -49,11 +65,7 @@ public class MetaUtils {
             throw new NullPointerException();
         }
 
-        s = s.replace(".", "{SEP}");
-        s = s.replace("/", "{FSEP}");
-        s = s.replace("$", "{DSEP}");
-
-        return s;
+        return escapeDelimiters(s, ".", "/", "-", "$");
     }
 
     /**
@@ -71,6 +83,7 @@ public class MetaUtils {
         s = s.replace("{SEP}", ".");
         s = s.replace("{FSEP}", "/");
         s = s.replace("{DSEP}", "$");
+        s = unescapeDelimiters(s, ".", "/", "-", "$");
 
         return s;
     }
@@ -81,42 +94,24 @@ public class MetaUtils {
      * @param holder the holder to apply the meta node to
      * @param server the server to apply the meta on, can be null
      * @param world  the world to apply the meta on, can be null
-     * @param node   the meta node
+     * @param key    the meta key
      * @param value  the meta value
      * @throws NullPointerException     if the holder, node or value is null
      * @throws IllegalArgumentException if the node or value is empty
      */
-    public static void setMeta(PermissionHolder holder, String server, String world, String node, String value) {
-        if (holder == null) {
-            throw new NullPointerException("holder");
-        }
+    public static void setMeta(PermissionHolder holder, String server, String world, String key, String value) {
+        if (holder == null) throw new NullPointerException("holder");
+        if (key == null) throw new NullPointerException("node");
+        if (value == null) throw new NullPointerException("value");
+        if (key.equals("")) throw new IllegalArgumentException("node is empty");
+        if (value.equals("")) throw new IllegalArgumentException("value is empty");
 
-        if (node == null) {
-            throw new NullPointerException("node");
-        }
-
-        if (value == null) {
-            throw new NullPointerException("value");
-        }
-
-        if (node.equals("")) {
-            throw new IllegalArgumentException("node is empty");
-        }
-
-        if (value.equals("")) {
-            throw new IllegalArgumentException("value is empty");
-        }
-
-        if (server == null || server.equals("")) {
-            server = "global";
-        }
-
-        node = escapeCharacters(node);
+        key = escapeCharacters(key);
         value = escapeCharacters(value);
 
         Set<Node> toRemove = new HashSet<>();
         for (Node n : holder.getEnduringPermissions()) {
-            if (n.isMeta() && n.getMeta().getKey().equals(node)) {
+            if (n.isMeta() && n.getMeta().getKey().equals(key)) {
                 toRemove.add(n);
             }
         }
@@ -124,22 +119,20 @@ public class MetaUtils {
         for (Node n : toRemove) {
             try {
                 holder.unsetPermission(n);
-            } catch (ObjectLacksException ignored) {
-            }
+            } catch (ObjectLacksException ignored) {}
         }
 
-        Node.Builder metaNode = LuckPerms.getApi().buildNode("meta." + node + "." + value).setValue(true);
-        if (!server.equalsIgnoreCase("global")) {
+        Node.Builder metaNode = LuckPerms.getApi().buildNode("meta." + key + "." + value).setValue(true);
+        if (server != null) {
             metaNode.setServer(server);
         }
-        if (world != null && !world.equals("")) {
-            metaNode.setServer(server).setWorld(world);
+        if (world != null) {
+            metaNode.setWorld(world);
         }
 
         try {
             holder.setPermission(metaNode.build());
-        } catch (ObjectAlreadyHasException ignored) {
-        }
+        } catch (ObjectAlreadyHasException ignored) {}
     }
 
     /**
@@ -156,18 +149,8 @@ public class MetaUtils {
      * @throws IllegalArgumentException if the node is empty
      */
     public static String getMeta(PermissionHolder holder, String server, String world, String node, String defaultValue, boolean includeGlobal) {
-        if (holder == null) {
-            throw new NullPointerException("holder");
-        }
-
-        if (server == null || server.equals("")) {
-            server = "global";
-        }
-
-        if (node == null) {
-            throw new NullPointerException("node");
-        }
-
+        if (holder == null) throw new NullPointerException("holder");
+        if (node == null) throw new NullPointerException("node");
         if (node.equals("")) {
             throw new IllegalArgumentException("node is empty");
         }
@@ -175,23 +158,10 @@ public class MetaUtils {
         node = escapeCharacters(node);
 
         for (Node n : holder.getPermissions()) {
-            if (!n.getValue()) {
-                continue;
-            }
+            if (!n.getValue() || !n.isMeta()) continue;
 
-            if (!n.isMeta()) {
-                continue;
-            }
-
-            if (!server.equalsIgnoreCase("global")) {
-                if (!n.shouldApplyOnServer(server, includeGlobal, false)) {
-                    continue;
-                }
-            }
-
-            if (!n.shouldApplyOnWorld(world, includeGlobal, false)) {
-                continue;
-            }
+            if (!n.shouldApplyOnServer(server, includeGlobal, false)) continue;
+            if (!n.shouldApplyOnWorld(world, includeGlobal, false)) continue;
 
             Map.Entry<String, String> meta = n.getMeta();
             if (meta.getKey().equalsIgnoreCase(node)) {
@@ -203,27 +173,23 @@ public class MetaUtils {
     }
 
     private static void setChatMeta(boolean prefix, PermissionHolder holder, String value, int priority, String server, String world) {
-        if (holder == null) {
-            throw new NullPointerException("holder");
-        }
-
+        if (holder == null) throw new NullPointerException("holder");
         if (value == null || value.equals("")) {
             throw new IllegalArgumentException("value is null/empty");
         }
 
         Node.Builder node = LuckPerms.getApi().buildNode(prefix ? "prefix" : "suffix" + "." + priority + "." + escapeCharacters(value));
         node.setValue(true);
-        if (!server.equalsIgnoreCase("global")) {
+        if (server != null) {
             node.setServer(server);
         }
-        if (world != null && !world.equals("")) {
-            node.setServer(server).setWorld(world);
+        if (world != null) {
+            node.setWorld(world);
         }
 
         try {
             holder.setPermission(node.build());
-        } catch (ObjectAlreadyHasException ignored) {
-        }
+        } catch (ObjectAlreadyHasException ignored) {}
     }
 
     /**
@@ -260,26 +226,14 @@ public class MetaUtils {
         if (holder == null) {
             throw new NullPointerException("holder");
         }
-        if (server == null) {
-            server = "global";
-        }
 
         int priority = Integer.MIN_VALUE;
         String meta = null;
         for (Node n : holder.getAllNodes(Contexts.allowAll())) {
-            if (!n.getValue()) {
-                continue;
-            }
+            if (!n.getValue()) continue;
 
-            if (!server.equalsIgnoreCase("global")) {
-                if (!n.shouldApplyOnServer(server, includeGlobal, false)) {
-                    continue;
-                }
-            }
-
-            if (!n.shouldApplyOnWorld(world, includeGlobal, false)) {
-                continue;
-            }
+            if (!n.shouldApplyOnServer(server, includeGlobal, false)) continue;
+            if (!n.shouldApplyOnWorld(world, includeGlobal, false)) continue;
 
             if (prefix ? !n.isPrefix() : !n.isSuffix()) {
                 continue;

api/src/main/java/me/lucko/luckperms/api/Node.java

@@ -33,7 +33,7 @@ import java.util.Set;
 /**
  * An immutable permission node
  *
- * <p> Use {@link LuckPermsApi#buildNode(String)} to get an instance.
+ * <p>Use {@link LuckPermsApi#buildNode(String)} to get an instance.</p>
  *
  * @since 2.6
  */
@@ -85,15 +85,49 @@ public interface Node extends Map.Entry<String, Boolean> {
     Optional<String> getWorld();
 
     /**
+     * Returns if this node is server specific
+     *
      * @return true if this node is server specific
      */
     boolean isServerSpecific();
 
     /**
+     * Returns if this node is server specific
+     *
      * @return true if this node is server specific
      */
     boolean isWorldSpecific();
 
+    /**
+     * Returns if this node applies globally, and has no specific context
+     *
+     * @return true if this node applies globally, and has no specific context
+     * @since 3.1
+     */
+    boolean appliesGlobally();
+
+    /**
+     * Returns if this node has any specific context in order to apply.
+     *
+     * @return true if this node has specific context
+     * @since 3.1
+     */
+    boolean hasSpecificContext();
+
+    /**
+     * Returns if this node is able to apply in the given context
+     *
+     * @param includeGlobal if global server values should apply
+     * @param includeGlobalWorld if global world values should apply
+     * @param server the server being checked against, or null
+     * @param world the world being checked against, or null
+     * @param context the context being checked against, or null
+     * @param applyRegex if regex should be applied
+     * @return true if the node should apply, otherwise false
+     * @since 3.1
+     */
+    boolean shouldApply(boolean includeGlobal, boolean includeGlobalWorld, String server, String world, ContextSet context, boolean applyRegex);
+
     /**
      * If this node should apply on a specific server
      *
@@ -133,31 +167,6 @@ public interface Node extends Map.Entry<String, Boolean> {
      */
     boolean shouldApplyWithContext(ContextSet context);
 
-    /**
-     * If this node should apply in the given context
-     *
-     * @param context        the context key value pairs
-     * @param worldAndServer if world and server contexts should be checked
-     * @return true if the node should apply
-     * @deprecated in favour of {@link #shouldApplyWithContext(ContextSet, boolean)}
-     */
-    @Deprecated
-    default boolean shouldApplyWithContext(Map<String, String> context, boolean worldAndServer) {
-        return shouldApplyWithContext(ContextSet.fromMap(context), worldAndServer);
-    }
-
-    /**
-     * If this node should apply in the given context
-     *
-     * @param context the context key value pairs
-     * @return true if the node should apply
-     * @deprecated in favour of {@link #shouldApplyWithContext(ContextSet)}
-     */
-    @Deprecated
-    default boolean shouldApplyWithContext(Map<String, String> context) {
-        return shouldApplyWithContext(ContextSet.fromMap(context));
-    }
-
     /**
      * Similar to {@link #shouldApplyOnServer(String, boolean, boolean)}, except this method accepts a List
      *
@@ -228,40 +237,49 @@ public interface Node extends Map.Entry<String, Boolean> {
     boolean hasExpired();
 
     /**
-     * @return the extra contexts required for this node to apply
-     * @deprecated in favour of {@link #getContexts()}
-     */
-    @Deprecated
-    default Map<String, String> getExtraContexts() {
-        return getContexts().toMap();
-    }
-
-    /**
+     * Gets the extra contexts required for this node to apply
+     *
      * @return the extra contexts required for this node to apply
      * @since 2.13
      */
     ContextSet getContexts();
 
+    /**
+     * The same as {@link #getContexts()}, but also includes values for "server" and "world" keys if present.
+     *
+     * @return the full contexts required for this node to apply
+     * @since 3.1
+     */
+    ContextSet getFullContexts();
+
     /**
      * Converts this node into a serialized form
      *
      * @return a serialized node string
+     * @deprecated because this serialized form is no longer used by the implementation.
      */
+    @Deprecated
     String toSerializedNode();
 
     /**
+     * Returns if this is a group node
+     *
      * @return true if this is a group node
      */
     boolean isGroupNode();
 
     /**
+     * Returns the name of the group
+     *
      * @return the name of the group
      * @throws IllegalStateException if this is not a group node. See {@link #isGroupNode()}
      */
     String getGroupName();
 
     /**
-     * @return true is this node is a wildcard node
+     * Returns if this node is a wildcard node
+     *
+     * @return true if this node is a wildcard node
      */
     boolean isWildcard();
 
@@ -274,6 +292,8 @@ public interface Node extends Map.Entry<String, Boolean> {
     int getWildcardLevel();
 
     /**
+     * Returns if this node is a meta node
+     *
      * @return true if this node is a meta node
      */
     boolean isMeta();

api/src/main/java/me/lucko/luckperms/api/NodeFactory.java

@@ -33,7 +33,7 @@ public interface NodeFactory {
      * Creates a node from a serialised node string
      *
      * @param serialisedPermission the serialised permission string
-     * @param value the value of the node
+     * @param value                the value of the node
      * @return a node instance
      * @throws NullPointerException if the permission is null
      */
@@ -60,18 +60,30 @@ public interface NodeFactory {
 
     /**
      * Creates a node builder from a serialised node string
+     *
      * @param serialisedPermission the serialised permission string
-     * @param value the value of the node
+     * @param value                the value of the node
      * @return a node builder instance
      * @throws NullPointerException if the permission is null
      */
     Node.Builder newBuilderFromSerialisedNode(String serialisedPermission, boolean value);
 
 
+    /**
+     * Creates a node builder from a group
+     *
+     * @param group the group
+     * @return a node builder instance
+     * @throws NullPointerException  if the group is null
+     * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
+     * @since 3.1
+     */
+    Node.Builder makeGroupNode(Group group);
+
     /**
      * Creates a node builder from a key value pair
      *
-     * @param key the key
+     * @param key   the key
      * @param value the value
      * @return a node builder instance
      * @throws NullPointerException if the key or value is null
@@ -82,7 +94,7 @@ public interface NodeFactory {
      * Creates a node builder from a prefix string and priority
      *
      * @param priority the priority
-     * @param prefix the prefix string
+     * @param prefix   the prefix string
      * @return a node builder instance
      * @throws NullPointerException if the prefix is null
      */
@@ -92,7 +104,7 @@ public interface NodeFactory {
      * Creates a node builder from a prefix string and priority
      *
      * @param priority the priority
-     * @param suffix the suffix string
+     * @param suffix   the suffix string
      * @return a node builder instance
      * @throws NullPointerException if the suffix is null
      */

api/src/main/java/me/lucko/luckperms/api/PermissionHolder.java

@@ -25,7 +25,6 @@ package me.lucko.luckperms.api;
 import me.lucko.luckperms.exceptions.ObjectAlreadyHasException;
 import me.lucko.luckperms.exceptions.ObjectLacksException;
 
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.SortedSet;
@@ -33,15 +32,15 @@ import java.util.SortedSet;
 /**
  * An object capable of holding permissions
  *
- * <p> Any changes made will be lost unless the instance is saved back to the {@link Storage}.
+ * <p>Any changes made will be lost unless the instance is saved back to the {@link Storage}.</p>
  */
 public interface PermissionHolder {
 
     /**
      * Gets the objects name
      *
-     * <p> {@link User#getUuid()}, {@link User#getName()} or {@link Group#getName()} should normally be used instead of
-     * this method.
+     * <p>{@link User#getUuid()}, {@link User#getName()} or {@link Group#getName()} should normally be used instead of
+     * this method.</p>
      *
      * @return the identifier for this object. Either a uuid string or name.
      */
@@ -73,22 +72,13 @@ public interface PermissionHolder {
      */
     Set<? extends Node> getTransientPermissions();
 
-
-    /**
-     * Gets an immutable set of the nodes that this object has and inherits
-     *
-     * @return an immutable set of permissions
-     * @since 2.6
-     * @deprecated in favour of {@link #getAllNodes(Contexts)}
-     */
-    @Deprecated
-    Set<Node> getAllNodes();
-
     /**
      * Gets a mutable sorted set of the nodes that this object has and inherits, filtered by context
-     * Unlike {@link #getAllNodesFiltered(Contexts)}, this method will not filter individual nodes. The context is only
-     * used to determine which groups should apply.
-     * Nodes are sorted into priority order.
+     *
+     * <p>Unlike {@link #getAllNodesFiltered(Contexts)}, this method will not filter individual nodes. The context is only
+     * used to determine which groups should apply.</p>
+     *
+     * <p>Nodes are sorted into priority order.</p>
      *
      * @param contexts the context for the lookup,
      * @return a mutable sorted set of permissions
@@ -99,8 +89,9 @@ public interface PermissionHolder {
 
     /**
      * Gets a mutable set of the nodes that this object has and inherits, filtered by context.
-     * Unlike {@link #getAllNodes(Contexts)}, this method WILL filter individual nodes, and only return ones that fully
-     * meet the context provided.
+     *
+     * <p>Unlike {@link #getAllNodes(Contexts)}, this method WILL filter individual nodes, and only return ones that fully
+     * meet the context provided.</p>
      *
      * @param contexts the context for the lookup
      * @return a mutable set of permissions
@@ -111,21 +102,13 @@ public interface PermissionHolder {
 
     /**
      * Converts the output of {@link #getAllNodesFiltered(Contexts)}, and expands shorthand permissions.
+     *
      * @param contexts the context for the lookup
      * @param lowerCase if the keys should be made lowercase whilst being exported
      * @return a mutable map of permissions
      */
     Map<String, Boolean> exportNodes(Contexts contexts, boolean lowerCase);
 
-    /**
-     * Gets an immutable Map of the objects permission nodes
-     *
-     * @return an immutable map of permissions
-     * @deprecated in favour of {@link #getPermissions()}
-     */
-    @Deprecated
-    Map<String, Boolean> getNodes();
-
     /**
      * Removes temporary permissions that have expired
      */
@@ -227,7 +210,7 @@ public interface PermissionHolder {
     boolean hasPermission(String node, boolean b, String server, String world, boolean temporary);
 
     /**
-     * Cheks to see if the object inherits a certain permission
+     * Checks to see if the object inherits a certain permission
      *
      * @param node the node to check for
      * @return a Tristate for the holders inheritance status for the node
@@ -321,17 +304,27 @@ public interface PermissionHolder {
      */
     void setPermission(Node node) throws ObjectAlreadyHasException;
 
+    /**
+     * Sets a permission for the object
+     *
+     * @param node The node to be set
+     * @throws NullPointerException if the node is null
+     * @return the result of the operation
+     * @since 3.1
+     */
+    DataMutateResult setPermissionUnchecked(Node node);
+
     /**
      * Sets a transient permission for the object
      *
-     * <p> A transient node is a permission that does not persist.
+     * <p>A transient node is a permission that does not persist.
      * Whenever a user logs out of the server, or the server restarts, this permission will disappear.
-     * It is never saved to the datastore, and therefore will not apply on other servers.
+     * It is never saved to the datastore, and therefore will not apply on other servers.</p>
      *
-     * <p> This is useful if you want to temporarily set a permission for a user while they're online, but don't
-     * want it to persist, and have to worry about removing it when they log out.
+     * <p>This is useful if you want to temporarily set a permission for a user while they're online, but don't
+     * want it to persist, and have to worry about removing it when they log out.</p>
      *
-     * <p> For unsetting a transient permission, see {@link #unsetTransientPermission(Node)}
+     * <p>For unsetting a transient permission, see {@link #unsetTransientPermission(Node)}</p>
      *
      * @param node The node to be set
      * @throws ObjectAlreadyHasException if the object already has the permission
@@ -340,6 +333,25 @@ public interface PermissionHolder {
      */
     void setTransientPermission(Node node) throws ObjectAlreadyHasException;
 
+    /**
+     * Sets a transient permission for the object
+     *
+     * <p>A transient node is a permission that does not persist.
+     * Whenever a user logs out of the server, or the server restarts, this permission will disappear.
+     * It is never saved to the datastore, and therefore will not apply on other servers.</p>
+     *
+     * <p>This is useful if you want to temporarily set a permission for a user while they're online, but don't
+     * want it to persist, and have to worry about removing it when they log out.</p>
+     *
+     * <p>For unsetting a transient permission, see {@link #unsetTransientPermission(Node)}</p>
+     *
+     * @param node The node to be set
+     * @throws NullPointerException      if the node is null
+     * @return the result of the operation
+     * @since 3.1
+     */
+    DataMutateResult setTransientPermissionUnchecked(Node node);
+
     /**
      * Sets a permission for the object
      *
@@ -437,6 +449,16 @@ public interface PermissionHolder {
      */
     void unsetPermission(Node node) throws ObjectLacksException;
 
+    /**
+     * Unsets a permission for the object
+     *
+     * @param node The node to be unset
+     * @throws NullPointerException if the node is null
+     * @return the result of the operation
+     * @since 3.1
+     */
+    DataMutateResult unsetPermissionUnchecked(Node node);
+
     /**
      * Unsets a transient permission for the object
      *
@@ -447,6 +469,16 @@ public interface PermissionHolder {
      */
     void unsetTransientPermission(Node node) throws ObjectLacksException;
 
+    /**
+     * Unsets a transient permission for the object
+     *
+     * @param node The node to be unset
+     * @throws NullPointerException if the node is null
+     * @return the result of the operation
+     * @since 3.1
+     */
+    DataMutateResult unsetTransientPermissionUnchecked(Node node);
+
     /**
      * Unsets a permission for the object
      *
@@ -631,86 +663,4 @@ public interface PermissionHolder {
      */
     Set<Node> getTemporaryPermissionNodes();
 
-    /**
-     * Gets the permissions and inherited permissions that apply to a specific server and world
-     *
-     * @param server         The server to get nodes for
-     * @param world          The world to get nodes for
-     * @param excludedGroups Groups that shouldn't be inherited (to prevent circular inheritance issues)
-     * @param possibleNodes  A list of possible permission nodes for wildcard permission handling
-     * @return a {@link Map} of the permissions
-     * @deprecated in favour of {@link #getPermissions(String, String, Map, boolean, List, boolean)}
-     */
-    @Deprecated
-    Map<String, Boolean> getLocalPermissions(String server, String world, List<String> excludedGroups, List<String> possibleNodes);
-
-    /**
-     * Gets the permissions and inherited permissions that apply to a specific server and world
-     *
-     * @param server         The server to get nodes for
-     * @param world          The world to get nodes for
-     * @param excludedGroups Groups that shouldn't be inherited (to prevent circular inheritance issues)
-     * @return a {@link Map} of the permissions
-     * @deprecated in favour of {@link #getPermissions(String, String, Map, boolean, List, boolean)}
-     */
-    @Deprecated
-    Map<String, Boolean> getLocalPermissions(String server, String world, List<String> excludedGroups);
-
-    /**
-     * Gets the permissions and inherited permissions that apply to a specific server
-     *
-     * @param server         The server to get nodes for
-     * @param excludedGroups Groups that shouldn't be inherited (to prevent circular inheritance issues)
-     * @param possibleNodes  A list of possible permission nodes for wildcard permission handling
-     * @return a {@link Map} of the permissions
-     * @deprecated in favour of {@link #getPermissions(String, String, Map, boolean, List, boolean)}
-     */
-    @Deprecated
-    Map<String, Boolean> getLocalPermissions(String server, List<String> excludedGroups, List<String> possibleNodes);
-
-    /**
-     * Gets the permissions and inherited permissions that apply to a specific server
-     *
-     * @param server         The server to get nodes for
-     * @param excludedGroups Groups that shouldn't be inherited (to prevent circular inheritance issues)
-     * @return a {@link Map} of the permissions
-     * @deprecated in favour of {@link #getPermissions(String, String, Map, boolean, List, boolean)}
-     */
-    @Deprecated
-    Map<String, Boolean> getLocalPermissions(String server, List<String> excludedGroups);
-
-    /**
-     * Convert the holders nodes into a Map of permissions to be applied on the platform
-     *
-     * @param server        the server
-     * @param world         the world
-     * @param extraContext  any extra context to filter by
-     * @param includeGlobal whether to include global nodes
-     * @param possibleNodes a list of possible permissions for resolving wildcards
-     * @param applyGroups   if inherited group permissions should be included
-     * @return a map of permissions
-     * @since 2.6
-     * @deprecated in favour of {@link #getAllNodesFiltered(Contexts)}
-     */
-    @Deprecated
-    Map<String, Boolean> getPermissions(String server, String world, Map<String, String> extraContext, boolean includeGlobal, List<String> possibleNodes, boolean applyGroups);
-
-    /**
-     * Processes the nodes and returns the temporary ones.
-     *
-     * @return a map of temporary nodes
-     * @deprecated in favour of {@link #getTemporaryPermissionNodes()}
-     */
-    @Deprecated
-    Map<Map.Entry<String, Boolean>, Long> getTemporaryNodes();
-
-    /**
-     * Processes the nodes and returns the non-temporary ones.
-     *
-     * @return a map of permanent nodes
-     * @deprecated in favour of {@link #getPermanentPermissionNodes()}
-     */
-    @Deprecated
-    Map<String, Boolean> getPermanentNodes();
-
 }

api/src/main/java/me/lucko/luckperms/api/PlatformType.java

@@ -31,12 +31,7 @@ public enum PlatformType {
 
     BUKKIT("Bukkit"),
     BUNGEE("Bungee"),
-    SPONGE("Sponge"),
-
-    /**
-     * @since 2.9
-     */
-    STANDALONE("Standalone");
+    SPONGE("Sponge");
 
     private final String friendlyName;
 

api/src/main/java/me/lucko/luckperms/api/Storage.java

@@ -34,11 +34,11 @@ import java.util.function.Consumer;
  *
  * <p>All methods return {@link CompletableFuture}s, which will be populated with the result once the data has been
  * loaded asynchronously. Care should be taken when using the methods to ensure that the main server thread is not
- * blocked.
+ * blocked.</p>
  *
  * <p>Methods such as {@link CompletableFuture#get()} and equivalent should <strong>not</strong> be called on the main
  * server thread. If you need to use the result of these operations on the main server thread, please register a
- * callback using {@link CompletableFuture#thenAcceptAsync(Consumer, Executor)} and {@link #getSyncExecutor()}.
+ * callback using {@link CompletableFuture#thenAcceptAsync(Consumer, Executor)} and {@link #getSyncExecutor()}.</p>
  *
  * @since 2.14
  */

api/src/main/java/me/lucko/luckperms/api/Track.java

@@ -41,7 +41,7 @@ public interface Track {
     /**
      * Gets an ordered list of the groups on this track
      *
-     * <p> Index 0 is the first/lowest group in (or start of) the track
+     * <p>Index 0 is the first/lowest group in (or start of) the track</p>
      *
      * @return an ordered {@link List} of the groups on this track
      */

api/src/main/java/me/lucko/luckperms/api/Tristate.java

@@ -25,8 +25,8 @@ package me.lucko.luckperms.api;
 /**
  * Represents a permission setting.
  *
- * <p> Consider a value of {@link #FALSE} to be a "negated" setting, and a value of {@link #UNDEFINED} to be a
- * non-existent value.
+ * <p>Consider a value of {@link #FALSE} to be a "negated" setting, and a value of {@link #UNDEFINED} to be a
+ * non-existent value.</p>
  */
 public enum Tristate {
 
@@ -63,7 +63,8 @@ public enum Tristate {
 
     /**
      * Returns the value of the Tristate as a boolean.
-     * <p> A value of {@link #UNDEFINED} converts to false.
+     *
+     * <p>A value of {@link #UNDEFINED} converts to false.</p>
      *
      * @return a boolean representation of the Tristate.
      */

api/src/main/java/me/lucko/luckperms/api/User.java

@@ -69,8 +69,8 @@ public interface User extends PermissionHolder {
     /**
      * Refresh and re-assign the users permissions.
      *
-     * <p> This request is not buffered, and the refresh call will be ran directly. This should ideally be called on
-     * an asynchronous thread.
+     * <p>This request is not buffered, and the refresh call will be ran directly. This should ideally be called on
+     * an asynchronous thread.</p>
      */
     void refreshPermissions();
 
@@ -128,7 +128,9 @@ public interface User extends PermissionHolder {
      * @throws ObjectAlreadyHasException if the user is already a member of the group
      * @throws NullPointerException      if the group is null
      * @throws IllegalStateException     if the group instance was not obtained from LuckPerms.
+     * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
+    @Deprecated
     void addGroup(Group group) throws ObjectAlreadyHasException;
 
     /**
@@ -140,7 +142,9 @@ public interface User extends PermissionHolder {
      * @throws NullPointerException      if the group or server is null
      * @throws IllegalStateException     if the group instance was not obtained from LuckPerms.
      * @throws IllegalArgumentException  if the server is invalid
+     * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
+    @Deprecated
     void addGroup(Group group, String server) throws ObjectAlreadyHasException;
 
     /**
@@ -153,7 +157,9 @@ public interface User extends PermissionHolder {
      * @throws NullPointerException      if the group, server or world is null
      * @throws IllegalStateException     if the group instance was not obtained from LuckPerms.
      * @throws IllegalArgumentException  if the server or world is invalid
+     * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
+    @Deprecated
     void addGroup(Group group, String server, String world) throws ObjectAlreadyHasException;
 
     /**
@@ -165,7 +171,9 @@ public interface User extends PermissionHolder {
      * @throws NullPointerException      if the group is null
      * @throws IllegalStateException     if the group instance was not obtained from LuckPerms.
      * @throws IllegalArgumentException  if the expiry time is in the past
+     * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
+    @Deprecated
     void addGroup(Group group, long expireAt) throws ObjectAlreadyHasException;
 
     /**
@@ -178,7 +186,9 @@ public interface User extends PermissionHolder {
      * @throws NullPointerException      if the group or server is null
      * @throws IllegalStateException     if the group instance was not obtained from LuckPerms.
      * @throws IllegalArgumentException  if the expiry time is in the past or the server is invalid
+     * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
+    @Deprecated
     void addGroup(Group group, String server, long expireAt) throws ObjectAlreadyHasException;
 
     /**
@@ -192,7 +202,9 @@ public interface User extends PermissionHolder {
      * @throws NullPointerException      if the group, server or world is null
      * @throws IllegalStateException     if the group instance was not obtained from LuckPerms.
      * @throws IllegalArgumentException  if the expiry time is in the past or the server/world is invalid
+     * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
+    @Deprecated
     void addGroup(Group group, String server, String world, long expireAt) throws ObjectAlreadyHasException;
 
     /**
@@ -202,7 +214,9 @@ public interface User extends PermissionHolder {
      * @throws ObjectLacksException  if the user isn't a member of the group
      * @throws NullPointerException  if the group is null
      * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
+     * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
+    @Deprecated
     void removeGroup(Group group) throws ObjectLacksException;
 
     /**
@@ -213,7 +227,9 @@ public interface User extends PermissionHolder {
      * @throws ObjectLacksException  if the user isn't a member of the group
      * @throws NullPointerException  if the group is null
      * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
+     * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
+    @Deprecated
     void removeGroup(Group group, boolean temporary) throws ObjectLacksException;
 
     /**
@@ -225,7 +241,9 @@ public interface User extends PermissionHolder {
      * @throws NullPointerException     if the group or server is null
      * @throws IllegalStateException    if the group instance was not obtained from LuckPerms.
      * @throws IllegalArgumentException if the server is invalid
+     * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
+    @Deprecated
     void removeGroup(Group group, String server) throws ObjectLacksException;
 
     /**
@@ -238,7 +256,9 @@ public interface User extends PermissionHolder {
      * @throws NullPointerException     if the group, server or world is null
      * @throws IllegalStateException    if the group instance was not obtained from LuckPerms.
      * @throws IllegalArgumentException if the server or world is invalid
+     * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
+    @Deprecated
     void removeGroup(Group group, String server, String world) throws ObjectLacksException;
 
     /**
@@ -251,7 +271,9 @@ public interface User extends PermissionHolder {
      * @throws NullPointerException     if the group or server is null
      * @throws IllegalStateException    if the group instance was not obtained from LuckPerms.
      * @throws IllegalArgumentException if the expiry time is in the past or the server is invalid
+     * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
+    @Deprecated
     void removeGroup(Group group, String server, boolean temporary) throws ObjectLacksException;
 
     /**
@@ -265,7 +287,9 @@ public interface User extends PermissionHolder {
      * @throws NullPointerException     if the group, server or world is null
      * @throws IllegalStateException    if the group instance was not obtained from LuckPerms.
      * @throws IllegalArgumentException if the expiry time is in the past or the server/world is invalid
+     * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
+    @Deprecated
     void removeGroup(Group group, String server, String world, boolean temporary) throws ObjectLacksException;
 
     /**

api/src/main/java/me/lucko/luckperms/api/UuidCache.java

@@ -27,15 +27,15 @@ import java.util.UUID;
 /**
  * A UUID cache for online users, between external Mojang UUIDs, and internal LuckPerms UUIDs.
  *
- * <p> This UuidCache is a means of allowing users to have the same internal UUID across a network of offline mode
+ * <p>This UuidCache is a means of allowing users to have the same internal UUID across a network of offline mode
  * servers or mixed offline mode and online mode servers. Platforms running in offline mode generate a UUID for a
  * user when they first join the server, but this UUID will then not be consistent across the network. LuckPerms will
  * instead check the datastore cache, to get a UUID for a user that is consistent across an entire network.
  *
- * <p> If you want to get a user object from the Storage using the api on a server in offline mode, you will need to use
+ * <p>If you want to get a user object from the Storage using the api on a server in offline mode, you will need to use
  * this cache, OR use Storage#getUUID, for users that are not online.
  *
- * <p> THIS IS ONLY EFFECTIVE FOR ONLINE PLAYERS. USE THE DATASTORE METHODS FOR OFFLINE PLAYERS.
+ * <p><strong>This is only effective for online players. Use {@link Storage#getUUID(String)} for offline players.</strong></p>
  */
 public interface UuidCache {
 

api/src/main/java/me/lucko/luckperms/api/caching/PermissionData.java

@@ -45,7 +45,7 @@ public interface PermissionData {
     /**
      * Invalidates the underlying permission calculator cache.
      *
-     * <p> Can be called to allow for an update in defaults.
+     * <p>Can be called to allow for an update in defaults.</p>
      */
     void invalidateCache();
 

api/src/main/java/me/lucko/luckperms/api/caching/UserData.java

@@ -30,7 +30,7 @@ import java.util.Set;
  * Holds cached permission and meta lookup data for a {@link me.lucko.luckperms.api.User}.
  *
  * <p>Data is only likely to be available for online users. All calls will account for inheritance, as well as any
- * default data provided by the platform. This calls are heavily cached and are therefore fast.
+ * default data provided by the platform. This calls are heavily cached and are therefore fast.</p>
  *
  * @since 2.13
  */
@@ -39,7 +39,7 @@ public interface UserData {
     /**
      * Gets PermissionData from the cache, given a specified context.
      *
-     * <p> If the data is not cached, it is calculated. Therefore, this call could be costly.
+     * <p>If the data is not cached, it is calculated. Therefore, this call could be costly.</p>
      *
      * @param contexts the contexts to get the permission data in
      * @return a permission data instance
@@ -50,7 +50,7 @@ public interface UserData {
     /**
      * Gets MetaData from the cache, given a specified context.
      *
-     * <p> If the data is not cached, it is calculated. Therefore, this call could be costly.
+     * <p>If the data is not cached, it is calculated. Therefore, this call could be costly.</p>
      *
      * @param contexts the contexts to get the permission data in
      * @return a meta data instance
@@ -79,8 +79,8 @@ public interface UserData {
     /**
      * Calculates permission data and stores it in the cache.
      *
-     * <p> If there is already data cached for the given contexts, and if the resultant output is different,
-     * the cached value is updated.
+     * <p>If there is already data cached for the given contexts, and if the resultant output is different,
+     * the cached value is updated.</p>
      *
      * @param contexts the contexts to recalculate in.
      * @throws NullPointerException if contexts is null
@@ -90,8 +90,8 @@ public interface UserData {
     /**
      * Calculates meta data and stores it in the cache.
      *
-     * <p> If there is already data cached for the given contexts, and if the resultant output is different,
-     * the cached value is updated.
+     * <p>If there is already data cached for the given contexts, and if the resultant output is different,
+     * the cached value is updated.</p>
      *
      * @param contexts the contexts to recalculate in.
      * @throws NullPointerException if contexts is null
@@ -119,7 +119,7 @@ public interface UserData {
     /**
      * Ensures that PermissionData and MetaData is cached for a context.
      *
-     * <p> If the cache does not contain any data for the context, it will be calculated and saved.
+     * <p>If the cache does not contain any data for the context, it will be calculated and saved.</p>
      *
      * @param contexts the contexts to pre-calculate for
      * @throws NullPointerException if contexts is null
@@ -128,7 +128,8 @@ public interface UserData {
 
     /**
      * Invalidates all of the underlying Permission calculators.
-     * Can be called to allow for an update in defaults.
+     *
+     * <p>Can be called to allow for an update in defaults.</p>
      */
     void invalidatePermissionCalculators();
 

api/src/main/java/me/lucko/luckperms/api/context/ContextCalculator.java

@@ -22,55 +22,22 @@
 
 package me.lucko.luckperms.api.context;
 
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CopyOnWriteArrayList;
-
 /**
- * A simple implementation of the listener aspects of {@link IContextCalculator}
+ * Calculates whether contexts are applicable to {@link T}
  *
- * @param <T> the subject type
+ * @param <T> the subject type. Is ALWAYS the player class of the platform.
+ * @since 2.13
  */
-public abstract class ContextCalculator<T> implements IContextCalculator<T> {
-    private final List<ContextListener<T>> listeners = new CopyOnWriteArrayList<>();
+public interface ContextCalculator<T> {
 
     /**
-     * Pushes an update to all registered {@link ContextListener}s.
-     * Make sure any changes are applied internally before this method is called.
+     * Gives the subject all of the applicable contexts they meet
      *
-     * @param subject the subject that changed
-     * @param before  the context state before the change
-     * @param current the context state after the change (now)
-     * @throws NullPointerException if any parameters are null
+     * @param subject     the subject to add contexts to
+     * @param accumulator a map of contexts to add to
+     * @return the map
+     * @since 2.13
      */
-    protected void pushUpdate(T subject, Map.Entry<String, String> before, Map.Entry<String, String> current) {
-        if (subject == null) {
-            throw new NullPointerException("subject");
-        }
-        if (before == null) {
-            throw new NullPointerException("before");
-        }
-        if (current == null) {
-            throw new NullPointerException("current");
-        }
-
-        for (ContextListener<T> listener : listeners) {
-            try {
-                listener.onContextChange(subject, before, current);
-            } catch (Exception e) {
-                System.out.println("Exception whilst passing context change to listener: " + listener);
-                e.printStackTrace();
-            }
-        }
-    }
-
-    @Override
-    public void addListener(ContextListener<T> listener) {
-        if (listener == null) {
-            throw new NullPointerException("listener");
-        }
-
-        listeners.add(listener);
-    }
+    MutableContextSet giveApplicableContext(T subject, MutableContextSet accumulator);
 
 }

api/src/main/java/me/lucko/luckperms/api/context/ContextSet.java

@@ -25,18 +25,20 @@ package me.lucko.luckperms.api.context;
 import com.google.common.collect.Multimap;
 
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 
 /**
- * Holds contexts.
- * Implementations may be either mutable or immutable.
+ * Holder of contexts.
+ *
+ * <p>Implementations may be either mutable or immutable.</p>
  *
  * @since 2.13
  */
 public interface ContextSet {
 
     /**
-     * Make a singleton ImmutableContextSet from a context pair
+     * Creates an ImmutableContextSet from a context pair
      *
      * @param key   the key
      * @param value the value
@@ -48,7 +50,22 @@ public interface ContextSet {
     }
 
     /**
-     * Creates a ImmutableContextSet from an existing map
+     * Creates an ImmutableContextSet from two context pairs
+     *
+     * @param key1 the first key
+     * @param value1 the first value
+     * @param key2 the second key
+     * @param value2 the second value
+     * @return a new ImmutableContextSet containing the two pairs
+     * @throws NullPointerException if any of the keys or values are null
+     * @since 3.1
+     */
+    static ImmutableContextSet of(String key1, String value1, String key2, String value2) {
+        return ImmutableContextSet.of(key1, value1, key2, value2);
+    }
+
+    /**
+     * Creates an ImmutableContextSet from an existing map
      *
      * @param map the map to copy from
      * @return a new ImmutableContextSet representing the pairs from the map
@@ -59,7 +76,7 @@ public interface ContextSet {
     }
 
     /**
-     * Creates a ImmutableContextSet from an existing iterable of Map Entries
+     * Creates an ImmutableContextSet from an existing iterable of Map Entries
      *
      * @param iterable the iterable to copy from
      * @return a new ImmutableContextSet representing the pairs in the iterable
@@ -70,7 +87,7 @@ public interface ContextSet {
     }
 
     /**
-     * Creates a ImmutableContextSet from an existing multimap
+     * Creates an ImmutableContextSet from an existing multimap
      *
      * @param multimap the multimap to copy from
      * @return a new ImmutableContextSet representing the pairs in the multimap
@@ -82,7 +99,7 @@ public interface ContextSet {
     }
 
     /**
-     * Creates a new ImmutableContextSet from an existing set.
+     * Creates an new ImmutableContextSet from an existing set.
      * Only really useful for converting between mutable and immutable types.
      *
      * @param contextSet the context set to copy from
@@ -167,6 +184,17 @@ public interface ContextSet {
      */
     Set<String> getValues(String key);
 
+    /**
+     * Returns any value from this set matching the key, if present.
+     *
+     * @param key the key to find values for
+     * @return an optional containing any match
+     * @since 3.1
+     */
+    default Optional<String> getAnyValue(String key) {
+        return getValues(key).stream().findAny();
+    }
+
     /**
      * Check if thr set contains a given key mapped to a given value
      *
@@ -187,6 +215,35 @@ public interface ContextSet {
      */
     boolean hasIgnoreCase(String key, String value);
 
+    /**
+     * Checks to see if all entries in this context set are also included in another set.
+     *
+     * @param other the other set to check
+     * @return true if all entries in this set are also in the other set
+     * @since 3.1
+     */
+    default boolean isSatisfiedBy(ContextSet other) {
+        if (this.isEmpty()) {
+            // this is empty, so is therefore always satisfied.
+            return true;
+        } else if (other.isEmpty()) {
+            // this set isn't empty, but the other one is
+            return false;
+        } else if (this.size() > other.size()) {
+            // this set has more unique entries than the other set, so there's no way this can be satisfied.
+            return false;
+        } else {
+            // neither are empty, we need to compare the individual entries
+            for (Map.Entry<String, String> pair : toSet()) {
+                if (!other.has(pair.getKey(), pair.getValue())) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+    }
+
     /**
      * Check if the set is empty
      *

api/src/main/java/me/lucko/luckperms/api/context/IContextCalculator.java

@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included in all
- *  copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
- */
-
-package me.lucko.luckperms.api.context;
-
-import java.util.Map;
-
-/**
- * Calculates whether contexts are applicable to {@link T}
- *
- * <p>Somewhat inspired by the system used on Sponge.
- *
- * @param <T> the subject type. Is ALWAYS the player class of the platform.
- */
-public interface IContextCalculator<T> {
-
-    /**
-     * Gives the subject all of the applicable contexts they meet
-     *
-     * @param subject     the subject to add contexts to
-     * @param accumulator a map of contexts to add to
-     * @return the map
-     * @since 2.13
-     */
-    MutableContextSet giveApplicableContext(T subject, MutableContextSet accumulator);
-
-    /**
-     * Checks to see if a context is applicable to a subject
-     *
-     * @param subject the subject to check against
-     * @param context the context to check for
-     * @return true if met, or false if not. If this calculator does not calculate the given context, return false.
-     */
-    boolean isContextApplicable(T subject, Map.Entry<String, String> context);
-
-    /**
-     * Adds a listener to be called whenever a context handled by this calculator changes
-     *
-     * @param listener the listener instance
-     * @throws NullPointerException if listener is null
-     */
-    void addListener(ContextListener<T> listener);
-
-}

api/src/main/java/me/lucko/luckperms/api/context/ImmutableContextSet.java

@@ -23,9 +23,10 @@
 package me.lucko.luckperms.api.context;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSetMultimap;
 import com.google.common.collect.Multimap;
+import com.google.common.collect.SetMultimap;
 
 import java.util.Collection;
 import java.util.Map;
@@ -37,10 +38,10 @@ import java.util.Set;
  * @since 2.16
  */
 public final class ImmutableContextSet implements ContextSet {
-    private static final ImmutableContextSet EMPTY = new ImmutableContextSet(ImmutableMultimap.of());
+    private static final ImmutableContextSet EMPTY = new ImmutableContextSet(ImmutableSetMultimap.of());
 
     /**
-     * Make a singleton ImmutableContextSet from a context pair
+     * Creates an ImmutableContextSet from a context pair
      *
      * @param key   the key
      * @param value the value
@@ -55,11 +56,39 @@ public final class ImmutableContextSet implements ContextSet {
             throw new NullPointerException("value");
         }
 
-        return new ImmutableContextSet(ImmutableMultimap.of(key.toLowerCase(), value));
+        return new ImmutableContextSet(ImmutableSetMultimap.of(key.toLowerCase(), value));
     }
 
     /**
-     * Creates a ImmutableContextSet from an existing map
+     * Creates an ImmutableContextSet from two context pairs
+     *
+     * @param key1 the first key
+     * @param value1 the first value
+     * @param key2 the second key
+     * @param value2 the second value
+     * @return a new ImmutableContextSet containing the two pairs
+     * @throws NullPointerException if any of the keys or values are null
+     * @since 3.1
+     */
+    public static ImmutableContextSet of(String key1, String value1, String key2, String value2) {
+        if (key1 == null) {
+            throw new NullPointerException("key1");
+        }
+        if (value1 == null) {
+            throw new NullPointerException("value1");
+        }
+        if (key2 == null) {
+            throw new NullPointerException("key2");
+        }
+        if (value2 == null) {
+            throw new NullPointerException("value2");
+        }
+
+        return new ImmutableContextSet(ImmutableSetMultimap.of(key1.toLowerCase(), value1, key2.toLowerCase(), value2));
+    }
+
+    /**
+     * Creates an ImmutableContextSet from an existing map
      *
      * @param map the map to copy from
      * @return a new ImmutableContextSet representing the pairs from the map
@@ -70,16 +99,16 @@ public final class ImmutableContextSet implements ContextSet {
             throw new NullPointerException("map");
         }
 
-        ImmutableMultimap.Builder<String, String> b = ImmutableMultimap.builder();
+        ImmutableSetMultimap.Builder<String, String> b = ImmutableSetMultimap.builder();
         for (Map.Entry<String, String> e : map.entrySet()) {
-            b.put(e.getKey(), e.getValue());
+            b.put(e.getKey().toLowerCase(), e.getValue());
         }
 
         return new ImmutableContextSet(b.build());
     }
 
     /**
-     * Creates a ImmutableContextSet from an existing iterable of Map Entries
+     * Creates an ImmutableContextSet from an existing iterable of Map Entries
      *
      * @param iterable the iterable to copy from
      * @return a new ImmutableContextSet representing the pairs in the iterable
@@ -94,7 +123,7 @@ public final class ImmutableContextSet implements ContextSet {
     }
 
     /**
-     * Creates a ImmutableContextSet from an existing multimap
+     * Creates an ImmutableContextSet from an existing multimap
      *
      * @param multimap the multimap to copy from
      * @return a new ImmutableContextSet representing the pairs in the multimap
@@ -121,7 +150,7 @@ public final class ImmutableContextSet implements ContextSet {
     }
 
     /**
-     * Creates a new empty ContextSet.
+     * Creates an new empty ContextSet.
      *
      * @return a new ContextSet
      */
@@ -129,10 +158,10 @@ public final class ImmutableContextSet implements ContextSet {
         return EMPTY;
     }
 
-    private final Multimap<String, String> map;
+    private final SetMultimap<String, String> map;
 
     ImmutableContextSet(Multimap<String, String> contexts) {
-        this.map = ImmutableMultimap.copyOf(contexts);
+        this.map = ImmutableSetMultimap.copyOf(contexts);
     }
 
     @Override

api/src/main/java/me/lucko/luckperms/api/context/MutableContextSet.java

@@ -25,8 +25,10 @@ package me.lucko.luckperms.api.context;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSetMultimap;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
+import com.google.common.collect.SetMultimap;
 
 import java.util.Collection;
 import java.util.Map;
@@ -60,6 +62,36 @@ public final class MutableContextSet implements ContextSet {
         return set;
     }
 
+    /**
+     * Makes a MutableContextSet from two context pairs
+     *
+     * @param key1 the first key
+     * @param value1 the first value
+     * @param key2 the second key
+     * @param value2 the second value
+     * @return a new MutableContextSet containing the two pairs
+     * @throws NullPointerException if any of the keys or values are null
+     * @since 3.1
+     */
+    public static MutableContextSet of(String key1, String value1, String key2, String value2) {
+        if (key1 == null) {
+            throw new NullPointerException("key1");
+        }
+        if (value1 == null) {
+            throw new NullPointerException("value1");
+        }
+        if (key2 == null) {
+            throw new NullPointerException("key2");
+        }
+        if (value2 == null) {
+            throw new NullPointerException("value2");
+        }
+
+        MutableContextSet ret = singleton(key1, value1);
+        ret.add(key2, value2);
+        return ret;
+    }
+
     /**
      * Creates a MutableContextSet from an existing map
      *
@@ -136,14 +168,14 @@ public final class MutableContextSet implements ContextSet {
         return new MutableContextSet();
     }
 
-    private final Multimap<String, String> map;
+    private final SetMultimap<String, String> map;
 
     public MutableContextSet() {
-        this.map = Multimaps.synchronizedMultimap(HashMultimap.create());
+        this.map = Multimaps.synchronizedSetMultimap(HashMultimap.create());
     }
 
     private MutableContextSet(Multimap<String, String> contexts) {
-        this.map = Multimaps.synchronizedMultimap(HashMultimap.create(contexts));
+        this.map = Multimaps.synchronizedSetMultimap(HashMultimap.create(contexts));
     }
 
     @Override
@@ -178,7 +210,7 @@ public final class MutableContextSet implements ContextSet {
 
     @Override
     public Multimap<String, String> toMultimap() {
-        return map;
+        return ImmutableSetMultimap.copyOf(map);
     }
 
     @Override
@@ -284,7 +316,7 @@ public final class MutableContextSet implements ContextSet {
      */
     public void addAll(Iterable<? extends Map.Entry<String, String>> iterable) {
         if (iterable == null) {
-            throw new NullPointerException("contexts");
+            throw new NullPointerException("iterable");
         }
 
         for (Map.Entry<String, String> e : iterable) {
@@ -300,7 +332,7 @@ public final class MutableContextSet implements ContextSet {
      */
     public void addAll(Map<String, String> map) {
         if (map == null) {
-            throw new NullPointerException("contexts");
+            throw new NullPointerException("map");
         }
         addAll(map.entrySet());
     }
@@ -334,7 +366,7 @@ public final class MutableContextSet implements ContextSet {
             throw new NullPointerException("value");
         }
 
-        map.entries().removeIf(entry -> entry.getKey().equalsIgnoreCase(key) && entry.getValue().equals(value));
+        map.entries().removeIf(entry -> entry.getKey().equals(key) && entry.getValue().equals(value));
     }
 
     /**

api/src/main/java/me/lucko/luckperms/api/data/Callback.java

@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included in all
- *  copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
- */
-
-package me.lucko.luckperms.api.data;
-
-import java.util.function.Consumer;
-
-/**
- * A callback used to wait for the completion of asynchronous operations.
- * All callbacks are ran on the main server thread.
- *
- * @param <T> the return type
- * @deprecated in favour of {@link Consumer}
- */
-@Deprecated
-public interface Callback<T> {
-
-    static <T> Callback<T> empty() {
-        return t -> {
-        };
-    }
-
-    static <T> Callback<T> of(Runnable runnable) {
-        if (runnable == null) {
-            throw new NullPointerException("runnable");
-        }
-        return t -> runnable.run();
-    }
-
-    static <T> Callback<T> of(Consumer<T> consumer) {
-        if (consumer == null) {
-            throw new NullPointerException("consumer");
-        }
-        return consumer::accept;
-    }
-
-    /**
-     * Helper method for converting old {@link Callback}s to use the new {@link me.lucko.luckperms.api.Storage}
-     * interface.
-     *
-     * @param callback the callback to convert
-     * @param <T>      the return type
-     * @return a consumer instance
-     * @since 2.14
-     * @deprecated in favour of just using {@link Consumer}s.
-     */
-    @Deprecated
-    static <T> Consumer<T> convertToConsumer(Callback<T> callback) {
-        return callback::onComplete;
-    }
-
-    /**
-     * Called when the operation completes.
-     *
-     * @param t the return value, may be null
-     */
-    void onComplete(T t);
-
-}

api/src/main/java/me/lucko/luckperms/api/data/DatastoreConfiguration.java

@@ -26,8 +26,7 @@ package me.lucko.luckperms.api.data;
  * Represents the data section of the main LuckPerms configuration.
  * All methods could return null.
  */
-@SuppressWarnings("deprecation")
-public interface DatastoreConfiguration extends MySQLConfiguration {
+public interface DatastoreConfiguration {
 
     String getAddress();
 

api/src/main/java/me/lucko/luckperms/api/event/Cancellable.java

@@ -22,21 +22,18 @@
 
 package me.lucko.luckperms.api.event;
 
-import me.lucko.luckperms.api.User;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
- * Represents an event acting upon a user.
+ * Represents an event that can be cancelled
  */
-public class UserEvent extends LPEvent {
+public interface Cancellable {
 
-    private final User user;
+    /**
+     * Gets an {@link AtomicBoolean} holding the cancellation state of the event
+     *
+     * @return the cancellation
+     */
+    AtomicBoolean getCancellationState();
 
-    protected UserEvent(String eventName, User user) {
-        super(eventName);
-        this.user = user;
-    }
-
-    public User getUser() {
-        return user;
-    }
 }

api/src/main/java/me/lucko/luckperms/api/event/EventBus.java

@@ -22,39 +22,33 @@
 
 package me.lucko.luckperms.api.event;
 
-import me.lucko.luckperms.api.LuckPermsApi;
+import java.util.Set;
+import java.util.function.Consumer;
 
 /**
- * Abstract LuckPerms Event class.
+ * The LuckPerms event bus. Used for subscribing (or registering listeners) to events.
+ *
+ * @since 3.0
  */
-public abstract class LPEvent {
+public interface EventBus {
 
     /**
-     * A friendly name of the event
+     * Subscribe to an event
+     *
+     * @param eventClass the event class
+     * @param handler    the event handler
+     * @param <T>        the event class
+     * @return an event handler instance representing this subscription
      */
-    private final String eventName;
+    <T extends LuckPermsEvent> EventHandler<T> subscribe(Class<T> eventClass, Consumer<T> handler);
+
     /**
-     * A link to the API instance provided for convenience.
+     * Gets a set of all registered handlers for a given event
+     *
+     * @param eventClass the event to find handlers for
+     * @param <T>        the event class
+     * @return an immutable set of event handlers
      */
-    private LuckPermsApi api = null;
-
-    protected LPEvent(String eventName) {
-        this.eventName = eventName;
-    }
-
-    public String getEventName() {
-        return eventName;
-    }
-
-    public LuckPermsApi getApi() {
-        return api;
-    }
-
-    public void setApi(LuckPermsApi api) {
-        if (this.api != null) {
-            throw new IllegalStateException("API can only be set once.");
-        }
-        this.api = api;
-    }
+    <T extends LuckPermsEvent> Set<EventHandler<T>> getHandlers(Class<T> eventClass);
 
 }

api/src/main/java/me/lucko/luckperms/api/event/EventHandler.java

@@ -22,41 +22,48 @@
 
 package me.lucko.luckperms.api.event;
 
-import me.lucko.luckperms.api.PermissionHolder;
+import java.util.function.Consumer;
 
-import java.util.Optional;
-
-public class AbstractPermissionRemoveEvent extends TargetedEvent<PermissionHolder> {
-
-    private final String server;
-    private final String world;
-    private final boolean temporary;
-
-    protected AbstractPermissionRemoveEvent(String eventName, PermissionHolder target, String server, String world, boolean temporary) {
-        super(eventName, target);
-        this.server = server;
-        this.world = world;
-        this.temporary = temporary;
-    }
-
-    public Optional<String> getServer() {
-        return Optional.ofNullable(server);
-    }
-
-    public Optional<String> getWorld() {
-        return Optional.ofNullable(world);
-    }
+/**
+ * Represents a handler for a LuckPerms event
+ *
+ * @param <T> the event class
+ */
+public interface EventHandler<T extends LuckPermsEvent> {
 
     /**
-     * @deprecated use {@link #isTemporary()}
+     * Gets the class this handler is listening to
+     *
+     * @return the event class
      */
-    @Deprecated
-    public boolean getTemporary() {
-        return temporary;
-    }
+    Class<T> getEventClass();
 
-    public boolean isTemporary() {
-        return temporary;
-    }
+    /**
+     * Returns true if this handler is active
+     *
+     * @return true if this handler is still active
+     */
+    boolean isActive();
+
+    /**
+     * Unregisters this handler from the event bus
+     *
+     * @return true if the handler wasn't already unregistered
+     */
+    boolean unregister();
+
+    /**
+     * Gets the event consumer responsible for handling the event
+     *
+     * @return the event consumer
+     */
+    Consumer<T> getConsumer();
+
+    /**
+     * Gets the number of times this handler has been called
+     *
+     * @return the number of times this handler has been called
+     */
+    int getCallCount();
 
 }

api/src/main/java/me/lucko/luckperms/api/event/LuckPermsEvent.java

@@ -22,21 +22,20 @@
 
 package me.lucko.luckperms.api.event;
 
+import me.lucko.luckperms.api.LuckPermsApi;
+
 /**
- * Represents an event acting upon a target
+ * The base event interface
  *
- * @param <T> the target type
+ * @since 3.0
  */
-public class TargetedEvent<T> extends LPEvent {
+public interface LuckPermsEvent {
 
-    private final T target;
+    /**
+     * Get the API instance this event was dispatched from
+     *
+     * @return the api instance
+     */
+    LuckPermsApi getApi();
 
-    protected TargetedEvent(String eventName, T target) {
-        super(eventName);
-        this.target = target;
-    }
-
-    public T getTarget() {
-        return target;
-    }
 }

api/src/main/java/me/lucko/luckperms/api/event/cause/CreationCause.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package me.lucko.luckperms.api.event.cause;
+
+/**
+ * The cause of a group/track creation
+ */
+public enum CreationCause {
+
+    /**
+     * The creation was caused by a command
+     */
+    COMMAND,
+
+    /**
+     * The creation was caused by an API call
+     */
+    API,
+
+    /**
+     * The creation was caused by a LuckPerms internal
+     */
+    INTERNAL
+
+}

api/src/main/java/me/lucko/luckperms/api/event/cause/DeletionCause.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package me.lucko.luckperms.api.event.cause;
+
+/**
+ * The cause of a group/track deletion
+ */
+public enum DeletionCause {
+
+    /**
+     * The deletion was caused by a command
+     */
+    COMMAND,
+
+    /**
+     * The deletion was caused by an API call
+     */
+    API,
+
+    /**
+     * The deletion was caused by a LuckPerms internal
+     */
+    INTERNAL
+
+}

api/src/main/java/me/lucko/luckperms/api/event/events/GroupRemoveEvent.java

@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included in all
- *  copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
- */
-
-package me.lucko.luckperms.api.event.events;
-
-import me.lucko.luckperms.api.PermissionHolder;
-import me.lucko.luckperms.api.event.AbstractPermissionRemoveEvent;
-
-/**
- * Called whenever a user or group is removed from / stops inheriting another group
- */
-public class GroupRemoveEvent extends AbstractPermissionRemoveEvent {
-
-    /**
-     * The name of group being removed from the target.
-     * Be aware that this group may have already been deleted, and and instance may therefore not exist internally.
-     */
-    private final String group;
-
-    public GroupRemoveEvent(PermissionHolder target, String group, String server, String world, boolean temporary) {
-        super("Group Remove Event", target, server, world, temporary);
-        this.group = group;
-    }
-
-    public String getGroup() {
-        return group;
-    }
-}

api/src/main/java/me/lucko/luckperms/api/event/events/PermissionUnsetEvent.java

@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included in all
- *  copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
- */
-
-package me.lucko.luckperms.api.event.events;
-
-import me.lucko.luckperms.api.PermissionHolder;
-import me.lucko.luckperms.api.event.AbstractPermissionRemoveEvent;
-
-/**
- * Called whenever a user or group has a permission unset.
- *
- * @deprecated in favour of {@link PermissionNodeUnsetEvent}
- */
-@Deprecated
-public class PermissionUnsetEvent extends AbstractPermissionRemoveEvent {
-
-    private final String node;
-
-    public PermissionUnsetEvent(PermissionHolder target, String node, String server, String world, boolean temporary) {
-        super("Permission Unset Event", target, server, world, temporary);
-        this.node = node;
-    }
-
-    public String getNode() {
-        return node;
-    }
-}

api/src/main/java/me/lucko/luckperms/api/event/group/GroupCreateEvent.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package me.lucko.luckperms.api.event.group;
+
+import me.lucko.luckperms.api.Group;
+import me.lucko.luckperms.api.event.LuckPermsEvent;
+import me.lucko.luckperms.api.event.cause.CreationCause;
+
+/**
+ * Called when a group is created
+ */
+public interface GroupCreateEvent extends LuckPermsEvent {
+
+    /**
+     * Gets the new group
+     *
+     * @return the new group
+     */
+    Group getGroup();
+
+    /**
+     * Gets the cause of the creation
+     *
+     * @return the cause of the creation
+     */
+    CreationCause getCause();
+
+}

api/src/main/java/me/lucko/luckperms/api/event/group/GroupDeleteEvent.java

@@ -20,19 +20,38 @@
  *  SOFTWARE.
  */
 
-package me.lucko.luckperms.api.event.events;
+package me.lucko.luckperms.api.event.group;
 
 import me.lucko.luckperms.api.Node;
-import me.lucko.luckperms.api.PermissionHolder;
-import me.lucko.luckperms.api.event.AbstractPermissionEvent;
+import me.lucko.luckperms.api.event.LuckPermsEvent;
+import me.lucko.luckperms.api.event.cause.DeletionCause;
+
+import java.util.Set;
 
 /**
- * Called when a permission node is set on a holder
- *
- * @since 2.6
+ * Called when a group is deleted
  */
-public class PermissionNodeSetEvent extends AbstractPermissionEvent {
-    public PermissionNodeSetEvent(PermissionHolder target, Node node) {
-        super("Permission Node Set Event", target, node);
-    }
+public interface GroupDeleteEvent extends LuckPermsEvent {
+
+    /**
+     * Gets the name of the deleted group
+     *
+     * @return the name of the deleted group
+     */
+    String getGroupName();
+
+    /**
+     * Gets an immutable copy of the groups existing data
+     *
+     * @return a copy of the groups existing data
+     */
+    Set<Node> getExistingData();
+
+    /**
+     * Gets the cause of the deletion
+     *
+     * @return the cause of the deletion
+     */
+    DeletionCause getCause();
+
 }

api/src/main/java/me/lucko/luckperms/api/event/group/GroupLoadAllEvent.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package me.lucko.luckperms.api.event.group;
+
+import me.lucko.luckperms.api.event.LuckPermsEvent;
+
+/**
+ * Called when all groups have been loaded in from storage.
+ *
+ * <p>Usually only called on startup and in sync tasks.</p>
+ */
+public interface GroupLoadAllEvent extends LuckPermsEvent {
+
+}

api/src/main/java/me/lucko/luckperms/api/event/group/GroupLoadEvent.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package me.lucko.luckperms.api.event.group;
+
+import me.lucko.luckperms.api.Group;
+import me.lucko.luckperms.api.event.LuckPermsEvent;
+
+/**
+ * Called when a group is loaded into memory from the storage.
+ *
+ * Note that this event is not the same as {@link GroupCreateEvent}
+ */
+public interface GroupLoadEvent extends LuckPermsEvent {
+
+    /**
+     * Gets the group that was loaded
+     *
+     * @return the group that was loaded
+     */
+    Group getGroup();
+
+}

api/src/main/java/me/lucko/luckperms/api/event/log/LogBroadcastEvent.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package me.lucko.luckperms.api.event.log;
+
+import me.lucko.luckperms.api.LogEntry;
+import me.lucko.luckperms.api.event.Cancellable;
+import me.lucko.luckperms.api.event.LuckPermsEvent;
+
+/**
+ * Called when a log entry is about to be sent to notifiable players on the platform
+ */
+public interface LogBroadcastEvent extends LuckPermsEvent, Cancellable {
+
+    /**
+     * Gets the log entry to be broadcasted
+     *
+     * @return the log entry to be broadcasted
+     */
+    LogEntry getEntry();
+
+}

api/src/main/java/me/lucko/luckperms/api/event/log/LogPublishEvent.java

@@ -20,24 +20,22 @@
  *  SOFTWARE.
  */
 
-package me.lucko.luckperms.api.event;
+package me.lucko.luckperms.api.event.log;
 
-import me.lucko.luckperms.api.Node;
-import me.lucko.luckperms.api.PermissionHolder;
+import me.lucko.luckperms.api.LogEntry;
+import me.lucko.luckperms.api.event.Cancellable;
+import me.lucko.luckperms.api.event.LuckPermsEvent;
 
 /**
- * @since 2.6
+ * Called when a log is about to be published to the storage file/table
  */
-public class AbstractPermissionEvent extends TargetedEvent<PermissionHolder> {
+public interface LogPublishEvent extends LuckPermsEvent, Cancellable {
 
-    private final Node node;
+    /**
+     * Gets the log entry to be published
+     *
+     * @return the log entry to be published
+     */
+    LogEntry getEntry();
 
-    protected AbstractPermissionEvent(String eventName, PermissionHolder target, Node node) {
-        super(eventName, target);
-        this.node = node;
-    }
-
-    public Node getNode() {
-        return node;
-    }
 }

api/src/main/java/me/lucko/luckperms/api/event/node/NodeAddEvent.java

@@ -20,19 +20,20 @@
  *  SOFTWARE.
  */
 
-package me.lucko.luckperms.api.data;
+package me.lucko.luckperms.api.event.node;
+
+import me.lucko.luckperms.api.Node;
 
 /**
- * @deprecated Use {@link DatastoreConfiguration}. This is now used by multiple datastores, not just MySQL.
+ * Called when a node is added to a holder
  */
-@Deprecated
-public interface MySQLConfiguration {
+public interface NodeAddEvent extends NodeMutateEvent {
 
-    String getAddress();
+    /**
+     * Gets the node that was added
+     *
+     * @return the node that was added
+     */
+    Node getNode();
 
-    String getDatabase();
-
-    String getUsername();
-
-    String getPassword();
 }

api/src/main/java/me/lucko/luckperms/api/event/node/NodeClearEvent.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package me.lucko.luckperms.api.event.node;
+
+/**
+ * Called when a holder has their nodes cleared
+ */
+public interface NodeClearEvent extends NodeMutateEvent {
+
+}

api/src/main/java/me/lucko/luckperms/api/event/node/NodeMutateEvent.java

@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package me.lucko.luckperms.api.event.node;
+
+import me.lucko.luckperms.api.Node;
+import me.lucko.luckperms.api.PermissionHolder;
+import me.lucko.luckperms.api.event.LuckPermsEvent;
+
+import java.util.Set;
+
+/**
+ * Called when a node is added to/removed from a user/group
+ */
+public interface NodeMutateEvent extends LuckPermsEvent {
+
+    /**
+     * Gets the target of the event
+     *
+     * @return the event target
+     */
+    PermissionHolder getTarget();
+
+    /**
+     * Gets an immutable copy of the holders data before the change
+     *
+     * @return the data before the change
+     */
+    Set<Node> getDataBefore();
+
+    /**
+     * Gets an immutable copy of the holders data after the change
+     *
+     * @return the data after the change
+     */
+    Set<Node> getDataAfter();
+
+    /**
+     * Gets whether the target of this event is a {@link me.lucko.luckperms.api.User}
+     *
+     * <p>This is equivalent to checking if getTarget() instanceof User</p>
+     *
+     * @return if the event is targeting a user
+     */
+    boolean isUser();
+
+    /**
+     * Gets whether the target of this event is a {@link me.lucko.luckperms.api.Group}
+     *
+     * <p>This is equivalent to checking if getTarget() instanceof Group</p>
+     *
+     * @return if the event is targeting a group
+     */
+    boolean isGroup();
+
+}

api/src/main/java/me/lucko/luckperms/api/event/node/NodeRemoveEvent.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package me.lucko.luckperms.api.event.node;
+
+import me.lucko.luckperms.api.Node;
+
+/**
+ * Called when a node is removed from a holder
+ */
+public interface NodeRemoveEvent extends NodeMutateEvent {
+
+    /**
+     * Gets the node that was removed
+     *
+     * @return the node that was removed
+     */
+    Node getNode();
+
+}

api/src/main/java/me/lucko/luckperms/api/event/sync/ConfigReloadEvent.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package me.lucko.luckperms.api.event.sync;
+
+import me.lucko.luckperms.api.event.LuckPermsEvent;
+
+/**
+ * Called when the configuration is reloaded
+ */
+public interface ConfigReloadEvent extends LuckPermsEvent {
+
+}

api/src/main/java/me/lucko/luckperms/api/event/sync/PostSyncEvent.java

@@ -20,17 +20,13 @@
  *  SOFTWARE.
  */
 
-package me.lucko.luckperms.api.event.events;
+package me.lucko.luckperms.api.event.sync;
 
-import me.lucko.luckperms.api.event.LPEvent;
+import me.lucko.luckperms.api.event.LuckPermsEvent;
 
 /**
- * Called after the sync task has ran.
+ * Called when an sync task has been completed
  */
-public class PostSyncEvent extends LPEvent {
-
-    public PostSyncEvent() {
-        super("Post Sync Event");
-    }
+public interface PostSyncEvent extends LuckPermsEvent {
 
 }

api/src/main/java/me/lucko/luckperms/api/event/sync/PreNetworkSyncEvent.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package me.lucko.luckperms.api.event.sync;
+
+import me.lucko.luckperms.api.event.Cancellable;
+import me.lucko.luckperms.api.event.LuckPermsEvent;
+
+import java.util.UUID;
+
+/**
+ * Called before a network sync task runs
+ */
+public interface PreNetworkSyncEvent extends LuckPermsEvent, Cancellable {
+
+    /**
+     * Gets the ID of the sync request
+     *
+     * @return the id of the sync request
+     */
+    UUID getSyncId();
+
+}

api/src/main/java/me/lucko/luckperms/api/event/sync/PreSyncEvent.java

@@ -20,18 +20,14 @@
  *  SOFTWARE.
  */
 
-package me.lucko.luckperms.api.event.events;
+package me.lucko.luckperms.api.event.sync;
 
-import me.lucko.luckperms.api.event.CancellableEvent;
+import me.lucko.luckperms.api.event.Cancellable;
+import me.lucko.luckperms.api.event.LuckPermsEvent;
 
 /**
- * Called before the sync task is about to run.
- * Set this event to cancelled to prevent the sync task from running.
+ * Called before a sync task runs
  */
-public class PreSyncEvent extends CancellableEvent {
-
-    public PreSyncEvent() {
-        super("Pre Sync Event");
-    }
+public interface PreSyncEvent extends LuckPermsEvent, Cancellable {
 
 }

api/src/main/java/me/lucko/luckperms/api/event/track/TrackCreateEvent.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package me.lucko.luckperms.api.event.track;
+
+import me.lucko.luckperms.api.Track;
+import me.lucko.luckperms.api.event.LuckPermsEvent;
+import me.lucko.luckperms.api.event.cause.CreationCause;
+
+/**
+ * Called when a track is created
+ */
+public interface TrackCreateEvent extends LuckPermsEvent {
+
+    /**
+     * Gets the new track
+     *
+     * @return the new track
+     */
+    Track getTrack();
+
+    /**
+     * Gets the cause of the creation
+     *
+     * @return the cause of the creation
+     */
+    CreationCause getCause();
+
+}

api/src/main/java/me/lucko/luckperms/api/event/track/TrackDeleteEvent.java

@@ -20,28 +20,37 @@
  *  SOFTWARE.
  */
 
-package me.lucko.luckperms.api.event.events;
+package me.lucko.luckperms.api.event.track;
 
-import me.lucko.luckperms.api.Group;
-import me.lucko.luckperms.api.PermissionHolder;
-import me.lucko.luckperms.api.event.AbstractPermissionAddEvent;
+import me.lucko.luckperms.api.event.LuckPermsEvent;
+import me.lucko.luckperms.api.event.cause.DeletionCause;
+
+import java.util.List;
 
 /**
- * Called whenever a user or group is added to / starts to inherit another group
+ * Called when a track is deleted
  */
-public class GroupAddEvent extends AbstractPermissionAddEvent {
+public interface TrackDeleteEvent extends LuckPermsEvent {
 
     /**
-     * The group being added to the target
+     * Gets the name of the deleted track
+     *
+     * @return the name of the deleted track
      */
-    private final Group group;
+    String getTrackName();
 
-    public GroupAddEvent(PermissionHolder target, Group group, String server, String world, long expiry) {
-        super("Group Add Event", target, server, world, expiry);
-        this.group = group;
-    }
+    /**
+     * Gets an immutable copy of the tracks existing data
+     *
+     * @return a copy of the tracks existing data
+     */
+    List<String> getExistingData();
+
+    /**
+     * Gets the cause of the deletion
+     *
+     * @return the cause of the deletion
+     */
+    DeletionCause getCause();
 
-    public Group getGroup() {
-        return group;
-    }
 }

api/src/main/java/me/lucko/luckperms/api/event/track/TrackLoadAllEvent.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package me.lucko.luckperms.api.event.track;
+
+import me.lucko.luckperms.api.event.LuckPermsEvent;
+
+/**
+ * Called when all tracks have been loaded in from storage.
+ *
+ * <p>Usually only called on startup and in sync tasks.</p>
+ */
+public interface TrackLoadAllEvent extends LuckPermsEvent {
+
+}

api/src/main/java/me/lucko/luckperms/api/event/track/TrackLoadEvent.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package me.lucko.luckperms.api.event.track;
+
+import me.lucko.luckperms.api.Track;
+import me.lucko.luckperms.api.event.LuckPermsEvent;
+
+/**
+ * Called when a track is loaded into memory from the storage.
+ *
+ * Note that this event is not the same as {@link TrackCreateEvent}
+ */
+public interface TrackLoadEvent extends LuckPermsEvent {
+
+    /**
+     * Gets the track that was loaded
+     *
+     * @return the track that was loaded
+     */
+    Track getTrack();
+
+}

api/src/main/java/me/lucko/luckperms/api/event/track/mutate/TrackAddGroupEvent.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package me.lucko.luckperms.api.event.track.mutate;
+
+/**
+ * Called when a group is added to a track
+ */
+public interface TrackAddGroupEvent extends TrackMutateEvent {
+
+    /**
+     * Gets the group that was added
+     *
+     * @return the group that was added
+     */
+    String getGroup();
+
+}

api/src/main/java/me/lucko/luckperms/api/event/track/mutate/TrackClearEvent.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package me.lucko.luckperms.api.event.track.mutate;
+
+/**
+ * Called when a track is cleared
+ */
+public interface TrackClearEvent extends TrackMutateEvent {
+
+}

api/src/main/java/me/lucko/luckperms/api/event/track/mutate/TrackMutateEvent.java

@@ -20,30 +20,37 @@
  *  SOFTWARE.
  */
 
-package me.lucko.luckperms.api.event.events;
+package me.lucko.luckperms.api.event.track.mutate;
 
-import me.lucko.luckperms.api.LogEntry;
-import me.lucko.luckperms.api.event.CancellableEvent;
+import me.lucko.luckperms.api.Track;
+import me.lucko.luckperms.api.event.LuckPermsEvent;
+
+import java.util.List;
 
 /**
- * Called before a LogEntry is broadcasted to players only with the notify permission.
- * The log entry will still be recorded in the datastore, regardless of the cancellation state of this event.
- * Cancelling this event only stops the broadcast.
+ * Called when a track is changed
  */
-public class LogNotifyEvent extends CancellableEvent {
+public interface TrackMutateEvent extends LuckPermsEvent {
 
     /**
-     * The log entry to be broadcasted
+     * Gets the track that was mutated
+     *
+     * @return the track that was mutated
      */
-    private final LogEntry entry;
+    Track getTrack();
 
-    public LogNotifyEvent(LogEntry entry) {
-        super("Log Notify Event");
-        this.entry = entry;
-    }
+    /**
+     * Gets an immutable copy of the tracks data before the change
+     *
+     * @return the data before the change
+     */
+    List<String> getDataBefore();
 
-    public LogEntry getEntry() {
-        return entry;
-    }
+    /**
+     * Gets an immutable copy of the tracks data after the change
+     *
+     * @return the data after the change
+     */
+    List<String> getDataAfter();
 
 }

api/src/main/java/me/lucko/luckperms/api/event/track/mutate/TrackRemoveGroupEvent.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package me.lucko.luckperms.api.event.track.mutate;
+
+/**
+ * Called when a group is removed from a track
+ */
+public interface TrackRemoveGroupEvent extends TrackMutateEvent {
+
+    /**
+     * Gets the group that was removed
+     *
+     * @return the group that was removed
+     */
+    String getGroup();
+
+}

api/src/main/java/me/lucko/luckperms/api/event/user/UserCacheLoadEvent.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package me.lucko.luckperms.api.event.user;
+
+import me.lucko.luckperms.api.User;
+import me.lucko.luckperms.api.caching.UserData;
+import me.lucko.luckperms.api.event.LuckPermsEvent;
+
+/**
+ * Called when a users {@link me.lucko.luckperms.api.caching.UserData} is loaded.
+ */
+public interface UserCacheLoadEvent extends LuckPermsEvent {
+
+    /**
+     * Gets the user whose data was loaded
+     *
+     * @return the user
+     */
+    User getUser();
+
+    /**
+     * Gets the data that was loaded
+     *
+     * @return the loaded data
+     */
+    UserData getLoadedData();
+
+}

api/src/main/java/me/lucko/luckperms/api/event/user/UserDataRecalculateEvent.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package me.lucko.luckperms.api.event.user;
+
+import me.lucko.luckperms.api.User;
+import me.lucko.luckperms.api.caching.UserData;
+import me.lucko.luckperms.api.event.LuckPermsEvent;
+
+/**
+ * Called when a users cached data is refreshed
+ */
+public interface UserDataRecalculateEvent extends LuckPermsEvent {
+
+    /**
+     * Gets the user whose data was recalculated
+     *
+     * @return the user
+     */
+    User getUser();
+
+    /**
+     * Gets the data that was recalculated
+     *
+     * @return the data
+     */
+    UserData getData();
+
+}

api/src/main/java/me/lucko/luckperms/api/event/user/UserFirstLoginEvent.java

@@ -20,35 +20,37 @@
  *  SOFTWARE.
  */
 
-package me.lucko.luckperms.api.event.events;
+package me.lucko.luckperms.api.event.user;
 
-import me.lucko.luckperms.api.event.LPEvent;
+import me.lucko.luckperms.api.event.LuckPermsEvent;
 
 import java.util.UUID;
 
 /**
- * Called when the user logs into the network for the first time. Particularly useful for networks with multiple
- * lobbies, who want to welcome a user when they join for the first time.
+ * Called when the user logs into the network for the first time.
+ *
+ * <p>Particularly useful for networks with multiple
+ * lobbies, who want to welcome a user when they join for the first time.</p>
  *
  * <p>This event is fired before the player has actually joined the game on the async login / auth event. If you want to
- * do something with the user, store the UUID in a set, and then check the set in the PlayerJoinEvent o.e.
+ * do something with the user, store the UUID in a set, and then check the set in the PlayerJoinEvent o.e.</p>
+ *
+ * <p>The users data will not be loaded when this event is called.</p>
  */
-public class UserFirstLoginEvent extends LPEvent {
+public interface UserFirstLoginEvent extends LuckPermsEvent {
 
-    private final UUID uuid;
-    private final String username;
+    /**
+     * Gets the UUID of the user
+     *
+     * @return the uuid of the user
+     */
+    UUID getUuid();
 
-    public UserFirstLoginEvent(UUID uuid, String username) {
-        super("User First Join Event");
-        this.uuid = uuid;
-        this.username = username;
-    }
+    /**
+     * Gets the username of the user
+     *
+     * @return the username of the user
+     */
+    String getUsername();
 
-    public UUID getUuid() {
-        return uuid;
-    }
-
-    public String getUsername() {
-        return username;
-    }
 }

api/src/main/java/me/lucko/luckperms/api/event/user/UserLoadEvent.java

@@ -20,19 +20,21 @@
  *  SOFTWARE.
  */
 
-package me.lucko.luckperms.api.event.events;
+package me.lucko.luckperms.api.event.user;
 
-import me.lucko.luckperms.api.Track;
 import me.lucko.luckperms.api.User;
-import me.lucko.luckperms.api.event.TrackEvent;
+import me.lucko.luckperms.api.event.LuckPermsEvent;
 
 /**
- * Called whenever a user is demoted down a track
+ * Called when a user is loaded into memory from the storage.
  */
-public class UserDemoteEvent extends TrackEvent {
+public interface UserLoadEvent extends LuckPermsEvent {
 
-    public UserDemoteEvent(Track track, User user, String from, String to) {
-        super("User Demote Event", track, user, from, to);
-    }
+    /**
+     * Gets the user that was loaded
+     *
+     * @return the user that was loaded
+     */
+    User getUser();
 
 }

api/src/main/java/me/lucko/luckperms/api/event/user/track/TrackAction.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package me.lucko.luckperms.api.event.user.track;
+
+/**
+ * Represents the type of action performed in a {@link UserTrackEvent}
+ */
+public enum TrackAction {
+
+    /**
+     * The user was promoted up a track
+     */
+    PROMOTION,
+
+    /**
+     * The user was demoted down a track
+     */
+    DEMOTION
+
+}

api/src/main/java/me/lucko/luckperms/api/event/user/track/UserDemoteEvent.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package me.lucko.luckperms.api.event.user.track;
+
+/**
+ * Called when a user is demoted down a track.
+ *
+ * <p>{@link #getAction()} is always {@link TrackAction#DEMOTION}</p>
+ */
+public interface UserDemoteEvent extends UserTrackEvent {
+
+}

api/src/main/java/me/lucko/luckperms/api/event/user/track/UserPromoteEvent.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package me.lucko.luckperms.api.event.user.track;
+
+/**
+ * Called when a user is promoted up a track.
+ *
+ * <p>{@link #getAction()} is always {@link TrackAction#PROMOTION}</p>
+ */
+public interface UserPromoteEvent extends UserTrackEvent {
+
+}

api/src/main/java/me/lucko/luckperms/api/event/user/track/UserTrackEvent.java

@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package me.lucko.luckperms.api.event.user.track;
+
+import me.lucko.luckperms.api.Track;
+import me.lucko.luckperms.api.User;
+import me.lucko.luckperms.api.event.LuckPermsEvent;
+
+import java.util.Optional;
+
+/**
+ * Called when a user interacts with a track through a promotion or demotion
+ */
+public interface UserTrackEvent extends LuckPermsEvent {
+
+    /**
+     * Gets the track involved in the event
+     *
+     * @return the track involved in the event
+     */
+    Track getTrack();
+
+    /**
+     * Gets the user who was promoted or demoted
+     *
+     * @return the user involved in the event
+     */
+    User getUser();
+
+    /**
+     * Gets the action performed
+     *
+     * @return the action performed
+     */
+    TrackAction getAction();
+
+    /**
+     * Gets the group the user was promoted/demoted from.
+     *
+     * <p>May be {@link Optional#empty()} if the user wasn't already placed on the track.</p>
+     *
+     * @return the group the user was promoted/demoted from
+     */
+    Optional<String> getGroupFrom();
+
+    /**
+     * Gets the group the user was promoted/demoted to
+     *
+     * @return the group the user was promoted/demoted to
+     */
+    Optional<String> getGroupTo();
+
+}

bukkit-legacy/pom.xml

@@ -5,25 +5,28 @@
     <parent>
         <artifactId>luckperms</artifactId>
         <groupId>me.lucko.luckperms</groupId>
-        <version>2.17-SNAPSHOT</version>
+        <version>3.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>luckperms-bukkit-legacy</artifactId>
     <build>
         <defaultGoal>clean package</defaultGoal>
-        <finalName>LuckPerms-Bukkit-Legacy-${release.version}.${git.closest.tag.commit.count}</finalName>
+        <finalName>LuckPerms-Bukkit-Legacy-${release.version}.${patch.version}</finalName>
         <resources>
             <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
+                <directory>../</directory>
+                <filtering>false</filtering>
+                <includes>
+                    <include>LICENSE.txt</include>
+                </includes>
             </resource>
         </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>${compiler.version}</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
@@ -32,7 +35,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>2.4.3</version>
+                <version>${shade.version}</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -41,11 +44,7 @@
                         </goals>
                         <configuration>
                             <minimizeJar>false</minimizeJar>
-                            <artifactSet>
-                                <excludes>
-                                    <exclude>org.xerial:*</exclude>
-                                </excludes>
-                            </artifactSet>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
                             <relocations>
                                 <relocation>
                                     <pattern>com.google.common</pattern>
@@ -64,21 +63,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>pl.project13.maven</groupId>
-                <artifactId>git-commit-id-plugin</artifactId>
-                <version>2.2.1</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>revision</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <injectAllReactorProjects>true</injectAllReactorProjects>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
@@ -89,6 +73,16 @@
             <artifactId>luckperms-bukkit</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>me.lucko.luckperms</groupId>
+                    <artifactId>luckperms-common</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>me.lucko.luckperms</groupId>
+                    <artifactId>luckperms-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- Shade gson and guava, as they are not included in earlier Bukkit releases -->

bukkit-placeholders/pom.xml

@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>luckperms</artifactId>
-        <groupId>me.lucko.luckperms</groupId>
-        <version>2.17-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>luckperms-bukkit-placeholders</artifactId>
-    <build>
-        <finalName>LuckPermsPlaceholderExpansion</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <!-- LuckPerms API -->
-        <dependency>
-            <groupId>me.lucko.luckperms</groupId>
-            <artifactId>luckperms-api</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- BukkitAPI -->
-        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>bukkit</artifactId>
-            <version>1.8.8-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- PlaceholderAPI -->
-        <dependency>
-            <groupId>me.clip</groupId>
-            <artifactId>placeholderapi</artifactId>
-            <version>2.2.0</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-</project>

bukkit-placeholders/src/main/java/me/lucko/luckperms/api/placeholders/LuckPermsPlaceholderExpansion.java

@@ -1,220 +0,0 @@
-/*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included in all
- *  copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
- */
-
-package me.lucko.luckperms.api.placeholders;
-
-import me.clip.placeholderapi.PlaceholderAPIPlugin;
-import me.clip.placeholderapi.expansion.PlaceholderExpansion;
-import me.clip.placeholderapi.util.TimeUtil;
-import me.lucko.luckperms.api.Contexts;
-import me.lucko.luckperms.api.LuckPermsApi;
-import me.lucko.luckperms.api.Node;
-import me.lucko.luckperms.api.Track;
-import me.lucko.luckperms.api.User;
-import me.lucko.luckperms.api.caching.UserData;
-import me.lucko.luckperms.api.context.MutableContextSet;
-
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-/*
- * PlaceholderAPI Expansion for LuckPerms, implemented using the LuckPerms API.
- *
- * Placeholders:
- * - group_name
- * - groups
- * - has_permission_<node>
- * - inherits_permission_<node>
- * - in_group_<name>
- * - inherits_group_<name>
- * - on_track_<track>
- * - expiry_time_<node>
- * - group_expiry_time_<group>
- * - prefix
- * - suffix
- * - meta_<node>
- */
-public class LuckPermsPlaceholderExpansion extends PlaceholderExpansion {
-    private static final String IDENTIFIER = "luckperms";
-    private static final String PLUGIN_NAME = "LuckPerms";
-    private static final String AUTHOR = "Luck";
-
-    private static String formatBoolean(boolean b) {
-        return b ? PlaceholderAPIPlugin.booleanTrue() : PlaceholderAPIPlugin.booleanFalse();
-    }
-
-    private LuckPermsApi api = null;
-
-    @Override
-    public boolean canRegister() {
-        return Bukkit.getServicesManager().isProvidedFor(LuckPermsApi.class);
-    }
-
-    @Override
-    public boolean register() {
-        if (!canRegister()) {
-            return false;
-        }
-
-        api = Bukkit.getServicesManager().getRegistration(LuckPermsApi.class).getProvider();
-        return super.register();
-    }
-
-    @Override
-    public String getVersion() {
-        return "2.13";
-    }
-
-    private Contexts makeContexts(Player player) {
-        MutableContextSet contextSet = new MutableContextSet();
-        contextSet.add("server", api.getConfiguration().getVaultServer());
-        contextSet.add("world", player.getWorld().getName());// ignore world?
-        return Contexts.of(contextSet.makeImmutable(), api.getConfiguration().getVaultIncludeGlobal(), true, true, true, true, player.isOp());
-    }
-
-    @Override
-    public String onPlaceholderRequest(Player player, String identifier) {
-        if (player == null || api == null) {
-            return "";
-        }
-
-        Optional<User> u = api.getUserSafe(api.getUuidCache().getUUID(player.getUniqueId()));
-        if (!u.isPresent()) {
-            return "";
-        }
-        final User user = u.get();
-
-        Optional<UserData> d = user.getUserDataCache();
-        if (!d.isPresent()) {
-            return "";
-        }
-        final UserData data = d.get();
-
-        identifier = identifier.toLowerCase();
-
-        if (identifier.equalsIgnoreCase("group_name")) {
-            return user.getPrimaryGroup();
-        }
-
-        if (identifier.equalsIgnoreCase("groups")) {
-            return user.getGroupNames().stream().collect(Collectors.joining(", "));
-        }
-
-        if (identifier.startsWith("has_permission_") && identifier.length() > "has_permission_".length()) {
-            String node = identifier.substring("has_permission_".length());
-            return formatBoolean(user.hasPermission(node, true));
-        }
-
-        if (identifier.startsWith("inherits_permission_") && identifier.length() > "inherits_permission_".length()) {
-            String node = identifier.substring("inherits_permission_".length());
-            return formatBoolean(data.getPermissionData(makeContexts(player)).getPermissionValue(node).asBoolean());
-        }
-
-        if (identifier.startsWith("in_group_") && identifier.length() > "in_group_".length()) {
-            String groupName = identifier.substring("in_group_".length());
-            return formatBoolean(user.getGroupNames().contains(groupName));
-        }
-
-        if (identifier.startsWith("inherits_group_") && identifier.length() > "inherits_group_".length()) {
-            String groupName = identifier.substring("inherits_group_".length());
-            return formatBoolean(data.getPermissionData(makeContexts(player)).getPermissionValue("group." + groupName).asBoolean());
-        }
-
-        if (identifier.startsWith("on_track_") && identifier.length() > "on_track_".length()) {
-            String trackName = identifier.substring("on_track_".length());
-
-            Optional<Track> track = api.getTrackSafe(trackName);
-            if (!track.isPresent()) return "";
-
-            return formatBoolean(track.get().containsGroup(user.getPrimaryGroup()));
-        }
-
-        if (identifier.startsWith("expiry_time_") && identifier.length() > "expiry_time_".length()) {
-            String node = identifier.substring("expiry_time_".length());
-            long currentTime = System.currentTimeMillis() / 1000L;
-            for (Node n : user.getTemporaryPermissionNodes()) {
-                if (n.toSerializedNode().equalsIgnoreCase(node)) {
-                    return TimeUtil.getTime((int) (n.getExpiryUnixTime() - currentTime));
-                }
-            }
-
-            return "";
-        }
-
-        if (identifier.startsWith("group_expiry_time_") && identifier.length() > "group_expiry_time_".length()) {
-            String node = "group." + identifier.substring("group_expiry_time_".length());
-            long currentTime = System.currentTimeMillis() / 1000L;
-            for (Node n : user.getTemporaryPermissionNodes()) {
-                if (n.getPermission().equalsIgnoreCase(node)) {
-                    return TimeUtil.getTime((int) (n.getExpiryUnixTime() - currentTime));
-                }
-            }
-
-            return "";
-        }
-
-        if (identifier.equalsIgnoreCase("prefix")) {
-            String prefix = data.calculateMeta(makeContexts(player)).getPrefix();
-            if (prefix == null) {
-                prefix = "";
-            }
-            return prefix;
-        }
-
-        if (identifier.equalsIgnoreCase("suffix")) {
-            String suffix = data.calculateMeta(makeContexts(player)).getSuffix();
-            if (suffix == null) {
-                suffix = "";
-            }
-            return suffix;
-        }
-
-        if (identifier.startsWith("meta_") && identifier.length() > "meta_".length()) {
-            String node = identifier.substring("meta_".length());
-            String meta = data.getMetaData(makeContexts(player)).getMeta().get(node);
-            if (meta == null) {
-                meta = "";
-            }
-            return meta;
-        }
-
-        return null;
-    }
-
-    @Override
-    public String getIdentifier() {
-        return IDENTIFIER;
-    }
-
-    @Override
-    public String getPlugin() {
-        return PLUGIN_NAME;
-    }
-
-    @Override
-    public String getAuthor() {
-        return AUTHOR;
-    }
-}

bukkit/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>luckperms</artifactId>
         <groupId>me.lucko.luckperms</groupId>
-        <version>2.17-SNAPSHOT</version>
+        <version>3.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -14,19 +14,26 @@
 
     <build>
         <defaultGoal>clean package</defaultGoal>
-        <finalName>LuckPerms-Bukkit-${release.version}.${git.closest.tag.commit.count}</finalName>
+        <finalName>LuckPerms-Bukkit-${release.version}.${patch.version}</finalName>
         <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
                 <filtering>true</filtering>
             </resource>
+            <resource>
+                <directory>../</directory>
+                <filtering>false</filtering>
+                <includes>
+                    <include>LICENSE.txt</include>
+                </includes>
+            </resource>
         </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>${compiler.version}</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
@@ -35,7 +42,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>2.4.3</version>
+                <version>${shade.version}</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -44,6 +51,7 @@
                         </goals>
                         <configuration>
                             <minimizeJar>false</minimizeJar>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
                             <relocations>
                                 <relocation>
                                     <pattern>io.github.mkremins.fanciful</pattern>
@@ -54,30 +62,15 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>pl.project13.maven</groupId>
-                <artifactId>git-commit-id-plugin</artifactId>
-                <version>2.2.1</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>revision</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <injectAllReactorProjects>true</injectAllReactorProjects>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
     <dependencies>
-        <!-- BukkitAPI -->
+        <!-- Spigot API -->
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.8.8-R0.1-SNAPSHOT</version>
+            <version>1.11.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <!-- Vault -->
@@ -101,18 +94,18 @@
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
-        <!-- HikariCP - needed as source -->
-        <dependency>
-            <groupId>com.zaxxer</groupId>
-            <artifactId>HikariCP</artifactId>
-            <version>2.5.1</version>
-            <scope>provided</scope>
-        </dependency>
         <!-- Lombok -->
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.16.10</version>
+            <version>${lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- LilyPad - used as a messaging service -->
+        <dependency>
+            <groupId>lilypad.client.connect</groupId>
+            <artifactId>api</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <!-- **************Migration Plugins************** -->
@@ -141,7 +134,7 @@
         <dependency>
             <groupId>com.github.cheesesoftware</groupId>
             <artifactId>PowerfulPermsAPI</artifactId>
-            <version>1.0.1</version>
+            <version>1.4.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitCalculatorFactory.java

@@ -30,7 +30,7 @@ import me.lucko.luckperms.api.Contexts;
 import me.lucko.luckperms.bukkit.calculators.AttachmentProcessor;
 import me.lucko.luckperms.bukkit.calculators.ChildProcessor;
 import me.lucko.luckperms.bukkit.calculators.DefaultsProcessor;
-import me.lucko.luckperms.bukkit.inject.Injector;
+import me.lucko.luckperms.bukkit.model.Injector;
 import me.lucko.luckperms.bukkit.model.LPPermissible;
 import me.lucko.luckperms.common.calculators.AbstractCalculatorFactory;
 import me.lucko.luckperms.common.calculators.PermissionCalculator;
@@ -38,6 +38,7 @@ import me.lucko.luckperms.common.calculators.PermissionProcessor;
 import me.lucko.luckperms.common.calculators.processors.MapProcessor;
 import me.lucko.luckperms.common.calculators.processors.RegexProcessor;
 import me.lucko.luckperms.common.calculators.processors.WildcardProcessor;
+import me.lucko.luckperms.common.config.ConfigKeys;
 import me.lucko.luckperms.common.core.model.User;
 
 import java.util.UUID;
@@ -57,12 +58,12 @@ public class BukkitCalculatorFactory extends AbstractCalculatorFactory {
             LPPermissible permissible = Injector.getPermissible(uuid);
             return permissible == null ? null : permissible.getAttachmentPermissions();
         }));
-        if (plugin.getConfiguration().isApplyingWildcards()) {
-            processors.add(new WildcardProcessor());
-        }
-        if (plugin.getConfiguration().isApplyingRegex()) {
+        if (plugin.getConfiguration().get(ConfigKeys.APPLYING_REGEX)) {
             processors.add(new RegexProcessor());
         }
+        if (plugin.getConfiguration().get(ConfigKeys.APPLYING_WILDCARDS)) {
+            processors.add(new WildcardProcessor());
+        }
         processors.add(new DefaultsProcessor(contexts.isOp(), plugin.getDefaultsProvider()));
 
         return registerCalculator(new PermissionCalculator(plugin, user.getName(), processors.build()));

bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitCommand.java

@@ -37,7 +37,7 @@ import org.bukkit.command.TabExecutor;
 import java.util.Arrays;
 import java.util.List;
 
-class BukkitCommand extends CommandManager implements CommandExecutor, TabExecutor {
+public class BukkitCommand extends CommandManager implements CommandExecutor, TabExecutor {
     private final LPBukkitPlugin plugin;
 
     BukkitCommand(LPBukkitPlugin plugin) {

bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitConfig.java

@@ -22,6 +22,9 @@
 
 package me.lucko.luckperms.bukkit;
 
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
 import me.lucko.luckperms.common.config.AbstractConfiguration;
 
 import org.bukkit.configuration.ConfigurationSection;
@@ -34,48 +37,53 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-class BukkitConfig extends AbstractConfiguration<LPBukkitPlugin> {
+@RequiredArgsConstructor
+public class BukkitConfig extends AbstractConfiguration {
+
+    @Getter
+    private final LPBukkitPlugin plugin;
+
     private YamlConfiguration configuration;
 
-    BukkitConfig(LPBukkitPlugin plugin) {
-        super(plugin, "global", true, "sqlite");
-    }
-
-    @SuppressWarnings("ResultOfMethodCallIgnored")
     @Override
-    protected void init() {
-        File configFile = new File(getPlugin().getDataFolder(), "config.yml");
+    public void init() {
+        File configFile = new File(plugin.getDataFolder(), "config.yml");
 
         if (!configFile.exists()) {
             configFile.getParentFile().mkdirs();
-            getPlugin().saveResource("config.yml", false);
+            plugin.saveResource("config.yml", false);
         }
 
         configuration = YamlConfiguration.loadConfiguration(configFile);
     }
 
     @Override
-    protected String getString(String path, String def) {
+    public boolean contains(String path) {
+        return configuration.contains(path);
+    }
+
+    @Override
+    public String getString(String path, String def) {
         return configuration.getString(path, def);
     }
 
     @Override
-    protected int getInt(String path, int def) {
+    public int getInt(String path, int def) {
         return configuration.getInt(path, def);
     }
 
     @Override
-    protected boolean getBoolean(String path, boolean def) {
+    public boolean getBoolean(String path, boolean def) {
         return configuration.getBoolean(path, def);
     }
 
     @Override
-    protected List<String> getList(String path, List<String> def) {
+    public List<String> getList(String path, List<String> def) {
         return Optional.ofNullable(configuration.getStringList(path)).orElse(def);
     }
 
     @Override
-    protected List<String> getObjectList(String path, List<String> def) {
+    public List<String> getObjectList(String path, List<String> def) {
         ConfigurationSection section = configuration.getConfigurationSection(path);
         if (section == null) {
             return def;
@@ -84,9 +92,8 @@ class BukkitConfig extends AbstractConfiguration<LPBukkitPlugin> {
         return Optional.ofNullable(section.getKeys(false).stream().collect(Collectors.toList())).orElse(def);
     }
 
-    @SuppressWarnings("unchecked")
     @Override
-    protected Map<String, String> getMap(String path, Map<String, String> def) {
+    public Map<String, String> getMap(String path, Map<String, String> def) {
         Map<String, String> map = new HashMap<>();
         ConfigurationSection section = configuration.getConfigurationSection(path);
         if (section == null) {

bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitListener.java

@@ -22,65 +22,139 @@
 
 package me.lucko.luckperms.bukkit;
 
-import me.lucko.luckperms.bukkit.inject.Injector;
+import lombok.RequiredArgsConstructor;
+
+import me.lucko.luckperms.bukkit.model.Injector;
 import me.lucko.luckperms.bukkit.model.LPPermissible;
+import me.lucko.luckperms.common.caching.UserCache;
+import me.lucko.luckperms.common.config.ConfigKeys;
 import me.lucko.luckperms.common.constants.Message;
 import me.lucko.luckperms.common.core.model.User;
-import me.lucko.luckperms.common.utils.AbstractListener;
+import me.lucko.luckperms.common.utils.LoginHelper;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
+import org.bukkit.event.player.PlayerChangedWorldEvent;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.server.PluginEnableEvent;
 
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.UUID;
 
-class BukkitListener extends AbstractListener implements Listener {
+@RequiredArgsConstructor
+public class BukkitListener implements Listener {
     private final LPBukkitPlugin plugin;
 
-    BukkitListener(LPBukkitPlugin plugin) {
-        super(plugin);
-        this.plugin = plugin;
-    }
+    private final Set<UUID> deniedAsyncLogin = Collections.synchronizedSet(new HashSet<>());
+    private final Set<UUID> deniedLogin = Collections.synchronizedSet(new HashSet<>());
 
     @EventHandler(priority = EventPriority.LOW)
     public void onPlayerPreLogin(AsyncPlayerPreLoginEvent e) {
-        if (!plugin.isStarted() || !plugin.getStorage().isAcceptingLogins()) {
+        /* Called when the player first attempts a connection with the server.
+           Listening on LOW priority to allow plugins to modify username / UUID data here. (auth plugins) */
 
-            // The datastore is disabled, prevent players from joining the server
-            e.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, Message.LOADING_ERROR.toString());
+        /* the player was denied entry to the server before this priority.
+           log this, so we can handle appropriately later. */
+        if (e.getLoginResult() != AsyncPlayerPreLoginEvent.Result.ALLOWED) {
+            plugin.getLog().warn("Connection from " + e.getUniqueId() + " was already denied. No permissions data will be loaded.");
+            deniedAsyncLogin.add(e.getUniqueId());
             return;
         }
 
-        // Process login
-        onAsyncLogin(e.getUniqueId(), e.getName());
+        /* either the plugin hasn't finished starting yet, or there was an issue connecting to the DB, performing file i/o, etc.
+           we don't let players join in this case, because it means they can connect to the server without their permissions data.
+           some server admins rely on negating perms to stop users from causing damage etc, so it's really important that
+           this data is loaded. */
+        if (!plugin.isStarted() || !plugin.getStorage().isAcceptingLogins()) {
+
+            // log that the user tried to login, but was denied at this stage.
+            deniedAsyncLogin.add(e.getUniqueId());
+
+            // actually deny the connection.
+            plugin.getLog().warn("Permissions storage is not loaded yet. Denying connection from: " + e.getUniqueId() + " - " + e.getName());
+            e.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, Message.LOADING_ERROR.asString(plugin.getLocaleManager()));
+            return;
+        }
+
+        /* Actually process the login for the connection.
+           We do this here to delay the login until the data is ready.
+           If the login gets cancelled later on, then this will be cleaned up.
+
+           This includes:
+           - loading uuid data
+           - loading permissions
+           - creating a user instance in the UserManager for this connection.
+           - setting up cached data. */
+        try {
+            LoginHelper.loadUser(plugin, e.getUniqueId(), e.getName());
+        } catch (Exception ex) {
+            ex.printStackTrace();
+
+            // there was some error loading data. deny the connection
+            deniedAsyncLogin.add(e.getUniqueId());
+            e.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, Message.LOADING_ERROR.asString(plugin.getLocaleManager()));
+        }
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerPreLoginMonitor(AsyncPlayerPreLoginEvent e) {
-        if (plugin.isStarted() && plugin.getStorage().isAcceptingLogins() && e.getLoginResult() != AsyncPlayerPreLoginEvent.Result.ALLOWED) {
+        /* Listen to see if the event was cancelled after we initially handled the connection
+           If the connection was cancelled here, we need to do something to clean up the data that was loaded. */
 
-            // Login event was cancelled by another plugin
-            onLeave(e.getUniqueId());
-        }
-    }
+        // Check to see if this connection was denied at LOW.
+        if (deniedAsyncLogin.remove(e.getUniqueId())) {
 
-    @EventHandler(priority = EventPriority.LOWEST)
-    public void onPlayerLogin(PlayerLoginEvent e) {
-        final Player player = e.getPlayer();
-        final User user = plugin.getUserManager().get(plugin.getUuidCache().getUUID(player.getUniqueId()));
+            // This is a problem, as they were denied at low priority, but are now being allowed.
+            if (e.getLoginResult() == AsyncPlayerPreLoginEvent.Result.ALLOWED) {
+                plugin.getLog().severe("Player connection was re-allowed for " + e.getUniqueId());
+                e.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, "");
+            }
 
-        if (user == null) {
-            // User wasn't loaded for whatever reason.
-            e.disallow(PlayerLoginEvent.Result.KICK_OTHER, Message.LOADING_ERROR.toString());
             return;
         }
 
+        // Login event was cancelled by another plugin
+        if (e.getLoginResult() != AsyncPlayerPreLoginEvent.Result.ALLOWED) {
+            // Schedule cleanup of this user.
+            plugin.getUserManager().scheduleUnload(e.getUniqueId());
+        }
+    }
+
+    @EventHandler(priority = EventPriority.LOW)
+    public void onPlayerLogin(PlayerLoginEvent e) {
+        /* Called when the player starts logging into the server.
+           At this point, the users data should be present and loaded.
+           Listening on LOW priority to allow plugins to further modify data here. (auth plugins, etc.) */
+
+        /* the player was denied entry to the server before this priority.
+           log this, so we can handle appropriately later. */
+        if (e.getResult() != PlayerLoginEvent.Result.ALLOWED) {
+            plugin.getLog().warn("Login from " + e.getPlayer().getUniqueId() + " was denied before an attachment could be injected.");
+            deniedLogin.add(e.getPlayer().getUniqueId());
+            return;
+        }
+
+        final Player player = e.getPlayer();
+        final User user = plugin.getUserManager().get(plugin.getUuidCache().getUUID(player.getUniqueId()));
+
+        /* User instance is null for whatever reason. Could be that it was unloaded between asyncpre and now. */
+        if (user == null) {
+            deniedLogin.add(e.getPlayer().getUniqueId());
+
+            plugin.getLog().warn("User " + player.getUniqueId() + " - " + player.getName() + " doesn't have data pre-loaded. - denying login.");
+            e.disallow(PlayerLoginEvent.Result.KICK_OTHER, Message.LOADING_ERROR.asString(plugin.getLocaleManager()));
+            return;
+        }
+
+        // User instance is there, now we can inject our custom Permissible into the player.
+        // Care should be taken at this stage to ensure that async tasks which manipulate bukkit data check that the player is still online.
         try {
             // Make a new permissible for the user
             LPPermissible lpPermissible = new LPPermissible(player, user, plugin);
@@ -92,49 +166,73 @@ class BukkitListener extends AbstractListener implements Listener {
             t.printStackTrace();
         }
 
-        if (player.isOp()) {
+        plugin.refreshAutoOp(player);
 
-            // We assume all users are not op, but those who are need extra calculation.
-            plugin.doAsync(() -> user.getUserData().preCalculate(plugin.getPreProcessContexts(true)));
+        // We assume all users are not op, but those who are need extra calculation.
+        if (player.isOp()) {
+            plugin.doAsync(() -> {
+                UserCache userData = user.getUserData();
+                if (userData == null) {
+                    return;
+                }
+
+                userData.preCalculate(plugin.getPreProcessContexts(true));
+            });
         }
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerLoginMonitor(PlayerLoginEvent e) {
-        if (e.getResult() != PlayerLoginEvent.Result.ALLOWED) {
+        /* Listen to see if the event was cancelled after we initially handled the login
+           If the connection was cancelled here, we need to do something to clean up the data that was loaded. */
 
-            // The player got denied on sync login.
-            onLeave(e.getPlayer().getUniqueId());
+        // Check to see if this connection was denied at LOW.
+        if (deniedLogin.remove(e.getPlayer().getUniqueId())) {
+
+            // This is a problem, as they were denied at low priority, but are now being allowed.
+            if (e.getResult() == PlayerLoginEvent.Result.ALLOWED) {
+                plugin.getLog().severe("Player connection was re-allowed for " + e.getPlayer().getUniqueId());
+                e.disallow(PlayerLoginEvent.Result.KICK_OTHER, "");
+            }
+
+            return;
         }
+
+        // Login event was cancelled by another plugin
+        if (e.getResult() != PlayerLoginEvent.Result.ALLOWED) {
+            // Schedule cleanup of this user.
+            plugin.getUserManager().scheduleUnload(e.getPlayer().getUniqueId());
+            return;
+        }
+
+        // everything is going well. login was processed ok, this is just to refresh auto-op status.
+        plugin.refreshAutoOp(e.getPlayer());
     }
 
-    @EventHandler(priority = EventPriority.MONITOR) // Allow other plugins to see data when this event gets called.
+    // Wait until the last priority to unload, so plugins can still perform permission checks on this event
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerQuit(PlayerQuitEvent e) {
         final Player player = e.getPlayer();
-        final UUID internal = plugin.getUuidCache().getUUID(player.getUniqueId());
-
-        // Remove from World cache
-        plugin.getWorldCalculator().getWorldCache().remove(internal);
 
         // Remove the custom permissible
-        Injector.unInject(player, true);
+        Injector.unInject(player, true, true);
 
         // Handle auto op
-        if (plugin.getConfiguration().isAutoOp()) {
+        if (plugin.getConfiguration().get(ConfigKeys.AUTO_OP)) {
             player.setOp(false);
         }
 
-        // Call internal leave handling
-        onLeave(player.getUniqueId());
+        // Request that the users data is unloaded.
+        plugin.getUserManager().scheduleUnload(player.getUniqueId());
     }
 
     @EventHandler
     public void onPlayerCommand(PlayerCommandPreprocessEvent e) {
-        if (plugin.getConfiguration().isOpsEnabled()) {
+        if (plugin.getConfiguration().get(ConfigKeys.OPS_ENABLED)) {
             return;
         }
 
-        String s = e.getMessage()
+        String s = e.getMessage().toLowerCase()
                 .replace("/", "")
                 .replace("bukkit:", "")
                 .replace("spigot:", "")
@@ -142,7 +240,7 @@ class BukkitListener extends AbstractListener implements Listener {
 
         if (s.equals("op") || s.startsWith("op ") || s.equals("deop") || s.startsWith("deop ")) {
             e.setCancelled(true);
-            e.getPlayer().sendMessage(Message.OP_DISABLED.toString());
+            e.getPlayer().sendMessage(Message.OP_DISABLED.asString(plugin.getLocaleManager()));
         }
     }
 
@@ -152,4 +250,9 @@ class BukkitListener extends AbstractListener implements Listener {
             plugin.tryVaultHook(true);
         }
     }
+
+    @EventHandler
+    public void onWorldChange(PlayerChangedWorldEvent e) {
+        plugin.refreshAutoOp(e.getPlayer());
+    }
 }

bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitSenderFactory.java

@@ -23,9 +23,9 @@
 package me.lucko.luckperms.bukkit;
 
 import me.lucko.luckperms.bukkit.compat.MessageHandler;
-import me.lucko.luckperms.common.LuckPermsPlugin;
 import me.lucko.luckperms.common.commands.sender.SenderFactory;
 import me.lucko.luckperms.common.constants.Constants;
+import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java

@@ -24,52 +24,59 @@ package me.lucko.luckperms.bukkit;
 
 import lombok.Getter;
 
-import com.google.common.collect.ImmutableMap;
-
 import me.lucko.luckperms.api.Contexts;
 import me.lucko.luckperms.api.Logger;
 import me.lucko.luckperms.api.LuckPermsApi;
 import me.lucko.luckperms.api.PlatformType;
 import me.lucko.luckperms.api.context.ContextSet;
 import me.lucko.luckperms.api.context.MutableContextSet;
-import me.lucko.luckperms.bukkit.calculators.AutoOPListener;
-import me.lucko.luckperms.bukkit.inject.Injector;
+import me.lucko.luckperms.bukkit.messaging.BungeeMessagingService;
+import me.lucko.luckperms.bukkit.messaging.LilyPadMessagingService;
 import me.lucko.luckperms.bukkit.model.ChildPermissionProvider;
 import me.lucko.luckperms.bukkit.model.DefaultsProvider;
+import me.lucko.luckperms.bukkit.model.Injector;
 import me.lucko.luckperms.bukkit.model.LPPermissible;
 import me.lucko.luckperms.bukkit.vault.VaultHook;
-import me.lucko.luckperms.common.LuckPermsPlugin;
 import me.lucko.luckperms.common.api.ApiHandler;
 import me.lucko.luckperms.common.api.ApiProvider;
+import me.lucko.luckperms.common.caching.UserCache;
 import me.lucko.luckperms.common.caching.handlers.CachedStateManager;
 import me.lucko.luckperms.common.calculators.CalculatorFactory;
 import me.lucko.luckperms.common.commands.sender.Sender;
-import me.lucko.luckperms.common.config.LPConfiguration;
+import me.lucko.luckperms.common.config.ConfigKeys;
+import me.lucko.luckperms.common.config.LuckPermsConfiguration;
 import me.lucko.luckperms.common.constants.Permission;
 import me.lucko.luckperms.common.contexts.ContextManager;
-import me.lucko.luckperms.common.contexts.ServerCalculator;
+import me.lucko.luckperms.common.contexts.StaticCalculator;
 import me.lucko.luckperms.common.core.UuidCache;
 import me.lucko.luckperms.common.core.model.User;
-import me.lucko.luckperms.common.data.Importer;
+import me.lucko.luckperms.common.dependencies.Dependency;
 import me.lucko.luckperms.common.dependencies.DependencyManager;
+import me.lucko.luckperms.common.locale.LocaleManager;
+import me.lucko.luckperms.common.locale.NoopLocaleManager;
+import me.lucko.luckperms.common.locale.SimpleLocaleManager;
 import me.lucko.luckperms.common.managers.GroupManager;
 import me.lucko.luckperms.common.managers.TrackManager;
 import me.lucko.luckperms.common.managers.UserManager;
 import me.lucko.luckperms.common.managers.impl.GenericGroupManager;
 import me.lucko.luckperms.common.managers.impl.GenericTrackManager;
 import me.lucko.luckperms.common.managers.impl.GenericUserManager;
+import me.lucko.luckperms.common.messaging.InternalMessagingService;
+import me.lucko.luckperms.common.messaging.NoopMessagingService;
 import me.lucko.luckperms.common.messaging.RedisMessaging;
+import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.storage.Storage;
 import me.lucko.luckperms.common.storage.StorageFactory;
 import me.lucko.luckperms.common.storage.StorageType;
 import me.lucko.luckperms.common.tasks.CacheHousekeepingTask;
 import me.lucko.luckperms.common.tasks.ExpireTemporaryTask;
 import me.lucko.luckperms.common.tasks.UpdateTask;
+import me.lucko.luckperms.common.treeview.PermissionVault;
 import me.lucko.luckperms.common.utils.BufferedRequest;
-import me.lucko.luckperms.common.utils.DebugHandler;
-import me.lucko.luckperms.common.utils.LocaleManager;
-import me.lucko.luckperms.common.utils.LogFactory;
-import me.lucko.luckperms.common.utils.PermissionCache;
+import me.lucko.luckperms.common.utils.FileWatcher;
+import me.lucko.luckperms.common.utils.LoggerImpl;
+import me.lucko.luckperms.common.utils.LoginHelper;
+import me.lucko.luckperms.common.verbose.VerboseHandler;
 
 import org.bukkit.World;
 import org.bukkit.command.PluginCommand;
@@ -83,34 +90,34 @@ import org.bukkit.plugin.java.JavaPlugin;
 import java.io.File;
 import java.io.InputStream;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 
 @Getter
 public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
     private Set<UUID> ignoringLogs;
-    private Executor syncExecutor;
-    private Executor asyncExecutor;
+    private LPBukkitScheduler scheduler;
+    private BukkitCommand commandManager;
     private VaultHook vaultHook = null;
-    private LPConfiguration configuration;
+    private LuckPermsConfiguration configuration;
     private UserManager userManager;
     private GroupManager groupManager;
     private TrackManager trackManager;
     private Storage storage;
-    private RedisMessaging redisMessaging = null;
+    private FileWatcher fileWatcher = null;
+    private InternalMessagingService messagingService = null;
     private UuidCache uuidCache;
     private BukkitListener listener;
     private ApiProvider apiProvider;
     private Logger log;
-    private Importer importer;
     private DefaultsProvider defaultsProvider;
     private ChildPermissionProvider childPermissionProvider;
     private LocaleManager localeManager;
@@ -120,25 +127,33 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
     private CalculatorFactory calculatorFactory;
     private BufferedRequest<Void> updateTaskBuffer;
     private boolean started = false;
-    private DebugHandler debugHandler;
+    private VerboseHandler verboseHandler;
     private BukkitSenderFactory senderFactory;
-    private PermissionCache permissionCache;
+    private PermissionVault permissionVault;
+
+    @Override
+    public void onLoad() {
+        // setup minimal functionality in order to load initial dependencies
+        scheduler = new LPBukkitScheduler(this);
+        localeManager = new NoopLocaleManager();
+        senderFactory = new BukkitSenderFactory(this);
+        log = new LoggerImpl(getConsoleSender());
+
+        DependencyManager.loadDependencies(this, Collections.singletonList(Dependency.CAFFEINE));
+    }
 
     @Override
     public void onEnable() {
-        // Used whilst the server is still starting
-        asyncExecutor = Executors.newCachedThreadPool();
-        syncExecutor = r -> getServer().getScheduler().runTask(this, r);
-        Executor bukkitAsyncExecutor = r -> getServer().getScheduler().runTaskAsynchronously(this, r);
+        LuckPermsPlugin.sendStartupBanner(getConsoleSender(), this);
 
-        log = LogFactory.wrap(getLogger());
         ignoringLogs = ConcurrentHashMap.newKeySet();
-        debugHandler = new DebugHandler(bukkitAsyncExecutor, getVersion());
-        senderFactory = new BukkitSenderFactory(this);
-        permissionCache = new PermissionCache(bukkitAsyncExecutor);
+        verboseHandler = new VerboseHandler(scheduler.getAsyncBukkitExecutor(), getVersion());
+        permissionVault = new PermissionVault(scheduler.getAsyncBukkitExecutor());
 
         getLog().info("Loading configuration...");
         configuration = new BukkitConfig(this);
+        configuration.init();
+        configuration.loadAll();
 
         Set<StorageType> storageTypes = StorageFactory.getRequiredTypes(this, StorageType.H2);
         DependencyManager.loadDependencies(this, storageTypes);
@@ -147,29 +162,18 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
         defaultsProvider = new DefaultsProvider();
         childPermissionProvider = new ChildPermissionProvider();
 
-        // give all plugins a chance to load their defaults, then refresh.
-        getServer().getScheduler().runTaskLater(this, () -> {
+        // give all plugins a chance to load their permissions, then refresh.
+        scheduler.doSyncLater(() -> {
             defaultsProvider.refresh();
             childPermissionProvider.setup();
 
-            getServer().getScheduler().runTaskAsynchronously(this, () -> {
-                for (Map.Entry<String, Boolean> e : defaultsProvider.getOpDefaults().entrySet()) {
-                    permissionCache.offer(e.getKey());
-                }
-
-                for (Map.Entry<String, Boolean> e : defaultsProvider.getNonOpDefaults().entrySet()) {
-                    permissionCache.offer(e.getKey());
-                }
-
-                ImmutableMap<Map.Entry<String, Boolean>, ImmutableMap<String, Boolean>> permissions = childPermissionProvider.getPermissions();
-                for (Map.Entry<Map.Entry<String, Boolean>, ImmutableMap<String, Boolean>> e : permissions.entrySet()) {
-                    permissionCache.offer(e.getKey().getKey());
-                    for (Map.Entry<String, Boolean> e1 : e.getValue().entrySet()) {
-                        permissionCache.offer(e1.getKey());
-                    }
-                }
+            Set<String> perms = new HashSet<>();
+            getServer().getPluginManager().getPermissions().forEach(p -> {
+                perms.add(p.getName());
+                perms.addAll(p.getChildren().keySet());
             });
 
+            perms.forEach(p -> permissionVault.offer(p));
         }, 1L);
 
         // register events
@@ -177,20 +181,55 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
         listener = new BukkitListener(this);
         pm.registerEvents(listener, this);
 
+        if (getConfiguration().get(ConfigKeys.WATCH_FILES)) {
+            fileWatcher = new FileWatcher(this);
+            getScheduler().doAsyncRepeating(fileWatcher, 30L);
+        }
+
         // initialise datastore
         storage = StorageFactory.getInstance(this, StorageType.H2);
 
-        // initialise redis
-        if (getConfiguration().isRedisEnabled()) {
+        // initialise messaging
+        String messagingType = getConfiguration().get(ConfigKeys.MESSAGING_SERVICE).toLowerCase();
+        if (messagingType.equals("none") && getConfiguration().get(ConfigKeys.REDIS_ENABLED)) {
+            messagingType = "redis";
+        }
+        if (messagingType.equals("redis")) {
             getLog().info("Loading redis...");
-            redisMessaging = new RedisMessaging(this);
-            try {
-                redisMessaging.init(getConfiguration().getRedisAddress(), getConfiguration().getRedisPassword());
-                getLog().info("Loaded redis successfully...");
-            } catch (Exception e) {
-                getLog().info("Couldn't load redis...");
-                e.printStackTrace();
+            if (getConfiguration().get(ConfigKeys.REDIS_ENABLED)) {
+                RedisMessaging redis = new RedisMessaging(this);
+                try {
+                    redis.init(getConfiguration().get(ConfigKeys.REDIS_ADDRESS), getConfiguration().get(ConfigKeys.REDIS_PASSWORD));
+                    getLog().info("Loaded redis successfully...");
+
+                    messagingService = redis;
+                } catch (Exception e) {
+                    getLog().warn("Couldn't load redis...");
+                    e.printStackTrace();
+                }
+            } else {
+                getLog().warn("Messaging Service was set to redis, but redis is not enabled!");
             }
+        } else if (messagingType.equals("bungee")) {
+            getLog().info("Loading bungee messaging service...");
+            BungeeMessagingService bungeeMessaging = new BungeeMessagingService(this);
+            bungeeMessaging.init();
+            messagingService = bungeeMessaging;
+        } else if (messagingType.equals("lilypad")) {
+            getLog().info("Loading LilyPad messaging service...");
+            if (getServer().getPluginManager().getPlugin("LilyPad-Connect") == null) {
+                getLog().warn("LilyPad-Connect plugin not present.");
+            } else {
+                LilyPadMessagingService lilyPadMessaging = new LilyPadMessagingService(this);
+                lilyPadMessaging.init();
+                messagingService = lilyPadMessaging;
+            }
+        } else if (!messagingType.equals("none")) {
+            getLog().warn("Messaging service '" + messagingType + "' not recognised.");
+        }
+
+        if (messagingService == null) {
+            messagingService = new NoopMessagingService();
         }
 
         // setup the update task buffer
@@ -203,7 +242,7 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
         };
 
         // load locale
-        localeManager = new LocaleManager();
+        localeManager = new SimpleLocaleManager();
         File locale = new File(getDataFolder(), "lang.yml");
         if (locale.exists()) {
             getLog().info("Found locale file. Attempting to load from it.");
@@ -216,7 +255,7 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
 
         // register commands
         getLog().info("Registering commands...");
-        BukkitCommand commandManager = new BukkitCommand(this);
+        commandManager = new BukkitCommand(this);
         PluginCommand main = getServer().getPluginCommand("luckperms");
         main.setExecutor(commandManager);
         main.setTabCompleter(commandManager);
@@ -224,24 +263,17 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
 
         // load internal managers
         getLog().info("Loading internal permission managers...");
-        uuidCache = new UuidCache(getConfiguration().isOnlineMode());
+        uuidCache = new UuidCache(this);
         userManager = new GenericUserManager(this);
         groupManager = new GenericGroupManager(this);
-        trackManager = new GenericTrackManager();
-        importer = new Importer(commandManager);
+        trackManager = new GenericTrackManager(this);
         calculatorFactory = new BukkitCalculatorFactory(this);
         cachedStateManager = new CachedStateManager(this);
 
         contextManager = new ContextManager<>();
         worldCalculator = new WorldCalculator(this);
-        pm.registerEvents(worldCalculator, this);
         contextManager.registerCalculator(worldCalculator);
-        contextManager.registerCalculator(new ServerCalculator<>(getConfiguration().getServer()));
-
-        // handle server operators
-        if (getConfiguration().isAutoOp()) {
-            contextManager.registerListener(new AutoOPListener());
-        }
+        contextManager.registerCalculator(new StaticCalculator<>(getConfiguration()));
 
         // Provide vault support
         tryVaultHook(false);
@@ -254,37 +286,41 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
 
 
         // schedule update tasks
-        int mins = getConfiguration().getSyncTime();
+        int mins = getConfiguration().get(ConfigKeys.SYNC_TIME);
         if (mins > 0) {
             long ticks = mins * 60 * 20;
-            getServer().getScheduler().runTaskTimerAsynchronously(this, () -> updateTaskBuffer.request(), 40L, ticks);
+            scheduler.doAsyncRepeating(() -> updateTaskBuffer.request(), ticks);
         }
+        scheduler.doAsyncLater(() -> updateTaskBuffer.request(), 40L);
 
         // run an update instantly.
         updateTaskBuffer.requestDirectly();
 
         // register tasks
-        getServer().getScheduler().runTaskTimerAsynchronously(this, new ExpireTemporaryTask(this), 60L, 60L);
-        getServer().getScheduler().runTaskTimerAsynchronously(this, new CacheHousekeepingTask(this), 2400L, 2400L);
+        scheduler.doAsyncRepeating(new ExpireTemporaryTask(this), 60L);
+        scheduler.doAsyncRepeating(new CacheHousekeepingTask(this), 2400L);
 
         // register permissions
-        registerPermissions(getConfiguration().isCommandsAllowOp() ? PermissionDefault.OP : PermissionDefault.FALSE);
-        if (!getConfiguration().isOpsEnabled()) {
-            getServer().getScheduler().runTask(this, () -> getServer().getOperators().forEach(o -> o.setOp(false)));
+        try {
+            registerPermissions(getConfiguration().get(ConfigKeys.COMMANDS_ALLOW_OP) ? PermissionDefault.OP : PermissionDefault.FALSE);
+        } catch (Exception e) {
+            // this throws an exception if the plugin is /reloaded, grr
+        }
+
+        if (!getConfiguration().get(ConfigKeys.OPS_ENABLED)) {
+            scheduler.doSync(() -> getServer().getOperators().forEach(o -> o.setOp(false)));
         }
 
         // replace the temporary executor when the Bukkit one starts
-        getServer().getScheduler().runTaskAsynchronously(this, () -> {
-            asyncExecutor = bukkitAsyncExecutor;
-        });
+        getServer().getScheduler().runTaskAsynchronously(this, () -> scheduler.setUseBukkitAsync(true));
 
         // Load any online users (in the case of a reload)
         for (Player player : getServer().getOnlinePlayers()) {
-            doAsync(() -> {
-                listener.onAsyncLogin(player.getUniqueId(), player.getName());
+            scheduler.doAsync(() -> {
+                LoginHelper.loadUser(this, player.getUniqueId(), player.getName());
                 User user = getUserManager().get(getUuidCache().getUUID(player.getUniqueId()));
                 if (user != null) {
-                    doSync(() -> {
+                    scheduler.doSync(() -> {
                         try {
                             LPPermissible lpPermissible = new LPPermissible(player, user, this);
                             Injector.inject(player, lpPermissible);
@@ -302,15 +338,18 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
 
     @Override
     public void onDisable() {
+        // Switch back to the LP executor, the bukkit one won't allow new tasks
+        scheduler.setUseBukkitAsync(false);
+
         started = false;
 
         defaultsProvider.close();
-        permissionCache.setShutdown(true);
-        debugHandler.setShutdown(true);
+        permissionVault.setShutdown(true);
+        verboseHandler.setShutdown(true);
 
         for (Player player : getServer().getOnlinePlayers()) {
-            Injector.unInject(player, false);
-            if (getConfiguration().isAutoOp()) {
+            Injector.unInject(player, false, false);
+            if (getConfiguration().get(ConfigKeys.AUTO_OP)) {
                 player.setOp(false);
             }
 
@@ -324,9 +363,13 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
         getLog().info("Closing datastore...");
         storage.shutdown();
 
-        if (redisMessaging != null) {
-            getLog().info("Closing redis...");
-            redisMessaging.shutdown();
+        if (fileWatcher != null) {
+            fileWatcher.close();
+        }
+
+        if (messagingService != null) {
+            getLog().info("Closing messaging service...");
+            messagingService.close();
         }
 
         getLog().info("Unregistering API...");
@@ -337,26 +380,26 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
             vaultHook.unhook(this);
         }
 
+        scheduler.shutdown();
+
         // Bukkit will do this again when #onDisable completes, but we do it early to prevent NPEs elsewhere.
         getServer().getScheduler().cancelTasks(this);
         HandlerList.unregisterAll(this);
 
         // Null everything
         ignoringLogs = null;
-        syncExecutor = null;
-        asyncExecutor = null;
         vaultHook = null;
         configuration = null;
         userManager = null;
         groupManager = null;
         trackManager = null;
         storage = null;
-        redisMessaging = null;
+        fileWatcher = null;
+        messagingService = null;
         uuidCache = null;
         listener = null;
         apiProvider = null;
         log = null;
-        importer = null;
         defaultsProvider = null;
         childPermissionProvider = null;
         localeManager = null;
@@ -365,9 +408,9 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
         worldCalculator = null;
         calculatorFactory = null;
         updateTaskBuffer = null;
-        debugHandler = null;
+        verboseHandler = null;
         senderFactory = null;
-        permissionCache = null;
+        permissionVault = null;
     }
 
     public void tryVaultHook(boolean force) {
@@ -399,19 +442,29 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
         }
     }
 
-    @Override
-    public void doAsync(Runnable r) {
-        asyncExecutor.execute(r);
-    }
+    public void refreshAutoOp(Player player) {
+        if (getConfiguration().get(ConfigKeys.AUTO_OP)) {
+            try {
+                LPPermissible permissible = Injector.getPermissible(player.getUniqueId());
+                if (permissible == null || !permissible.getActive().get()) {
+                    return;
+                }
 
-    @Override
-    public void doSync(Runnable r) {
-        syncExecutor.execute(r);
-    }
+                User user = permissible.getUser();
+                if (user == null) {
+                    return;
+                }
 
-    @Override
-    public void doAsyncRepeating(Runnable r, long interval) {
-        getServer().getScheduler().runTaskTimerAsynchronously(this, r, interval, interval);
+                UserCache userData = user.getUserData();
+                if (userData == null) {
+                    return;
+                }
+
+                Map<String, Boolean> backing = userData.getPermissionData(permissible.calculateContexts()).getImmutableBacking();
+                boolean op = Optional.ofNullable(backing.get("luckperms.autoop")).orElse(false);
+                player.setOp(op);
+            } catch (Exception ignored) {}
+        }
     }
 
     @Override
@@ -420,7 +473,7 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
     }
 
     @Override
-    public PlatformType getType() {
+    public PlatformType getServerType() {
         return PlatformType.BUKKIT;
     }
 
@@ -431,12 +484,12 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
 
     @Override
     public String getServerVersion() {
-        return getServer().getVersion();
+        return getServer().getVersion() + " - " + getServer().getBukkitVersion();
     }
 
     @Override
-    public File getMainDir() {
-        return getDataFolder();
+    public File getDataDirectory() {
+        return super.getDataFolder();
     }
 
     @Override
@@ -457,11 +510,11 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
         }
         return new Contexts(
                 getContextManager().getApplicableContext(player),
-                getConfiguration().isIncludingGlobalPerms(),
-                getConfiguration().isIncludingGlobalWorldPerms(),
+                getConfiguration().get(ConfigKeys.INCLUDING_GLOBAL_PERMS),
+                getConfiguration().get(ConfigKeys.INCLUDING_GLOBAL_WORLD_PERMS),
                 true,
-                getConfiguration().isApplyingGlobalGroups(),
-                getConfiguration().isApplyingGlobalWorldGroups(),
+                getConfiguration().get(ConfigKeys.APPLYING_GLOBAL_GROUPS),
+                getConfiguration().get(ConfigKeys.APPLYING_GLOBAL_WORLD_GROUPS),
                 player.isOp()
         );
     }
@@ -482,12 +535,13 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
     }
 
     @Override
-    public boolean isOnline(UUID external) {
-        return getServer().getPlayer(external) != null;
+    public boolean isPlayerOnline(UUID external) {
+        Player player = getServer().getPlayer(external);
+        return player != null && player.isOnline();
     }
 
     @Override
-    public List<Sender> getSenders() {
+    public List<Sender> getOnlineSenders() {
         return getServer().getOnlinePlayers().stream()
                 .map(p -> getSenderFactory().wrap(p))
                 .collect(Collectors.toList());
@@ -502,29 +556,31 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
     public Set<Contexts> getPreProcessContexts(boolean op) {
         Set<ContextSet> c = new HashSet<>();
         c.add(ContextSet.empty());
-        c.add(ContextSet.singleton("server", getConfiguration().getServer()));
+        c.add(ContextSet.singleton("server", getConfiguration().get(ConfigKeys.SERVER)));
 
         // Pre process all worlds
         c.addAll(getServer().getWorlds().stream()
                 .map(World::getName)
                 .map(s -> {
                     MutableContextSet set = MutableContextSet.create();
-                    set.add("server", getConfiguration().getServer());
+                    set.add("server", getConfiguration().get(ConfigKeys.SERVER));
                     set.add("world", s);
+                    set.addAll(configuration.getStaticContexts().getContextSet());
                     return set.makeImmutable();
                 })
                 .collect(Collectors.toList())
         );
 
         // Pre process the separate Vault server, if any
-        if (!getConfiguration().getServer().equals(getConfiguration().getVaultServer())) {
-            c.add(ContextSet.singleton("server", getConfiguration().getVaultServer()));
+        if (!getConfiguration().get(ConfigKeys.SERVER).equals(getConfiguration().get(ConfigKeys.VAULT_SERVER))) {
+            c.add(ContextSet.singleton("server", getConfiguration().get(ConfigKeys.VAULT_SERVER)));
             c.addAll(getServer().getWorlds().stream()
                     .map(World::getName)
                     .map(s -> {
                         MutableContextSet set = MutableContextSet.create();
-                        set.add("server", getConfiguration().getVaultServer());
+                        set.add("server", getConfiguration().get(ConfigKeys.VAULT_SERVER));
                         set.add("world", s);
+                        set.addAll(configuration.getStaticContexts().getContextSet());
                         return set.makeImmutable();
                     })
                     .collect(Collectors.toList())
@@ -537,25 +593,25 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
         contexts.addAll(c.stream()
                 .map(set -> new Contexts(
                         set,
-                        getConfiguration().isIncludingGlobalPerms(),
-                        getConfiguration().isIncludingGlobalWorldPerms(),
+                        getConfiguration().get(ConfigKeys.INCLUDING_GLOBAL_PERMS),
+                        getConfiguration().get(ConfigKeys.INCLUDING_GLOBAL_WORLD_PERMS),
                         true,
-                        getConfiguration().isApplyingGlobalGroups(),
-                        getConfiguration().isApplyingGlobalWorldGroups(),
+                        getConfiguration().get(ConfigKeys.APPLYING_GLOBAL_GROUPS),
+                        getConfiguration().get(ConfigKeys.APPLYING_GLOBAL_WORLD_GROUPS),
                         op
                 ))
                 .collect(Collectors.toSet())
         );
 
         // Check for and include varying Vault config options
-        boolean vaultDiff = getConfiguration().isVaultIncludingGlobal() != getConfiguration().isIncludingGlobalPerms() ||
-                !getConfiguration().isIncludingGlobalWorldPerms() ||
-                !getConfiguration().isApplyingGlobalGroups() ||
-                !getConfiguration().isApplyingGlobalWorldGroups();
+        boolean vaultDiff = getConfiguration().get(ConfigKeys.VAULT_INCLUDING_GLOBAL) != getConfiguration().get(ConfigKeys.INCLUDING_GLOBAL_PERMS) ||
+                !getConfiguration().get(ConfigKeys.INCLUDING_GLOBAL_WORLD_PERMS) ||
+                !getConfiguration().get(ConfigKeys.APPLYING_GLOBAL_GROUPS) ||
+                !getConfiguration().get(ConfigKeys.APPLYING_GLOBAL_WORLD_GROUPS);
 
         if (vaultDiff) {
             contexts.addAll(c.stream()
-                    .map(map -> new Contexts(map, getConfiguration().isVaultIncludingGlobal(), true, true, true, true, op))
+                    .map(map -> new Contexts(map, getConfiguration().get(ConfigKeys.VAULT_INCLUDING_GLOBAL), true, true, true, true, op))
                     .collect(Collectors.toSet())
             );
         }
@@ -567,45 +623,19 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
     public LinkedHashMap<String, Object> getExtraInfo() {
         LinkedHashMap<String, Object> map = new LinkedHashMap<>();
         map.put("Vault Enabled", vaultHook != null);
-        map.put("Vault Server", configuration.getVaultServer());
+        map.put("Vault Server", configuration.get(ConfigKeys.VAULT_SERVER));
         map.put("Bukkit Defaults count", defaultsProvider.size());
         map.put("Bukkit Child Permissions count", childPermissionProvider.getPermissions().size());
-        map.put("World Cache size", worldCalculator.getWorldCache().size());
-        map.put("Vault Including Global", configuration.isVaultIncludingGlobal());
-        map.put("Vault Ignoring World", configuration.isVaultIgnoreWorld());
-        map.put("Vault Primary Group Overrides", configuration.isVaultPrimaryGroupOverrides());
-        map.put("Vault Debug", configuration.isVaultDebug());
-        map.put("OPs Enabled", configuration.isOpsEnabled());
-        map.put("Auto OP", configuration.isAutoOp());
-        map.put("Commands Allow OPs", configuration.isCommandsAllowOp());
+        map.put("Vault Including Global", configuration.get(ConfigKeys.VAULT_INCLUDING_GLOBAL));
+        map.put("Vault Ignoring World", configuration.get(ConfigKeys.VAULT_IGNORE_WORLD));
+        map.put("Vault Primary Group Overrides", configuration.get(ConfigKeys.VAULT_PRIMARY_GROUP_OVERRIDES));
+        map.put("Vault Debug", configuration.get(ConfigKeys.VAULT_DEBUG));
+        map.put("OPs Enabled", configuration.get(ConfigKeys.OPS_ENABLED));
+        map.put("Auto OP", configuration.get(ConfigKeys.AUTO_OP));
+        map.put("Commands Allow OPs", configuration.get(ConfigKeys.COMMANDS_ALLOW_OP));
         return map;
     }
 
-    @Override
-    public Object getPlugin(String name) {
-        return getServer().getPluginManager().getPlugin(name);
-    }
-
-    @Override
-    public Object getService(Class clazz) {
-        return getServer().getServicesManager().load(clazz);
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public UUID getUUID(String playerName) {
-        try {
-            return getServer().getOfflinePlayer(playerName).getUniqueId();
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    @Override
-    public boolean isPluginLoaded(String name) {
-        return getServer().getPluginManager().isPluginEnabled(name);
-    }
-
     private void registerPermissions(PermissionDefault def) {
         PluginManager pm = getServer().getPluginManager();
 

bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitScheduler.java

@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package me.lucko.luckperms.bukkit;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import me.lucko.luckperms.common.plugin.LuckPermsScheduler;
+
+import org.bukkit.scheduler.BukkitTask;
+
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+public class LPBukkitScheduler implements LuckPermsScheduler {
+    private final LPBukkitPlugin plugin;
+
+    @Getter
+    private ExecutorService asyncLpExecutor;
+    @Getter
+    private Executor asyncBukkitExecutor;
+    private Executor syncExecutor;
+
+    @Getter
+    @Setter
+    private boolean useBukkitAsync = false;
+
+    private Set<BukkitTask> tasks = ConcurrentHashMap.newKeySet();
+
+    public LPBukkitScheduler(LPBukkitPlugin plugin) {
+        this.plugin = plugin;
+
+        this.asyncLpExecutor = Executors.newCachedThreadPool();
+        this.asyncBukkitExecutor = r -> plugin.getServer().getScheduler().runTaskAsynchronously(plugin, r);
+        this.syncExecutor = r -> plugin.getServer().getScheduler().runTask(plugin, r);
+    }
+
+    @Override
+    public Executor getAsyncExecutor() {
+        return useBukkitAsync ? asyncBukkitExecutor : asyncLpExecutor;
+    }
+
+    @Override
+    public Executor getSyncExecutor() {
+        return syncExecutor;
+    }
+
+    @Override
+    public void doAsync(Runnable r) {
+        getAsyncExecutor().execute(r);
+    }
+
+    @Override
+    public void doSync(Runnable r) {
+        getSyncExecutor().execute(r);
+    }
+
+    @Override
+    public void doAsyncRepeating(Runnable r, long interval) {
+        BukkitTask task = plugin.getServer().getScheduler().runTaskTimerAsynchronously(plugin, r, interval, interval);
+        tasks.add(task);
+    }
+
+    @Override
+    public void doSyncRepeating(Runnable r, long interval) {
+        BukkitTask task = plugin.getServer().getScheduler().runTaskTimer(plugin, r, interval, interval);
+        tasks.add(task);
+    }
+
+    @Override
+    public void doAsyncLater(Runnable r, long delay) {
+        plugin.getServer().getScheduler().runTaskLaterAsynchronously(plugin, r, delay);
+    }
+
+    @Override
+    public void doSyncLater(Runnable r, long delay) {
+        plugin.getServer().getScheduler().runTaskLater(plugin, r, delay);
+    }
+
+    @Override
+    public void shutdown() {
+        tasks.forEach(BukkitTask::cancel);
+        // wait for executor
+        asyncLpExecutor.shutdown();
+        try {
+            asyncLpExecutor.awaitTermination(30, TimeUnit.SECONDS);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+
+    }
+}

bukkit/src/main/java/me/lucko/luckperms/bukkit/WorldCalculator.java

@@ -22,85 +22,32 @@
 
 package me.lucko.luckperms.bukkit;
 
-import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
 import com.google.common.collect.Maps;
 
 import me.lucko.luckperms.api.context.ContextCalculator;
 import me.lucko.luckperms.api.context.MutableContextSet;
-import me.lucko.luckperms.common.LuckPermsPlugin;
+import me.lucko.luckperms.common.config.ConfigKeys;
+import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 
 import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerChangedWorldEvent;
-import org.bukkit.event.player.PlayerLoginEvent;
-
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
 
 @RequiredArgsConstructor
-public class WorldCalculator extends ContextCalculator<Player> implements Listener {
+public class WorldCalculator implements ContextCalculator<Player> {
     private static final String WORLD_KEY = "world";
 
     private final LuckPermsPlugin plugin;
 
-    @Getter
-    private final Map<UUID, String> worldCache = new ConcurrentHashMap<>();
-
     @Override
     public MutableContextSet giveApplicableContext(Player subject, MutableContextSet accumulator) {
-        String world = getWorld(subject);
+        String world = subject.getWorld().getName();
+        world = plugin.getConfiguration().get(ConfigKeys.WORLD_REWRITES).getOrDefault(world, world);
 
         if (world != null) {
-            accumulator.add(Maps.immutableEntry(WORLD_KEY, world));
+            accumulator.add(Maps.immutableEntry(WORLD_KEY, world.toLowerCase()));
         }
 
         return accumulator;
     }
-
-    @Override
-    public boolean isContextApplicable(Player subject, Map.Entry<String, String> context) {
-        if (!context.getKey().equals(WORLD_KEY)) {
-            return false;
-        }
-
-        String world = getWorld(subject);
-        return world != null && world.equals(context.getValue());
-    }
-
-    private String getWorld(Player player) {
-        UUID internal = plugin.getUuidCache().getUUID(player.getUniqueId());
-        String world = worldCache.get(internal);
-        if (world == null) {
-            return null;
-        }
-
-        return plugin.getConfiguration().getWorldRewrites().getOrDefault(world, world);
-    }
-
-    @EventHandler(priority = EventPriority.LOW)
-    public void onPlayerJoin(PlayerLoginEvent e) {
-        UUID internal = plugin.getUuidCache().getUUID(e.getPlayer().getUniqueId());
-        worldCache.put(internal, e.getPlayer().getWorld().getName());
-        pushUpdate(
-                e.getPlayer(),
-                Maps.immutableEntry(WORLD_KEY, null),
-                Maps.immutableEntry(WORLD_KEY, e.getPlayer().getWorld().getName())
-        );
-    }
-
-    @EventHandler(priority = EventPriority.LOWEST)
-    public void onPlayerChangedWorld(PlayerChangedWorldEvent e) {
-        UUID internal = plugin.getUuidCache().getUUID(e.getPlayer().getUniqueId());
-        worldCache.put(internal, e.getPlayer().getWorld().getName());
-        pushUpdate(
-                e.getPlayer(),
-                Maps.immutableEntry(WORLD_KEY, e.getFrom().getName()),
-                Maps.immutableEntry(WORLD_KEY, e.getPlayer().getWorld().getName())
-        );
-    }
 }

bukkit/src/main/java/me/lucko/luckperms/bukkit/compat/BukkitJsonMessageHandler.java

@@ -22,7 +22,6 @@
 
 package me.lucko.luckperms.bukkit.compat;
 
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 import java.lang.reflect.Constructor;
@@ -58,7 +57,7 @@ public class BukkitJsonMessageHandler {
             }
         }
 
-        Class<?> packetChatClass = Class.forName(getVersionedClassName("PacketPlayOutChat"));
+        Class<?> packetChatClass = ReflectionUtil.nmsClass("PacketPlayOutChat");
         Constructor[] packetConstructors = packetChatClass.getDeclaredConstructors();
         for (Constructor c : packetConstructors) {
             Class<?>[] parameters = c.getParameterTypes();
@@ -68,30 +67,19 @@ public class BukkitJsonMessageHandler {
             }
         }
 
-        Class<?> baseComponentClass = Class.forName(getVersionedClassName("IChatBaseComponent"));
-        Class<?> chatSerializerClass = baseComponentClass.getClasses()[0];
+        Class<?> baseComponentClass = ReflectionUtil.nmsClass("IChatBaseComponent");
+        Class<?> chatSerializerClass;
+
+        if (baseComponentClass.getClasses().length > 0) {
+            chatSerializerClass = baseComponentClass.getClasses()[0];
+        } else {
+            // 1.7 class is here instead.
+            chatSerializerClass = ReflectionUtil.nmsClass("ChatSerializer");
+        }
 
         SERIALIZE_METHOD = chatSerializerClass.getDeclaredMethod("a", String.class);
     }
 
-    private static String getVersionedClassName(String className) {
-        Class server = Bukkit.getServer().getClass();
-        if (!server.getSimpleName().equals("CraftServer")) {
-            throw new RuntimeException("Couldn't reflect into server " + server);
-        }
-
-        String version;
-        if (server.getName().equals("org.bukkit.craftbukkit.CraftServer")) {
-            // Non versioned class
-            version = ".";
-        } else {
-            version = server.getName().substring("org.bukkit.craftbukkit".length());
-            version = version.substring(0, version.length() - "CraftServer".length());
-        }
-
-        return "net.minecraft.server" + version + className;
-    }
-
     private static synchronized boolean trySetup(Object player) {
         if (setup) return true;
         if (triedAndFailed) return false;

bukkit/src/main/java/me/lucko/luckperms/bukkit/compat/MessageHandler.java

@@ -37,9 +37,9 @@ public class MessageHandler {
     }
 
     public void sendJsonMessage(CommandSender sender, FancyMessage message) {
-        if (sender instanceof Player) {
+        if (ReflectionUtil.isChatCompatible() && sender instanceof Player) {
             Player player = (Player) sender;
-            String json = message.toJSONString();
+            String json = message.exportToJson();
 
             // Try Bukkit.
             if (bukkitHandler.sendJsonMessage(player, json)) {

bukkit/src/main/java/me/lucko/luckperms/bukkit/compat/ReflectionUtil.java

@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package me.lucko.luckperms.bukkit.compat;
+
+import lombok.experimental.UtilityClass;
+
+import org.bukkit.Bukkit;
+
+@UtilityClass
+public class ReflectionUtil {
+    private static final String SERVER_VERSION = _getServerVersion();
+    private static final boolean CHAT_COMPATIBLE = !SERVER_VERSION.startsWith(".v1_7_");
+
+    private static String _getServerVersion() {
+        Class<?> server = Bukkit.getServer().getClass();
+        if (!server.getSimpleName().equals("CraftServer")) {
+            return ".";
+        }
+        if (server.getName().equals("org.bukkit.craftbukkit.CraftServer")) {
+            // Non versioned class
+            return ".";
+        } else {
+            String version = server.getName().substring("org.bukkit.craftbukkit".length());
+            return version.substring(0, version.length() - "CraftServer".length());
+        }
+    }
+
+    public static String getServerVersion() {
+        return SERVER_VERSION;
+    }
+
+    public static boolean isChatCompatible() {
+        return CHAT_COMPATIBLE;
+    }
+
+    public static String nms(String className) {
+        return "net.minecraft.server" + getServerVersion() + className;
+    }
+
+    public static Class<?> nmsClass(String className) throws ClassNotFoundException {
+        return Class.forName(nms(className));
+    }
+
+    public static String obc(String className) {
+        return "org.bukkit.craftbukkit" + getServerVersion() + className;
+    }
+
+    public static Class<?> obcClass(String className) throws ClassNotFoundException {
+        return Class.forName(obc(className));
+    }
+}

bukkit/src/main/java/me/lucko/luckperms/bukkit/messaging/BungeeMessagingService.java

@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package me.lucko.luckperms.bukkit.messaging;
+
+import com.google.common.collect.Iterables;
+import com.google.common.io.ByteArrayDataInput;
+import com.google.common.io.ByteArrayDataOutput;
+import com.google.common.io.ByteStreams;
+
+import me.lucko.luckperms.bukkit.LPBukkitPlugin;
+import me.lucko.luckperms.common.messaging.AbstractMessagingService;
+
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.messaging.PluginMessageListener;
+import org.bukkit.scheduler.BukkitRunnable;
+
+import java.util.Collection;
+
+/**
+ * An implementation of {@link me.lucko.luckperms.api.MessagingService} using the plugin messaging channels.
+ */
+public class BungeeMessagingService extends AbstractMessagingService implements PluginMessageListener {
+    private final LPBukkitPlugin plugin;
+
+    public BungeeMessagingService(LPBukkitPlugin plugin) {
+        super(plugin, "Bungee");
+        this.plugin = plugin;
+    }
+
+    public void init() {
+        plugin.getServer().getMessenger().registerOutgoingPluginChannel(plugin, CHANNEL);
+        plugin.getServer().getMessenger().registerIncomingPluginChannel(plugin, CHANNEL, this);
+    }
+
+    @Override
+    public void close() {
+        plugin.getServer().getMessenger().unregisterIncomingPluginChannel(plugin, CHANNEL);
+        plugin.getServer().getMessenger().unregisterOutgoingPluginChannel(plugin, CHANNEL);
+    }
+
+    @Override
+    protected void sendMessage(String channel, String message) {
+        new BukkitRunnable() {
+            @Override
+            public void run() {
+                Collection<? extends Player> players = plugin.getServer().getOnlinePlayers();
+                Player p = Iterables.getFirst(players, null);
+                if (p == null) {
+                    return;
+                }
+
+                ByteArrayDataOutput out = ByteStreams.newDataOutput();
+                out.writeUTF(message);
+
+                byte[] data = out.toByteArray();
+
+                p.sendPluginMessage(plugin, channel, data);
+                cancel();
+            }
+        }.runTaskTimer(plugin, 1L, 100L);
+    }
+
+    @Override
+    public void onPluginMessageReceived(String s, Player player, byte[] bytes) {
+        if (!s.equals(CHANNEL)) {
+            return;
+        }
+
+        ByteArrayDataInput in = ByteStreams.newDataInput(bytes);
+        String msg = in.readUTF();
+
+        onMessage(s, msg, null);
+    }
+}

bukkit/src/main/java/me/lucko/luckperms/bukkit/messaging/LilyPadMessagingService.java

@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package me.lucko.luckperms.bukkit.messaging;
+
+import me.lucko.luckperms.bukkit.LPBukkitPlugin;
+import me.lucko.luckperms.common.messaging.AbstractMessagingService;
+
+import lilypad.client.connect.api.Connect;
+import lilypad.client.connect.api.event.EventListener;
+import lilypad.client.connect.api.event.MessageEvent;
+import lilypad.client.connect.api.request.RequestException;
+import lilypad.client.connect.api.request.impl.MessageRequest;
+
+import java.io.UnsupportedEncodingException;
+import java.util.Collections;
+
+/**
+ * An implementation of {@link me.lucko.luckperms.api.MessagingService} using LilyPad.
+ */
+public class LilyPadMessagingService extends AbstractMessagingService {
+    private final LPBukkitPlugin plugin;
+    private Connect connect;
+
+    public LilyPadMessagingService(LPBukkitPlugin plugin) {
+        super(plugin, "LilyPad");
+        this.plugin = plugin;
+    }
+
+    public void init() {
+        connect = plugin.getServer().getServicesManager().getRegistration(Connect.class).getProvider();
+        connect.registerEvents(this);
+    }
+
+    @Override
+    public void close() {
+        connect.unregisterEvents(this);
+    }
+
+    @Override
+    protected void sendMessage(String channel, String message) {
+        MessageRequest request;
+
+        try {
+            request = new MessageRequest(Collections.emptyList(), channel, message);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+            return;
+        }
+
+        try {
+            connect.request(request);
+        } catch (RequestException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @EventListener
+    public void onMessage(MessageEvent event) {
+        plugin.doAsync(() -> {
+            try {
+                String channel = event.getChannel();
+                String message = event.getMessageAsString();
+
+                onMessage(channel, message, null);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        });
+    }
+}

bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationBPermissions.java

@@ -29,35 +29,34 @@ import de.bananaco.bpermissions.api.Permission;
 import de.bananaco.bpermissions.api.World;
 import de.bananaco.bpermissions.api.WorldManager;
 
-import me.lucko.luckperms.api.Logger;
-import me.lucko.luckperms.api.MetaUtils;
-import me.lucko.luckperms.common.LuckPermsPlugin;
+import me.lucko.luckperms.api.event.cause.CreationCause;
 import me.lucko.luckperms.common.commands.CommandException;
 import me.lucko.luckperms.common.commands.CommandResult;
-import me.lucko.luckperms.common.commands.SubCommand;
+import me.lucko.luckperms.common.commands.abstraction.SubCommand;
+import me.lucko.luckperms.common.commands.impl.migration.MigrationUtils;
 import me.lucko.luckperms.common.commands.sender.Sender;
-import me.lucko.luckperms.common.constants.Constants;
+import me.lucko.luckperms.common.core.NodeFactory;
 import me.lucko.luckperms.common.core.model.PermissionHolder;
 import me.lucko.luckperms.common.core.model.User;
-import me.lucko.luckperms.common.data.LogEntry;
+import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.utils.Predicates;
-import me.lucko.luckperms.exceptions.ObjectAlreadyHasException;
+import me.lucko.luckperms.common.utils.ProgressLogger;
+
+import org.bukkit.Bukkit;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
 
 import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import static me.lucko.luckperms.common.constants.Permission.MIGRATION;
 
 public class MigrationBPermissions extends SubCommand<Object> {
     private static Field uConfigField;
-    private static Method getConfigurationSectionMethod = null;
-    private static Method getKeysMethod = null;
-
     static {
         try {
             uConfigField = Class.forName("de.bananaco.bpermissions.imp.YamlWorld").getDeclaredField("uconfig");
@@ -67,182 +66,104 @@ public class MigrationBPermissions extends SubCommand<Object> {
         }
     }
 
-    @SuppressWarnings("unchecked")
-    private static Set<String> getUsers(World world) {
-        try {
-            Object yamlWorldUsers = uConfigField.get(world);
-            if (getConfigurationSectionMethod == null) {
-                getConfigurationSectionMethod = yamlWorldUsers.getClass().getMethod("getConfigurationSection", String.class);
-                getConfigurationSectionMethod.setAccessible(true);
-            }
-
-            Object configSection = getConfigurationSectionMethod.invoke(yamlWorldUsers, "users");
-            if (configSection == null) {
-                return Collections.emptySet();
-            }
-
-            if (getKeysMethod == null) {
-                getKeysMethod = configSection.getClass().getMethod("getKeys", boolean.class);
-                getKeysMethod.setAccessible(true);
-            }
-
-            return (Set<String>) getKeysMethod.invoke(configSection, false);
-        } catch (Throwable t) {
-            t.printStackTrace();
-            return null;
-        }
-    }
-
-    private static void migrateHolder(LuckPermsPlugin plugin, World world, Calculable c, PermissionHolder holder) {
-        // Migrate the groups permissions in this world
-        for (Permission p : c.getPermissions()) {
-            try {
-                holder.setPermission(p.name(), p.isTrue(), "global", world.getName());
-                LogEntry.build()
-                        .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                        .acted(holder).action("set " + p.name() + " " + p.isTrue() + " global " + world.getName())
-                        .build().submit(plugin);
-            } catch (Exception ex) {
-                if (!(ex instanceof ObjectAlreadyHasException)) {
-                    ex.printStackTrace();
-                }
-            }
-
-            // Include any child permissions
-            for (Map.Entry<String, Boolean> child : p.getChildren().entrySet()) {
-                try {
-                    holder.setPermission(child.getKey(), child.getValue(), "global", world.getName());
-                    LogEntry.build()
-                            .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                            .acted(holder).action("set " + child.getKey() + " " + child.getValue() + " global " + world.getName())
-                            .build().submit(plugin);
-                } catch (Exception ex) {
-                    if (!(ex instanceof ObjectAlreadyHasException)) {
-                        ex.printStackTrace();
-                    }
-                }
-            }
-        }
-
-        // Migrate any inherited groups
-        for (Group parent : c.getGroups()) {
-            try {
-                holder.setPermission("group." + parent.getName(), true, "global", world.getName());
-                LogEntry.build()
-                        .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                        .acted(holder).action("setinherit " + parent.getName() + " global " + world.getName())
-                        .build().submit(plugin);
-            } catch (Exception ex) {
-                if (!(ex instanceof ObjectAlreadyHasException)) {
-                    ex.printStackTrace();
-                }
-            }
-        }
-
-        // Migrate existing meta
-        for (Map.Entry<String, String> meta : c.getMeta().entrySet()) {
-            if (meta.getKey().equalsIgnoreCase("prefix") || meta.getKey().equalsIgnoreCase("suffix")) {
-                String chatMeta = MetaUtils.escapeCharacters(meta.getValue());
-                try {
-                    holder.setPermission(meta.getKey().toLowerCase() + "." + c.getPriority() + "." + chatMeta, true);
-                    LogEntry.build()
-                            .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                            .acted(holder).action("set " + meta.getKey().toLowerCase() + "." + c.getPriority() + "." + chatMeta + " true")
-                            .build().submit(plugin);
-                } catch (Exception ex) {
-                    if (!(ex instanceof ObjectAlreadyHasException)) {
-                        ex.printStackTrace();
-                    }
-                }
-                continue;
-            }
-
-            try {
-                holder.setPermission("meta." + meta.getKey() + "." + meta.getValue(), true, "global", world.getName());
-                LogEntry.build()
-                        .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                        .acted(holder).action("set meta." + meta.getKey() + "." + meta.getValue() + " true global " + world.getName())
-                        .build().submit(plugin);
-            } catch (Exception ex) {
-                if (!(ex instanceof ObjectAlreadyHasException)) {
-                    ex.printStackTrace();
-                }
-            }
-        }
-    }
-
     public MigrationBPermissions() {
         super("bpermissions", "Migration from bPermissions", MIGRATION, Predicates.alwaysFalse(), null);
     }
 
     @Override
     public CommandResult execute(LuckPermsPlugin plugin, Sender sender, Object o, List<String> args, String label) throws CommandException {
-        final Logger log = plugin.getLog();
+        ProgressLogger log = new ProgressLogger("bPermissions");
+        log.addListener(plugin.getConsoleSender());
+        log.addListener(sender);
+
+        log.log("Starting.");
 
         WorldManager worldManager = WorldManager.getInstance();
         if (worldManager == null) {
-            log.severe("bPermissions Migration: Error -> bPermissions is not loaded.");
+            log.logErr("Plugin not loaded.");
             return CommandResult.STATE_ERROR;
         }
 
-        log.info("bPermissions Migration: Forcing the plugin to load all data. This could take a while.");
+        log.log("Forcing the plugin to load all data. This could take a while.");
         for (World world : worldManager.getAllWorlds()) {
-            Set<String> users = getUsers(world);
+            log.log("Loading users in world " + world.getName());
+
+            YamlConfiguration yamlWorldUsers = null;
+            try {
+                yamlWorldUsers = (YamlConfiguration) uConfigField.get(world);
+            } catch (Throwable t) {
+                t.printStackTrace();
+            }
+
+            if (yamlWorldUsers == null) {
+                continue;
+            }
+
+            ConfigurationSection configSection = yamlWorldUsers.getConfigurationSection("users");
+            if (configSection == null) {
+                continue;
+            }
+
+            Set<String> users = configSection.getKeys(false);
             if (users == null) {
-                log.severe("bPermissions Migration: Couldn't get a list of users.");
+                log.logErr("Couldn't get a list of users.");
                 return CommandResult.FAILURE;
             }
-            users.forEach(s -> world.loadOne(s, CalculableType.USER));
+            AtomicInteger userLoadCount = new AtomicInteger(0);
+            users.forEach(s -> {
+                world.loadOne(s, CalculableType.USER);
+                log.logProgress("Forcefully loaded {} users so far.", userLoadCount.incrementAndGet());
+            });
         }
+        log.log("Forcefully loaded all users.");
 
         // Migrate one world at a time.
-        log.info("bPermissions Migration: Starting world migration.");
+        log.log("Starting world migration.");
         for (World world : worldManager.getAllWorlds()) {
-            log.info("bPermissions Migration: Migrating world: " + world.getName());
+            log.log("Migrating world: " + world.getName());
 
             // Migrate all groups
-            log.info("bPermissions Migration: Starting group migration in world " + world.getName() + ".");
-            int groupCount = 0;
+            log.log("Starting group migration in world " + world.getName() + ".");
+            AtomicInteger groupCount = new AtomicInteger(0);
             for (Calculable group : world.getAll(CalculableType.GROUP)) {
-                groupCount++;
-                String groupName = group.getName().toLowerCase();
+                String groupName = MigrationUtils.standardizeName(group.getName());
                 if (group.getName().equalsIgnoreCase(world.getDefaultGroup())) {
                     groupName = "default";
                 }
 
                 // Make a LuckPerms group for the one being migrated.
-                plugin.getStorage().createAndLoadGroup(groupName).join();
+                plugin.getStorage().createAndLoadGroup(groupName, CreationCause.INTERNAL).join();
                 me.lucko.luckperms.common.core.model.Group lpGroup = plugin.getGroupManager().getIfLoaded(groupName);
-                try {
-                    LogEntry.build()
-                            .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                            .acted(lpGroup).action("create")
-                            .build().submit(plugin);
-                } catch (Exception ex) {
-                    ex.printStackTrace();
-                }
 
-                migrateHolder(plugin, world, group, lpGroup);
+                MigrationUtils.setGroupWeight(lpGroup, group.getPriority());
+                migrateHolder(world, group, lpGroup);
+
                 plugin.getStorage().saveGroup(lpGroup);
+
+                log.logAllProgress("Migrated {} groups so far.", groupCount.incrementAndGet());
             }
-            log.info("bPermissions Migration: Migrated " + groupCount + " groups in world " + world.getName() + ".");
+            log.log("Migrated " + groupCount.get() + " groups in world " + world.getName() + ".");
+
 
             // Migrate all users
-            log.info("bPermissions Migration: Starting user migration in world " + world.getName() + ".");
-            int userCount = 0;
+            log.log("Starting user migration in world " + world.getName() + ".");
+            AtomicInteger userCount = new AtomicInteger(0);
             for (Calculable user : world.getAll(CalculableType.USER)) {
-                userCount++;
-
                 // There is no mention of UUIDs in the API. I assume that name = uuid. idk?
-                UUID uuid;
+                UUID uuid = null;
                 try {
                     uuid = UUID.fromString(user.getName());
                 } catch (IllegalArgumentException e) {
-                    uuid = plugin.getUUID(user.getName());
+                    try {
+                        //noinspection deprecation
+                        uuid = Bukkit.getOfflinePlayer(user.getName()).getUniqueId();
+                    } catch (Exception ex) {
+                        e.printStackTrace();
+                    }
                 }
 
                 if (uuid == null) {
-                    log.info("bPermissions Migration: Unable to migrate user " + user.getName() + ". Unable to get UUID.");
+                    log.logErr("Unable to migrate user " + user.getName() + ". Cannot to get UUID.");
                     continue;
                 }
 
@@ -250,16 +171,61 @@ public class MigrationBPermissions extends SubCommand<Object> {
                 plugin.getStorage().loadUser(uuid, "null").join();
                 User lpUser = plugin.getUserManager().get(uuid);
 
-                migrateHolder(plugin, world, user, lpUser);
+                migrateHolder(world, user, lpUser);
 
                 plugin.getStorage().saveUser(lpUser);
                 plugin.getUserManager().cleanup(lpUser);
+
+                log.logProgress("Migrated {} users so far.", userCount.incrementAndGet());
             }
 
-            log.info("bPermissions Migration: Migrated " + userCount + " users in world " + world.getName() + ".");
+            log.log("Migrated " + userCount.get() + " users in world " + world.getName() + ".");
         }
 
-        log.info("bPermissions Migration: Success! Completed without any errors.");
+        log.log("Success! Migration complete.");
         return CommandResult.SUCCESS;
     }
+
+    private static void migrateHolder(World world, Calculable c, PermissionHolder holder) {
+        // Migrate the groups permissions in this world
+        for (Permission p : c.getPermissions()) {
+            if (p.name().isEmpty()) {
+                continue;
+            }
+            holder.setPermission(NodeFactory.make(p.name(), p.isTrue(), "global", world.getName()));
+
+            // Include any child permissions
+            for (Map.Entry<String, Boolean> child : p.getChildren().entrySet()) {
+                if (child.getKey().isEmpty()) {
+                    continue;
+                }
+
+                holder.setPermission(NodeFactory.make(child.getKey(), child.getValue(), "global", world.getName()));
+            }
+        }
+
+        // Migrate any inherited groups
+        for (Group parent : c.getGroups()) {
+            String parentName = MigrationUtils.standardizeName(parent.getName());
+            if (parent.getName().equalsIgnoreCase(world.getDefaultGroup())) {
+                parentName = "default";
+            }
+
+            holder.setPermission(NodeFactory.make("group." + parentName, true, "global", world.getName()));
+        }
+
+        // Migrate existing meta
+        for (Map.Entry<String, String> meta : c.getMeta().entrySet()) {
+            if (meta.getKey().isEmpty() || meta.getValue().isEmpty()) {
+                continue;
+            }
+
+            if (meta.getKey().equalsIgnoreCase("prefix") || meta.getKey().equalsIgnoreCase("suffix")) {
+                holder.setPermission(NodeFactory.makeChatMetaNode(meta.getKey().equalsIgnoreCase("prefix"), c.getPriority(), meta.getValue()).setWorld(world.getName()).build());
+                continue;
+            }
+
+            holder.setPermission(NodeFactory.makeMetaNode(meta.getKey(), meta.getValue()).setWorld(world.getName()).build());
+        }
+    }
 }

bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationGroupManager.java

@@ -22,20 +22,19 @@
 
 package me.lucko.luckperms.bukkit.migration;
 
-import me.lucko.luckperms.api.Logger;
-import me.lucko.luckperms.common.LuckPermsPlugin;
+import me.lucko.luckperms.api.Node;
+import me.lucko.luckperms.api.event.cause.CreationCause;
 import me.lucko.luckperms.common.commands.Arg;
 import me.lucko.luckperms.common.commands.CommandException;
 import me.lucko.luckperms.common.commands.CommandResult;
-import me.lucko.luckperms.common.commands.SubCommand;
+import me.lucko.luckperms.common.commands.abstraction.SubCommand;
+import me.lucko.luckperms.common.commands.impl.migration.MigrationUtils;
 import me.lucko.luckperms.common.commands.sender.Sender;
-import me.lucko.luckperms.common.constants.Constants;
 import me.lucko.luckperms.common.constants.Permission;
 import me.lucko.luckperms.common.core.NodeFactory;
-import me.lucko.luckperms.common.data.LogEntry;
+import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.utils.Predicates;
-import me.lucko.luckperms.exceptions.ObjectAlreadyHasException;
-import me.lucko.luckperms.exceptions.ObjectLacksException;
+import me.lucko.luckperms.common.utils.ProgressLogger;
 
 import org.anjocaido.groupmanager.GlobalGroups;
 import org.anjocaido.groupmanager.GroupManager;
@@ -43,254 +42,242 @@ import org.anjocaido.groupmanager.data.Group;
 import org.anjocaido.groupmanager.data.User;
 import org.anjocaido.groupmanager.dataholder.WorldDataHolder;
 import org.anjocaido.groupmanager.dataholder.worlds.WorldsHolder;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
 
-import java.util.AbstractMap;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 public class MigrationGroupManager extends SubCommand<Object> {
     public MigrationGroupManager() {
         super("groupmanager", "Migration from GroupManager", Permission.MIGRATION, Predicates.is(0),
-                Arg.list(Arg.create("world names...", false, "a list of worlds to migrate permissions from"))
+                Arg.list(Arg.create("migrate as global", true, "if world permissions should be ignored, and just migrated as global"))
         );
     }
 
     @Override
     public CommandResult execute(LuckPermsPlugin plugin, Sender sender, Object o, List<String> args, String label) throws CommandException {
-        final Logger log = plugin.getLog();
-        if (!plugin.isPluginLoaded("GroupManager")) {
-            log.severe("GroupManager Migration: Error -> GroupManager is not loaded.");
+        ProgressLogger log = new ProgressLogger("GroupManager");
+        log.addListener(plugin.getConsoleSender());
+        log.addListener(sender);
+
+        log.log("Starting.");
+
+        if (!args.get(0).equalsIgnoreCase("true") && !args.get(0).equalsIgnoreCase("false")) {
+            log.logErr("Was expecting true/false, but got " + args.get(0) + " instead.");
+            return CommandResult.STATE_ERROR;
+        }
+        final boolean migrateAsGlobal = Boolean.parseBoolean(args.get(0));
+        final Function<String, String> worldMappingFunc = s -> migrateAsGlobal ? null : s;
+        
+        if (!Bukkit.getPluginManager().isPluginEnabled("GroupManager")) {
+            log.logErr("Plugin not loaded.");
             return CommandResult.STATE_ERROR;
         }
 
-        final List<String> worlds = args.stream()
-                .map(String::toLowerCase)
-                .collect(Collectors.toList());
-
-        GroupManager gm = (GroupManager) plugin.getPlugin("GroupManager");
+        List<String> worlds = Bukkit.getWorlds().stream().map(World::getName).map(String::toLowerCase).collect(Collectors.toList());
+        GroupManager gm = (GroupManager) Bukkit.getPluginManager().getPlugin("GroupManager");
 
         // Migrate Global Groups
-        log.info("GroupManager Migration: Starting Global Group migration.");
+        log.log("Starting global group migration.");
         GlobalGroups gg = GroupManager.getGlobalGroups();
 
+        AtomicInteger globalGroupCount = new AtomicInteger(0);
         for (Group g : gg.getGroupList()) {
-            plugin.getStorage().createAndLoadGroup(g.getName().toLowerCase()).join();
-            me.lucko.luckperms.common.core.model.Group group = plugin.getGroupManager().getIfLoaded(g.getName().toLowerCase());
-            try {
-                LogEntry.build()
-                        .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                        .acted(group).action("create")
-                        .build().submit(plugin);
-            } catch (Exception ex) {
-                ex.printStackTrace();
-            }
+            String groupName = MigrationUtils.standardizeName(g.getName());
+
+            plugin.getStorage().createAndLoadGroup(groupName, CreationCause.INTERNAL).join();
+            me.lucko.luckperms.common.core.model.Group group = plugin.getGroupManager().getIfLoaded(groupName);
 
             for (String node : g.getPermissionList()) {
-                boolean value = true;
-                if (node.startsWith("!") || node.startsWith("-")) {
-                    node = node.substring(1);
-                    value = false;
-                } else if (node.startsWith("+")) {
-                    node = node.substring(1);
-                    value = true;
+                if (node.isEmpty()) {
+                    continue;
                 }
 
-                try {
-                    group.setPermission(node, value);
-                    LogEntry.build()
-                            .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                            .acted(group).action("set " + node + " " + value)
-                            .build().submit(plugin);
-                } catch (Exception ex) {
-                    if (!(ex instanceof ObjectAlreadyHasException)) {
-                        ex.printStackTrace();
-                    }
-                }
+                group.setPermission(MigrationUtils.parseNode(node, true).build());
             }
 
             for (String s : g.getInherits()) {
-                try {
-                    group.setPermission("group." + s.toLowerCase(), true);
-                    LogEntry.build()
-                            .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                            .acted(group).action("setinherit " + s.toLowerCase())
-                            .build().submit(plugin);
-                } catch (Exception ex) {
-                    if (!(ex instanceof ObjectAlreadyHasException)) {
-                        ex.printStackTrace();
-                    }
+                if (s.isEmpty()) {
+                    continue;
                 }
+
+                group.setPermission(NodeFactory.make("group." + MigrationUtils.standardizeName(s)));
             }
 
             plugin.getStorage().saveGroup(group);
+            log.logAllProgress("Migrated {} groups so far.", globalGroupCount.incrementAndGet());
         }
+        log.log("Migrated " + globalGroupCount.get() + " global groups");
 
-        Map<UUID, Map<Map.Entry<String, String>, Boolean>> users = new HashMap<>();
+        // Collect data
+        Map<UUID, Set<Node>> users = new HashMap<>();
         Map<UUID, String> primaryGroups = new HashMap<>();
-        Map<String, Map<Map.Entry<String, String>, Boolean>> groups = new HashMap<>();
+        Map<String, Set<Node>> groups = new HashMap<>();
 
         WorldsHolder wh = gm.getWorldsHolder();
 
         // Collect data for all users and groups.
-        log.info("GroupManager Migration: Starting user and group migration.");
+        log.log("Collecting user and group data.");
         for (String world : worlds) {
             world = world.toLowerCase();
+            log.log("Querying world " + world);
 
             WorldDataHolder wdh = wh.getWorldData(world);
 
-            for (Group g : wdh.getGroupList()) {
-                groups.putIfAbsent(g.getName().toLowerCase(), new HashMap<>());
+            AtomicInteger groupWorldCount = new AtomicInteger(0);
+            for (Group group : wdh.getGroupList()) {
+                String groupName = MigrationUtils.standardizeName(group.getName());
 
-                for (String node : g.getPermissionList()) {
-                    boolean value = true;
-                    if (node.startsWith("!") || node.startsWith("-")) {
-                        node = node.substring(1);
-                        value = false;
-                    } else if (node.startsWith("+")) {
-                        node = node.substring(1);
-                        value = true;
+                groups.putIfAbsent(groupName, new HashSet<>());
+
+                for (String node : group.getPermissionList()) {
+                    if (node.isEmpty()) {
+                        continue;
                     }
 
-                    groups.get(g.getName().toLowerCase()).put(new AbstractMap.SimpleEntry<>(world, node), value);
+                    groups.get(groupName).add(MigrationUtils.parseNode(node, true).setWorld(worldMappingFunc.apply(world)).build());
                 }
 
-                for (String s : g.getInherits()) {
-                    groups.get(g.getName().toLowerCase()).put(new AbstractMap.SimpleEntry<>(world, "group." + s.toLowerCase()), true);
+                for (String s : group.getInherits()) {
+                    if (s.isEmpty()) {
+                        continue;
+                    }
+
+                    groups.get(groupName).add(NodeFactory.make("group." + MigrationUtils.standardizeName(s), true, null, worldMappingFunc.apply(world)));
                 }
+
+
+                String[] metaKeys = group.getVariables().getVarKeyList();
+                for (String key : metaKeys) {
+                    String value = group.getVariables().getVarString(key);
+                    key = key.toLowerCase();
+
+                    if (key.isEmpty() || value.isEmpty()) {
+                        continue;
+                    }
+
+                    if (key.equals("build")) {
+                        continue;
+                    }
+
+                    if (key.equals("prefix") || key.equals("suffix")) {
+                        groups.get(groupName).add(NodeFactory.makeChatMetaNode(key.equals("prefix"), 50, value).setWorld(worldMappingFunc.apply(world)).build());
+                    } else {
+                        groups.get(groupName).add(NodeFactory.makeMetaNode(key, value).setWorld(worldMappingFunc.apply(world)).build());
+                    }
+                }
+
+                log.logAllProgress("Migrated {} groups so far in world " + world, groupWorldCount.incrementAndGet());
             }
+            log.log("Migrated " + groupWorldCount.get() + " groups in world " + world);
 
+            AtomicInteger userWorldCount = new AtomicInteger(0);
             for (User user : wdh.getUserList()) {
                 UUID uuid;
                 try {
                     uuid = UUID.fromString(user.getUUID());
                 } catch (IllegalArgumentException e) {
+                    log.logErr("Could not parse UUID for user: " + user.getUUID());
                     continue;
                 }
 
-                users.putIfAbsent(uuid, new HashMap<>());
+                users.putIfAbsent(uuid, new HashSet<>());
 
                 for (String node : user.getPermissionList()) {
-                    boolean value = true;
-                    if (node.startsWith("!") || node.startsWith("-")) {
-                        node = node.substring(1);
-                        value = false;
-                    } else if (node.startsWith("+")) {
-                        node = node.substring(1);
-                        value = true;
+                    if (node.isEmpty()) {
+                        continue;
                     }
 
-                    users.get(uuid).put(new AbstractMap.SimpleEntry<>(world, node), value);
+                    users.get(uuid).add(MigrationUtils.parseNode(node, true).setWorld(worldMappingFunc.apply(world)).build());
                 }
 
-                String finalWorld = world;
-                users.get(uuid).putAll(user.subGroupListStringCopy().stream()
-                        .map(n -> "group." + n)
-                        .map(n -> new AbstractMap.SimpleEntry<>(finalWorld, n))
-                        .collect(Collectors.toMap(n -> n, n -> true))
+                // Collect sub groups
+                String finalWorld = worldMappingFunc.apply(world);
+                users.get(uuid).addAll(user.subGroupListStringCopy().stream()
+                        .filter(n -> !n.isEmpty())
+                        .map(n -> "group." + MigrationUtils.standardizeName(n))
+                        .map(n -> NodeFactory.make(n, true, null, finalWorld))
+                        .collect(Collectors.toSet())
                 );
-                primaryGroups.put(uuid, user.getGroupName());
-            }
 
+                // Get primary group
+                primaryGroups.put(uuid, MigrationUtils.standardizeName(user.getGroupName()));
+
+                String[] metaKeys = user.getVariables().getVarKeyList();
+                for (String key : metaKeys) {
+                    String value = user.getVariables().getVarString(key);
+                    key = key.toLowerCase();
+
+                    if (key.isEmpty() || value.isEmpty()) {
+                        continue;
+                    }
+
+                    if (key.equals("build")) {
+                        continue;
+                    }
+
+                    if (key.equals("prefix") || key.equals("suffix")) {
+                        users.get(uuid).add(NodeFactory.makeChatMetaNode(key.equals("prefix"), 100, value).setWorld(worldMappingFunc.apply(world)).build());
+                    } else {
+                        users.get(uuid).add(NodeFactory.makeMetaNode(key, value).setWorld(worldMappingFunc.apply(world)).build());
+                    }
+                }
+
+                log.logProgress("Migrated {} users so far in world " + world, userWorldCount.incrementAndGet());
+            }
+            log.log("Migrated " + userWorldCount.get() + " users in world " + world);
         }
 
-        log.info("GroupManager Migration: All existing GroupManager data has been processed. Now beginning the import process.");
-        log.info("GroupManager Migration: Found a total of " + users.size() + " users and " + groups.size() + " groups.");
+        log.log("All data has now been processed, now starting the import process.");
+        log.log("Found a total of " + users.size() + " users and " + groups.size() + " groups.");
 
-        for (Map.Entry<String, Map<Map.Entry<String, String>, Boolean>> e : groups.entrySet()) {
-            plugin.getStorage().createAndLoadGroup(e.getKey()).join();
+        log.log("Starting group migration.");
+        AtomicInteger groupCount = new AtomicInteger(0);
+        for (Map.Entry<String, Set<Node>> e : groups.entrySet()) {
+            plugin.getStorage().createAndLoadGroup(e.getKey(), CreationCause.INTERNAL).join();
             me.lucko.luckperms.common.core.model.Group group = plugin.getGroupManager().getIfLoaded(e.getKey());
-            try {
-                LogEntry.build()
-                        .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                        .acted(group).action("create")
-                        .build().submit(plugin);
-            } catch (Exception ex) {
-                ex.printStackTrace();
-            }
 
-
-            for (Map.Entry<Map.Entry<String, String>, Boolean> n : e.getValue().entrySet()) {
-                // n.key.key = world
-                // n.key.value = node
-                // n.value = true/false
-                try {
-                    group.setPermission(NodeFactory.fromSerialisedNode("global-" + n.getKey().getKey() + "/" + n.getKey().getValue(), n.getValue()));
-
-                    if (n.getKey().getValue().startsWith("group.")) {
-                        String groupName = n.getKey().getValue().substring(6);
-                        LogEntry.build()
-                                .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                                .acted(group).action("setinherit " + groupName + " global " + n.getKey().getKey())
-                                .build().submit(plugin);
-                    } else {
-                        LogEntry.build()
-                                .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                                .acted(group).action("set " + n.getKey().getValue() + " " + n.getValue() + " global " + n.getKey().getKey())
-                                .build().submit(plugin);
-                    }
-
-                } catch (Exception ex) {
-                    if (!(ex instanceof ObjectAlreadyHasException)) {
-                        ex.printStackTrace();
-                    }
-                }
+            for (Node node : e.getValue()) {
+                group.setPermission(node);
             }
 
             plugin.getStorage().saveGroup(group);
+            log.logAllProgress("Migrated {} groups so far.", groupCount.incrementAndGet());
         }
+        log.log("Migrated " + groupCount.get() + " groups");
 
-        for (Map.Entry<UUID, Map<Map.Entry<String, String>, Boolean>> e : users.entrySet()) {
+        log.log("Starting user migration.");
+        AtomicInteger userCount = new AtomicInteger(0);
+        for (Map.Entry<UUID, Set<Node>> e : users.entrySet()) {
             plugin.getStorage().loadUser(e.getKey(), "null").join();
             me.lucko.luckperms.common.core.model.User user = plugin.getUserManager().get(e.getKey());
 
-            for (Map.Entry<Map.Entry<String, String>, Boolean> n : e.getValue().entrySet()) {
-                // n.key.key = world
-                // n.key.value = node
-                // n.value = true/false
-                try {
-                    user.setPermission(NodeFactory.fromSerialisedNode("global-" + n.getKey().getKey() + "/" + n.getKey().getValue(), n.getValue()));
-
-                    if (n.getKey().getValue().startsWith("group.")) {
-                        String group = n.getKey().getValue().substring(6);
-                        LogEntry.build()
-                                .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                                .acted(user).action("addgroup " + group + " global " + n.getKey().getKey())
-                                .build().submit(plugin);
-                    } else {
-                        LogEntry.build()
-                                .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                                .acted(user).action("set " + n.getKey().getValue() + " " + n.getValue() + " global " + n.getKey().getKey())
-                                .build().submit(plugin);
-                    }
-
-                } catch (Exception ex) {
-                    if (!(ex instanceof ObjectAlreadyHasException)) {
-                        ex.printStackTrace();
-                    }
-                }
+            for (Node node : e.getValue()) {
+                user.setPermission(node);
             }
 
             String primaryGroup = primaryGroups.get(e.getKey());
             if (primaryGroup != null) {
-                try {
-                    user.setPermission("group." + primaryGroup, true);
-                } catch (ObjectAlreadyHasException ignored) {
-                }
-                user.setPrimaryGroup(primaryGroup);
-                try {
-                    user.unsetPermission("group.default");
-                } catch (ObjectLacksException ignored) {
-                }
+                user.setPermission(NodeFactory.make("group." + primaryGroup));
+                user.getPrimaryGroup().setStoredValue(primaryGroup);
+                user.unsetPermission(NodeFactory.make("group.default"));
             }
 
             plugin.getStorage().saveUser(user);
             plugin.getUserManager().cleanup(user);
+            log.logProgress("Migrated {} users so far.", userCount.incrementAndGet());
         }
 
-        log.info("GroupManager Migration: Success! Completed without any errors.");
+        log.log("Migrated " + userCount.get() + " users.");
+        log.log("Success! Migration complete.");
         return CommandResult.SUCCESS;
     }
 }

bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPermissionsEx.java

@@ -22,22 +22,22 @@
 
 package me.lucko.luckperms.bukkit.migration;
 
-import me.lucko.luckperms.api.Logger;
-import me.lucko.luckperms.api.MetaUtils;
-import me.lucko.luckperms.api.PlatformType;
-import me.lucko.luckperms.common.LuckPermsPlugin;
-import me.lucko.luckperms.common.commands.Arg;
+import me.lucko.luckperms.api.event.cause.CreationCause;
 import me.lucko.luckperms.common.commands.CommandException;
 import me.lucko.luckperms.common.commands.CommandResult;
-import me.lucko.luckperms.common.commands.SubCommand;
+import me.lucko.luckperms.common.commands.abstraction.SubCommand;
+import me.lucko.luckperms.common.commands.impl.migration.MigrationUtils;
 import me.lucko.luckperms.common.commands.sender.Sender;
-import me.lucko.luckperms.common.constants.Constants;
 import me.lucko.luckperms.common.constants.Permission;
+import me.lucko.luckperms.common.core.NodeFactory;
 import me.lucko.luckperms.common.core.model.Group;
 import me.lucko.luckperms.common.core.model.User;
-import me.lucko.luckperms.common.data.LogEntry;
+import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.utils.Predicates;
-import me.lucko.luckperms.exceptions.ObjectAlreadyHasException;
+import me.lucko.luckperms.common.utils.ProgressLogger;
+
+import org.bukkit.Bukkit;
+import org.bukkit.World;
 
 import ru.tehkode.permissions.NativeInterface;
 import ru.tehkode.permissions.PermissionGroup;
@@ -48,35 +48,31 @@ import ru.tehkode.permissions.bukkit.PermissionsEx;
 import java.lang.reflect.Field;
 import java.util.List;
 import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 public class MigrationPermissionsEx extends SubCommand<Object> {
     public MigrationPermissionsEx() {
-        super("permissionsex", "Migration from PermissionsEx", Permission.MIGRATION, Predicates.alwaysFalse(),
-                Arg.list(Arg.create("world names...", false, "a list of worlds to migrate permissions from"))
-        );
+        super("permissionsex", "Migration from PermissionsEx", Permission.MIGRATION, Predicates.alwaysFalse(), null);
     }
 
     @SuppressWarnings("deprecation")
     @Override
     public CommandResult execute(LuckPermsPlugin plugin, Sender sender, Object o, List<String> args, String label) throws CommandException {
-        final Logger log = plugin.getLog();
-        if (!plugin.isPluginLoaded("PermissionsEx")) {
-            log.severe("PermissionsEx Migration: Error -> PermissionsEx is not loaded.");
+        ProgressLogger log = new ProgressLogger("PermissionsEx");
+        log.addListener(plugin.getConsoleSender());
+        log.addListener(sender);
+
+        log.log("Starting.");
+
+        if (!Bukkit.getPluginManager().isPluginEnabled("PermissionsEx")) {
+            log.logErr("Plugin not loaded.");
             return CommandResult.STATE_ERROR;
         }
 
-        if (plugin.getType() != PlatformType.BUKKIT) {
-            // Sponge uses a completely different version of PEX.
-            log.severe("PEX import is not supported on this platform.");
-            return CommandResult.STATE_ERROR;
-        }
+        List<String> worlds = Bukkit.getWorlds().stream().map(World::getName).map(String::toLowerCase).collect(Collectors.toList());
 
-        final List<String> worlds = args.stream()
-                .map(String::toLowerCase)
-                .collect(Collectors.toList());
-
-        PermissionsEx pex = (PermissionsEx) plugin.getPlugin("PermissionsEx");
+        PermissionsEx pex = (PermissionsEx) Bukkit.getPluginManager().getPlugin("PermissionsEx");
         PermissionManager manager = pex.getPermissionsManager();
 
         NativeInterface ni;
@@ -89,106 +85,62 @@ public class MigrationPermissionsEx extends SubCommand<Object> {
             return CommandResult.FAILURE;
         }
 
-        // Migrate all groups.
-        log.info("PermissionsEx Migration: Starting group migration.");
-
-        int maxGroupWeight = 0;
-        int groupCount = 0;
-
+        log.log("Calculating group weightings.");
+        int maxWeight = 0;
         for (PermissionGroup group : manager.getGroupList()) {
-            int groupWeight = group.getWeight() * -1;
-            groupCount++;
-            maxGroupWeight = Math.max(maxGroupWeight, groupWeight);
+            maxWeight = Math.max(maxWeight, group.getRank());
+        }
+        maxWeight += 5;
 
-            final String name = group.getName().toLowerCase();
-            plugin.getStorage().createAndLoadGroup(name).join();
-            Group lpGroup = plugin.getGroupManager().getIfLoaded(name);
-            try {
-                LogEntry.build()
-                        .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                        .acted(lpGroup).action("create")
-                        .build().submit(plugin);
-            } catch (Exception ex) {
-                ex.printStackTrace();
-            }
+        // Migrate all groups.
+        log.log("Starting group migration.");
+        AtomicInteger groupCount = new AtomicInteger(0);
+        for (PermissionGroup group : manager.getGroupList()) {
+            int groupWeight = maxWeight - group.getRank();
+
+            final String groupName = MigrationUtils.standardizeName(group.getName());
+            plugin.getStorage().createAndLoadGroup(groupName, CreationCause.INTERNAL).join();
+            Group lpGroup = plugin.getGroupManager().getIfLoaded(groupName);
+
+            MigrationUtils.setGroupWeight(lpGroup, groupWeight);
 
             try {
                 for (String node : group.getOwnPermissions(null)) {
-                    boolean value = true;
-                    if (node.startsWith("-")) {
-                        node = node.substring(1);
-                        value = false;
+                    if (node.isEmpty()) {
+                        continue;
                     }
 
-                    try {
-                        lpGroup.setPermission(node, value);
-                        LogEntry.build()
-                                .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                                .acted(lpGroup).action("set " + node + " " + value)
-                                .build().submit(plugin);
-                    } catch (Exception ex) {
-                        if (!(ex instanceof ObjectAlreadyHasException)) {
-                            ex.printStackTrace();
-                        }
-                    }
+                    lpGroup.setPermission(MigrationUtils.parseNode(node, true).build());
                 }
             } catch (NullPointerException ignored) {
-                // Probably won't happen. I have no API docs on getOwnPermissions#null though.
+                // No docs on if #getOwnPermissions(null) is ok. Should be fine though.
             }
 
-            if (worlds != null && !worlds.isEmpty()) {
-                for (String world : worlds) {
-                    for (String node : group.getOwnPermissions(world)) {
-                        boolean value = true;
-                        if (node.startsWith("-")) {
-                            node = node.substring(1);
-                            value = false;
-                        }
+            for (String world : worlds) {
+                if (world.isEmpty()) {
+                    continue;
+                }
 
-                        try {
-                            lpGroup.setPermission(node, value, "global", world);
-                            LogEntry.build()
-                                    .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                                    .acted(lpGroup).action("set " + node + " " + value + " global " + world)
-                                    .build().submit(plugin);
-                        } catch (Exception ex) {
-                            if (!(ex instanceof ObjectAlreadyHasException)) {
-                                ex.printStackTrace();
-                            }
-                        }
+                for (String node : group.getOwnPermissions(world)) {
+                    if (node.isEmpty()) {
+                        continue;
                     }
+
+                    lpGroup.setPermission(MigrationUtils.parseNode(node, true).setWorld(world.toLowerCase()).build());
                 }
             }
 
             for (PermissionGroup g : group.getParents()) {
-                try {
-                    lpGroup.setPermission("group." + g.getName().toLowerCase(), true);
-                    LogEntry.build()
-                            .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                            .acted(lpGroup).action("setinherit " + g.getName().toLowerCase())
-                            .build().submit(plugin);
-                } catch (Exception ex) {
-                    if (!(ex instanceof ObjectAlreadyHasException)) {
-                        ex.printStackTrace();
-                    }
-                }
+                lpGroup.setPermission(NodeFactory.make("group." + MigrationUtils.standardizeName(g.getName())));
             }
 
-            if (worlds != null && !worlds.isEmpty()) {
-                for (String world : worlds) {
-                    for (PermissionGroup g : group.getParents(world)) {
-                        try {
-                            lpGroup.setPermission("group." + g.getName().toLowerCase(), true, "global", world);
-                            LogEntry.build()
-                                    .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                                    .acted(lpGroup).action("setinherit " + g.getName().toLowerCase() + " global " + world)
-                                    .build().submit(plugin);
-                        } catch (Exception ex) {
-                            if (!(ex instanceof ObjectAlreadyHasException)) {
-                                ex.printStackTrace();
-                            }
-                        }
-                    }
+            for (String world : worlds) {
+                if (world.isEmpty()) {
+                    continue;
+                }
+
+                for (PermissionGroup g : group.getParents(world)) {
+                    lpGroup.setPermission(NodeFactory.make("group." + MigrationUtils.standardizeName(g.getName()), true, "global", world.toLowerCase()));
                 }
             }
 
@@ -196,143 +148,93 @@ public class MigrationPermissionsEx extends SubCommand<Object> {
             String suffix = group.getOwnSuffix();
 
             if (prefix != null && !prefix.equals("")) {
-                prefix = MetaUtils.escapeCharacters(prefix);
-                try {
-                    lpGroup.setPermission("prefix." + groupWeight + "." + prefix, true);
-                    LogEntry.build()
-                            .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                            .acted(lpGroup).action("set prefix." + groupWeight + "." + prefix + " true")
-                            .build().submit(plugin);
-                } catch (Exception ex) {
-                    if (!(ex instanceof ObjectAlreadyHasException)) {
-                        ex.printStackTrace();
-                    }
-                }
+                lpGroup.setPermission(NodeFactory.makePrefixNode(groupWeight, prefix).build());
             }
 
             if (suffix != null && !suffix.equals("")) {
-                suffix = MetaUtils.escapeCharacters(suffix);
-                try {
-                    lpGroup.setPermission("suffix." + groupWeight + "." + suffix, true);
-                    LogEntry.build()
-                            .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                            .acted(lpGroup).action("set suffix." + groupWeight + "." + suffix + " true")
-                            .build().submit(plugin);
-                } catch (Exception ex) {
-                    if (!(ex instanceof ObjectAlreadyHasException)) {
-                        ex.printStackTrace();
-                    }
-                }
+                lpGroup.setPermission(NodeFactory.makeSuffixNode(groupWeight, suffix).build());
             }
 
             plugin.getStorage().saveGroup(lpGroup);
-
+            log.logAllProgress("Migrated {} groups so far.", groupCount.incrementAndGet());
         }
-
-        log.info("PermissionsEx Migration: Migrated " + groupCount + " groups");
+        log.log("Migrated " + groupCount.get() + " groups");
 
         // Migrate all users
-        log.info("PermissionsEx Migration: Starting user migration.");
-        int userCount = 0;
-        maxGroupWeight++;
-        for (PermissionUser user : manager.getUsers()) {
-            UUID u = null;
+        log.log("Starting user migration.");
+        AtomicInteger userCount = new AtomicInteger(0);
 
+        // Increment the max weight from the group migrations. All user meta should override.
+        maxWeight += 5;
+
+        for (PermissionUser user : manager.getUsers()) {
+            UUID u;
             try {
                 u = UUID.fromString(user.getIdentifier());
             } catch (IllegalArgumentException e) {
                 u = ni.nameToUUID(user.getIdentifier());
                 if (u == null) {
-                    u = plugin.getUUID(user.getIdentifier());
+                    try {
+                        u = Bukkit.getOfflinePlayer(user.getIdentifier()).getUniqueId();
+                    } catch (Exception ex) {
+                        e.printStackTrace();
+                    }
                 }
             }
 
             if (u == null) {
-                log.severe("Unable to get a UUID for user identifier: " + user.getIdentifier());
+                log.logErr("Unable to get a UUID for user identifier: " + user.getIdentifier());
                 continue;
             }
 
-            userCount++;
             plugin.getStorage().loadUser(u, user.getName()).join();
             User lpUser = plugin.getUserManager().get(u);
 
             try {
                 for (String node : user.getOwnPermissions(null)) {
-                    boolean value = true;
-                    if (node.startsWith("-")) {
-                        node = node.substring(1);
-                        value = false;
+                    if (node.isEmpty()) {
+                        continue;
                     }
 
-                    try {
-                        lpUser.setPermission(node, value);
-                        LogEntry.build()
-                                .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                                .acted(lpUser).action("set " + node + " " + value)
-                                .build().submit(plugin);
-                    } catch (Exception ex) {
-                        if (!(ex instanceof ObjectAlreadyHasException)) {
-                            ex.printStackTrace();
-                        }
-                    }
+                    lpUser.setPermission(MigrationUtils.parseNode(node, true).build());
                 }
             } catch (NullPointerException ignored) {
-                // Probably won't happen. I have no API docs on getOwnPermissions#null though.
+                // No docs on if #getOwnPermissions(null) is ok. Should be fine though.
             }
 
-            if (worlds != null && !worlds.isEmpty()) {
-                for (String world : worlds) {
-                    for (String node : user.getOwnPermissions(world)) {
-                        boolean value = true;
-                        if (node.startsWith("-")) {
-                            node = node.substring(1);
-                            value = false;
-                        }
+            for (String world : worlds) {
+                if (world.isEmpty()) {
+                    continue;
+                }
 
-                        try {
-                            lpUser.setPermission(node, value, "global", world);
-                            LogEntry.build()
-                                    .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                                    .acted(lpUser).action("set " + node + " " + value + " global " + world)
-                                    .build().submit(plugin);
-                        } catch (Exception ex) {
-                            if (!(ex instanceof ObjectAlreadyHasException)) {
-                                ex.printStackTrace();
-                            }
-                        }
+                for (String node : user.getOwnPermissions(world)) {
+                    if (node.isEmpty()) {
+                        continue;
                     }
+
+                    lpUser.setPermission(MigrationUtils.parseNode(node, true).setWorld(world.toLowerCase()).build());
                 }
             }
 
-            for (String s : user.getGroupNames()) {
-                try {
-                    lpUser.setPermission("group." + s.toLowerCase(), true);
-                    LogEntry.build()
-                            .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                            .acted(lpUser).action("addgroup " + s.toLowerCase())
-                            .build().submit(plugin);
-                } catch (Exception ex) {
-                    if (!(ex instanceof ObjectAlreadyHasException)) {
-                        ex.printStackTrace();
-                    }
+            for (String g : user.getGroupNames()) {
+                if (g.isEmpty()) {
+                    continue;
                 }
+
+                lpUser.setPermission(NodeFactory.make("group." + MigrationUtils.standardizeName(g)));
             }
 
-            if (worlds != null && !worlds.isEmpty()) {
-                for (String world : worlds) {
-                    for (String s : user.getGroupNames(world)) {
-                        try {
-                            lpUser.setPermission("group." + s.toLowerCase(), true, "global", world);
-                            LogEntry.build()
-                                    .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                                    .acted(lpUser).action("addgroup " + s.toLowerCase() + " global " + world)
-                                    .build().submit(plugin);
-                        } catch (Exception ex) {
-                            if (!(ex instanceof ObjectAlreadyHasException)) {
-                                ex.printStackTrace();
-                            }
-                        }
+            for (String world : worlds) {
+                if (world.isEmpty()) {
+                    continue;
+                }
+
+                for (String g : user.getGroupNames(world)) {
+                    if (g.isEmpty()) {
+                        continue;
                     }
+
+                    lpUser.setPermission(NodeFactory.make("group." + MigrationUtils.standardizeName(g), true, "global", world.toLowerCase()));
                 }
             }
 
@@ -340,58 +242,36 @@ public class MigrationPermissionsEx extends SubCommand<Object> {
             String suffix = user.getOwnSuffix();
 
             if (prefix != null && !prefix.equals("")) {
-                prefix = MetaUtils.escapeCharacters(prefix);
-                try {
-                    lpUser.setPermission("prefix." + maxGroupWeight + "." + prefix, true);
-                    LogEntry.build()
-                            .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                            .acted(lpUser).action("set prefix." + maxGroupWeight + "." + prefix + " true")
-                            .build().submit(plugin);
-                } catch (Exception ex) {
-                    if (!(ex instanceof ObjectAlreadyHasException)) {
-                        ex.printStackTrace();
-                    }
-                }
+                lpUser.setPermission(NodeFactory.makePrefixNode(maxWeight, prefix).build());
             }
 
             if (suffix != null && !suffix.equals("")) {
-                suffix = MetaUtils.escapeCharacters(suffix);
-                try {
-                    lpUser.setPermission("suffix." + maxGroupWeight + "." + suffix, true);
-                    LogEntry.build()
-                            .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                            .acted(lpUser).action("set suffix." + maxGroupWeight + "." + suffix + " true")
-                            .build().submit(plugin);
-                } catch (Exception ex) {
-                    if (!(ex instanceof ObjectAlreadyHasException)) {
-                        ex.printStackTrace();
-                    }
-                }
+                lpUser.setPermission(NodeFactory.makeSuffixNode(maxWeight, suffix).build());
             }
 
+            // Lowest rank is the highest group #logic
             String primary = null;
-            int weight = -100;
+            int weight = Integer.MAX_VALUE;
             for (PermissionGroup group : user.getOwnParents()) {
-                if (group.getRank() > weight) {
+                if (group.getRank() < weight) {
                     primary = group.getName();
-                    weight = group.getWeight();
+                    weight = group.getRank();
                 }
             }
 
-            if (primary != null) {
-                try {
-                    lpUser.setPermission("group." + primary.toLowerCase(), true);
-                } catch (ObjectAlreadyHasException ignored) {
-                }
-                lpUser.setPrimaryGroup(primary);
+            if (primary != null && !primary.equalsIgnoreCase("default")) {
+                lpUser.setPermission(NodeFactory.make("group." + primary.toLowerCase()));
+                lpUser.getPrimaryGroup().setStoredValue(primary);
+                lpUser.unsetPermission(NodeFactory.make("group.default"));
             }
 
             plugin.getUserManager().cleanup(lpUser);
             plugin.getStorage().saveUser(lpUser);
+            log.logProgress("Migrated {} users so far.", userCount.incrementAndGet());
         }
 
-        log.info("PermissionsEx Migration: Migrated " + userCount + " users.");
-        log.info("PermissionsEx Migration: Success! Completed without any errors.");
+        log.log("Migrated " + userCount.get() + " users.");
+        log.log("Success! Migration complete.");
         return CommandResult.SUCCESS;
     }
 }

bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPowerfulPerms.java

@@ -22,156 +22,52 @@
 
 package me.lucko.luckperms.bukkit.migration;
 
-import lombok.Cleanup;
+import lombok.SneakyThrows;
 
 import com.github.cheesesoftware.PowerfulPermsAPI.CachedGroup;
 import com.github.cheesesoftware.PowerfulPermsAPI.Group;
 import com.github.cheesesoftware.PowerfulPermsAPI.Permission;
 import com.github.cheesesoftware.PowerfulPermsAPI.PermissionManager;
 import com.github.cheesesoftware.PowerfulPermsAPI.PowerfulPermsPlugin;
-import com.github.cheesesoftware.PowerfulPermsAPI.ResultRunnable;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.zaxxer.hikari.HikariDataSource;
 
-import me.lucko.luckperms.api.Logger;
-import me.lucko.luckperms.api.data.Callback;
-import me.lucko.luckperms.bukkit.migration.utils.LPResultRunnable;
-import me.lucko.luckperms.common.LuckPermsPlugin;
+import me.lucko.luckperms.api.Node;
+import me.lucko.luckperms.api.event.cause.CreationCause;
 import me.lucko.luckperms.common.commands.Arg;
 import me.lucko.luckperms.common.commands.CommandException;
 import me.lucko.luckperms.common.commands.CommandResult;
-import me.lucko.luckperms.common.commands.SubCommand;
+import me.lucko.luckperms.common.commands.abstraction.SubCommand;
+import me.lucko.luckperms.common.commands.impl.migration.MigrationUtils;
 import me.lucko.luckperms.common.commands.sender.Sender;
-import me.lucko.luckperms.common.constants.Constants;
+import me.lucko.luckperms.common.config.ConfigKeys;
+import me.lucko.luckperms.common.core.NodeFactory;
 import me.lucko.luckperms.common.core.model.PermissionHolder;
 import me.lucko.luckperms.common.core.model.User;
-import me.lucko.luckperms.common.data.LogEntry;
+import me.lucko.luckperms.common.dependencies.DependencyManager;
+import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
+import me.lucko.luckperms.common.storage.StorageType;
+import me.lucko.luckperms.common.utils.HikariSupplier;
 import me.lucko.luckperms.common.utils.Predicates;
-import me.lucko.luckperms.exceptions.ObjectAlreadyHasException;
+import me.lucko.luckperms.common.utils.ProgressLogger;
+
+import org.bukkit.Bukkit;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.util.HashMap;
+import java.util.Collection;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import static me.lucko.luckperms.common.constants.Permission.MIGRATION;
 
-@SuppressWarnings("unchecked")
+// Only supports the latest versions of the PP API. (it seems to change randomly almost every release)
 public class MigrationPowerfulPerms extends SubCommand<Object> {
-    /* <sadness>
-        The PowerfulPerms API is a complete joke. Seriously, it would probably be easier reflecting into the actual plugin.
-        Methods move about randomly every version...
-
-        What kind of API requires reflection to function with multiple versions...
-        Doesn't that just defeat the whole god damn point of having an API in the first place?
-        Whatever happened to depreciation?
-    </sadness> */
-
-    private static Method getPlayerPermissionsMethod = null;
-    private static Method getPlayerGroupsMethod = null;
-    private static Method getGroupMethod = null;
-
-    // lol
-    private static boolean superLegacy = false;
-    private static boolean legacy = false;
-
-    static {
-        try {
-            Class.forName("com.github.cheesesoftware.PowerfulPermsAPI.ResponseRunnable");
-            legacy = true;
-        } catch (ClassNotFoundException ignored) {
-        }
-
-        if (legacy) {
-            try {
-                getPlayerPermissionsMethod = PermissionManager.class.getMethod("getPlayerOwnPermissions", UUID.class, ResultRunnable.class);
-                getPlayerPermissionsMethod.setAccessible(true);
-            } catch (NoSuchMethodException ignored) {
-            }
-        } else {
-            try {
-                getPlayerPermissionsMethod = PermissionManager.class.getMethod("getPlayerOwnPermissions", UUID.class);
-                getPlayerPermissionsMethod.setAccessible(true);
-            } catch (NoSuchMethodException ignored) {
-            }
-        }
-
-        try {
-            getGroupMethod = CachedGroup.class.getMethod("getGroup");
-            getGroupMethod.setAccessible(true);
-            superLegacy = true;
-        } catch (NoSuchMethodException ignored) {
-        }
-
-        if (!legacy) {
-            try {
-                getPlayerGroupsMethod = PermissionManager.class.getMethod("getPlayerOwnGroups", UUID.class);
-                getPlayerGroupsMethod.setAccessible(true);
-            } catch (NoSuchMethodException e) {
-                e.printStackTrace();
-            }
-        } else {
-            try {
-                getPlayerGroupsMethod = PermissionManager.class.getMethod("getPlayerOwnGroups", UUID.class, ResultRunnable.class);
-                getPlayerGroupsMethod.setAccessible(true);
-            } catch (NoSuchMethodException e) {
-                try {
-                    getPlayerGroupsMethod = PermissionManager.class.getMethod("getPlayerGroups", UUID.class, ResultRunnable.class);
-                    getPlayerGroupsMethod.setAccessible(true);
-                } catch (NoSuchMethodException e1) {
-                    e1.printStackTrace();
-                }
-            }
-        }
-    }
-
-    private static void getPlayerPermissions(PermissionManager manager, UUID uuid, Callback<List<Permission>> callback) {
-        if (legacy) {
-            try {
-                getPlayerPermissionsMethod.invoke(manager, uuid, new LPResultRunnable<List<Permission>>() {
-                    @Override
-                    public void run() {
-                        callback.onComplete(getResult());
-                    }
-                });
-            } catch (IllegalAccessException | InvocationTargetException e) {
-                e.printStackTrace();
-            }
-        } else {
-            try {
-                ListenableFuture<List<Permission>> lf = (ListenableFuture<List<Permission>>) getPlayerPermissionsMethod.invoke(manager, uuid);
-                try {
-                    if (lf.isDone()) {
-                        callback.onComplete(lf.get());
-                    } else {
-                        lf.addListener(() -> {
-                            try {
-                                callback.onComplete(lf.get());
-                            } catch (InterruptedException | ExecutionException e) {
-                                e.printStackTrace();
-                            }
-                        }, Runnable::run);
-                    }
-                } catch (InterruptedException | ExecutionException e) {
-                    e.printStackTrace();
-                }
-            } catch (IllegalAccessException | InvocationTargetException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
     public MigrationPowerfulPerms() {
         super("powerfulperms", "Migration from PowerfulPerms", MIGRATION, Predicates.not(5),
                 Arg.list(
@@ -186,443 +82,267 @@ public class MigrationPowerfulPerms extends SubCommand<Object> {
 
     @Override
     public CommandResult execute(LuckPermsPlugin plugin, Sender sender, Object o, List<String> args, String label) throws CommandException {
-        try {
-            return run(plugin, args);
-        } catch (Throwable t) {
-            t.printStackTrace();
-            return CommandResult.FAILURE;
-        }
-    }
+        ProgressLogger log = new ProgressLogger("PowerfulPerms");
+        log.addListener(plugin.getConsoleSender());
+        log.addListener(sender);
 
-    private CommandResult run(LuckPermsPlugin plugin, List<String> args) {
-        final Logger log = plugin.getLog();
-        if (!plugin.isPluginLoaded("PowerfulPerms")) {
-            log.severe("PowerfulPerms Migration: Error -> PowerfulPerms is not loaded.");
+        log.log("Starting.");
+
+        if (!Bukkit.getPluginManager().isPluginEnabled("PowerfulPerms")) {
+            log.logErr("Plugin not loaded.");
             return CommandResult.STATE_ERROR;
         }
 
-        final String address = args.get(0);
-        final String database = args.get(1);
-        final String username = args.get(2);
-        final String password = args.get(3);
-        final String dbTable = args.get(4);
+        String method = plugin.getConfiguration().get(ConfigKeys.STORAGE_METHOD);
+        StorageType type = StorageType.parse(method);
+
+        if (type == null || type != StorageType.MYSQL) {
+            // We need to load the Hikari/MySQL stuff.
+            DependencyManager.loadDependencies(plugin, DependencyManager.STORAGE_DEPENDENCIES.get(StorageType.MYSQL));
+        }
+
+        String address = args.get(0);
+        String database = args.get(1);
+        String username = args.get(2);
+        String password = args.get(3);
+        String dbTable = args.get(4);
 
         // Find a list of UUIDs
-        log.info("PowerfulPerms Migration: Getting a list of UUIDs to migrate.");
-
-        @Cleanup HikariDataSource hikari = new HikariDataSource();
-        hikari.setMaximumPoolSize(2);
-        hikari.setDataSourceClassName("com.mysql.jdbc.jdbc2.optional.MysqlDataSource");
-        hikari.addDataSourceProperty("serverName", address.split(":")[0]);
-        hikari.addDataSourceProperty("port", address.split(":")[1]);
-        hikari.addDataSourceProperty("databaseName", database);
-        hikari.addDataSourceProperty("user", username);
-        hikari.addDataSourceProperty("password", password);
-
+        log.log("Getting a list of UUIDs to migrate.");
         Set<UUID> uuids = new HashSet<>();
 
-        try {
-            @Cleanup Connection connection = hikari.getConnection();
-            DatabaseMetaData meta = connection.getMetaData();
+        try (HikariSupplier hikari = new HikariSupplier(address, database, username, password)) {
+            hikari.setup("powerfulperms-migrator-pool");
 
-            @Cleanup ResultSet tables = meta.getTables(null, null, dbTable, null);
-            if (!tables.next()) {
-                log.severe("PowerfulPerms Migration: Error - Couldn't find table.");
-                return CommandResult.FAILURE;
+            try (Connection c = hikari.getConnection()) {
+                DatabaseMetaData meta = c.getMetaData();
 
-            } else {
-                @Cleanup PreparedStatement columnPs = connection.prepareStatement("SELECT COLUMN_NAME, COLUMN_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME=?");
-                columnPs.setString(1, dbTable);
-                @Cleanup ResultSet columnRs = columnPs.executeQuery();
-
-                log.info("Found table: " + dbTable);
-                while (columnRs.next()) {
-                    log.info("" + columnRs.getString("COLUMN_NAME") + " - " + columnRs.getString("COLUMN_TYPE"));
-                }
-
-                @Cleanup PreparedStatement preparedStatement = connection.prepareStatement("SELECT `uuid` FROM " + dbTable);
-                @Cleanup ResultSet resultSet = preparedStatement.executeQuery();
-
-                while (resultSet.next()) {
-                    uuids.add(UUID.fromString(resultSet.getString("uuid")));
-                }
-            }
-
-        } catch (Exception e) {
-            e.printStackTrace();
-            return CommandResult.FAILURE;
-        }
-
-        if (uuids.isEmpty()) {
-            log.severe("PowerfulPerms Migration: Error - Unable to find any UUIDs to migrate.");
-            return CommandResult.FAILURE;
-        }
-
-        log.info("PowerfulPerms Migration: Found " + uuids.size() + " uuids. Starting migration.");
-
-        PowerfulPermsPlugin ppPlugin = (PowerfulPermsPlugin) plugin.getPlugin("PowerfulPerms");
-        PermissionManager pm = ppPlugin.getPermissionManager();
-
-        // Groups first.
-        log.info("PowerfulPerms Migration: Starting group migration.");
-        Map<Integer, Group> groups = pm.getGroups(); // All versions
-        for (Group g : groups.values()) {
-            plugin.getStorage().createAndLoadGroup(g.getName().toLowerCase()).join();
-            final me.lucko.luckperms.common.core.model.Group group = plugin.getGroupManager().getIfLoaded(g.getName().toLowerCase());
-            try {
-                LogEntry.build()
-                        .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                        .acted(group).action("create")
-                        .build().submit(plugin);
-            } catch (Exception ex) {
-                ex.printStackTrace();
-            }
-
-            for (Permission p : g.getOwnPermissions()) { // All versions
-                applyPerm(group, p, plugin);
-            }
-
-            for (Group parent : g.getParents()) { // All versions
-                try {
-                    group.setPermission("group." + parent.getName().toLowerCase(), true);
-                    LogEntry.build()
-                            .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                            .acted(group).action("setinherit " + parent.getName().toLowerCase()) // All versions
-                            .build().submit(plugin);
-                } catch (Exception ex) {
-                    if (!(ex instanceof ObjectAlreadyHasException)) {
-                        ex.printStackTrace();
+                try (ResultSet rs = meta.getTables(null, null, dbTable, null)) {
+                    if (!rs.next()) {
+                        log.log("Error - Couldn't find table.");
+                        return CommandResult.FAILURE;
                     }
                 }
             }
 
-            plugin.getStorage().saveGroup(group);
-        }
-        log.info("PowerfulPerms Migration: Group migration complete.");
+            try (Connection c = hikari.getConnection()) {
+                try (PreparedStatement ps = c.prepareStatement("SELECT COLUMN_NAME, COLUMN_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME=?")) {
+                    ps.setString(1, dbTable);
 
-        // Now users.
-        log.info("PowerfulPerms Migration: Starting user migration.");
-        final Map<UUID, CountDownLatch> progress = new HashMap<>();
+                    try (ResultSet rs = ps.executeQuery()) {
+                        log.log("Found table: " + dbTable);
+                        while (rs.next()) {
+                            log.log("" + rs.getString("COLUMN_NAME") + " - " + rs.getString("COLUMN_TYPE"));
+                        }
+                    }
+                }
+
+                try (PreparedStatement ps = c.prepareStatement("SELECT `uuid` FROM " + dbTable)) {
+                    try (ResultSet rs = ps.executeQuery()) {
+                        while (rs.next()) {
+                            uuids.add(UUID.fromString(rs.getString("uuid")));
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        if (uuids.isEmpty()) {
+            log.logErr("Unable to find any UUIDs to migrate.");
+            return CommandResult.FAILURE;
+        }
+
+        log.log("Found " + uuids.size() + " uuids. Starting migration.");
+
+        PowerfulPermsPlugin ppPlugin = (PowerfulPermsPlugin) Bukkit.getPluginManager().getPlugin("PowerfulPerms");
+        PermissionManager pm = ppPlugin.getPermissionManager();
+
+        Collection<Group> groups = pm.getGroups().values();
+
+        int maxWeight = 0;
+
+        // Groups first.
+        log.log("Starting group migration.");
+        AtomicInteger groupCount = new AtomicInteger(0);
+        for (Group g : groups) {
+            maxWeight = Math.max(maxWeight, g.getRank());
+
+            final String groupName = MigrationUtils.standardizeName(g.getName());
+            plugin.getStorage().createAndLoadGroup(groupName, CreationCause.INTERNAL).join();
+            final me.lucko.luckperms.common.core.model.Group group = plugin.getGroupManager().getIfLoaded(groupName);
+
+            MigrationUtils.setGroupWeight(group, g.getRank());
+
+            for (Permission p : g.getOwnPermissions()) {
+                applyPerm(group, p);
+            }
+
+            for (Group parent : g.getParents()) {
+                group.setPermission(NodeFactory.make("group." + parent.getName().toLowerCase(), true));
+            }
+
+            // server --> prefix afaik
+            for (Map.Entry<String, String> prefix : g.getPrefixes().entrySet()) {
+                String server = prefix.getKey().toLowerCase();
+                if (prefix.getKey().equals("*") || prefix.getKey().equals("all")) {
+                    server = null;
+                }
+
+                if (server != null) {
+                    group.setPermission(NodeFactory.makePrefixNode(g.getRank(), prefix.getValue()).setServer(server).build());
+                } else {
+                    group.setPermission(NodeFactory.makePrefixNode(g.getRank(), prefix.getValue()).build());
+                }
+            }
+
+            for (Map.Entry<String, String> suffix : g.getSuffixes().entrySet()) {
+                String server = suffix.getKey().toLowerCase();
+                if (suffix.getKey().equals("*") || suffix.getKey().equals("all")) {
+                    server = null;
+                }
+
+                if (server != null) {
+                    group.setPermission(NodeFactory.makeSuffixNode(g.getRank(), suffix.getValue()).setServer(server).build());
+                } else {
+                    group.setPermission(NodeFactory.makeSuffixNode(g.getRank(), suffix.getValue()).build());
+                }
+            }
+
+            plugin.getStorage().saveGroup(group);
+            log.logAllProgress("Migrated {} groups so far.", groupCount.incrementAndGet());
+        }
+        log.log("Migrated " + groupCount.get() + " groups");
+
+        // Migrate all users
+        log.log("Starting user migration.");
+        AtomicInteger userCount = new AtomicInteger(0);
+
+        // Increment the max weight from the group migrations. All user meta should override.
+        maxWeight += 5;
 
         // Migrate all users and their groups
         for (UUID uuid : uuids) {
-            progress.put(uuid, new CountDownLatch(2));
 
             // Create a LuckPerms user for the UUID
             plugin.getStorage().loadUser(uuid, "null").join();
             User user = plugin.getUserManager().get(uuid);
 
-            // Get a list of Permissions held by the user from the PP API.
-            getPlayerPermissions(pm, uuid, perms -> { // Changes each version
-                perms.forEach(p -> applyPerm(user, p, plugin));
+            List<Permission> permissions = joinFuture(pm.getPlayerOwnPermissions(uuid));
 
-                // Update the progress so the user can be saved and unloaded.
-                synchronized (progress) {
-                    progress.get(uuid).countDown();
-                    if (progress.get(uuid).getCount() == 0) {
-                        plugin.getStorage().saveUser(user);
-                        plugin.getUserManager().cleanup(user);
-                    }
-                }
-            });
+            for (Permission p : permissions) {
+                applyPerm(user, p);
+            }
 
-            // Migrate the user's groups to LuckPerms from PP.
-            Callback<Map<String, List<CachedGroup>>> callback = groups1 -> {
-                for (Map.Entry<String, List<CachedGroup>> e : groups1.entrySet()) {
-                    final String server;
-                    if (e.getKey() != null && (e.getKey().equals("") || e.getKey().equalsIgnoreCase("all"))) {
-                        server = null;
-                    } else {
-                        server = e.getKey();
-                    }
-
-                    if (superLegacy) {
-                        e.getValue().stream()
-                                .filter(cg -> !cg.isNegated())
-                                .map(cg -> {
-                                    try {
-                                        return (Group) getGroupMethod.invoke(cg);
-                                    } catch (IllegalAccessException | InvocationTargetException e1) {
-                                        e1.printStackTrace();
-                                        return null;
-                                    }
-                                })
-                                .forEach(g -> {
-                                    if (g != null) {
-                                        if (server == null) {
-                                            try {
-                                                user.setPermission("group." + g.getName().toLowerCase(), true);
-                                                LogEntry.build()
-                                                        .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                                                        .acted(user).action("addgroup " + g.getName().toLowerCase())
-                                                        .build().submit(plugin);
-                                            } catch (Exception ex) {
-                                                if (!(ex instanceof ObjectAlreadyHasException)) {
-                                                    ex.printStackTrace();
-                                                }
-                                            }
-                                        } else {
-                                            try {
-                                                user.setPermission("group." + g.getName().toLowerCase(), true, server);
-                                                LogEntry.build()
-                                                        .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                                                        .acted(user).action("addgroup " + g.getName().toLowerCase() + " " + server)
-                                                        .build().submit(plugin);
-                                            } catch (Exception ex) {
-                                                if (!(ex instanceof ObjectAlreadyHasException)) {
-                                                    ex.printStackTrace();
-                                                }
-                                            }
-                                        }
-                                    }
-                                });
-                    } else {
-                        e.getValue().stream()
-                                .filter(g -> !g.hasExpired() && !g.isNegated())
-                                .forEach(g -> {
-                                    final Group group = pm.getGroup(g.getGroupId());
-                                    if (g.willExpire()) {
-                                        if (server == null) {
-                                            try {
-                                                user.setPermission("group." + group.getName().toLowerCase(), true, g.getExpirationDate().getTime() / 1000L);
-                                                LogEntry.build()
-                                                        .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                                                        .acted(user).action("addtempgroup " + group.getName().toLowerCase() + " " + g.getExpirationDate().getTime() / 1000L)
-                                                        .build().submit(plugin);
-                                            } catch (Exception ex) {
-                                                if (!(ex instanceof ObjectAlreadyHasException)) {
-                                                    ex.printStackTrace();
-                                                }
-                                            }
-                                        } else {
-                                            try {
-                                                user.setPermission("group." + group.getName().toLowerCase(), true, server, g.getExpirationDate().getTime() / 1000L);
-                                                LogEntry.build()
-                                                        .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                                                        .acted(user).action("addtempgroup " + group.getName().toLowerCase() + " " + g.getExpirationDate().getTime() / 1000L + " " + server)
-                                                        .build().submit(plugin);
-                                            } catch (Exception ex) {
-                                                if (!(ex instanceof ObjectAlreadyHasException)) {
-                                                    ex.printStackTrace();
-                                                }
-                                            }
-                                        }
-
-                                    } else {
-                                        if (server == null) {
-                                            try {
-                                                user.setPermission("group." + group.getName().toLowerCase(), true);
-                                                LogEntry.build()
-                                                        .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                                                        .acted(user).action("addgroup " + group.getName().toLowerCase())
-                                                        .build().submit(plugin);
-                                            } catch (Exception ex) {
-                                                if (!(ex instanceof ObjectAlreadyHasException)) {
-                                                    ex.printStackTrace();
-                                                }
-                                            }
-                                        } else {
-                                            try {
-                                                user.setPermission("group." + group.getName().toLowerCase(), true, server);
-                                                LogEntry.build()
-                                                        .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                                                        .acted(user).action("addgroup " + group.getName().toLowerCase() + " " + server)
-                                                        .build().submit(plugin);
-                                            } catch (Exception ex) {
-                                                if (!(ex instanceof ObjectAlreadyHasException)) {
-                                                    ex.printStackTrace();
-                                                }
-                                            }
-                                        }
-                                    }
-                                });
-                    }
+            // server --> list of groups
+            Map<String, List<CachedGroup>> parents = joinFuture(pm.getPlayerOwnGroups(uuid));
+            for (Map.Entry<String, List<CachedGroup>> parent : parents.entrySet()) {
+                String server = parent.getKey().toLowerCase();
+                if (parent.getKey().equals("*") || parent.getKey().equals("all")) {
+                    server = null;
                 }
 
-                // Update the progress so the user can be saved and unloaded.
-                synchronized (progress) {
-                    progress.get(uuid).countDown();
-                    if (progress.get(uuid).getCount() == 0) {
-                        plugin.getStorage().saveUser(user);
-                        plugin.getUserManager().cleanup(user);
-                    }
-                }
-            };
-
-            if (!legacy) {
-                try {
-                    ListenableFuture<LinkedHashMap<String, List<CachedGroup>>> future = (ListenableFuture<LinkedHashMap<String, List<CachedGroup>>>) getPlayerGroupsMethod.invoke(pm, uuid);
-                    try {
-                        if (future.isDone()) {
-                            callback.onComplete(future.get());
-                        } else {
-                            future.addListener(() -> {
-                                try {
-                                    callback.onComplete(future.get());
-                                } catch (InterruptedException | ExecutionException e) {
-                                    e.printStackTrace();
-                                }
-                            }, Runnable::run);
-                        }
-                    } catch (InterruptedException | ExecutionException e) {
-                        e.printStackTrace();
-                    }
-                } catch (IllegalAccessException | InvocationTargetException e) {
-                    log.info("PowerfulPerms Migration: Error");
-                    e.printStackTrace();
-                }
-            } else {
-                try {
-                    getPlayerGroupsMethod.invoke(pm, uuid, new LPResultRunnable<LinkedHashMap<String, List<CachedGroup>>>() {
-                        @Override
-                        public void run() {
-                            callback.onComplete(getResult());
-                        }
-                    });
-                } catch (IllegalAccessException | InvocationTargetException e) {
-                    log.info("PowerfulPerms Migration: Error");
-                    e.printStackTrace();
+                for (CachedGroup group : parent.getValue()) {
+                    applyGroup(pm, user, group, server);
                 }
             }
+
+            String prefix = joinFuture(pm.getPlayerOwnPrefix(uuid));
+            String suffix = joinFuture(pm.getPlayerOwnSuffix(uuid));
+
+            if (prefix != null && !prefix.equals("")) {
+                user.setPermission(NodeFactory.makePrefixNode(maxWeight, prefix).build());
+            }
+
+            if (suffix != null && !suffix.equals("")) {
+                user.setPermission(NodeFactory.makeSuffixNode(maxWeight, suffix).build());
+            }
+
+            String primary = joinFuture(pm.getPlayerPrimaryGroup(uuid)).getName().toLowerCase();
+            if (!primary.equals("default")) {
+                user.setPermission(NodeFactory.make("group." + primary));
+                user.getPrimaryGroup().setStoredValue(primary);
+            }
+
+            plugin.getUserManager().cleanup(user);
+            plugin.getStorage().saveUser(user);
+            log.logProgress("Migrated {} users so far.", userCount.incrementAndGet());
         }
 
-        // All groups are migrated, but there may still be some users being migrated.
-        // This block will wait for all users to be completed.
-        log.info("PowerfulPerms Migration: Waiting for user migration to complete. This may take some time");
-        boolean sleep = true;
-        while (sleep) {
-            sleep = false;
-
-            for (Map.Entry<UUID, CountDownLatch> e : progress.entrySet()) {
-                if (e.getValue().getCount() != 0) {
-                    sleep = true;
-                    break;
-                }
-            }
-
-            if (sleep) {
-                try {
-                    Thread.sleep(5000);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-
-        }
-
-        // We done.
-        log.info("PowerfulPerms Migration: Success! Completed without any errors.");
+        log.log("Migrated " + userCount.get() + " users.");
+        log.log("Success! Migration complete.");
         return CommandResult.SUCCESS;
     }
 
-    private void applyPerm(PermissionHolder holder, Permission p, LuckPermsPlugin plugin) {
+    private void applyPerm(PermissionHolder holder, Permission p) {
         String node = p.getPermissionString();
         boolean value = true;
-        if (node.startsWith("!")) {
+        if (node.startsWith("!") || node.startsWith("-")) {
             node = node.substring(1);
             value = false;
         }
 
         String server = p.getServer();
-        if (server != null && server.equalsIgnoreCase("all")) {
+        if (server != null && (server.equalsIgnoreCase("all") || server.equalsIgnoreCase("*"))) {
             server = null;
         }
 
         String world = p.getWorld();
-        if (world != null && world.equalsIgnoreCase("all")) {
+        if (world != null && (world.equalsIgnoreCase("all") || world.equalsIgnoreCase("*"))) {
             world = null;
         }
 
         long expireAt = 0L;
-        if (!superLegacy) {
-            if (p.willExpire()) {
-                expireAt = p.getExpirationDate().getTime() / 1000L;
-            }
+        if (p.willExpire()) {
+            expireAt = p.getExpirationDate().getTime() / 1000L;
         }
 
         if (world != null && server == null) {
             server = "global";
         }
 
-        if (world != null) {
-            if (expireAt == 0L) {
-                try {
-                    holder.setPermission(node, value, server, world);
-                    LogEntry.build()
-                            .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                            .acted(holder).action("set " + node + " " + value + " " + server + " " + world)
-                            .build().submit(plugin);
-                } catch (Exception ex) {
-                    if (!(ex instanceof ObjectAlreadyHasException)) {
-                        ex.printStackTrace();
-                    }
-                }
-            } else {
-                try {
-                    holder.setPermission(node, value, server, world, expireAt);
-                    LogEntry.build()
-                            .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                            .acted(holder).action("settemp " + node + " " + value + " " + expireAt + " " + server + " " + world)
-                            .build().submit(plugin);
-                } catch (Exception ex) {
-                    if (!(ex instanceof ObjectAlreadyHasException)) {
-                        ex.printStackTrace();
-                    }
-                }
-            }
+        Node.Builder nb = NodeFactory.newBuilder(node).setValue(value);
 
-        } else if (server != null) {
-            if (expireAt == 0L) {
-                try {
-                    holder.setPermission(node, value, server);
-                    LogEntry.build()
-                            .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                            .acted(holder).action("set " + node + " " + value + " " + server)
-                            .build().submit(plugin);
-                } catch (Exception ex) {
-                    if (!(ex instanceof ObjectAlreadyHasException)) {
-                        ex.printStackTrace();
-                    }
-                }
-            } else {
-                try {
-                    holder.setPermission(node, value, server, expireAt);
-                    LogEntry.build()
-                            .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                            .acted(holder).action("settemp " + node + " " + value + " " + expireAt + " " + server)
-                            .build().submit(plugin);
-                } catch (Exception ex) {
-                    if (!(ex instanceof ObjectAlreadyHasException)) {
-                        ex.printStackTrace();
-                    }
-                }
-            }
-        } else {
-            if (expireAt == 0L) {
-                try {
-                    holder.setPermission(node, value);
-                    LogEntry.build()
-                            .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                            .acted(holder).action("set " + node + " " + value)
-                            .build().submit(plugin);
-                } catch (Exception ex) {
-                    if (!(ex instanceof ObjectAlreadyHasException)) {
-                        ex.printStackTrace();
-                    }
-                }
-            } else {
-                try {
-                    holder.setPermission(node, value, expireAt);
-                    LogEntry.build()
-                            .actor(Constants.CONSOLE_UUID).actorName(Constants.CONSOLE_NAME)
-                            .acted(holder).action("settemp " + node + " " + value + " " + expireAt)
-                            .build().submit(plugin);
-                } catch (Exception ex) {
-                    if (!(ex instanceof ObjectAlreadyHasException)) {
-                        ex.printStackTrace();
-                    }
-                }
-            }
+        if (expireAt != 0) {
+            nb.setExpiry(expireAt);
         }
+
+        if (server != null) {
+            nb.setServer(server);
+        }
+
+        if (world != null) {
+            nb.setWorld(world);
+        }
+
+        holder.setPermission(nb.build());
+    }
+
+    private void applyGroup(PermissionManager pm, PermissionHolder holder, CachedGroup g, String server) {
+        Group group = pm.getGroup(g.getGroupId());
+        String node = "group." + MigrationUtils.standardizeName(group.getName());
+
+        long expireAt = 0L;
+        if (g.willExpire()) {
+            expireAt = g.getExpirationDate().getTime() / 1000L;
+        }
+
+        Node.Builder nb = NodeFactory.newBuilder(node);
+
+        if (expireAt != 0) {
+            nb.setExpiry(expireAt);
+        }
+
+        if (server != null) {
+            nb.setServer(server);
+        }
+
+        holder.setPermission(nb.build());
+    }
+
+    @SneakyThrows
+    private static <T> T joinFuture(Future<T> future) {
+        return future.get();
     }
 }

bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationZPermissions.java

@@ -22,11 +22,11 @@
 
 package me.lucko.luckperms.bukkit.migration;
 
-import me.lucko.luckperms.api.Logger;
-import me.lucko.luckperms.common.LuckPermsPlugin;
+import me.lucko.luckperms.api.event.cause.CreationCause;
 import me.lucko.luckperms.common.commands.CommandException;
 import me.lucko.luckperms.common.commands.CommandResult;
-import me.lucko.luckperms.common.commands.SubCommand;
+import me.lucko.luckperms.common.commands.abstraction.SubCommand;
+import me.lucko.luckperms.common.commands.impl.migration.MigrationUtils;
 import me.lucko.luckperms.common.commands.sender.Sender;
 import me.lucko.luckperms.common.constants.Permission;
 import me.lucko.luckperms.common.core.NodeFactory;
@@ -34,9 +34,11 @@ import me.lucko.luckperms.common.core.model.Group;
 import me.lucko.luckperms.common.core.model.PermissionHolder;
 import me.lucko.luckperms.common.core.model.Track;
 import me.lucko.luckperms.common.core.model.User;
+import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.utils.Predicates;
-import me.lucko.luckperms.exceptions.ObjectAlreadyHasException;
+import me.lucko.luckperms.common.utils.ProgressLogger;
 
+import org.bukkit.Bukkit;
 import org.tyrannyofheaven.bukkit.zPermissions.ZPermissionsService;
 import org.tyrannyofheaven.bukkit.zPermissions.dao.PermissionService;
 import org.tyrannyofheaven.bukkit.zPermissions.model.EntityMetadata;
@@ -48,29 +50,34 @@ import org.tyrannyofheaven.bukkit.zPermissions.model.PermissionEntity;
 import java.lang.reflect.Field;
 import java.util.List;
 import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
 
 public class MigrationZPermissions extends SubCommand<Object> {
-
     public MigrationZPermissions() {
         super("zpermissions", "Migration from zPermissions", Permission.MIGRATION, Predicates.alwaysFalse(), null);
     }
 
     @Override
     public CommandResult execute(LuckPermsPlugin plugin, Sender sender, Object o, List<String> args, String label) throws CommandException {
-        final Logger log = plugin.getLog();
-        if (!plugin.isPluginLoaded("zPermissions")) {
-            log.severe("zPermissions Migration: Error -> zPermissions is not loaded.");
+        ProgressLogger log = new ProgressLogger("zPermissions");
+        log.addListener(plugin.getConsoleSender());
+        log.addListener(sender);
+
+        log.log("Starting.");
+        
+        if (!Bukkit.getPluginManager().isPluginEnabled("zPermissions")) {
+            log.logErr("Plugin not loaded.");
             return CommandResult.STATE_ERROR;
         }
 
-        ZPermissionsService service = (ZPermissionsService) plugin.getService(ZPermissionsService.class);
-        if (service == null) {
-            log.severe("zPermissions Migration: Error -> zPermissions is not loaded.");
+        if (!Bukkit.getServicesManager().isProvidedFor(ZPermissionsService.class)) {
+            log.logErr("Plugin not loaded.");
             return CommandResult.STATE_ERROR;
         }
 
+        ZPermissionsService service = Bukkit.getServicesManager().getRegistration(ZPermissionsService.class).getProvider();
+
         PermissionService internalService;
-
         try {
             Field psField = service.getClass().getDeclaredField("permissionService");
             psField.setAccessible(true);
@@ -81,88 +88,92 @@ public class MigrationZPermissions extends SubCommand<Object> {
         }
 
         // Migrate all groups
-        log.info("zPermissions Migration: Starting group migration.");
+        log.log("Starting group migration.");
+        AtomicInteger groupCount = new AtomicInteger(0);
         for (String g : service.getAllGroups()) {
-            plugin.getStorage().createAndLoadGroup(g.toLowerCase()).join();
-            Group group = plugin.getGroupManager().getIfLoaded(g.toLowerCase());
+            String groupName = MigrationUtils.standardizeName(g);
+
+            plugin.getStorage().createAndLoadGroup(groupName, CreationCause.INTERNAL).join();
+            Group group = plugin.getGroupManager().getIfLoaded(groupName);
 
             PermissionEntity entity = internalService.getEntity(g, null, true);
             migrateEntity(group, entity, null);
 
             plugin.getStorage().saveGroup(group);
+            log.logAllProgress("Migrated {} groups so far.", groupCount.incrementAndGet());
         }
+        log.log("Migrated " + groupCount.get() + " groups");
 
         // Migrate all tracks
-        log.info("zPermissions Migration: Starting track migration.");
+        log.log("Starting track migration.");
+        AtomicInteger trackCount = new AtomicInteger(0);
         for (String t : service.getAllTracks()) {
-            plugin.getStorage().createAndLoadTrack(t.toLowerCase()).join();
-            Track track = plugin.getTrackManager().getIfLoaded(t.toLowerCase());
+            String trackName = MigrationUtils.standardizeName(t);
+
+            plugin.getStorage().createAndLoadTrack(trackName, CreationCause.INTERNAL).join();
+            Track track = plugin.getTrackManager().getIfLoaded(trackName);
             track.setGroups(service.getTrackGroups(t));
             plugin.getStorage().saveTrack(track);
+
+            log.logAllProgress("Migrated {} tracks so far.", trackCount.incrementAndGet());
         }
+        log.log("Migrated " + trackCount.get() + " tracks");
 
         // Migrate all users.
-        log.info("zPermissions Migration: Starting user migration.");
+        log.log("Starting user migration.");
+        AtomicInteger userCount = new AtomicInteger(0);
         for (UUID u : service.getAllPlayersUUID()) {
-            plugin.getStorage().loadUser(u, "null").join();
-            User user = plugin.getUserManager().get(u);
-
             PermissionEntity entity = internalService.getEntity(null, u, false);
-            migrateEntity(user, entity, internalService.getGroups(u));
-
-            user.setPrimaryGroup(service.getPlayerPrimaryGroup(u));
-
+            String username = null;
             if (!entity.isGroup()) {
-                user.setName(entity.getDisplayName());
+                username = entity.getDisplayName();
             }
 
+            plugin.getStorage().loadUser(u, username).join();
+            User user = plugin.getUserManager().get(u);
+            migrateEntity(user, entity, internalService.getGroups(u));
+            user.getPrimaryGroup().setStoredValue(MigrationUtils.standardizeName(service.getPlayerPrimaryGroup(u)));
+
             plugin.getUserManager().cleanup(user);
             plugin.getStorage().saveUser(user);
+            log.logProgress("Migrated {} users so far.", userCount.incrementAndGet());
         }
 
-        log.info("zPermissions Migration: Success! Completed without any errors.");
+        log.log("Migrated " + userCount.get() + " users.");
+        log.log("Success! Migration complete.");
         return CommandResult.SUCCESS;
     }
 
-    private void migrateEntity(PermissionHolder group, PermissionEntity entity, List<Membership> memberships) {
+    private void migrateEntity(PermissionHolder holder, PermissionEntity entity, List<Membership> memberships) {
         for (Entry e : entity.getPermissions()) {
-            if (e.getWorld() != null) {
-                try {
-                    group.setPermission(e.getPermission(), true, "global", e.getWorld().getName());
-                } catch (ObjectAlreadyHasException ignored) {
-                }
+            if (e.getWorld() != null && !e.getWorld().getName().equals("")) {
+                holder.setPermission(MigrationUtils.parseNode(e.getPermission(), true).setWorld(e.getWorld().getName()).build());
             } else {
-                try {
-                    group.setPermission(e.getPermission(), true); // TODO handle negated.
-                } catch (ObjectAlreadyHasException ignored) {
-                }
+                holder.setPermission(MigrationUtils.parseNode(e.getPermission(), true).build());
             }
         }
 
         if (entity.isGroup()) {
+            // entity.getMemberships() doesn't work for groups (always returns 0 records)
             for (Inheritance inheritance : entity.getInheritancesAsChild()) {
-                try {
-                    if (!inheritance.getParent().getName().equals(group.getObjectName())) {
-                        group.setPermission("group." + inheritance.getParent().getName(), true);
-                    }
-                } catch (ObjectAlreadyHasException ignored) {
+                if (!inheritance.getParent().getName().equals(holder.getObjectName())) {
+                    holder.setPermission(NodeFactory.make("group." + MigrationUtils.standardizeName(inheritance.getParent().getName())));
                 }
             }
         } else {
-            // entity.getMemberships() doesn't work (always returns 0 records)
             for (Membership membership : memberships) {
-                try {
-                    group.setPermission("group." + membership.getGroup().getDisplayName(), true);
-                } catch (ObjectAlreadyHasException ignored) {
-                }
+                holder.setPermission(NodeFactory.make("group." + MigrationUtils.standardizeName(membership.getGroup().getDisplayName())));
             }
         }
 
+        int weight = entity.isGroup() ? 50 : 100;
         for (EntityMetadata metadata : entity.getMetadata()) {
-            try {
-                group.setPermission(NodeFactory.makeMetaNode(metadata.getName(), metadata.getStringValue()).build());
-            } catch (Exception e) {
-                e.printStackTrace();
+            String key = metadata.getName().toLowerCase();
+
+            if (key.equals("prefix") || key.equals("suffix")) {
+                holder.setPermission(NodeFactory.makeChatMetaNode(key.equals("prefix"), weight, metadata.getStringValue()).build());
+            } else {
+                holder.setPermission(NodeFactory.makeMetaNode(key, metadata.getStringValue()).build());
             }
         }
     }

bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/utils/LPResultRunnable.java

@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included in all
- *  copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
- */
-
-package me.lucko.luckperms.bukkit.migration.utils;
-
-import com.github.cheesesoftware.PowerfulPermsAPI.ResultRunnable;
-
-/**
- * Overrides the default ResultRunnable, callbacks will always run in the same thread. (an async one, hopefully.)
- *
- * @param <T> type
- */
-public abstract class LPResultRunnable<T> extends ResultRunnable<T> {
-    public LPResultRunnable() {
-        super();
-        super.sameThread = true;
-    }
-
-    public T getResult() {
-        return super.result;
-    }
-
-}

bukkit/src/main/java/me/lucko/luckperms/bukkit/model/ChildPermissionProvider.java

@@ -36,6 +36,33 @@ import java.util.Map;
 
 public class ChildPermissionProvider {
 
+    @Getter
+    private ImmutableMap<Map.Entry<String, Boolean>, ImmutableMap<String, Boolean>> permissions = ImmutableMap.of();
+
+    public void setup() {
+        ImmutableMap.Builder<Map.Entry<String, Boolean>, ImmutableMap<String, Boolean>> permissions = ImmutableMap.builder();
+
+        for (Permission permission : Bukkit.getServer().getPluginManager().getPermissions()) {
+            // handle true
+            Map<String, Boolean> trueChildren = new HashMap<>();
+            resolveChildren(trueChildren, Collections.singletonMap(permission.getName(), true), false);
+            trueChildren.remove(permission.getName(), true);
+            if (!trueChildren.isEmpty()) {
+                permissions.put(Maps.immutableEntry(permission.getName().toLowerCase(), true), ImmutableMap.copyOf(trueChildren));
+            }
+
+            // handle false
+            Map<String, Boolean> falseChildren = new HashMap<>();
+            resolveChildren(falseChildren, Collections.singletonMap(permission.getName(), false), false);
+            falseChildren.remove(permission.getName(), false);
+            if (!falseChildren.isEmpty()) {
+                permissions.put(Maps.immutableEntry(permission.getName().toLowerCase(), false), ImmutableMap.copyOf(falseChildren));
+            }
+        }
+
+        this.permissions = permissions.build();
+    }
+
     private static void resolveChildren(Map<String, Boolean> accumulator, Map<String, Boolean> children, boolean invert) {
         for (Map.Entry<String, Boolean> e : children.entrySet()) {
             if (accumulator.containsKey(e.getKey())) {
@@ -53,25 +80,4 @@ public class ChildPermissionProvider {
             }
         }
     }
-
-    @Getter
-    private ImmutableMap<Map.Entry<String, Boolean>, ImmutableMap<String, Boolean>> permissions = ImmutableMap.of();
-
-    public void setup() {
-        Map<Map.Entry<String, Boolean>, ImmutableMap<String, Boolean>> permissions = new HashMap<>();
-
-        for (Permission permission : Bukkit.getServer().getPluginManager().getPermissions()) {
-            // handle true
-            Map<String, Boolean> children = new HashMap<>();
-            resolveChildren(children, Collections.singletonMap(permission.getName(), true), false);
-            permissions.put(Maps.immutableEntry(permission.getName().toLowerCase(), true), ImmutableMap.copyOf(children));
-
-            // handle false
-            Map<String, Boolean> nChildren = new HashMap<>();
-            resolveChildren(nChildren, Collections.singletonMap(permission.getName(), false), false);
-            permissions.put(Maps.immutableEntry(permission.getName().toLowerCase(), false), ImmutableMap.copyOf(nChildren));
-        }
-
-        this.permissions = ImmutableMap.copyOf(permissions);
-    }
 }

bukkit/src/main/java/me/lucko/luckperms/bukkit/model/DefaultsProvider.java

@@ -22,7 +22,6 @@
 
 package me.lucko.luckperms.bukkit.model;
 
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 import com.google.common.collect.ImmutableMap;
@@ -30,57 +29,14 @@ import com.google.common.collect.ImmutableMap;
 import me.lucko.luckperms.api.Tristate;
 
 import org.bukkit.Bukkit;
-import org.bukkit.permissions.Permissible;
 import org.bukkit.permissions.Permission;
-import org.bukkit.permissions.PermissionAttachment;
-import org.bukkit.permissions.PermissionAttachmentInfo;
-import org.bukkit.plugin.Plugin;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
 public class DefaultsProvider {
 
-    private static void unregisterDefaults(Map<String, Boolean> map, DummyPermissible p) {
-        Set<String> perms = map.keySet();
-
-        for (String name : perms) {
-            Bukkit.getServer().getPluginManager().unsubscribeFromPermission(name, p);
-        }
-
-        Bukkit.getServer().getPluginManager().unsubscribeFromDefaultPerms(false, p);
-        Bukkit.getServer().getPluginManager().unsubscribeFromDefaultPerms(true, p);
-    }
-
-    private static void calculateDefaults(Map<String, Boolean> map, DummyPermissible p, boolean op) {
-        Set<Permission> defaults = Bukkit.getServer().getPluginManager().getDefaultPermissions(op);
-        Bukkit.getServer().getPluginManager().subscribeToDefaultPerms(op, p);
-
-        for (Permission perm : defaults) {
-            String name = perm.getName().toLowerCase();
-            map.put(name, true);
-            Bukkit.getServer().getPluginManager().subscribeToPermission(name, p);
-            calculateChildPermissions(map, p, perm.getChildren(), false);
-        }
-    }
-
-    private static void calculateChildPermissions(Map<String, Boolean> map, DummyPermissible p, Map<String, Boolean> children, boolean invert) {
-        for (Map.Entry<String, Boolean> e : children.entrySet()) {
-            Permission perm = Bukkit.getServer().getPluginManager().getPermission(e.getKey());
-            boolean value = e.getValue() ^ invert;
-            String lName = e.getKey().toLowerCase();
-
-            map.put(lName, value);
-            Bukkit.getServer().getPluginManager().subscribeToPermission(e.getKey(), p);
-
-            if (perm != null) {
-                calculateChildPermissions(map, p, perm.getChildren(), !value);
-            }
-        }
-    }
-
     @Getter
     private Map<String, Boolean> opDefaults = ImmutableMap.of();
     private final DummyPermissible opDummy = new DummyPermissible(this::refreshOp);
@@ -128,73 +84,41 @@ public class DefaultsProvider {
         return opDefaults.size() + nonOpDefaults.size();
     }
 
-    @AllArgsConstructor
-    private static class DummyPermissible implements Permissible {
-        private final Runnable onRefresh;
+    private static void unregisterDefaults(Map<String, Boolean> map, DummyPermissible p) {
+        Set<String> perms = map.keySet();
 
-        @Override
-        public void recalculatePermissions() {
-            onRefresh.run();
+        for (String name : perms) {
+            Bukkit.getServer().getPluginManager().unsubscribeFromPermission(name, p);
         }
 
-        @Override
-        public Set<PermissionAttachmentInfo> getEffectivePermissions() {
-            return Collections.emptySet();
+        Bukkit.getServer().getPluginManager().unsubscribeFromDefaultPerms(false, p);
+        Bukkit.getServer().getPluginManager().unsubscribeFromDefaultPerms(true, p);
+    }
+
+    private static void calculateDefaults(Map<String, Boolean> map, DummyPermissible p, boolean op) {
+        Set<Permission> defaults = Bukkit.getServer().getPluginManager().getDefaultPermissions(op);
+        Bukkit.getServer().getPluginManager().subscribeToDefaultPerms(op, p);
+
+        for (Permission perm : defaults) {
+            String name = perm.getName().toLowerCase();
+            map.put(name, true);
+            Bukkit.getServer().getPluginManager().subscribeToPermission(name, p);
+            calculateChildPermissions(map, p, perm.getChildren(), false);
         }
+    }
 
-        @Override
-        public boolean isPermissionSet(String name) {
-            return false;
-        }
+    private static void calculateChildPermissions(Map<String, Boolean> map, DummyPermissible p, Map<String, Boolean> children, boolean invert) {
+        for (Map.Entry<String, Boolean> e : children.entrySet()) {
+            Permission perm = Bukkit.getServer().getPluginManager().getPermission(e.getKey());
+            boolean value = e.getValue() ^ invert;
+            String lName = e.getKey().toLowerCase();
 
-        @Override
-        public boolean isPermissionSet(Permission perm) {
-            return false;
-        }
-
-        @Override
-        public boolean hasPermission(String name) {
-            return false;
-        }
-
-        @Override
-        public boolean hasPermission(Permission perm) {
-            return false;
-        }
-
-        @Override
-        public PermissionAttachment addAttachment(Plugin plugin, String name, boolean value) {
-            return null;
-        }
-
-        @Override
-        public PermissionAttachment addAttachment(Plugin plugin) {
-            return null;
-        }
-
-        @Override
-        public PermissionAttachment addAttachment(Plugin plugin, String name, boolean value, int ticks) {
-            return null;
-        }
-
-        @Override
-        public PermissionAttachment addAttachment(Plugin plugin, int ticks) {
-            return null;
-        }
-
-        @Override
-        public void removeAttachment(PermissionAttachment attachment) {
-
-        }
-
-        @Override
-        public boolean isOp() {
-            return false;
-        }
-
-        @Override
-        public void setOp(boolean value) {
+            map.put(lName, value);
+            Bukkit.getServer().getPluginManager().subscribeToPermission(e.getKey(), p);
 
+            if (perm != null) {
+                calculateChildPermissions(map, p, perm.getChildren(), !value);
+            }
         }
     }
 

bukkit/src/main/java/me/lucko/luckperms/bukkit/model/DummyPermissible.java

@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package me.lucko.luckperms.bukkit.model;
+
+import lombok.AllArgsConstructor;
+
+import org.bukkit.permissions.Permissible;
+import org.bukkit.permissions.Permission;
+import org.bukkit.permissions.PermissionAttachment;
+import org.bukkit.permissions.PermissionAttachmentInfo;
+import org.bukkit.plugin.Plugin;
+
+import java.util.Collections;
+import java.util.Set;
+
+@AllArgsConstructor
+public class DummyPermissible implements Permissible {
+    private final Runnable onRefresh;
+
+    @Override
+    public void recalculatePermissions() {
+        onRefresh.run();
+    }
+
+    @Override
+    public Set<PermissionAttachmentInfo> getEffectivePermissions() {
+        return Collections.emptySet();
+    }
+
+    @Override
+    public boolean isPermissionSet(String name) {
+        return false;
+    }
+
+    @Override
+    public boolean isPermissionSet(Permission perm) {
+        return false;
+    }
+
+    @Override
+    public boolean hasPermission(String name) {
+        return false;
+    }
+
+    @Override
+    public boolean hasPermission(Permission perm) {
+        return false;
+    }
+
+    @Override
+    public PermissionAttachment addAttachment(Plugin plugin, String name, boolean value) {
+        return null;
+    }
+
+    @Override
+    public PermissionAttachment addAttachment(Plugin plugin) {
+        return null;
+    }
+
+    @Override
+    public PermissionAttachment addAttachment(Plugin plugin, String name, boolean value, int ticks) {
+        return null;
+    }
+
+    @Override
+    public PermissionAttachment addAttachment(Plugin plugin, int ticks) {
+        return null;
+    }
+
+    @Override
+    public void removeAttachment(PermissionAttachment attachment) {
+
+    }
+
+    @Override
+    public boolean isOp() {
+        return false;
+    }
+
+    @Override
+    public void setOp(boolean value) {
+
+    }
+}