Properly implement Contexts#allowAll - bump API to 3.3

- Remove usage of Java 8 streams from frequently called methods
- Use LinkedLists where appropriate to improve Iterator#remove speed
- Cache immutable multimap conversion
- Rename some methods to make the intended use/behaviour clearer

.locale/en_US.yml

@@ -0,0 +1,738 @@
+# LuckPerms Language File
+# 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 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}"
+verbose-log: "&3VERBOSE &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-save-success: "&7(User data was saved to storage)"
+user-save-error: "There was an error whilst saving the 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-world-invalid-entry: "Server/world names can only contain alphanumeric characters and cannot exceed 36 characters in length."
+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 filter: &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 filter: &f{0}"
+verbose-recording-upload-start: "&bVerbose recording was disabled. Uploading results..."
+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-searching-members: "&aSearching for users and groups who inherit from &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}"
+apply-edits-invalid-code: "&aInvalid code. &7({0})"
+apply-edits-unable-to-read: "&aUnable to read data using the given code. &7({0})"
+apply-edits-no-target: "&aUnable to parse the target of the edit. Please supply it as an extra argument."
+apply-edits-target-group-not-exists: "&aTarget group &b{0}&a does not exist."
+apply-edits-target-user-not-uuid: "&aTarget user &b{0}&a is not a valid uuid."
+apply-edits-target-user-unable-to-load: "&aUnable to load target user &b{0}&a."
+apply-edits-target-unknown: "&aInvalid target. &7({0})"
+apply-edits-success: "&aSuccessfully applied &b{0}&a nodes to &b{1}&a."
+editor-upload-failure: "&cUnable to upload permission data to the editor."
+editor-url: "&aEditor URL:"
+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 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."
+groups-load-error: "An unexpected error occurred. Unable to load all groups."
+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 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{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: "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: &7(name, weight, tracks)"
+groups-list-entry: "&f-  &3{0} &7- &b{1}"
+groups-list-entry-with-tracks: "&f-  &3{0} &7- &b{1} &7- [&3{2}&7]"
+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:"
+listnodes-temp-with-page: "&b{0}'s Temporary Nodes:  {1}"
+listparents: "&b{0}'s Parent Groups:"
+listparents-temp: "&b{0}'s Temporary Parent Groups:"
+list-tracks: >
+  &b{0}'s Tracks:\n
+  {1}
+list-tracks-empty: "{0} is not on any tracks."
+context-pair-inline: "&3{0}=&b{1}"
+context-pair--global-inline: "&eglobal"
+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."
+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."
+set-track-parent-success: "&b{0}&a had their existing parent groups on track &b{1}&a cleared, and now only inherits &b{2}&a in context {3}&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 in context {1}&a. (&b{2}&a nodes were removed.)"
+clear-success-singular: "&b{0}&a's permissions were cleared in context {1}&a. (&b{2}&a node was removed.)"
+parent-clear-success: "&b{0}&a's parents were cleared in context {1}&a. &b{2}&a nodes were removed.)"
+parent-clear-success-singular: "&b{0}&a's parents were cleared in context {1}&a. &b{2}&a node was removed.)"
+parent-clear-track-success: "&b{0}&a's parents on track &b{1}&a were cleared in context {2}&a. &b{3}&a nodes were removed.)"
+parent-clear-track-success-singular: "&b{0}&a's parents on track &b{1}&a were cleared in context {2}&a. &b{3}&a node was removed.)"
+meta-clear-success: "&b{0}&a's meta was cleared in context {1}&a. &b{2}&a nodes were removed.)"
+meta-clear-success-singular: "&b{0}&a's meta was cleared in context {1}&a. &b{2}&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"
+chat-meta-entry: "&b-> {0} &f- &f\"{1}&f\" &8(&7inherited from &a{2}&8)"
+chat-meta-entry-with-context: "&b-> {0} &f- &f\"{1}&f\" &8(&7inherited from &a{2}&8){3}"
+meta-entry: "&b-> &a{0} &f= &f\"{1}&f\" &8(&7inherited from &a{2}&8)"
+meta-entry-with-context: "&b-> &a{0} &f= &f\"{1}&f\" &8(&7inherited from &a{2}&8){3}"
+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-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{2}&a removed in context {3}&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{2}&a removed in context {3}&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 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-update-invalid-data-type: "Invalid type. Was expecting 'all', 'users' or 'groups'."
+bulk-update-invalid-constraint: "Invalid constraint &4{0}&c. Constraints should be in the format '&f<field> <comparison operator> <value>&c'."
+bulk-update-invalid-comparison: "Invalid comparison operator '&4{0}&c'. Expected one of the following: &f==  !=  ~~  ~!"
+bulk-update-queued: "&aBulk update operation was queued. &7(&f{0}&7)"
+bulk-update-confirm: "&aRun &b/{0} bulkupdate confirm {1} &ato execute the update."
+bulk-update-unknown-id: "&aOperation with id &b{0}&a does not exist or has expired."
+bulk-update-starting: "&aRunning bulk update."
+bulk-update-success: "&bBulk update completed successfully."
+bulk-update-failure: "&cBulk update failed. Check the console for errors."
+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-    &3Has contextual data: {0}\n
+  {PREFIX}&f-    &3Current Contexts: {1}\n
+  {PREFIX}&f-    &3Current Prefix: {2}\n
+  {PREFIX}&f-    &3Current Suffix: {3}
+info-parent-header: "&f- &aParent Groups:"
+info-temp-parent-header: "&f- &aTemporary Parent Groups:"
+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."
+user-track-added-to-first: "&b{0}&a isn't in any groups on this track, so they were added to the first group, &b{1}&a in context {2}&a."
+user-promote-success: "&aPromoting user along track &b{0}&a from &b{1}&a to &b{2}&a in context {3}&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.\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 in context {3}&a."
+user-demote-endoftrack: "The end of track &4{0}&c was reached, so &4{1}&c was removed from &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.
+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: "&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}
+track-clear: "&b{0}&a's groups track was cleared."
+track-append-success: "&aGroup &b{0}&a was successfully appended to track &b{1}&a."
+track-insert-success: "&aGroup &b{0}&a was successfully inserted into track &b{1}&a at position &b{2}&a."
+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<------------------------------------------>"
+
+command-specs:
+  user:
+    description: "User commands"
+    usage: "/%s user <user>"
+  group:
+    description: "Group commands"
+    usage: "/%s group <group>"
+  track:
+    description: "Track commands"
+    usage: "/%s track <track>"
+  log:
+    description: "Log commands"
+    usage: "/%s log"
+  sync:
+    description: "Sync changes with the storage"
+    usage: "/%s sync"
+  info:
+    description: "Print general plugin info"
+    usage: "/%s info"
+  verbose:
+    description: "Manage verbose permission checking"
+    usage: "/%s verbose <true|false> [filter]"
+    args:
+      "on|record|off|paste": "whether to enable/disable logging, or to paste the logged output"
+      "filter": "the filter to match entries against"
+  tree:
+    description: "Generate a tree view of permissions"
+    usage: "/%s tree [selection] [max level] [player]"
+    args:
+      "selection": "the root of the tree. specify \".\" to include all permissions"
+      "max level": "how many branch levels should be returned"
+      "player": "the name of an online player to check against"
+  search:
+    description: "Search for users/groups with a specific permission"
+    usage: "/%s search <permission>"
+    args:
+      "permission": "the permission to search for"
+      "page": "the page to view"
+  check:
+    description: "Perform a standard permission check on an online player"
+    usage: "/%s check <user> <permission>"
+    args:
+      "user": "the user to check"
+      "permission": "the permission to check for"
+  network-sync:
+    description: "Sync changes with the storage and request that all other servers on the network do the same"
+    usage: "/%s networksync"
+  import:
+    description: "Import data from a file"
+    usage: "/%s import <file>"
+    args:
+      "file": "the file to import from"
+  export:
+    description: "Export data to a file"
+    usage: "/%s export <file>"
+    args:
+      "file": "the file to export to"
+  reload-config:
+    description: "Reload some of the config options"
+    usage: "/%s reloadconfig"
+  bulk-update:
+    description: "Execute bulk change queries on all data"
+    usage: "/%s bulkupdate"
+    args:
+      "data type": "the type of data being changed. ('all', 'users' or 'groups')"
+      "action": "the action to perform on the data. ('update' or 'delete')"
+      "action field": "the field to act upon. only required for 'update'. ('permission', 'server' or 'world')"
+      "action value": "the value to replace with. only required for 'update'."
+      "constraint...": "the constraints required for the update"
+  migration:
+    description: "Migration commands"
+    usage: "/%s migration"
+  apply-edits:
+    description: "Applies permission changes made from the web editor"
+    usage: "/%s applyedits <code> [target]"
+    args:
+      "code": "the unique code for the data"
+      "target": "who to apply the data to"
+  create-group:
+    description: "Create a new group"
+    usage: "/%s creategroup <group>"
+    args:
+      "name": "the name of the group"
+  delete-group:
+    description: "Delete a group"
+    usage: "/%s deletegroup <group>"
+    args:
+      "name": "the name of the group"
+  list-groups:
+    description: "List all groups on the platform"
+    usage: "/%s listgroups"
+  create-track:
+    description: "Create a new track"
+    usage: "/%s createtrack <track>"
+    args:
+      "name": "the name of the track"
+  delete-track:
+    description: "Delete a track"
+    usage: "/%s deletetrack <track>"
+    args:
+      "name": "the name of the track"
+  list-tracks:
+    description: "List all tracks on the platform"
+    usage: "/%s listtracks"
+  user-info:
+    description: "Shows info about the user"
+  user-switchprimarygroup:
+    description: "Switches the user's primary group"
+    args:
+      "group": "the group to switch to"
+  user-promote:
+    description: "Promotes the user up a track"
+    args:
+      "track": "the track to promote the user up"
+      "context...": "the contexts to promote the user in"
+  user-demote:
+    description: "Demotes the user down a track"
+    args:
+      "track": "the track to demote the user down"
+      "context...": "the contexts to demote the user in"
+  group-info:
+    description: "Gives info about the group"
+  group-listmembers:
+    description: "Show the users/groups who inherit from this group"
+    args:
+      "page": "the page to view"
+  group-setweight:
+    description: "Set the groups weight"
+    args:
+      "weight": "the weight to set"
+  group-rename:
+    description: "Rename the group"
+    args:
+      "name": "the new name"
+  group-clone:
+    description: "Clone the group"
+    args:
+      "name": "the name of the group to clone onto"
+  holder-editor:
+    description: "Opens the web permission editor"
+  holder-showtracks:
+    description: "Lists the tracks that the object is on"
+  holder-clear:
+    description: "Removes all permissions, parents and meta"
+    args:
+      "context...": "the contexts to filter by"
+  permission:
+    description: "Edit permissions"
+  parent:
+    description: "Edit inheritances"
+  meta:
+    description: "Edit metadata values"
+  permission-info:
+    description: "Lists the permission nodes the object has"
+    args:
+      "page": "the page to view"
+      "filter": "the string to filter by"
+  permission-set:
+    description: "Sets a permission for the object"
+    args:
+      "node": "the permission node to set"
+      "true|false": "the value of the node"
+      "context...": "the contexts to add the permission in"
+  permission-unset:
+    description: "Unsets a permission for the object"
+    args:
+      "node": "the permission node to unset"
+      "context...": "the contexts to remove the permission in"
+  permission-settemp:
+    description: "Sets a permission for the object temporarily"
+    args:
+      "node": "the permission node to set"
+      "true|false": "the value of the node"
+      "duration": "the duration until the permission node expires"
+      "context...": "the contexts to add the permission in"
+  permission-unsettemp:
+    description: "Unsets a temporary permission for the object"
+    args:
+      "node": "the permission node to unset"
+      "context...": "the contexts to remove the permission in"
+  permission-check:
+    description: "Checks to see if the object has a certain permission node"
+    args:
+      "node": "the permission node to check for"
+      "context...": "the contexts to check in"
+  permission-check-inherits:
+    description: "Checks to see if the object inherits a certain permission node"
+    args:
+      "node": "the permission node to check for"
+      "context...": "the contexts to check in"
+  parent-info:
+    description: "Lists the groups that this object inherits from"
+  parent-set:
+    description: "Removes all other groups the object inherits already and adds them to the one given"
+    args:
+      "group": "the group to set to"
+      "context...": "the contexts to set the group in"
+  parent-add:
+    description: "Sets another group for the object to inherit permissions from"
+    args:
+      "group": "the group to inherit from"
+      "context...": "the contexts to inherit the group in"
+  parent-remove:
+    description: "Removes a previously set inheritance rule"
+    args:
+      "group": "the group to remove"
+      "context...": "the contexts to remove the group in"
+  parent-set-track:
+    description: "Removes all other groups the object inherits from already on the given track and adds them to the one given"
+    args:
+      "track": "the track to set on"
+      "group": "the group to set to, or a number relating to the position of the group on the given track"
+      "context...": "the contexts to set the group in"
+  parent-add-temp:
+    description: "Sets another group for the object to inherit permissions from temporarily"
+    args:
+      "group": "the group to inherit from"
+      "duration": "the duration of the group membership"
+      "context...": "the contexts to inherit the group in"
+  parent-remove-temp:
+    description: "Removes a previously set temporary inheritance rule"
+    args:
+      "group": "the group to remove"
+      "context...": "the contexts to remove the group in"
+  parent-clear:
+    description: "Clears all parents"
+    args:
+      "context...": "the contexts to filter by"
+  parent-clear-track:
+    description: "Clears all parents on a given track"
+    args:
+      "track": "the track to remove on"
+      "context...": "the contexts to filter by"
+  meta-info:
+    description: "Shows all chat meta"
+  meta-set:
+    description: "Sets a meta value"
+    args:
+      "key": "the key to set"
+      "value": "the value to set"
+      "context...": "the contexts to add the meta pair in"
+  meta-unset:
+    description: "Unsets a meta value"
+    args:
+      "key": "the key to unset"
+      "context...": "the contexts to remove the meta pair in"
+  meta-settemp:
+    description: "Sets a meta value temporarily"
+    args:
+      "key": "the key to set"
+      "value": "the value to set"
+      "duration": "the duration until the meta value expires"
+      "context...": "the contexts to add the meta pair in"
+  meta-unsettemp:
+    description: "Unsets a temporary meta value"
+    args:
+      "key": "the key to unset"
+      "context...": "the contexts to remove the meta pair in"
+  meta-addprefix:
+    description: "Adds a prefix"
+    args:
+      "priority": "the priority to add the prefix at"
+      "prefix": "the prefix string"
+      "context...": "the contexts to add the prefix in"
+  meta-addsuffix:
+    description: "Adds a suffix"
+    args:
+      "priority": "the priority to add the suffix at"
+      "suffix": "the suffix string"
+      "context...": "the contexts to add the suffix in"
+  meta-removeprefix:
+    description: "Removes a prefix"
+    args:
+      "priority": "the priority to remove the prefix at"
+      "prefix": "the prefix string"
+      "context...": "the contexts to remove the prefix in"
+  meta-removesuffix:
+    description: "Removes a suffix"
+    args:
+      "priority": "the priority to remove the suffix at"
+      "suffix": "the suffix string"
+      "context...": "the contexts to remove the suffix in"
+  meta-addtemp-prefix:
+    description: "Adds a prefix temporarily"
+    args:
+      "priority": "the priority to add the prefix at"
+      "prefix": "the prefix string"
+      "duration": "the duration until the prefix expires"
+      "context...": "the contexts to add the prefix in"
+  meta-addtemp-suffix:
+    description: "Adds a suffix temporarily"
+    args:
+      "priority": "the priority to add the suffix at"
+      "suffix": "the suffix string"
+      "duration": "the duration until the suffix expires"
+      "context...": "the contexts to add the suffix in"
+  meta-removetemp-prefix:
+    description: "Removes a temporary prefix"
+    args:
+      "priority": "the priority to remove the prefix at"
+      "prefix": "the prefix string"
+      "context...": "the contexts to remove the prefix in"
+  meta-removetemp-suffix:
+    description: "Removes a temporary suffix"
+    args:
+      "priority": "the priority to remove the suffix at"
+      "suffix": "the suffix string"
+      "context...": "the contexts to remove the suffix in"
+  meta-clear:
+    description: "Clears all chat meta"
+    args:
+      "context...": "the contexts to filter by"
+  track-info:
+    description: "Gives info about the track"
+  track-append:
+    description: "Appends a group onto the end of the track"
+    args:
+      "group": "the group to append"
+  track-insert:
+    description: "Inserts a group at a given position along the track"
+    args:
+      "group": "the group to insert"
+      "position": "the position to insert the group at (the first position on the track is 1)"
+  track-remove:
+    description: "Removes a group from the track"
+    args:
+      "group": "the group to remove"
+  track-clear:
+    description: "Clears the groups on the track"
+  track-rename:
+    description: "Rename the track"
+    args:
+      "name": "the new name"
+  track-clone:
+    description: "Clone the track"
+    args:
+      "name": "the name of the track to clone onto"
+  log-recent:
+    description: "View recent actions"
+    args:
+      "user": "the name/uuid of the user to filter by"
+      "page": "the page number to view"
+  log-search:
+    description: "Search the log for an entry"
+    args:
+      "query": "the query to search by"
+      "page": "the page number to view"
+  log-notify:
+    description: "Toggle log notifications"
+    args:
+      "on|off": "whether to toggle on or off"
+  log-user-history:
+    description: "View a user's history"
+    args:
+      "user": "the name/uuid of the user"
+      "page": "the page number to view"
+  log-group-history:
+    description: "View an group's history"
+    args:
+      "group": "the name of the group"
+      "page": "the page number to view"
+  log-track-history:
+    description: "View a track's history"
+    args:
+      "track": "the name of the track"
+      "page": "the page number to view"
+  sponge:
+    description: "Edit extra Sponge data"
+    usage: "/%s sponge <collection> <subject>"
+    args:
+      "collection": "the collection to query"
+      "subject": "the subject to modify"
+  sponge-permission-info:
+    description: "Shows info about the subject's permissions"
+    args:
+      "contexts...": "the contexts to filter by"
+  sponge-permission-set:
+    description: "Sets a permission for the Subject"
+    args:
+      "node": "the permission node to set"
+      "tristate": "the value to set the permission to"
+      "contexts...": "the contexts to set the permission in"
+  sponge-permission-clear:
+    description: "Clears the Subjects permissions"
+    args:
+      "contexts...": "the contexts to clear permissions in"
+  sponge-parent-info:
+    description: "Shows info about the subject's parents"
+    args:
+      "contexts...": "the contexts to filter by"
+  sponge-parent-add:
+    description: "Adds a parent to the Subject"
+    args:
+      "collection": "the subject collection where the parent Subject is"
+      "subject": "the name of the parent Subject"
+      "contexts...": "the contexts to add the parent in"
+  sponge-parent-remove:
+    description: "Removes a parent from the Subject"
+    args:
+      "collection": "the subject collection where the parent Subject is"
+      "subject": "the name of the parent Subject"
+      "contexts...": "the contexts to remove the parent in"
+  sponge-parent-clear:
+    description: "Clears the Subjects parents"
+    args:
+      "contexts...": "the contexts to clear parents in"
+  sponge-option-info:
+    description: "Shows info about the subject's options"
+    args:
+      "contexts...": "the contexts to filter by"
+  sponge-option-set:
+    description: "Sets an option for the Subject"
+    args:
+      "key": "the key to set"
+      "value": "the value to set the key to"
+      "contexts...": "the contexts to set the option in"
+  sponge-option-unset:
+    description: "Unsets an option for the Subject"
+    args:
+      "key": "the key to unset"
+      "contexts...": "the contexts to unset the key in"
+  sponge-option-clear:
+    description: "Clears the Subjects options"
+    args:
+      "contexts...": "the contexts to clear options in"
+  migration-command:
+    description: "Migration command"
+  migration-groupmanager:
+    description: "Migration command"
+    args:
+      "migrate as global": "if world permissions should be ignored, and just migrated as global"
+  migration-powerfulperms:
+    description: "Migration command"
+    args:
+      "address": "the address of the PP database"
+      "database": "the name of the PP database"
+      "username": "the username to log into the DB"
+      "password": "the password to log into the DB"
+      "db table": "the name of the PP table where player data is stored"

.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/pl_PL.yml

@@ -0,0 +1,290 @@
+# LuckPerms Language File
+# Locale: pl_PL (Polish)
+# Author: dzegarek
+
+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[UWAGA] {0}"
+log-error: "&7&l[&bLuck&3Perms&7&l] &4[BŁĄD] {0}"
+empty: "{0}"
+player-online: "&aOnline"
+player-offline: "&cOffline"
+loading-error: "Nie można załadować danych uprawnień. Spróbuj ponownie później."
+op-disabled: "&bSystem vanilla OP jest wyłączony na tym serwerze."
+op-disabled-sponge: "&2Stan operatora serwera nie ma wpływu na instalację wtyczki uprawnień. Proszę bezpośrednio edytować dane użytkownika."
+log: "&3LOG &3&l> {0}"
+export-log: "&3Eksport &3&l> &f{0}"
+export-log-progress: "&3Eksport &3&l> &7{0}"
+migration-log: "&3MIGRACJA &7[&3{0}&7] &3&l> &f{1}"
+migration-log-progress: "&3MIGRACJA &7[&3{0}&7] &3&l> &7{1}"
+command-not-recognised: "Komenda nie została rozpoznana."
+command-no-permission: "Nie masz uprawnień do korzystania z tego polecenia!"
+already-haspermission: "{0} ma już to uprawnienie!"
+does-not-havepermission: "{0} nie ma tego zestawu uprawnień."
+already-has-temp-permission: "{0} ma już tymczasowo uprawnienie!"
+does-not-have-temp-permission: "{0} nie ma tymczasowego zezwolenia."
+user-not-found: "&bNie można znaleźć użytkownika."
+user-not-online: "&bUżytkownik &a{0}&b nie jest online."
+user-save-success: "&7(Dane użytkownika zostały zapisane w pamięci)"
+user-save-error: "Podczas zapisywania użytkownika wystąpił błąd."
+group-not-found: "&bNie można odnaleźć grupy."
+group-save-success: "&7(Dane grupy zostały zapisane w pamięci)"
+group-save-error: "Podczas zapisywania grupy wystąpił błąd."
+track-not-found: "&bŚcieżka nie została odnaleziona."
+track-save-success: "&7(Dane ścieżki zostały zapisane w pamięci)"
+track-save-error: "Podczas zapisywania ścieżki wystąpił błąd."
+user-invalid-entry: "&d{0}&c nie jest poprawną nazwą użytkownika/uuid."
+group-invalid-entry: "Nazwy grup mogą zawierać tylko znaki alfanumeryczne."
+track-invalid-entry: "Nazwy dróg mogą zawierać tylko znaki alfanumeryczne."
+server-world-invalid-entry: "Nazwy serwerów/świata mogą zawierać znaki alfanumeryczne, ale nie mogą przekraczać 36 znaków."
+use-inherit-command: "Użyj komendy 'parent add' lub 'parent remove' zamiast określenia węzła."
+verbose-invalid-filter: "&cNieprawidłowy szczegółowy filtr: &f{0}"
+verbose-on: "&bZapis szczegółowych plików wyjściowych ustawiony jest na & aTRUE & bdla wszystkich uprawnień."
+verbose-on-query: "&bZapis szczegółowych plików wyjściowych ustawiony jest na & aTRUE & bdla wszystkich pasujących do filtra: &f{0}"
+verbose-off: "&bZapis szczegółowych plików wyjściowych jest ustawiony na &cFALSE&b."
+verbose-recording-on: "&bVerbose recording set to &aTRUE &bfor all permissions."
+verbose-recording-on-query: "&bZapis szczegółowych zapisów jest ustawiony na &aTRUE &bdla wszystkich uprawnień pasujących do filtra: &f{0}"
+verbose-recording-upload-start: "&Zapis szczegółowych zapisów został wyłączony. Przesyłanie wyników..."
+verbose-recording-url: "&aSzczegółowe URL wyników:"
+tree-upload-start: "&bGenerowanie drzewa uprawnień..."
+tree-empty: "&aNie można wygenerować drzewa. Nie znaleziono żadnych wyników."
+tree-url: "&aURL drzewa uprawnień:"
+search-searching: "&aPoszukiwanie użytkowników i grup &b{0}&a..."
+search-searching-members: "&aWyszukiwanie użytkowników i grup, które dziedziczą &b{0}&a..."
+search-result: "&aZnaleziono &b{0}&a wpisy z &b{1}&a użytkowników i &b{2}&a grup."
+search-showing-users: "&bWyświetlanie wpisów użytkownika:"
+search-showing-groups: "&bWyświetlanie wpisów grup:"
+search-showing-users-with-page: "&bWyświetlanie wpisów użytkownika:  {0}"
+search-showing-groups-with-page: "&bWyświetlanie wpisów grup:  {0}"
+check-result: "&aWynik sprawdzenia uprawnień dla użytkownika &b{0}&a dla uprawnień &b{1}&a: &f{2}"
+create-success: "&b{0}&a został pomyślnie utworzone."
+delete-success: "&b{0}&a został pomyślnie usunięty."
+rename-success: "&b{0}&a został pomyślnie zmieniony na &b{1}&a."
+clone-success: "&b{0}&a został pomyślnie sklonowany na &b{1}&a."
+already-inherits: "{0} już dziedziczy '{1}'."
+does-not-inherit: "{0} nie dziedziczy '{1}'."
+already-temp-inherits: "{0} już tymczasowo dziedziczy '{1}'."
+does-not-temp-inherit: "{0} nie dziedziczy tymczasowo '{1}'."
+track-already-contains: "Ścieżka {0} zawiera już grupę '{1}'."
+track-does-not-contain: "Ścieżka {0} nie zawiera tej grupy '{1}'."
+track-ambiguous-call: "Podany użytkownik jest członkiem wielu grup na tej ścieżce. Nie można określić ich lokalizacji."
+group-already-exists: "Ta grupa już istnieje!"
+group-does-not-exist: "Ta grupa nie istnieje!"
+group-load-error: "Wystąpił nieoczekiwany błąd. Grupa nie została załadowana."
+groups-load-error: "Wystąpił nieoczekiwany błąd. Nie można załadować wszystkich grup."
+track-already-exists: "Ta ścieżka już istnieje!"
+track-does-not-exist: "Ta ścieżka nie istnieje!"
+track-load-error: "Wystąpił nieoczekiwany błąd. Ścieżka nie została załadowana."
+tracks-load-error: "Wystąpił nieoczekiwany błąd. Nie można wczytać wszystkich ścieżek."
+track-empty: "Ścieżka nie może być używana jako pusta lub zawierać tylko jedną grupę."
+update-task-request: "&bZaktualizuj zaplanowane zadanie."
+update-task-complete: "&aZaktualizowano zadanie."
+update-task-complete-network: "&aZaktualizowano zadanie. Teraz próbuj wejść na inne serwery."
+update-task-push-success: "&aInne serwery zostały powiadomione za pośrednictwem & b {0} wiadomości &apomyślnie."
+update-task-push-failure: "&cPodczas przesyłania zmian do innych serwerów wystąpił błąd."
+update-task-push-failure-not-setup: "&cPodczas przesyłania zmian do innych serwerów wystąpił błąd. Usługa wiadomości nie została skonfigurowana."
+reload-config-success: "&aPlik konfiguracyjny został ponownie załadowany. &7(niektóre opcje będą obowiązywać tylko po ponownym uruchomieniu serwera.)"
+info: >
+  {PREFIX}&2Uruchamianie &bLuckPerms v{0}&2 by &bLuck&2.\n
+  {PREFIX}&f-  &3Platforma: &f{1}\n
+  {PREFIX}&f-  &3Metoda Składowania: &f{2}\n
+  {PREFIX}&f-  &3Nazwa Serwera: &f{3}\n
+  {PREFIX}&f-  &3Synchronizacja Czasu: &a{4} &fminuty\n
+  {PREFIX}&f-  &3Usługa wiadomości: &f{5}\n
+  {PREFIX}&f-  &bLiczba:\n
+  {PREFIX}&f-     &3Online Graczy: &a{6}\n
+  {PREFIX}&f-     &3Załadowanych użytkowników: &a{7}\n
+  {PREFIX}&f-     &3Załadowanych grup: &a{8}\n
+  {PREFIX}&f-     &3Załadowanych Ścieżek: &a{9}\n
+  {PREFIX}&f-     &3Rozmiar Loga: &a{10}\n
+  {PREFIX}&f-     &3Rozmiar pamięci podręcznej UUID: &a{11}\n
+  {PREFIX}&f-     &3Załadowane tłumaczenia: &a{12}\n
+  {PREFIX}&f-     &3Kontrole wstępne: &a{13}\n
+  {PREFIX}&f-     &3Kalkulatory Kontekstu: &a{14}\n
+  {PREFIX}&f-     &3Unikalne uprawnienia: &a{15}\n
+  {PREFIX}&f-  &bKonfiguracja:\n
+  {PREFIX}&f-     &3Używany Server UUIDs: {16}\n
+  {PREFIX}&f-     &bObliczanie uprawnień:\n
+  {PREFIX}&f-        &3Łącznie ze światem: {17}\n
+  {PREFIX}&f-        &3Łącznie z globalnym światem: {18}\n
+  {PREFIX}&f-        &3Stosowanie grup globalnych: {19}\n
+  {PREFIX}&f-        &3Stosowanie Globalnych Grup Światowych: {20}\n
+  {PREFIX}&f-        &3Stosowanie symboli wieloznacznych: {21}\n
+  {PREFIX}&f-        &3Stosowanie Regex: {22}\n
+  {PREFIX}&f-        &3Stosowanie skrótu: {23}
+create-group-error: "Podczas tworzenia grupy wystąpił błąd."
+delete-group-error: "Podczas usuwania grupy wystąpił błąd."
+delete-group-error-default: "Nie można usunąć grupy domyślnej."
+groups-list: "&aGrupy: {0}"
+create-track-error: "Podczas tworzenia ścieżki wystąpił błąd."
+delete-track-error: "Podczas usuwania ścieżki wystąpił błąd."
+tracks-list: "&aŚcieżki: {0}"
+listnodes: "&b{0}'s Węzły:"
+listnodes-with-page: "&b{0}'s Węzły:  {1}"
+listnodes-temp: >
+  &b{0}'s Tymczasowe Węzły:\n
+  {1}
+listparents: >
+  &b{0}'s Grupy Rodzicielskie:\n
+  {1}
+listparents-temp: >
+  &b{0}'s Tymczasowe Grupy Rodzicielskie:\n
+  {1}
+list-tracks: >
+  &b{0}'s Ścieżki:\n
+  {1}
+list-tracks-empty: "{0} nie jest na żadnej ścieżce."
+context-pair-inline: "&3{0}=&b{1}"
+context-pair--global-inline: "&eglobalnie"
+context-pair-sep: "&a, "
+context-pair: "&8(&7{0}=&f{1}&8)"
+check-permission: "&b{0}&a ma uprawnienia &b{1}&a ustawione na {2}&a w kontekście {3}&a."
+setpermission-success: "&aUstawiono &b{0}&a na &b{1}&a dla &b{2}&a w kontekście {3}&a."
+setpermission-temp-success: "&aUstawiono &b{0}&a na &b{1}&a dla &b{2}&a na czas trwania &b{3}&a w kontekście {4}&a."
+unsetpermission-success: "&aUsunięto &b{0}&a dla &b{1}&a w kontekście {2}&a."
+unset-temp-permission-success: "&aTymczasowe uprawnienia &b{0}&a dla &b{1}&a w kontekście {2}&a."
+set-inherit-success: "&b{0}&a teraz dziedziczy uprawnienia od &b{1}&a w kontekście {2}&a."
+set-temp-inherit-success: "&b{0}&a teraz dziedziczy uprawnienia &b{1}&a na czas trwania &b{2}&a w kontekście {3}&a."
+set-parent-success: "&b{0}&a gdyby istniejące grupy macierzyste zostały wyczyszczone, a teraz tylko dziedziczą &b{1}&a w kontekście {2}&a."
+set-track-parent-success: "&b{0}&a miały istniejące grupy macierzyste na ścieżce &b{1}&a wyczyszczone, a teraz dziedziczą &b{2}&a w kontekście {3}&a."
+unset-inherit-success: "&b{0}&a już nie dziedziczy uprawnień &b{1}&a w kontekście {2}&a."
+unset-temp-inherit-success: "&b{0}&a przestaje tymczasowo dziedziczyć uprawnienia &b{1}&a w kontekście {2}&a."
+clear-success: "&b{0}&a's uprawnienia zostały wyczyszczone w kontekście {1}&a. (&b{2}&a węzły zostały usunięte.)"
+clear-success-singular: "&b{0}&a's uprawnienia zostały wyczyszczone w kontekście {1}&a. (&b{2}&a węzeł został usunięty.)"
+parent-clear-success: "&b{0}&a's rodzice zostali wyczyszczeni w kontekście {1}&a. &b{2}&a węzły zostały usunięte.)"
+parent-clear-success-singular: "&b{0}&a's rodzice zostali wyczyszczeni w kontekście {1}&a. &b{2}&a węzeł został usunięty.)"
+parent-clear-track-success: "&b{0}&a's rodzice na ścieżce &b{1}&a zostali wyczyszczeni w kontekście {2}&a. &b{3}&a węzły zostały usunięte.)"
+parent-clear-track-success-singular: "&b{0}&a's parents on track &b{1}&a were cleared in context {2}&a. &b{3}&a węzeł został usunięty.)"
+meta-clear-success: "&b{0}&a's meta zostały usunięte w kontekście {1}&a. &b{2}&a węzły zostały usunięte.)"
+meta-clear-success-singular: "&b{0}&a's meta zostały usunięte w kontekście {1}&a. &b{2}&a węzeł został usunięty.)"
+illegal-date-error: "Nie można przeanalizować daty '{0}'."
+past-date-error: "W przeszłości nie można ustawić daty!"
+chat-meta-prefix-header: "&b{0}'s Prefiksy"
+chat-meta-suffix-header: "&b{0}'s Suffiksy"
+meta-header: "&b{0}'s Meta"
+chat-meta-entry: "&b-> {0} &f- &f\"{1}&f\" &8(&7odziedziczone po &a{2}&8)"
+chat-meta-entry-with-context: "&b-> {0} &f- &f\"{1}&f\" &8(&7odziedziczone po &a{2}&8){3}"
+meta-entry: "&b-> &a{0} &f= &f\"{1}&f\" &8(&7odziedziczone po &a{2}&8)"
+meta-entry-with-context: "&b-> &a{0} &f= &f\"{1}&f\" &8(&7odziedziczone po &a{2}&8){3}"
+chat-meta-prefix-none: "&b{0} nie ma prefiksów."
+chat-meta-suffix-none: "&b{0} has no suffiksów."
+meta-none: "&b{0} nie ma meta."
+meta-invalid-priority: "Nieprawidłowy priorytet '{0}'. Spodziewany numer."
+already-has-chat-meta: "{0} już to ma {1} ustawione."
+does-not-have-chat-meta: "{0} nie ma tego {1} ustawionego."
+add-chatmeta-success: "&b{0}&a ma {1} &f\"{2}&f\"&a ustawiony priorytet z &b{3}&a w kontekście {4}&a."
+add-temp-chatmeta-success: "&b{0}&a ma {1} &f\"{2}&f\"&a ustawiony priorytet z &b{3}&a na czas trwania &b{4}&a w kontekście {5}&a."
+remove-chatmeta-success: "&b{0}&a ma {1} &f\"{2}&f\"&a at priority &b{3}&a removed in context {4}&a."
+bulk-remove-chatmeta-success: "&b{0}&a ma cały {1}es na priorytecie &b{2}&a usunięte w kontekście {3}&a."
+remove-temp-chatmeta-success: "&b{0}&a ma tymczasowo {1} &f\"{2}&f\"&a at priority &b{3}&a usunięte w kontekście {4}&a."
+bulk-remove-temp-chatmeta-success: "&b{0}&a miał wszystkie tymczasowe {1}es na priorytecie &b{2}&a usunięte w kontekście {3}&a."
+already-has-meta: "{0} ma już tę parę par kluczy meta."
+set-meta-success: "&aUstawiono wartość meta dla klucza &f\"{0}&f\"&a do &f\"{1}&f\"&a dla &b{2}&a w kontekście {3}&a."
+set-meta-temp-success: "&aUstawiono wartości meta dla klucza &f\"{0}&f\"&a do &f\"{1}&f\"&a dla &b{2}&a na czas trwania &b{3}&a w kontekście {4}&a."
+unset-meta-success: "&aUsunięto wartość meta za pomocą klucza &f\"{0}&f\"&a dla &b{1}&a w kontekście {2}&a."
+unset-meta-temp-success: "&aUsunięcie tymczasowej wartości meta za pomocą klucza &f\"{0}&f\"&a dla &b{1}&a w kontekście {2}&a."
+bulk-update-invalid-data-type: "Nieprawidłowy typ. Spodziewane 'all', 'users' lub 'groups'."
+bulk-update-invalid-constraint: "Nieprawidłowe ograniczenie &4{0}&c. Ograniczenia powinny być w formacie '&f<field> <comparison operator> <value>&c'."
+bulk-update-invalid-comparison: "Nieprawidłowy operator porównania '&4{0}&c'. Oczekiwany jeden z poniższych: &f==  !=  ~~  ~!"
+bulk-update-queued: "&aOperacja aktualizacji została w kolejce. &7(&f{0}&7)"
+bulk-update-confirm: "&aUruchom &b/{0} uaktualnianie zbiorcze {1} &a i wykonaj aktualizacje."
+bulk-update-unknown-id: "&aOperacja z id &b{0}&a nie istnieje lub upłynął."
+bulk-update-starting: "&aUaktualnianie zbiorcze."
+bulk-update-success: "&bAktualizacja zbiorcza powiodła się pomyślnie."
+bulk-update-failure: "&cAktualizacja zbiorcza nie powiodła się. Sprawdź, czy konsola nie zawiera błędów."
+user-info-general: >
+  {PREFIX}&b&l> &bInfo Użytkownika: &f{0}\n
+  {PREFIX}&f- &3UUID: &f{1}\n
+  {PREFIX}&f- &3Status: {2}\n
+  {PREFIX}&f- &3Grupa Podstawowa: &f{3}\n
+  {PREFIX}&f- &aLiczba:\n
+  {PREFIX}&f-    &3Uprawnień: &a{4}\n
+  {PREFIX}&f-    &3Tymczasowych uprawnień: &a{5}\n
+  {PREFIX}&f-    &3Prefiksów: &a{6}\n
+  {PREFIX}&f-    &3Suffiksów: &a{7}\n
+  {PREFIX}&f-    &3Meta: &a{8}
+user-info-data: >
+  {PREFIX}&f- &aDane buforowane:\n
+  {PREFIX}&f-    &3Posiada dane kontekstowe: {0}\n
+  {PREFIX}&f-    &3Obecne konteksty: {1}\n
+  {PREFIX}&f-    &3Obecny Prefiks: {2}\n
+  {PREFIX}&f-    &3Obecny Suffiks: {3}
+info-parent-header: "&f- &aGrupy Rodziców:"
+info-temp-parent-header: "&f- &aTymczasowe Grupy Rodziców:"
+user-removegroup-error-primary: "Nie można usunąć użytkownika z podstawowej grupy."
+user-primarygroup-success: "&b{0}&a's pierwsza grupa została ustawiona na &b{1}&a."
+user-primarygroup-warn-option: "&cUwaga: Podstawowa metoda obliczania grupy jest używana przez ten serwer &7({0}) &cmoże nie odzwierciedlać tej zmiany."
+user-primarygroup-error-alreadyhas: "Użytkownik ma już tę grupę jako pierwszą."
+user-primarygroup-error-notmember: "&b{0}&a nie był już użytkownikiem z &b{1}&a, dodając je teraz."
+user-track-error-not-contain-group: "Podany przez Ciebie użytkownik nie jest jeszcze w żadnej z grup na tej ścieżce."
+user-track-added-to-first: "&b{0}&a nie jest w żadnej grupie na tej ścieżce, więc został dodany do pierwszej grupy, &b{1}&a w kontekście {2}&a."
+user-promote-success: "&aPromowanie użytkownika wzdłuż toru &b{0}&a z &b{1}&a do &b{2}&a w kontekście {3}&a."
+user-promote-error-endoftrack: "Koniec ścieżki &4{0}&c został osiągnięty. Nie można promować użytkownika."
+user-promote-error-malformed: >
+  {PREFIX}Następna grupa na ścieżce, {0}, już nie istnieje. Nie można promować użytkownika..\n
+  {PREFIX}Albo utwórz grupę lub usuń ją ze ścieżki i spróbuj ponownie.
+user-demote-success: "&aObniżanie użytkownika wzdłuż ścieżki &b{0}&a z &b{1}&a do &b{2}&a w kontekście {3}&a."
+user-demote-endoftrack: "Koniec ścieżki &4{0}&c został osiągnięty, więc &4{1}&c zostało usunięte z &4{2}&c."
+user-demote-error-malformed: >
+  {PREFIX}Poprzednia grupa na ścieżce, {0}, już nie istnieje. Nie można obniżyć użytkownika.\n
+  {PREFIX}Albo utwórz grupę lub usuń ją ze ścieżki i spróbuj ponownie.
+group-info-general: >
+  {PREFIX}&b&l> &bInfo Grupy: &f{0}\n
+  {PREFIX}&f- &3Wyświetlana Nazwa: &f{1}\n
+  {PREFIX}&f- &3Rola: &f{2}\n
+  {PREFIX}&f- &aLiczba:\n
+  {PREFIX}&f-    &3Uprawnienia: &a{3}\n
+  {PREFIX}&f-    &3Tymczasowe Uprawnienia: &a{4}\n
+  {PREFIX}&f-    &3Prefiksy: &a{5}\n
+  {PREFIX}&f-    &3Suffiksy: &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> &bWyświetlanie ścieżki: &f{0}\n
+  {PREFIX}&f- &7Ścieżka: &f{1}
+track-clear: "&b{0}&a grupy zostały usunięte"
+track-append-success: "&aGrupa &b{0}&a została z powodzeniem dodana do śledzenia &b{1}&a."
+track-insert-success: "&aGrupa &b{0}&a została pomyślnie wstawiona do ścieżki &b{1}&a na pozycji &b{2}&a."
+track-insert-error-number: "Przewidywany numer, ale otrzymany: {0}"
+track-insert-error-invalid-pos: "Nie można wstawić w pozycji {0}. Wyloguj się z granic."
+track-remove-success: "&aGrupa &b{0}&a została z powodzeniem usunięta ze ścieżki &b{1}&a."
+log-load-error: "Nie można załadować loga."
+log-invalid-page: "Nieprawidłowy numer strony."
+log-invalid-page-range: "Nieprawidłowy numer strony. Wprowadź wartość między 1 a {0}."
+log-no-entries: "&bBrak wpisów do logów."
+log-entry: "&b#{0} -> &8(&7{1} temu&8) {2}"
+log-notify-toggle-on: "&aWłączone&b wyjście z logowania."
+log-notify-toggle-off: "&cWyłączone&b wyjście z logowania."
+log-notify-already-on: "Obecnie otrzymujesz powiadomienia."
+log-notify-already-off: "Obecnie nie otrzymujesz powiadomień."
+log-notify-unknown: "Stan nieznany. Oczekiwanie na \"on\" lub \"off\"."
+log-search-header: "&aWyświetlanie ostatnich działań dotyczących zapytania &b{0} &a(strona &f{1}&a z &f{2}&a)"
+log-recent-header: "&aWyświetlanie ostatnich działań (strona &f{0}&a z &f{1}&a)"
+log-recent-by-header: "&aPokazanie ostatnich działań przez &b{0} &a(strona &f{1}&a z &f{2}&a)"
+log-history-user-header: "&aWyświetlanie historii dla użytkowników &b{0} &a(strona &f{1}&a z &f{2}&a)"
+log-history-group-header: "&aWyświetlanie historii dla grup &b{0} &a(strona &f{1}&a z &f{2}&a)"
+log-history-track-header: "&aWyświetlanie historii dla ścieżki &b{0} &a(strona &f{1}&a z &f{2}&a)"
+log-export-already-exists: "Błąd: Plik {0} już istnieje."
+log-export-not-writable: "Błąd: Plik {0} jest tylko do odczytu."
+log-export-empty: "Log jest pusty i dlatego nie może być eksportowany"
+log-export-failure: "Podczas zapisywania do pliku wystąpił nieoczekiwany błąd."
+log-export-success: "&aPomyślnie exportowano log do &b{0}&a."
+import-already-running: "Inny proces importowania jest już uruchomiony. Spróbuj ponownie później."
+export-already-running: "Inny proces eksportowania jest już uruchomiony. Spróbuj ponownie później."
+import-log-doesnt-exist: "Błąd: Plik {0} nie istnieje."
+import-log-not-readable: "Błąd: Plik {0} nie można odczytać."
+import-log-failure: "Podczas odtwarzania loga wystąpił nieoczekiwany błąd."
+import-progress: "&b(Import) &b-> &f{0} &fprocent kompletne &7- &b{1}&f/&b{2} &foperacja zakończona z &c{3} &fbłędami."
+import-progress-sin: "&b(Import) &b-> &f{0} &fprocent kompletne &7- &b{1}&f/&b{2} &foperacja zakończona z &c{3} &fbłędami."
+import-start: "&b(Import) &b-> &fUruchamianie procesu importowania."
+import-end-complete: "&b(Import) &a&lZAKOŃCZONE &7- zajęło &b{0} &7sekundy - &7Nie ma błędów."
+import-end-complete-err: "&b(Import) &a&lZAKOŃCZONE &7- zajęło &b{0} &7sekundy - &c{1} błędy."
+import-end-complete-err-sin: "&b(Import) &a&lZAKOŃCZONE &7- zajęło &b{0} &7sekundy - &c{1} błąd."
+import-end-error-header: >
+  {PREFIX}&b(Import) &7------------> &fWyświetlanie błędu #&b{0} &7<------------\n
+  {PREFIX}&b(Import) &fWykonując: &3Komende #{1}\n
+  {PREFIX}&b(Import) &fKomenda: &7{2}\n
+  {PREFIX}&b(Import) &fWpisane: &3{3}\n 
+  {PREFIX}&b(Import) &fWyjście:
+import-end-error-content: "&b(Import) &b-> &c{0}"
+import-end-error-footer: "&b(Import) &7<------------------------------------------>"

.locale/ru_RU.yml

@@ -0,0 +1,303 @@
+# 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[ПРЕДУПРЕЖДЕНИЕ] {0}"
+log-error: "&7&l[&bLuck&3Perms&7&l] &4[ОШИБКА] {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-save-success: "&7(Данные о путе сохранены на хранение)"
+track-save-error: "При сохранении пути произошла ошибка."
+user-invalid-entry: "&d{0}&c не является допустимым именем пользователя/uuid."
+group-invalid-entry: "Имена групп могут содержать только буквенно-цифровые символы."
+track-invalid-entry: "Имена путей могут содержать только буквенно-цифровые символы."
+server-invalid-entry: "Имена серверов могут содержать только буквенно-цифровые символы."
+use-inherit-command: "Используйте команды «parent add» и «parent remove» вместо указания узла (node)."
+verbose-invalid-filter: "&cНедопустимый подробный (verbose) фильтр: &f{0}"
+verbose-on: "&Запись подробной проверки установлена на &aTRUE &bдля всех разрешений (пермов)."
+verbose-on-query: "&Запись подробной проверки установлена на &aTRUE &bДля разрешений, соответствующих следующим фильтрам: &f{0}"
+verbose-off: "&Запись подробной проверки установлена на &cFALSE&b."
+verbose-recording-on: "&Запись подробной записи установлена ​​на &aTRUE &bдля всех разрешений."
+verbose-recording-on-query: "&Запись подробной записи установлена ​​на &aTRUE &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-searching-members: "&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: "Путь {0} уже содержит группу '{1}'."
+track-does-not-contain: "Путь {0} не содержит группу '{1}'."
+track-ambiguous-call: "Указанный пользователь является членом нескольких групп на этом пути. Невозможно определить их местоположение."
+group-already-exists: "Эта группа уже существует!"
+group-does-not-exist: "Эта группа не существует!"
+group-load-error: "Произошла непредвиденная ошибка. Группа не загружена."
+groups-load-error: "Произошла непредвиденная ошибка. Не удалось загрузить все группы."
+track-already-exists: "Этот путь уже существует!"
+track-does-not-exist: "Этот путь не существует!"
+track-load-error: "Произошла непредвиденная ошибка. Путь не загружен."
+tracks-load-error: "Произошла непредвиденная ошибка. Не удалось загрузить все пути."
+track-empty: "Путь нельзя использовать, так как он пуст или содержит только одну группу."
+update-task-request: "&bОбновление задачи запланировано."
+update-task-complete: "&aОбновление задачи завершено."
+update-task-complete-network: "&aОбновление задачи завершено. Теперь пытаемся подключиться к другим серверам."
+update-task-push-success: "&aДругие серверы были уведомлены через &b{0} cообщения и удаленный доступ."
+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Загруженные пути: &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: "При создании пути произошла ошибка."
+delete-track-error: "При удалении пути произошла ошибка."
+tracks-list: "&aГенеральные пути: {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 Пути:\n
+  {1}
+list-tracks-empty: "{0} не на каких-либо путях."
+context-pair-inline: "&3{0}=&b{1}"
+context-pair--global-inline: "&eГлобальный"
+context-pair-end: "&a."
+context-pair-sep: "&a, "
+context-pair: "&8(&7{0}=&f{1}&8)"
+check-permission: "&b{0}&a имеет разрешение &b{1}&a установленое в {2}&a в контексте {3}&a."
+check-permission-inherited: "&b{0}&a имеет разрешение &b{1}&a установленое в {2}&a в контексте {3}&a, наследованный от &b{4}&a."
+setpermission-success: "&aУстановить &b{0}&a к &b{1}&a для &b{2}&a."
+setpermission-temp-success: "&aУстановить &b{0}&a к &b{1}&a для &b{2}&a На срок &b{3}&a."
+unsetpermission-success: "&aСбросить &b{0}&a для &b{1}&a."
+unset-temp-permission-success: "&aСбросить временное разрешение &b{0}&a для &b{1}&a."
+set-inherit-success: "&b{0}&a теперь наследует разрешения от &b{1}&a."
+set-parent-success: "&b{0}&a их существующие родительские группы очищены, и теперь только наследуют &b{1}&a."
+set-temp-inherit-success: "&b{0}&a теперь наследует разрешения от &b{1}&a на срок &b{2}&a."
+unset-inherit-success: "&b{0}&a больше не наследует разрешения от &b{1}&a."
+unset-temp-inherit-success: "&b{0}&a больше не наследует временные разрешения (пермы) &b{1}&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 мета очищена. (&b{1}&a узлы были удалены.)"
+meta-clear-success-singular: "&b{0}&a's мета очищена. (&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 Мета"
+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-invalid-priority: "Недопустимый приоритет '{0}'. Ожидается число."
+already-has-chat-meta: "{0} уже имеет этот {1}."
+does-not-have-chat-meta: "{0} не имеет этого {1}."
+add-chatmeta-success: "&b{0}&a имеет {1} &f\"{2}&f\"&a установлен в приоритете &b{3}&a в контексте {4}&a."
+add-temp-chatmeta-success: "&b{0}&a имеет {1} &f\"{2}&f\"&a установлен в приоритете &b{3}&a на срок &b{4}&a в контексте {5}&a."
+remove-chatmeta-success: "&b{0}&a имеет {1} &f\"{2}&f\"&a в приоритете &b{3}&a удален из контекста {4}&a."
+bulk-remove-chatmeta-success: "&b{0}&a все временные {1}es в приоритете &b{3}&a были удалены из контекста {4}&a."
+remove-temp-chatmeta-success: "&b{0}&a временно установленный {1} &f\"{2}&f\"&a в приоритете &b{3}&a был удален из контекста {4}&a."
+bulk-remove-temp-chatmeta-success: "&b{0}&a все временные {1}es в приоритете &b{3}&a были удалены из контекста {4}&a."
+already-has-meta: "{0} уже установлено, что установлена ​​пара мета-значения клавиши."
+set-meta-success: "&aУстановить метазначение для клавиши &f\"{0}&f\"&a к &f\"{1}&f\"&a для &b{2}&a."
+set-meta-temp-success: "&aУстановить метазначение для клавиши &f\"{0}&f\"&a к &f\"{1}&f\"&a для &b{2}&a на срок &b{3}&a."
+unset-meta-success: "&aСбросить метазначение с помощью клавиши &f\"{0}&f\"&a для &b{1}&a."
+unset-meta-temp-success: "&aСбросить временное мета-значение с помощью клавиши &f\"{0}&f\"&a для &b{1}&a."
+bulk-update-invalid-data-type: "Недопустимый тип. Выберите 'all', 'users' или 'groups'."
+bulk-update-invalid-constraint: "Недопустимое ограничение &4{0}&c. Ограничения должны быть в формате '&f<поле> <оператор сравнения> <значение>&c'."
+bulk-update-invalid-comparison: "Недопустимый оператор сравнения '&4{0}&c'. Выберите одно из следующих: &f==  !=  ~~  ~!"
+bulk-update-queued: "&aМассовое обновление было поставлено в очередь. &7(&f{0}&7)"
+bulk-update-confirm: "&aВведите &b/{0} bulkupdate confirm {1} &aчтобы подтвердить выполнение массового обновления."
+bulk-update-unknown-id: "&aОперация с id &b{0} &aне существует или истек срок действия."
+bulk-update-starting: "&aВыполнение массового обновления."
+bulk-update-success: "&bМассовое обновление успешно завершено."
+bulk-update-failure: "&cНе удалось выполнить массовое обновление. Проверьте консоль на наличие ошибок."
+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-    &3Мета: &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: "Указанный пользователь не находится ни в каких группах на этом  пути."
+user-track-added-to-first: "&b{0}&a не находится ни в каких группах на этом треке, поэтому они были добавлены в первую группу &b{1}&a в контексте {2}&a."
+user-promote-success: "&aПовышение пользователя &b{0}&a от &b{1}&a к &b{2}&a в контексте {3}&a."
+user-promote-error-endoftrack: "Конец пути &4{0}&c, был достигнут. Не удалось повысить пользователя."
+user-promote-error-malformed: >
+  {PREFIX}Следующая группа на пути, {0}, более не существует. Не удалось продвинуть пользователя.\n
+  {PREFIX}Создайте группу или удалите ее с пути и повторите попытку.
+user-demote-success: "&aПонижение пользователя по пути &b{0}&a от &b{1}&a к &b{2}&a в контексте {3}&a."
+user-demote-endoftrack: "Конец пути &4{0}&c был достингут, поэтому &4{1}&c был удален из &4{2}&c."
+user-demote-error-malformed: >
+  {PREFIX}Предыдущая группа на пути, {0}, более не существуют. Невозможно понизить рейтинг пользователя.\n
+  {PREFIX}Создайте группу или удалите ее с пути и повторите попытку.
+user-showpos: >
+  &aпоказывает &b{0}&a's позицию на пути &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-    &3Мета: &a{7}
+group-set-weight: "&aУстановить значение &b{0}&a для группы &b{1}&a."
+track-info: >
+  {PREFIX}&b&l> &bПоказать путь: &f{0}\n
+  {PREFIX}&f- &7Путь: &f{1}
+track-clear: "&b{0}&a's путь групп был очищен."
+track-append-success: "&aГруппа &b{0}&a успешно добавлен в путь &b{1}&a."
+track-insert-success: "&aГруппа &b{0}&a был успешно добавлен в путь &b{1}&a на позиции &b{2}&a."
+track-insert-error-number: "Ожидаемое число, но вместо этого получено: {0}"
+track-insert-error-invalid-pos: "Невозможно вставить в позицию {0}. Индекс вне пределов."
+track-remove-success: "&aГруппа &b{0}&a Успешно удален с пути &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} тому назад&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(страница &f{1}&a из &f{2}&a)"
+log-recent-header: "&aПоследние действия (страница &f{0}&a из &f{1}&a)"
+log-recent-by-header: "&aПоказывать последние действия &b{0} &a(страница &f{1}&a из &f{2}&a)"
+log-history-user-header: "&aОтображение истории для пользователя &b{0} &a(страница &f{1}&a из &f{2}&a)"
+log-history-group-header: "&aОтображение истории для группы &b{0} &a(страница &f{1}&a из &f{2}&a)"
+log-history-track-header: "&aОтображение истории для пути &b{0} &a(страница &f{1}&a из &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<------------------------------------------>"

.locale/zh-CN.yml

@@ -0,0 +1,303 @@
+# LuckPerms Language File
+# Locale: zh-CN (Simplified Chinese)
+# Author: EuropeJing
+
+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[警告] {0}"
+log-error: "&7&l[&bLuck&3Perms&7&l] &4[错误] {0}"
+empty: "{0}"
+player-online: "&a在线"
+player-offline: "&c离线"
+loading-error: "无法加载权限数据,请稍后再试."
+op-disabled: "&b此服务器上禁用了vanilla OP系统."
+op-disabled-sponge: "&2服务器管理员状态在安装权限插件时无效,请直接编辑用户数据."
+log: "&3日志 &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-save-success: "&7(保存轨道到文件)"
+track-save-error: "保存轨道时出错."
+user-invalid-entry: "&d{0}&c不是有效的用户名/uuid."
+group-invalid-entry: "组名只能包含字母数字字符."
+track-invalid-entry: "轨道名称只能包含字母数字字符."
+server-invalid-entry: "服务器名称只能包含字母数字字符."
+use-inherit-command: "使用'parent add'和'parent remove'命令,而不是指定节点."
+verbose-invalid-filter: "&c无效的详细过滤器: &f{0}"
+verbose-on: "&b所有权限的详细输出设置为&a开&b."
+verbose-on-query: "&b将匹配过滤器:&f{0}&b的权限详细输出设置为&a开&b."
+verbose-off: "&b所有权限的详细输出设置为&c关&b."
+verbose-recording-on: "&b所有权限的详细记录设置为&a开&b."
+verbose-recording-on-query: "&b将匹配过滤器:&f{0}&b的权限详细记录设置为&a开&b."
+verbose-recording-upload-start: "&b详细记录被禁用. 正在上传结果..."
+verbose-recording-url: "&a详细结果的网址:"
+tree-upload-start: "&b生成权限树..."
+tree-empty: "&a无法生成树,没有找到结果."
+tree-url: "&a权限树网址:"
+search-searching: "&a使用&b{0}&a搜索用户和组..."
+search-searching-members: "&a正在搜索继承自&b{0}&a的用户和组..."
+search-result: "&a从&b{1}&a用户和&b{2}&a组找到&b{0}&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权限的检查结果&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: "轨道{0}已经包含组'{1}'."
+track-does-not-contain: "轨道{0}不包含组'{1}'."
+track-ambiguous-call: "指定的用户是此轨道上多个组的成员,无法确定他们的位置."
+group-already-exists: "该组已存在!"
+group-does-not-exist: "组不存在!"
+group-load-error: "发生意外错误,组未加载."
+groups-load-error: "发生意外错误,无法加载所有组."
+track-already-exists: "轨道已存在!"
+track-does-not-exist: "轨道不存在!"
+track-load-error: "发生意外错误. 轨道未加载."
+tracks-load-error: "出现意外错误,无法加载所有轨道."
+track-empty: "轨道不能使用,因为它是空的或只包含一个组."
+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加载轨道: &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应用通配符: {21}\n
+  {PREFIX}&f-        &3应用正则表达式: {22}\n
+  {PREFIX}&f-        &3应用速记: {23}
+create-group-error: "创建组时出错."
+delete-group-error: "删除组时出错."
+delete-group-error-default: "您不能删除默认组."
+groups-list: "&aGroups: {0}"
+create-track-error: "创建轨道时出错."
+delete-track-error: "删除轨道时出错."
+tracks-list: "&a轨道: {0}"
+listnodes: "&b{0}的节点:"
+listnodes-with-page: "&b{0}的节点:  {1}"
+listnodes-temp: >
+  &b{0}的临时节点:\n
+  {1}
+listparents: >
+  &b{0}的父组:\n
+  {1}
+listparents-temp: >
+  &b{0}的临时父组:\n
+  {1}
+listgroups: >
+  &b{0}的组:\n
+  {1}
+listgroups-temp: >
+  &b{0}的临时组:\n
+  {1}
+list-tracks: >
+  &b{0}的轨道:\n
+  {1}
+list-tracks-empty: "{0}不在任何轨道上."
+context-pair-inline: "&3{0}=&b{1}"
+context-pair--global-inline: "&e全局"
+context-pair-end: "&a."
+context-pair-sep: "&a, "
+context-pair: "&8(&7{0}=&f{1}&8)"
+check-permission: "&b在环境&b{3}&b中,&b{0}&b的权限&b{1}&b被设置为&b{2}&b."
+check-permission-inherited: "&b{0}&a在环境&b{3}&a中的&b{1}&a被设置为&b{2}&a,继承自&b{4}&a."
+setpermission-success: "&a在&b{3}&a中为&b{2}&a设置&b{0}&a为&b{1}&a."
+setpermission-temp-success: "&a在环境&b{4}&a将&b{0}&a的&b{2}&a设为&b{1}&a,持续时间&b{3}&a."
+unsetpermission-success: "&a在环境&b{2}&a中取消&b{1}&a的&b{0}&a."
+unset-temp-permission-success: "&a在环境&b{2}&a中取消设置&b{1}&a的临时许可&b{0}&a."
+set-inherit-success: "&b{0}&a现在在环境&b{2}&a中继承&b{1}&a的权限&a."
+set-temp-inherit-success: "&b{0}&a现在在环境&b{3}&a中继承&b{1}&a的权限,持续时间&b{2}&a."
+set-parent-success: "&b{0}&a现有的父组被清除,现在只在&b{2}&a中继承&b{1}&a."
+unset-inherit-success: "&b{0}&a不再继承环境&b{2}&a中的&b{1}&a权限."
+unset-temp-inherit-success: "&b{0}&a在环境{2}中不再临时从&b{1}&a继承权限."
+clear-success: "&b{0}&a的权限被清除. (&b{1}&a节点被删除.)"
+clear-success-singular: "&b{0}&a的权限被清除. (&b{1}&a节点已被删除.)"
+parent-clear-success: "&b{0}&a的组被清除. (&b{1}&a节点被删除.)"
+parent-clear-success-singular: "&b{0}&a的组被清除. (&b{1}&a节点已被删除.)"
+meta-clear-success: "&b{0}&a的父组被清除. (&b{1}&a节点被删除.)"
+meta-clear-success-singular: "已经清除了这个&b{0}&a的元数据. (&b{1}&a节点已被删除.)"
+illegal-date-error: "无法解析日期'{0}'."
+past-date-error: "您不能设定一个过去的日期!"
+chat-meta-prefix-header: "&b{0}的前缀"
+chat-meta-suffix-header: "&b{0}的后缀"
+meta-header: "&b{0}的元信息"
+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-invalid-priority: "优先级'{0}'无效. 应该是一个数字."
+already-has-chat-meta: "{0}已经设置了{1}."
+does-not-have-chat-meta: "{0}没有设置{1}."
+add-chatmeta-success: "&b{0}&a在环境&b{4}&a中将优先级&b{3}&a设置为 {1} &f\"{2}&f\"."
+add-temp-chatmeta-success: "&b{0}&a在环境&b{5}&a中,设置为优先级&b{3}&a的{1} &f\"{2}&f\"&a,持续时间为&b{4}&a."
+remove-chatmeta-success: "&b{0}&a在&b{3}&a中删除了优先级&b{3}&a的{1} &f\"{2}&f\"&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在环境&b{4}&a中删除了优先级&b{3}&a的临时{1} &f\"{2}&f\"&a."
+bulk-remove-temp-chatmeta-success: "&b{0}&a在环境&b{4}&a中移除了优先级&b{3}&a的所有临时&b{1}&a.."
+already-has-meta: "{0}已经有了这个元信息集."
+set-meta-success: "将环境&b{3}&a中的&b{2}&a的键&f\"{0}&f\"&a的元信息设置为&f\"{1}&f\"&a."
+set-meta-temp-success: "&a在环境&b{4}&a中将&b{2}&a的键&f\"{0}&f\"&a的值设置为&f\"{1}&f\"&a,持续时间为&b{3}&a."
+unset-meta-success: "&a在环境{2}中取消设置&b{1}&a的键&f\"{0}&f\"&a的元信息."
+unset-meta-temp-success: "&a在环境{2}中取消设置&b{1}&a的键&f\"{0}&f\"&a的临时元信息."
+bulk-update-invalid-data-type: "Invalid type. Was expecting 'all', 'users' or 'groups'."
+bulk-update-invalid-constraint: "无效的约束&4{0}&c.约束的格式应该是'&f<field> <comparison operator> <value>&c'."
+bulk-update-invalid-comparison: "比较运算符无效'&4{0}&c'. 应该以下之一: &f==  !=  ~~  ~!"
+bulk-update-queued: "&a批量更新操作已排队.&7(&f{0}&7)"
+bulk-update-confirm: "&a运行&b/{0} bulkupdate &a确认{1}执行更新."
+bulk-update-unknown-id: "&a使用id&b{0}&a的操作不存在或已过期."
+bulk-update-starting: "&a运行批量更新."
+bulk-update-success: "&b量更新已成功完成."
+bulk-update-failure: "&cBulk update failed. Check the console for errors."
+bulk-change-type-error: "类型无效. 应该是 'server' 或 'world'."
+bulk-change-success: "&a应用批量更改成功. {0}记录已更改."
+user-info-general: >
+  {PREFIX}&b&l> &bUser Info: &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-    &3元信息: &a{8}
+user-info-data: >
+  {PREFIX}&f- &aCached Data:\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: "&b{0}&b的UUID是&b{1}&b."
+user-removegroup-error-primary: "您不能从其主组中删除用户."
+user-primarygroup-success: "&b{0}&的主组已设为&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: "指定的用户尚未在此轨道上的任何组中."
+user-track-added-to-first: "&b{0}&a不在此轨道上的任何组中, 因此在环境&b{2}&a中将其添加到第一组&b{2}&a."
+user-promote-success: "&a在环境&b{3}&a中将用户沿轨道&b{0}&a从&b{1}&a提升到&b{2}&a."
+user-promote-error-endoftrack: "已达到轨道&4{0}&c的结尾,所以无法提升用户."
+user-promote-error-malformed: >
+  {PREFIX}轨道上的下一个组{0}不存在. 无法提升用户.\n
+  {PREFIX}创建组,或将其从轨道中删除,然后重试.
+user-demote-success: "&a在环境&b{3}&a中将用户沿轨道&b{0}&a从&b{1}&a转移到&b{2}&a."
+user-demote-endoftrack: "已达到轨道&4{0}&c的结尾,所以&4{1}&c已从&4{2}&c中移除."
+user-demote-error-malformed: >
+  {PREFIX}轨道上的上一组{0}不存在.无法降级用户.\n
+  {PREFIX}创建组,或将其从轨道中删除,然后重试.
+user-showpos: >
+  &a显示&b{0}&a在轨道&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-    &3元信息: &a{7}
+group-set-weight: "&a将组&b{1}&a的权重设置为&b{0}&a."
+track-info: >
+  {PREFIX}&b&l> &b显示轨道: &f{0}\n
+  {PREFIX}&f- &7路径: &f{1}
+track-clear: "&b{0}&a's groups track was cleared."
+track-append-success: "&a组&b{0}&a已成功添加到轨道&b{1}&a."
+track-insert-success: "&a组&b{0}&a已成功插入轨道&b{1}&a的&b{2}&a位置."
+track-insert-error-number: "没有预期的数量,而是收到: {0}"
+track-insert-error-invalid-pos: "无法插入位置{0}. 索引超出范围."
+track-remove-success: "&aGroup &b{0}&a已成功从轨道&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显示轨道的历史记录 &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}完成 &7- &b{1}&f/&b{2} &f完成 &c{3}&f错误."
+import-progress-sin: "&b(导入) &b-> &f百分之{0}完成 &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(导入) &7------------> &f显示错误 #&b{0} &7<------------\n
+  {PREFIX}&b(导入) &f执行时: &3Command #{1}\n
+  {PREFIX}&b(导入) &f命令: &7{2}\n
+  {PREFIX}&b(导入) &f类型: &3{3}\n
+  {PREFIX}&b(导入) &f输出:
+import-end-error-content: "&b(导入) &b-> &c{0}"
+import-end-error-footer: "&b(导入) &7<------------------------------------------>"

LICENSE.txt

@@ -1,6 +1,7 @@
-MIT License
+The MIT License.
 
-Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+Copyright (c) lucko (Luck) <luck@lucko.me>
+Copyright (c) contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,29 +1,63 @@
 ![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.
+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.
 
-## Links
+LuckPerms also includes an extensive API for developers, and support for a variety of Minecraft server software & data storage options.
+
+[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")
+
+## Useful Links
 * **Development Builds** - <https://ci.lucko.me/job/LuckPerms>
-* **Javadocs** - <https://jd.lucko.me/LuckPerms>
+* **Javadocs** - <https://luckperms.lucko.me/javadocs/>
 * **Wiki** - <https://github.com/lucko/LuckPerms/wiki>
 
-## Description
-LuckPerms is an advanced permissions implementation aiming to be a flexible, performant and reliable alternative to other permission systems, providing all the features you could ever possibly need in a permissions plugin, along with an extensive and well documented API for developers.
+## Building
+LuckPerms uses Maven to handle dependencies.
 
-* [Spigot Plugin Page](https://www.spigotmc.org/resources/luckperms-an-advanced-permissions-system.28140/ "Spigot Plugin Page")
-* [Sponge Plugin Page](https://forums.spongepowered.org/t/luckperms-an-advanced-permissions-system/14274 "Sponge Plugin Page")
+#### Requirements
+* Java 8 JDK
+* Maven 3.3.x (the older versions will not work.)
+* Git
+
+#### Then run
+```sh
+git clone https://github.com/lucko/LuckPerms.git
+cd LuckPerms/
+mvn clean package
+```
+
+You can find the output jars in the `target` directories.
+
+## Contributing
+In order to contribute to and make changes to the plugin, you will need the dependencies listed above, plus the [Lombok plugin](https://projectlombok.org/download.html) for your IDE. 
+
+#### Pull Requests
+If you make any changes or improvements to the plugin which you think would be beneficial upstream, please consider making a Pull Request to merge your changes back into the upstream project. (especially if your changes are bug fixes!)
+
+LuckPerms loosely follows the [Google Java Style Guide](https://google.github.io/styleguide/javaguide.html), with a few minor changes here and there. Generally, try to copy the style of code found in the class you're editing. 
+
+#### Project Layout
+The project is split up into 5 seperate modules.
+
+* **API** - The public facing API classes used by other plugins when integrating with LuckPerms. This is basically just a collection of interfaces implemented inside of the plugin.
+* **Common** - This includes all of the classes shared by separate implementations of LuckPerms. This is where the bulk of the project is.
+* **Bukkit, BungeeCord & Sponge** - Includes all of the platform specific classes used to implement LuckPerms on each of the 3 supported platforms.
+
+## License
+LuckPerms is licensed under the permissive MIT license. Please see [`LICENSE.txt`](https://github.com/lucko/LuckPerms/blob/master/LICENSE.txt) for more info.
 
 ## 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._
-## License
-LuckPerms is licensed under the permissive MIT license. See LICENSE.md for more info.
+![alt text](https://luckperms.lucko.me/assets/bukkit-compare.png "Feature comparison")
 
-## Thanks to:
+### 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

@@ -1,21 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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.14-SNAPSHOT</version>
+        <version>3.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>luckperms-api</artifactId>
+
     <build>
+        <finalName>LuckPerms-API-${release.version}</finalName>
+        <resources>
+            <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>
@@ -24,6 +35,68 @@
         </plugins>
     </build>
 
+    <profiles>
+        <profile>
+            <id>deployment</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <version>3.0.1</version>
+                        <executions>
+                            <execution>
+                                <id>attach-sources</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>2.10.4</version>
+                        <executions>
+                            <execution>
+                                <id>attach-javadocs</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <links>
+                                <link>https://google.github.io/guava/releases/21.0/api/docs/</link>
+                            </links>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>sign</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>${gpg.version}</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
     <dependencies>
         <!-- guava -->
         <dependency>
@@ -32,6 +105,12 @@
             <version>19.0</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
 </project>

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -26,17 +29,24 @@ import me.lucko.luckperms.api.LuckPermsApi;
 
 import java.util.Optional;
 
+import javax.annotation.Nonnull;
+
 /**
- * Static access to LuckPerms
+ * 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>
  */
 public final class LuckPerms {
     private static LuckPermsApi api = null;
 
     /**
-     * Gets an instance of {@link LuckPermsApi}
+     * Gets an instance of {@link LuckPermsApi}, throwing {@link IllegalStateException} if the API is not loaded.
+     *
      * @return an api instance
      * @throws IllegalStateException if the api is not loaded
      */
+    @Nonnull
     public static LuckPermsApi getApi() {
         if (api == null) {
             throw new IllegalStateException("API is not loaded.");
@@ -45,18 +55,24 @@ public final class LuckPerms {
     }
 
     /**
-     * Gets an instance of {@link LuckPermsApi} safely. Unlike {@link LuckPerms#getApi}, this method will not throw an
-     * {@link IllegalStateException} if the api is not loaded, rather return an empty {@link Optional}.
+     * Gets an instance of {@link LuckPermsApi}, if it is loaded.
+     *
+     * <p> Unlike {@link LuckPerms#getApi}, this method will not throw an {@link IllegalStateException} if the API is
+     * not loaded, rather return an empty {@link Optional}.
+     *
      * @return an optional api instance
      */
+    @Nonnull
     public static Optional<LuckPermsApi> getApiSafe() {
         return Optional.ofNullable(api);
     }
 
+    /* method used by the implementation to set the singleton instance */
     static void registerProvider(LuckPermsApi luckPermsApi) {
         api = luckPermsApi;
     }
 
+    /* method used by the implementation to remove any previous instance */
     static void unregisterProvider() {
         api = null;
     }

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

@@ -0,0 +1,107 @@
+/*
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  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 com.google.common.base.Preconditions;
+
+import java.util.Map;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Represents a type of chat meta
+ *
+ * @since 3.2
+ */
+public enum ChatMetaType {
+
+    /**
+     * Represents a prefix
+     */
+    PREFIX {
+        @Override
+        public boolean matches(Node node) {
+            return Preconditions.checkNotNull(node, "node").isPrefix();
+        }
+
+        @Override
+        public boolean shouldIgnore(Node node) {
+            return !Preconditions.checkNotNull(node, "node").isPrefix();
+        }
+
+        @Override
+        public Map.Entry<Integer, String> getEntry(Node node) {
+            return Preconditions.checkNotNull(node, "node").getPrefix();
+        }
+    },
+
+    /**
+     * Represents a suffix
+     */
+    SUFFIX {
+        @Override
+        public boolean matches(Node node) {
+            return Preconditions.checkNotNull(node, "node").isSuffix();
+        }
+
+        @Override
+        public boolean shouldIgnore(Node node) {
+            return !Preconditions.checkNotNull(node, "node").isSuffix();
+        }
+
+        @Override
+        public Map.Entry<Integer, String> getEntry(Node node) {
+            return Preconditions.checkNotNull(node, "node").getSuffix();
+        }
+    };
+
+    /**
+     * Returns if the passed node matches the type
+     *
+     * @param node the node to test
+     * @return true if the node has the same type
+     */
+    public abstract boolean matches(@Nonnull Node node);
+
+    /**
+     * Returns if the passed node should be ignored when searching for meta of this type
+     *
+     * @param node the node to test
+     * @return true if the node does not share the same type
+     */
+    public abstract boolean shouldIgnore(@Nonnull Node node);
+
+    /**
+     * Maps the corresponding entry from the given node
+     *
+     * @param node the node to retrieve the entry from
+     * @return the entry
+     * @throws IllegalStateException if the node does not share the same type
+     */
+    @Nonnull
+    public abstract Map.Entry<Integer, String> getEntry(@Nonnull Node node);
+
+}

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -24,66 +27,46 @@ package me.lucko.luckperms.api;
 
 import me.lucko.luckperms.api.context.ContextSet;
 
-import java.util.Map;
+import javax.annotation.Nonnull;
 
 /**
- * Represents the context and options for a permission lookup.
- * All values are immutable.
+ * Context and options for a permission lookup.
+ *
+ * <p>All values are immutable.</p>
+ *
  * @since 2.11
  */
 public class Contexts {
     public static final String SERVER_KEY = "server";
     public static final String WORLD_KEY = "world";
 
+    private static final Contexts GLOBAL = new Contexts(ContextSet.empty(), true, true, true, true, true, false);
+
     /**
-     * Gets a context that will allow all nodes
-     * @return a context that will not apply any filters
+     * Gets the {@link FullySatisfiedContexts} instance.
+     *
+     * @return a context that will satisfy all contextual requirements.
      */
+    @Nonnull
     public static Contexts allowAll() {
-        return new Contexts(ContextSet.empty(), true, true, true, true, true, true);
+        return FullySatisfiedContexts.getInstance();
     }
 
-    public static Contexts of(ContextSet context, boolean includeGlobal, boolean includeGlobalWorld, boolean applyGroups, boolean applyGlobalGroups, boolean applyGlobalWorldGroups, boolean op) {
+    /**
+     * A contexts instance with no defined context.
+     *
+     * @return the global contexts
+     * @since 3.3
+     */
+    @Nonnull
+    public static Contexts global() {
+        return GLOBAL;
+    }
+
+    public static Contexts of(@Nonnull ContextSet context, boolean includeGlobal, boolean includeGlobalWorld, boolean applyGroups, boolean applyGlobalGroups, boolean applyGlobalWorldGroups, boolean op) {
         return new Contexts(context, includeGlobal, includeGlobalWorld, applyGroups, applyGlobalGroups, applyGlobalWorldGroups, op);
     }
 
-    public Contexts(ContextSet context, boolean includeGlobal, boolean includeGlobalWorld, boolean applyGroups, boolean applyGlobalGroups, boolean applyGlobalWorldGroups, boolean op) {
-        if (context == null) {
-            throw new NullPointerException("context");
-        }
-
-        this.context = context.makeImmutable();
-        this.includeGlobal = includeGlobal;
-        this.includeGlobalWorld = includeGlobalWorld;
-        this.applyGroups = applyGroups;
-        this.applyGlobalGroups = applyGlobalGroups;
-        this.applyGlobalWorldGroups = applyGlobalWorldGroups;
-        this.op = 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);
-    }
-
-    @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);
-    }
-
     /**
      * The contexts that apply for this lookup
      * The keys for servers and worlds are defined as static values.
@@ -92,6 +75,7 @@ public class Contexts {
 
     /**
      * The mode to parse defaults on Bukkit
+     *
      * @since 2.12
      */
     private final boolean op;
@@ -121,27 +105,34 @@ public class Contexts {
      */
     private final boolean applyGlobalWorldGroups;
 
+    public Contexts(@Nonnull ContextSet context, boolean includeGlobal, boolean includeGlobalWorld, boolean applyGroups, boolean applyGlobalGroups, boolean applyGlobalWorldGroups, boolean op) {
+        if (context == null) {
+            throw new NullPointerException("context");
+        }
+
+        this.context = context.makeImmutable();
+        this.includeGlobal = includeGlobal;
+        this.includeGlobalWorld = includeGlobalWorld;
+        this.applyGroups = applyGroups;
+        this.applyGlobalGroups = applyGlobalGroups;
+        this.applyGlobalWorldGroups = applyGlobalWorldGroups;
+        this.op = op;
+    }
+
     /**
      * Gets the contexts that apply for this lookup
+     *
      * @return an immutable set of context key value pairs
      * @since 2.13
      */
+    @Nonnull
     public ContextSet getContexts() {
         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
+     *
      * @return true if op defaults should be included
      */
     public boolean isOp() {
@@ -150,6 +141,7 @@ public class Contexts {
 
     /**
      * Gets if global or non server specific nodes should be applied
+     *
      * @return true if global or non server specific nodes should be applied
      */
     public boolean isIncludeGlobal() {
@@ -158,6 +150,7 @@ public class Contexts {
 
     /**
      * Gets if global or non world specific nodes should be applied
+     *
      * @return true if global or non world specific nodes should be applied
      */
     public boolean isIncludeGlobalWorld() {
@@ -166,6 +159,7 @@ public class Contexts {
 
     /**
      * Gets if parent groups should be applied
+     *
      * @return true if parent groups should be applied
      */
     public boolean isApplyGroups() {
@@ -174,6 +168,7 @@ public class Contexts {
 
     /**
      * Gets if global or non server specific group memberships should be applied
+     *
      * @return true if global or non server specific group memberships should be applied
      */
     public boolean isApplyGlobalGroups() {
@@ -182,12 +177,15 @@ public class Contexts {
 
     /**
      * Gets if global or non world specific group memberships should be applied
+     *
      * @return true if global or non world specific group memberships should be applied
      */
     public boolean isApplyGlobalWorldGroups() {
         return this.applyGlobalWorldGroups;
     }
 
+    @Override
+    @Nonnull
     public String toString() {
         return "Contexts(" +
                 "context=" + this.getContexts() + ", " +
@@ -204,38 +202,28 @@ public class Contexts {
      * Ugly auto-generated lombok code
      */
 
-    /**
-     * Check for equality
-     * @param o the other
-     * @return true if equal
-     * @since 2.12
-     */
+    @Override
     public boolean equals(Object o) {
         if (o == this) return true;
+        if (o == allowAll()) return false;
         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().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();
     }
 
-    /**
-     * Gets the hashcode
-     * @return the hashcode
-     * @since 2.12
-     */
+    @Override
     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.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

@@ -0,0 +1,68 @@
+/*
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  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.exceptions.ObjectAlreadyHasException;
+import me.lucko.luckperms.exceptions.ObjectLacksException;
+
+import java.util.function.Supplier;
+
+public enum DataMutateResult {
+
+    SUCCESS(true, null),
+    ALREADY_HAS(false, ObjectAlreadyHasException::new),
+    LACKS(false, ObjectLacksException::new),
+    FAIL(false, RuntimeException::new);
+
+    private boolean value;
+    private final Supplier<? extends Exception> exceptionSupplier;
+
+    DataMutateResult(boolean value, Supplier<? extends Exception> exceptionSupplier) {
+        this.value = value;
+        this.exceptionSupplier = exceptionSupplier;
+    }
+
+    public void throwException() {
+        if (exceptionSupplier != null) {
+            sneakyThrow(exceptionSupplier.get());
+        }
+    }
+
+    public boolean asBoolean() {
+        return 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,126 +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;
-
-/**
- * Interface for the internal Datastore instance
- * @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/FullySatisfiedContexts.java

@@ -0,0 +1,51 @@
+package me.lucko.luckperms.api;
+
+import me.lucko.luckperms.api.caching.MetaContexts;
+import me.lucko.luckperms.api.caching.UserData;
+import me.lucko.luckperms.api.context.ContextSet;
+
+import javax.annotation.Nonnull;
+
+/**
+ * A special instance of {@link Contexts}, which when passed to:
+ *
+ * <p><ul>
+ * <li>{@link UserData#getPermissionData(Contexts)}</li>
+ * <li>{@link UserData#getMetaData(Contexts)}</li>
+ * <li>{@link UserData#getMetaData(MetaContexts)}</li>
+ * </ul></p>
+ *
+ * <p>will always satisfy all contextual requirements.</p>
+ *
+ * <p>This effectively allows you to do lookups which ignore context.</p>
+ *
+ * @since 3.3
+ */
+public final class FullySatisfiedContexts extends Contexts {
+    private static final FullySatisfiedContexts INSTANCE = new FullySatisfiedContexts();
+
+    @Nonnull
+    public static Contexts getInstance() {
+        return INSTANCE;
+    }
+
+    private FullySatisfiedContexts() {
+        super(ContextSet.empty(), true, true, true, true, true, false);
+    }
+
+    @Nonnull
+    @Override
+    public String toString() {
+        return "FullySatisfiedContexts";
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return o == this;
+    }
+
+    @Override
+    public int hashCode() {
+        return System.identityHashCode(this);
+    }
+}

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -22,216 +25,295 @@
 
 package me.lucko.luckperms.api;
 
+import me.lucko.luckperms.api.context.ContextSet;
 import me.lucko.luckperms.exceptions.ObjectAlreadyHasException;
 import me.lucko.luckperms.exceptions.ObjectLacksException;
 
 import java.util.List;
+import java.util.OptionalInt;
+
+import javax.annotation.Nonnull;
 
 /**
- * Interface for internal Group instances
+ * A group which holds permission data.
  */
-@SuppressWarnings("unused")
 public interface Group extends PermissionHolder {
 
     /**
+     * Get the name of the group
+     *
      * @return the name of the group
      */
+    @Nonnull
     String getName();
 
     /**
-     * Check to see if a group inherits a group
+     * Check to see if a group inherits another group directly
+     *
      * @param group The group to check membership of
      * @return true if the group inherits the other group
-     * @throws NullPointerException if the group is null
+     * @throws NullPointerException  if the group is null
      * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
      */
-    boolean inheritsGroup(Group group);
+    boolean inheritsGroup(@Nonnull Group group);
+
+    /**
+     * Check to see if a group inherits another group directly
+     *
+     * @param group The group to check membership of
+     * @param contextSet the context set to filter by
+     * @return true if the group inherits the other group
+     * @throws NullPointerException  if the group is null
+     * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
+     * @since 3.2
+     */
+    boolean inheritsGroup(@Nonnull Group group, @Nonnull ContextSet contextSet);
+
+    /**
+     * Gets the weight of this group, if present.
+     *
+     * @return the group weight
+     * @since 2.17
+     */
+    @Nonnull
+    OptionalInt getWeight();
 
     /**
      * Check to see if the group inherits a group on a specific server
-     * @param group The group to check membership of
+     *
+     * @param group  The group to check membership of
      * @param server The server to check on
      * @return true if the group inherits the group on the server
-     * @throws NullPointerException if the group or server is null
-     * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
+     * @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 #inheritsGroup(Group, ContextSet)}
      */
-    boolean inheritsGroup(Group group, String server);
+    @Deprecated
+    boolean inheritsGroup(@Nonnull Group group, @Nonnull String server);
 
     /**
      * Check to see if the group inherits a group on a specific server and world
-     * @param group The group to check membership of
+     *
+     * @param group  The group to check membership of
      * @param server The server to check on
-     * @param world The world to check on
+     * @param world  The world to check on
      * @return true if the group inherits the group on the server and world
-     * @throws NullPointerException if the group, server or world is null
-     * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
+     * @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 #inheritsGroup(Group, ContextSet)}
      */
-    boolean inheritsGroup(Group group, String server, String world);
+    @Deprecated
+    boolean inheritsGroup(@Nonnull Group group, @Nonnull String server, @Nonnull String world);
 
     /**
      * Make this group inherit another group
+     *
      * @param group the group to be inherited
      * @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.
+     * @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)}
      */
-    void setInheritGroup(Group group) throws ObjectAlreadyHasException;
+    @Deprecated
+    void setInheritGroup(@Nonnull Group group) throws ObjectAlreadyHasException;
 
     /**
      * Make this group inherit another group on a specific server
-     * @param group the group to be inherited
+     *
+     * @param group  the group to be inherited
      * @param server The server to inherit the group on
      * @throws ObjectAlreadyHasException if the group already inherits the group on that server
-     * @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
+     * @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)}
      */
-    void setInheritGroup(Group group, String server) throws ObjectAlreadyHasException;
+    @Deprecated
+    void setInheritGroup(@Nonnull Group group, @Nonnull String server) throws ObjectAlreadyHasException;
 
     /**
      * Make this group inherit another group on a specific server and world
-     * @param group the group to be inherited
+     *
+     * @param group  the group to be inherited
      * @param server The server to inherit the group on
-     * @param world The world to inherit the group on
+     * @param world  The world to inherit the group on
      * @throws ObjectAlreadyHasException if the group already inherits the group on that server and world
-     * @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
+     * @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)}
      */
-    void setInheritGroup(Group group, String server, String world) throws ObjectAlreadyHasException;
+    @Deprecated
+    void setInheritGroup(@Nonnull Group group, @Nonnull String server, @Nonnull String world) throws ObjectAlreadyHasException;
 
     /**
      * Make this group inherit another group temporarily
-     * @param group the group to be inherited
+     *
+     * @param group    the group to be inherited
      * @param expireAt the unix time when the group should expire
      * @throws ObjectAlreadyHasException if the group already inherits the group temporarily
-     * @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
+     * @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)}
      */
-    void setInheritGroup(Group group, long expireAt) throws ObjectAlreadyHasException;
+    @Deprecated
+    void setInheritGroup(@Nonnull Group group, long expireAt) throws ObjectAlreadyHasException;
 
     /**
      * Make this group inherit another group on a specific server temporarily
-     * @param group the group to be inherited
-     * @param server The server inherit add the group on
+     *
+     * @param group    the group to be inherited
+     * @param server   The server inherit add the group on
      * @param expireAt when the group should expire
      * @throws ObjectAlreadyHasException if the group already inherits the group on that server temporarily
-     * @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
+     * @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)}
      */
-    void setInheritGroup(Group group, String server, long expireAt) throws ObjectAlreadyHasException;
+    @Deprecated
+    void setInheritGroup(@Nonnull Group group, @Nonnull String server, long expireAt) throws ObjectAlreadyHasException;
 
     /**
      * Make this group inherit another group on a specific server and world temporarily
-     * @param group the group to be inherited
-     * @param server The server to inherit the group on
-     * @param world The world to inherit the group on
+     *
+     * @param group    the group to be inherited
+     * @param server   The server to inherit the group on
+     * @param world    The world to inherit the group on
      * @param expireAt when the group should expire
      * @throws ObjectAlreadyHasException if the group already inherits the group on that server and world temporarily
-     * @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
+     * @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)}
      */
-    void setInheritGroup(Group group, String server, String world, long expireAt) throws ObjectAlreadyHasException;
+    @Deprecated
+    void setInheritGroup(@Nonnull Group group, @Nonnull String server, @Nonnull String world, long expireAt) throws ObjectAlreadyHasException;
 
     /**
      * Remove a previously set inheritance rule
+     *
      * @param group the group to uninherit
-     * @throws ObjectLacksException if the group does not already inherit the group
-     * @throws NullPointerException if the group is null
+     * @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)}
      */
-    void unsetInheritGroup(Group group) throws ObjectLacksException;
+    @Deprecated
+    void unsetInheritGroup(@Nonnull Group group) throws ObjectLacksException;
 
     /**
      * Remove a previously set inheritance rule
-     * @param group the group to uninherit
+     *
+     * @param group     the group to uninherit
      * @param temporary if the group being removed is temporary
-     * @throws ObjectLacksException if the group does not already inherit the group
-     * @throws NullPointerException if the group is null
+     * @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)}
      */
-    void unsetInheritGroup(Group group, boolean temporary) throws ObjectLacksException;
+    @Deprecated
+    void unsetInheritGroup(@Nonnull Group group, boolean temporary) throws ObjectLacksException;
 
     /**
      * Remove a previously set inheritance rule on a specific server
-     * @param group the group to uninherit
+     *
+     * @param group  the group to uninherit
      * @param server The server to remove the group on
-     * @throws ObjectLacksException if the group does not already inherit the group on that server
-     * @throws NullPointerException if the group or server is null
-     * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
+     * @throws ObjectLacksException     if the group does not already inherit the group on that server
+     * @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)}
      */
-    void unsetInheritGroup(Group group, String server) throws ObjectLacksException;
+    @Deprecated
+    void unsetInheritGroup(@Nonnull Group group, @Nonnull String server) throws ObjectLacksException;
 
     /**
      * Remove a previously set inheritance rule on a specific server and world
-     * @param group the group to uninherit
+     *
+     * @param group  the group to uninherit
      * @param server The server to remove the group on
-     * @param world The world to remove the group on
-     * @throws ObjectLacksException if the group does not already inherit the group
-     * @throws NullPointerException if the group, server or world is null
-     * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
+     * @param world  The world to remove the group on
+     * @throws ObjectLacksException     if the group does not already inherit the group
+     * @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)}
      */
-    void unsetInheritGroup(Group group, String server, String world) throws ObjectLacksException;
+    @Deprecated
+    void unsetInheritGroup(@Nonnull Group group, @Nonnull String server, @Nonnull String world) throws ObjectLacksException;
 
     /**
      * Remove a previously set inheritance rule on a specific server
-     * @param group the group to uninherit
-     * @param server The server to remove the group on
+     *
+     * @param group     the group to uninherit
+     * @param server    The server to remove the group on
      * @param temporary if the group being removed is temporary
-     * @throws ObjectLacksException if the group does not already inherit the group
-     * @throws NullPointerException if the group or server is null
-     * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
+     * @throws ObjectLacksException     if the group does not already inherit the group
+     * @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)}
      */
-    void unsetInheritGroup(Group group, String server, boolean temporary) throws ObjectLacksException;
+    @Deprecated
+    void unsetInheritGroup(@Nonnull Group group, @Nonnull String server, boolean temporary) throws ObjectLacksException;
 
     /**
      * Remove a previously set inheritance rule on a specific server and world
-     * @param group the group to uninherit
-     * @param server The server to remove the group on
-     * @param world The world to remove the group on
+     *
+     * @param group     the group to uninherit
+     * @param server    The server to remove the group on
+     * @param world     The world to remove the group on
      * @param temporary if the group being removed was set temporarily
-     * @throws ObjectLacksException if the group does not already inherit the group
-     * @throws NullPointerException if the group, server or world is null
-     * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
+     * @throws ObjectLacksException     if the group does not already inherit the group
+     * @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)}
      */
-    void unsetInheritGroup(Group group, String server, String world, boolean temporary) throws ObjectLacksException;
-
-    /**
-     * Clear all of the groups permission nodes
-     */
-    void clearNodes();
+    @Deprecated
+    void unsetInheritGroup(@Nonnull Group group, @Nonnull String server, @Nonnull String world, boolean temporary) throws ObjectLacksException;
 
     /**
      * Get a {@link List} of all of the groups the group inherits, on all servers
+     *
      * @return a {@link List} of group names
+     * @deprecated in favour of just querying a users permissions
      */
+    @Deprecated
+    @Nonnull
     List<String> getGroupNames();
 
     /**
      * Get a {@link List} of the groups the group inherits on a specific server
+     *
      * @param server the server to check
-     * @param world the world to check
      * @return a {@link List} of group names
-     * @throws NullPointerException if the server or world is null
-     * @throws IllegalArgumentException if the server or world is invalid
+     * @throws NullPointerException     if the server is null
+     * @throws IllegalArgumentException if the server is invalid
+     * @deprecated in favour of just querying a users permissions
      */
-    List<String> getLocalGroups(String server, String world);
+    @Deprecated
+    @Nonnull
+    List<String> getLocalGroups(@Nonnull String server);
+
 
     /**
-     * Get a {@link List} of the groups the group inherits on a specific server
+     * Get a {@link List} of the groups the group inherits on a specific server and world
+     *
      * @param server the server to check
+     * @param world  the world to check
      * @return a {@link List} of group names
-     * @throws NullPointerException if the server is null
-     * @throws IllegalArgumentException if the server is invalid
+     * @throws NullPointerException     if the server or world is null
+     * @throws IllegalArgumentException if the server or world is invalid
+     * @deprecated in favour of just querying a users permissions
      */
-    List<String> getLocalGroups(String server);
+    @Deprecated
+    @Nonnull
+    List<String> getLocalGroups(@Nonnull String server, @Nonnull String world);
+
 }

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

@@ -0,0 +1,105 @@
+/*
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  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 com.google.common.collect.Multimap;
+
+import java.util.Optional;
+import java.util.OptionalLong;
+
+import javax.annotation.Nonnull;
+
+/**
+ * A relationship between a Holder and a permission
+ *
+ * @param <T> the identifier type of the holder
+ * @since 2.17
+ */
+public interface HeldPermission<T> {
+
+    /**
+     * Gets the holder of the permission
+     *
+     * @return the holder
+     */
+    @Nonnull
+    T getHolder();
+
+    /**
+     * Gets the permission being held
+     *
+     * @return the permission
+     */
+    @Nonnull
+    String getPermission();
+
+    /**
+     * Gets the value of the permission
+     *
+     * @return the value
+     */
+    boolean getValue();
+
+    /**
+     * Gets the server where the permission is held
+     *
+     * @return the server
+     */
+    @Nonnull
+    Optional<String> getServer();
+
+    /**
+     * Gets the world where the permission is held
+     *
+     * @return the world
+     */
+    @Nonnull
+    Optional<String> getWorld();
+
+    /**
+     * Gets the time in unix time when the permission will expire
+     *
+     * @return the expiry time
+     */
+    OptionalLong getExpiry();
+
+    /**
+     * Gets the context for the permission.
+     *
+     * @return the context
+     */
+    @Nonnull
+    Multimap<String, String> getContext();
+
+    /**
+     * Converts this permission into a Node
+     *
+     * @return a Node copy of this permission
+     */
+    @Nonnull
+    Node asNode();
+
+}

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -23,156 +26,171 @@
 package me.lucko.luckperms.api;
 
 import me.lucko.luckperms.api.data.DatastoreConfiguration;
-import me.lucko.luckperms.api.data.MySQLConfiguration;
 
 import java.util.Map;
 
+import javax.annotation.Nonnull;
+
 /**
- * A wrapper interface for the internal LuckPerms configuration, providing read only access.
+ * Read-only access to the LuckPerms configuration settings
  */
-@SuppressWarnings("unused")
 public interface LPConfiguration {
 
     /**
+     * Returns the name of this server
      * @return the name of this server
      */
+    @Nonnull
     String getServer();
 
     /**
+     * Returns how often a sync task will run in minutes
      * @return how often a sync task will run in minutes
      */
     int getSyncTime();
 
     /**
-     * @return the default group, in a node representation
-     * @deprecated as of 2.6, the default group is always "default"
-     */
-    @Deprecated
-    String getDefaultGroupNode();
-
-    /**
-     * @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
      */
     boolean getIncludeGlobalPerms();
 
     /**
+     * Returns if the users on this server will have their global world permissions applied
      * @return if the users on this server will have their global world permissions applied
      * @since 2.9
      */
     boolean getIncludeGlobalWorldPerms();
 
     /**
+     * Returns true if the platform is applying global groups
      * @return true if the platform is applying global groups
      * @since 2.9
      */
     boolean getApplyGlobalGroups();
 
     /**
+     * Returns true if the platform is applying global world groups
      * @return true if the platform is applying global world groups
      * @since 2.9
      */
     boolean getApplyGlobalWorldGroups();
 
     /**
-     * @return the online mode setting in the config
+     * Returns the online mode setting
+     * @return the online mode setting
      */
     boolean getOnlineMode();
 
     /**
+     * Returns if LuckPerms is applying wildcard permissions
      * @return if LuckPerms is applying wildcard permissions
      */
     boolean getApplyWildcards();
 
     /**
+     * Returns if LuckPerms is resolving and applying regex permissions
      * @return if LuckPerms is resolving and applying regex permissions
      */
     boolean getApplyRegex();
 
     /**
+     * Returns if LuckPerms is expanding shorthand permissions
      * @return if LuckPerms is expanding shorthand permissions
      */
     boolean getApplyShorthand();
 
     /**
+     * Returns if LuckPerms will send notifications to users when permissions are modified
      * @return if LuckPerms will send notifications to users when permissions are modified
      * @since 2.7
      */
     boolean getLogNotify();
 
     /**
-     * @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
      * @since 2.8
      */
     boolean getEnableOps();
 
     /**
+     * Returns true if opped players are allowed to use LuckPerms commands
      * @return true if opped players are allowed to use LuckPerms commands
      * @since 2.8
      */
     boolean getCommandsAllowOp();
 
     /**
+     * Returns true if auto op is enabled
      * @return true if auto op is enabled
      * @since 2.9
      */
     boolean getAutoOp();
 
     /**
+     * Returns the name of the server used within Vault operations
      * @return the name of the server used within Vault operations
      * @since 2.7
      */
+    @Nonnull
     String getVaultServer();
 
     /**
+     * Returns true if global permissions should be considered when retrieving meta or player groups
      * @return true if global permissions should be considered when retrieving meta or player groups
      * @since 2.7
      */
     boolean getVaultIncludeGlobal();
 
     /**
-     * @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
      */
+    @Nonnull
     DatastoreConfiguration getDatastoreConfig();
 
     /**
+     * Returns the storage method string from the configuration
      * @return the storage method string from the configuration
      */
+    @Nonnull
     String getStorageMethod();
 
     /**
+     * Returns true if split storage is enabled
      * @return true if split storage is enabled
      * @since 2.7
      */
     boolean getSplitStorage();
 
     /**
-     * @return a map of split storage options, where the key is the storage section, and the value is the storage method.
-     * For example: key = user, value = json
+     * Returns a map of split storage options
+     * @return a map of split storage options, where the key is the storage section, and the value is the storage
+     * method. For example: key = user, value = json
      * @since 2.7
      */
+    @Nonnull
     Map<String, String> getSplitStorageOptions();
 
+    @Nonnull
+    Unsafe unsafe();
+
+    interface Unsafe {
+
+        /**
+         * Gets an Object from the config.
+         *
+         * <p>This method is nested under {@link Unsafe} because the keys
+         * and return types may change between versions without warning.</p>
+         *
+         * @param key the key, as defined as a parameter name in
+         *            the "ConfigKeys" class.
+         * @return the corresponding object, if one is present
+         * @throws IllegalArgumentException if the key isn't known
+         */
+        @Nonnull
+        Object getObject(String key);
+    }
+
 }

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -22,23 +25,30 @@
 
 package me.lucko.luckperms.api;
 
+import javax.annotation.Nonnull;
+
 /**
- * Represents a Node and where it was inherited from.
+ * A node with a traceable origin
+ *
  * @since 2.11
  */
 public interface LocalizedNode extends Node {
 
     /**
-     * Gets the node
+     * Gets the delegate node
+     *
      * @return the node this instance is representing
      */
+    @Nonnull
     Node getNode();
 
     /**
      * Gets the location where the {@link Node} is inherited from
+     *
      * @return where the node was inherited from. Will not return null.
      * @see PermissionHolder#getObjectName()
      */
+    @Nonnull
     String getLocation();
 
 }

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -26,28 +29,37 @@ import java.util.SortedMap;
 import java.util.SortedSet;
 import java.util.UUID;
 
+import javax.annotation.Nonnull;
+
 /**
  * Represents the internal LuckPerms log.
- * All content internally is immutable. You can add to the log using the {@link Datastore}, 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>
  */
-@SuppressWarnings("unused")
 public interface Log {
 
     /**
      * @return a {@link SortedSet} of all of the {@link LogEntry} objects in this {@link Log}
      */
+    @Nonnull
     SortedSet<LogEntry> getContent();
 
     /**
      * @return all content in this log
      */
+    @Nonnull
     SortedSet<LogEntry> getRecent();
 
     /**
      * Gets the recent content separated by page
+     *
      * @param pageNo the page number
      * @return the page content
+     * @throws IllegalArgumentException if the pageNo is less than 1
+     * @throws IllegalStateException if the log doesn't contain enough entries to populate the page. See {@link #getRecentMaxPages()}}
      */
+    @Nonnull
     SortedMap<Integer, LogEntry> getRecent(int pageNo);
 
     /**
@@ -60,102 +72,128 @@ public interface Log {
      * @param actor the uuid of the actor to filter by
      * @return all content in this log where is actor = uuid
      */
-    SortedSet<LogEntry> getRecent(UUID actor);
+    @Nonnull
+    SortedSet<LogEntry> getRecent(@Nonnull UUID actor);
 
     /**
      * Gets the recent content for the uuid, separated into pages
+     *
      * @param pageNo the page number
-     * @param actor the uuid of the actor to filter by
+     * @param actor  the uuid of the actor to filter by
      * @return the page content
+     * @throws IllegalArgumentException if the pageNo is less than 1
+     * @throws IllegalStateException if the log doesn't contain enough entries to populate the page. See {@link #getRecentMaxPages(UUID)}}
      */
-    SortedMap<Integer, LogEntry> getRecent(int pageNo, UUID actor);
+    @Nonnull
+    SortedMap<Integer, LogEntry> getRecent(int pageNo, @Nonnull UUID actor);
 
     /**
      * @param actor the actor to filter by
      * @return the max page number allowed in the {@link #getRecent(int, UUID)} method
      */
-    int getRecentMaxPages(UUID actor);
+    int getRecentMaxPages(@Nonnull UUID actor);
 
 
     /**
      * @param uuid the uuid to filter by
      * @return all content in this log where the user = uuid
      */
-    SortedSet<LogEntry> getUserHistory(UUID uuid);
+    @Nonnull
+    SortedSet<LogEntry> getUserHistory(@Nonnull UUID uuid);
 
     /**
      * Gets the user history content, separated by pages
+     *
      * @param pageNo the page number
-     * @param uuid the uuid of the acted user to filter by
+     * @param uuid   the uuid of the acted user to filter by
      * @return the page content
+     * @throws IllegalArgumentException if the pageNo is less than 1
+     * @throws IllegalStateException if the log doesn't contain enough entries to populate the page. See {@link #getUserHistoryMaxPages(UUID)}}
      */
-    SortedMap<Integer, LogEntry> getUserHistory(int pageNo, UUID uuid);
+    @Nonnull
+    SortedMap<Integer, LogEntry> getUserHistory(int pageNo, @Nonnull UUID uuid);
 
     /**
      * @param uuid the uuid to filter by
      * @return the max page number allowed in the {@link #getUserHistory(int, UUID)} method
      */
-    int getUserHistoryMaxPages(UUID uuid);
+    int getUserHistoryMaxPages(@Nonnull UUID uuid);
+
 
-    
     /**
      * @param name the name to filter by
      * @return all content in this log where the group = name
      */
-    SortedSet<LogEntry> getGroupHistory(String name);
+    @Nonnull
+    SortedSet<LogEntry> getGroupHistory(@Nonnull String name);
 
     /**
      * Gets the group history content, separated by pages
+     *
      * @param pageNo the page number
-     * @param name the name of the acted group to filter by
+     * @param name   the name of the acted group to filter by
      * @return the page content
+     * @throws IllegalArgumentException if the pageNo is less than 1
+     * @throws IllegalStateException if the log doesn't contain enough entries to populate the page. See {@link #getGroupHistoryMaxPages(String)}}
      */
-    SortedMap<Integer, LogEntry> getGroupHistory(int pageNo, String name);
+    @Nonnull
+    SortedMap<Integer, LogEntry> getGroupHistory(int pageNo, @Nonnull String name);
 
     /**
      * @param name the name to filter by
      * @return the max page number allowed in the {@link #getGroupHistory(int, String)} method
      */
-    int getGroupHistoryMaxPages(String name);
+    int getGroupHistoryMaxPages(@Nonnull String name);
 
 
     /**
      * @param name the name to filter by
      * @return all content in this log where the track = name
      */
-    SortedSet<LogEntry> getTrackHistory(String name);
+    @Nonnull
+    SortedSet<LogEntry> getTrackHistory(@Nonnull String name);
 
     /**
      * Gets the track history content, separated by pages
+     *
      * @param pageNo the page number
-     * @param name the name of the acted track to filter by
+     * @param name   the name of the acted track to filter by
      * @return the page content
      */
-    SortedMap<Integer, LogEntry> getTrackHistory(int pageNo, String name);
+    @Nonnull
+    SortedMap<Integer, LogEntry> getTrackHistory(int pageNo, @Nonnull String name);
 
     /**
      * @param name the name to filter by
      * @return the max page number allowed in the {@link #getTrackHistory(int, String)} method
+     * @throws IllegalArgumentException if the pageNo is less than 1
+     * @throws IllegalStateException if the log doesn't contain enough entries to populate the page. See {@link #getTrackHistoryMaxPages(String)}}
      */
-    int getTrackHistoryMaxPages(String name);
+    int getTrackHistoryMaxPages(@Nonnull String name);
+
 
     /**
      * @param query the query to filter by
      * @return all content in this log where the content matches query
      */
-    SortedSet<LogEntry> getSearch(String query);
+    @Nonnull
+    SortedSet<LogEntry> getSearch(@Nonnull String query);
 
     /**
      * Gets the search content, separated by pages
+     *
      * @param pageNo the page number
-     * @param query the query to filter by
+     * @param query  the query to filter by
      * @return the page content
+     * @throws IllegalArgumentException if the pageNo is less than 1
+     * @throws IllegalStateException if the log doesn't contain enough entries to populate the page. See {@link #getSearchMaxPages(String)}}
      */
-    SortedMap<Integer, LogEntry> getSearch(int pageNo, String query);
+    @Nonnull
+    SortedMap<Integer, LogEntry> getSearch(int pageNo, @Nonnull String query);
 
     /**
      * @param query the query to filter by
      * @return the max page number allowed in the {@link #getSearch(int, String)} method
      */
-    int getSearchMaxPages(String query);
+    int getSearchMaxPages(@Nonnull String query);
 }

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -24,17 +27,22 @@ package me.lucko.luckperms.api;
 
 import java.util.UUID;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
- * Represents a single entry in a log
+ * A single entry in the log
+ *
+ * <p>Implements {@link Comparable} ordering based upon the timestamp of the entry.</p>
  */
-@SuppressWarnings({"unused", "WeakerAccess"})
 public class LogEntry implements Comparable<LogEntry> {
+    private static final String FORMAT = "&8(&e%s&8) [&a%s&8] (&b%s&8) &7--> &f%s";
+
+    @Nonnull
     public static LogEntryBuilder builder() {
         return new LogEntryBuilder();
     }
 
-    private static final String FORMAT = "&8(&e%s&8) [&a%s&8] (&b%s&8) &7--> &f%s";
-
     private long timestamp;
     private UUID actor;
     private String actorName;
@@ -43,7 +51,7 @@ public class LogEntry implements Comparable<LogEntry> {
     private String actedName;
     private String action;
 
-    public LogEntry(long timestamp, UUID actor, String actorName, char type, UUID acted, String actedName, String action) {
+    public LogEntry(long timestamp, @Nonnull UUID actor, @Nonnull String actorName, char type, @Nullable UUID acted, @Nonnull String actedName, @Nonnull String action) {
         if (actor == null) {
             throw new NullPointerException("actor");
         }
@@ -81,17 +89,18 @@ public class LogEntry implements Comparable<LogEntry> {
         return equals(o) ? 0 : (Long.compare(timestamp, o.getTimestamp()) == 0 ? 1 : Long.compare(timestamp, o.getTimestamp()));
     }
 
-    public boolean matchesSearch(String query) {
+    public boolean matchesSearch(@Nonnull String query) {
         query = query.toLowerCase();
         return actorName.toLowerCase().contains(query) || actedName.toLowerCase().contains(query)
                 || action.toLowerCase().contains(query);
     }
 
+    @Nonnull
     public String getFormatted() {
         return String.format(FORMAT,
-                actorName,
+                String.valueOf(actorName).equals("null") ? actor.toString() : actorName,
                 Character.toString(type),
-                actedName,
+                String.valueOf(actedName).equals("null") && acted != null ? acted.toString() : actedName,
                 action
         );
     }
@@ -100,63 +109,74 @@ public class LogEntry implements Comparable<LogEntry> {
         return timestamp;
     }
 
+    void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    @Nonnull
     public UUID getActor() {
         return actor;
     }
 
+    void setActor(@Nonnull UUID actor) {
+        this.actor = actor;
+    }
+
+    @Nonnull
     public String getActorName() {
         return actorName;
     }
 
+    void setActorName(@Nonnull String actorName) {
+        this.actorName = actorName;
+    }
+
     public char getType() {
         return type;
     }
 
-    public UUID getActed() {
-        return acted;
-    }
-
-    public String getActedName() {
-        return actedName;
-    }
-
-    public String getAction() {
-        return action;
-    }
-
-    void setTimestamp(long timestamp) {
-        this.timestamp = timestamp;
-    }
-
-    void setActor(UUID actor) {
-        this.actor = actor;
-    }
-
-    void setActorName(String actorName) {
-        this.actorName = actorName;
-    }
-
     void setType(char type) {
         this.type = type;
     }
 
-    void setActed(UUID acted) {
+    @Nullable
+    public UUID getActed() {
+        return acted;
+    }
+
+    void setActed(@Nullable UUID acted) {
         this.acted = acted;
     }
 
-    void setActedName(String actedName) {
+    @Nonnull
+    public String getActedName() {
+        return actedName;
+    }
+
+    void setActedName(@Nonnull String actedName) {
         this.actedName = actedName;
     }
 
-    void setAction(String action) {
+    @Nonnull
+    public String getAction() {
+        return action;
+    }
+
+    void setAction(@Nonnull String action) {
         this.action = action;
     }
 
     @Override
     public String toString() {
-        return "LogEntry(timestamp=" + this.getTimestamp() + ", actor=" + this.getActor() + ", actorName=" +
-                this.getActorName() + ", type=" + this.getType() + ", acted=" + this.getActed() + ", actedName=" +
-                this.getActedName() + ", action=" + this.getAction() + ")";
+        return "LogEntry(" +
+                "timestamp=" + this.getTimestamp() + ", " +
+                "actor=" + this.getActor() + ", " +
+                "actorName=" + this.getActorName() + ", " +
+                "type=" + this.getType() + ", " +
+                "acted=" + this.getActed() + ", " +
+                "actedName=" + this.getActedName() + ", " +
+                "action=" + this.getAction() +
+                ")";
     }
 
     @Override
@@ -164,42 +184,26 @@ 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;
-        final Object this$actor = this.getActor();
-        final Object other$actor = other.getActor();
-        if (this$actor == null ? other$actor != null : !this$actor.equals(other$actor)) return false;
-        final Object this$actorName = this.getActorName();
-        final Object other$actorName = other.getActorName();
-        if (this$actorName == null ? other$actorName != null : !this$actorName.equals(other$actorName)) return false;
-        if (this.getType() != other.getType()) return false;
-        final Object this$acted = this.getActed();
-        final Object other$acted = other.getActed();
-        if (this$acted == null ? other$acted != null : !this$acted.equals(other$acted)) return false;
-        final Object this$actedName = this.getActedName();
-        final Object other$actedName = other.getActedName();
-        if (this$actedName == null ? other$actedName != null : !this$actedName.equals(other$actedName)) return false;
-        final Object this$action = this.getAction();
-        final Object other$action = other.getAction();
-        return this$action == null ? other$action == null : this$action.equals(other$action);
+        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
     public int hashCode() {
         final int PRIME = 59;
         int result = 1;
-        final long $timestamp = this.getTimestamp();
-        result = result * PRIME + (int) ($timestamp >>> 32 ^ $timestamp);
-        final Object $actor = this.getActor();
-        result = result * PRIME + ($actor == null ? 43 : $actor.hashCode());
-        final Object $actorName = this.getActorName();
-        result = result * PRIME + ($actorName == null ? 43 : $actorName.hashCode());
+        result = result * PRIME + (int) (this.getTimestamp() >>> 32 ^ this.getTimestamp());
+        result = result * PRIME + (this.getActor() == null ? 43 : this.getActor().hashCode());
+        result = result * PRIME + (this.getActorName() == null ? 43 : this.getActorName().hashCode());
         result = result * PRIME + this.getType();
-        final Object $acted = this.getActed();
-        result = result * PRIME + ($acted == null ? 43 : $acted.hashCode());
-        final Object $actedName = this.getActedName();
-        result = result * PRIME + ($actedName == null ? 43 : $actedName.hashCode());
-        final Object $action = this.getAction();
-        result = result * PRIME + ($action == null ? 43 : $action.hashCode());
+        result = result * PRIME + (this.getActed() == null ? 43 : this.getActed().hashCode());
+        result = result * PRIME + (this.getActedName() == null ? 43 : this.getActedName().hashCode());
+        result = result * PRIME + (this.getAction() == null ? 43 : this.getAction().hashCode());
         return result;
     }
 
@@ -214,6 +218,7 @@ public class LogEntry implements Comparable<LogEntry> {
         protected LogEntryBuilder getThis() {
             return this;
         }
+
     }
 
     public static abstract class AbstractLogEntryBuilder<T extends LogEntry, B extends AbstractLogEntryBuilder<T, B>> {
@@ -226,6 +231,7 @@ public class LogEntry implements Comparable<LogEntry> {
         }
 
         protected abstract T createObj();
+
         protected abstract B getThis();
 
         public long getTimestamp() {
@@ -310,9 +316,15 @@ public class LogEntry implements Comparable<LogEntry> {
 
         @Override
         public String toString() {
-            return "LogEntry.LogEntryBuilder(timestamp=" + getTimestamp() + ", actor=" + getActor() + ", actorName=" +
-                    getActorName() + ", type=" + getType() + ", acted=" + getActed() + ", actedName=" + getActedName() +
-                    ", action=" + getAction() + ")";
+            return "LogEntry.LogEntryBuilder(" +
+                    "timestamp=" + this.getTimestamp() + ", " +
+                    "actor=" + this.getActor() + ", " +
+                    "actorName=" + this.getActorName() + ", " +
+                    "type=" + this.getType() + ", " +
+                    "acted=" + this.getActed() + ", " +
+                    "actedName=" + this.getActedName() + ", " +
+                    "action=" + this.getAction() +
+                    ")";
         }
     }
 

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -22,16 +25,20 @@
 
 package me.lucko.luckperms.api;
 
+import javax.annotation.Nonnull;
+
 /**
- * A wrapper interface for platform logger instances.
+ * Represents the logger instance being used by LuckPerms on the platform.
  *
- * <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>Messages sent using the logger are sent prefixed with the LuckPerms tag, and on some implementations will be colored
+ * depending on the message type.</p>
  */
 public interface Logger {
 
-    void info(String s);
-    void warn(String s);
-    void severe(String s);
+    void info(@Nonnull String s);
+
+    void warn(@Nonnull String s);
+
+    void severe(@Nonnull String s);
 
 }

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -22,18 +25,21 @@
 
 package me.lucko.luckperms.api;
 
-import me.lucko.luckperms.api.context.ContextListener;
-import me.lucko.luckperms.api.context.IContextCalculator;
-import me.lucko.luckperms.api.event.LPListener;
+import me.lucko.luckperms.api.context.ContextCalculator;
+import me.lucko.luckperms.api.context.ContextSet;
+import me.lucko.luckperms.api.event.EventBus;
+import me.lucko.luckperms.api.metastacking.MetaStackFactory;
 
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
- * The root API interface in LuckPerms
+ * The root API interface for LuckPerms
  */
-@SuppressWarnings("unused")
 public interface LuckPermsApi {
 
     /**
@@ -42,212 +48,311 @@ 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
      */
+    @Nonnull
     String getVersion();
 
     /**
+     * Gets the platform LuckPerms is running on
+     *
      * @return the platform LuckPerms is running on
      * @since 2.7
      */
+    @Nonnull
     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);
+    @Nonnull
+    EventBus getEventBus();
 
     /**
      * Gets a wrapped {@link LPConfiguration} instance, with read only access
+     *
      * @return a configuration instance
      */
+    @Nonnull
     LPConfiguration getConfiguration();
 
     /**
      * Gets a wrapped {@link Storage} instance.
+     *
      * @return a storage instance
      * @since 2.14
      */
+    @Nonnull
     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.
+     *
      * @return an optional that may contain a messaging service instance.
      */
+    @Nonnull
     Optional<MessagingService> getMessagingService();
 
     /**
      * Gets the {@link Logger} wrapping used by the platform
+     *
      * @return the logger instance
      */
+    @Nonnull
     Logger getLogger();
 
     /**
      * Gets a wrapped {@link UuidCache} instance, providing read access to the LuckPerms internal uuid caching system
+     *
      * @return a uuid cache instance
      */
+    @Nonnull
     UuidCache getUuidCache();
 
     /**
      * Gets a wrapped user object from the user storage
+     *
      * @param uuid the uuid of the user to get
      * @return a {@link User} object, if one matching the uuid is loaded, or null if not
      * @throws NullPointerException if the uuid is null
      */
-    User getUser(UUID uuid);
+    @Nullable
+    User getUser(@Nonnull 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
      * @throws NullPointerException if the uuid is null
      */
-    Optional<User> getUserSafe(UUID uuid);
+    @Nonnull
+    Optional<User> getUserSafe(@Nonnull UUID uuid);
 
     /**
      * Gets a wrapped user object from the user storage
+     *
      * @param name the username of the user to get
      * @return a {@link User} object, if one matching the uuid is loaded, or null if not
      * @throws NullPointerException if the name is null
      */
-    User getUser(String name);
+    @Nullable
+    User getUser(@Nonnull 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
      * @throws NullPointerException if the name is null
      */
-    Optional<User> getUserSafe(String name);
+    @Nonnull
+    Optional<User> getUserSafe(@Nonnull String name);
 
     /**
      * Gets a set of all loaded users.
+     *
      * @return a {@link Set} of {@link User} objects
      */
+    @Nonnull
     Set<User> getUsers();
 
     /**
      * Check if a user is loaded in memory
+     *
      * @param uuid the uuid to check for
      * @return true if the user is loaded
      * @throws NullPointerException if the uuid is null
      */
-    boolean isUserLoaded(UUID uuid);
+    boolean isUserLoaded(@Nonnull UUID uuid);
 
     /**
      * Unload a user from the internal storage, if they're not currently online.
+     *
      * @param user the user to unload
      * @throws NullPointerException if the user is null
      * @since 2.6
      */
-    void cleanupUser(User user);
+    void cleanupUser(@Nonnull User user);
 
     /**
      * Gets a wrapped group object from the group storage
+     *
      * @param name the name of the group to get
      * @return a {@link Group} object, if one matching the name exists, or null if not
      * @throws NullPointerException if the name is null
      */
-    Group getGroup(String name);
+    @Nullable
+    Group getGroup(@Nonnull 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
      * @throws NullPointerException if the name is null
      */
-    Optional<Group> getGroupSafe(String name);
+    @Nonnull
+    Optional<Group> getGroupSafe(@Nonnull String name);
 
     /**
      * Gets a set of all loaded groups.
+     *
      * @return a {@link Set} of {@link Group} objects
      */
+    @Nonnull
     Set<Group> getGroups();
 
     /**
      * Check if a group is loaded in memory
+     *
      * @param name the name to check for
      * @return true if the group is loaded
      * @throws NullPointerException if the name is null
      */
-    boolean isGroupLoaded(String name);
+    boolean isGroupLoaded(@Nonnull String name);
 
     /**
      * Gets a wrapped track object from the track storage
+     *
      * @param name the name of the track to get
      * @return a {@link Track} object, if one matching the name exists, or null if not
      * @throws NullPointerException if the name is null
      */
-    Track getTrack(String name);
+    @Nullable
+    Track getTrack(@Nonnull 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
      * @throws NullPointerException if the name is null
      */
-    Optional<Track> getTrackSafe(String name);
+    @Nonnull
+    Optional<Track> getTrackSafe(@Nonnull String name);
 
     /**
      * Gets a set of all loaded tracks.
+     *
      * @return a {@link Set} of {@link Track} objects
      */
+    @Nonnull
     Set<Track> getTracks();
 
     /**
      * Check if a track is loaded in memory
+     *
      * @param name the name to check for
      * @return true if the track is loaded
      * @throws NullPointerException if the name is null
      */
-    boolean isTrackLoaded(String name);
+    boolean isTrackLoaded(@Nonnull String name);
+
+    /**
+     * Gets the node factory instance for the platform
+     *
+     * @return the node factory
+     */
+    @Nonnull
+    NodeFactory getNodeFactory();
+
+    /**
+     * Gets the MetaStackFactory, used for creating MetaStacks.
+     *
+     * @return the meta stack factory
+     * @since 3.2
+     */
+    @Nonnull
+    MetaStackFactory getMetaStackFactory();
 
     /**
      * Returns a permission builder instance
+     *
      * @param permission the main permission node to build
      * @return a {@link Node.Builder} instance
      * @throws IllegalArgumentException if the permission is invalid
-     * @throws NullPointerException if the permission is null
+     * @throws NullPointerException     if the permission is null
      * @since 2.6
      */
-    Node.Builder buildNode(String permission) throws IllegalArgumentException;
+    @Nonnull
+    Node.Builder buildNode(@Nonnull String permission) throws IllegalArgumentException;
 
     /**
      * Register a custom context calculator to the server
+     *
      * @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);
+    void registerContextCalculator(@Nonnull ContextCalculator<?> 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.
+     * Gets a calculated context instance for the user using the rules of the platform.
+     *
+     * <p> These values are calculated using the options in the configuration, and the provided calculators.
+     *
+     * @param user the user to get contexts for
+     * @return an optional containing contexts. Will return empty if the user is not online.
      */
-    void registerContextListener(ContextListener<?> contextListener);
+    @Nonnull
+    Optional<Contexts> getContextForUser(@Nonnull User user);
+
+    /**
+     * 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.
+     * @since 2.17
+     */
+    @Nonnull
+    ContextSet getContextForPlayer(@Nonnull Object player);
+
+    /**
+     * Gets a Contexts instance for the 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.
+     * @since 3.3
+     */
+    @Nonnull
+    Contexts getContextsForPlayer(@Nonnull Object player);
+
+    /**
+     * Gets the unique players which have connected to the server since it started.
+     *
+     * @return the unique connections
+     * @since 3.3
+     */
+    @Nonnull
+    Set<UUID> getUniqueConnections();
+
+    /**
+     * Gets the time when the plugin first started in milliseconds.
+     *
+     * @return the enable time
+     * @since 3.3
+     */
+    long getStartTime();
 
 }

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -23,14 +26,17 @@
 package me.lucko.luckperms.api;
 
 /**
- * Exposes any networking provider being used on the platform. e.g. Redis
+ * A means to push changes to other servers using the platforms networking
+ *
  * @since 2.14
  */
 public interface MessagingService {
 
     /**
      * Uses the messaging service to inform other servers about changes.
-     * This will push the update asynchronously, and this method will return almost immediately.
+     *
+     * <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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -32,14 +35,30 @@ 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 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
+     *
      * @param s the string to escape
      * @return an escaped string
      * @throws NullPointerException if the string is null
@@ -48,16 +67,13 @@ public class MetaUtils {
         if (s == null) {
             throw new NullPointerException();
         }
-        
-        s = s.replace(".", "{SEP}");
-        s = s.replace("/", "{FSEP}");
-        s = s.replace("$", "{DSEP}");
 
-        return s;
+        return escapeDelimiters(s, ".", "/", "-", "$");
     }
 
     /**
      * Unescapes special characters used within LuckPerms, the inverse of {@link #escapeCharacters(String)}
+     *
      * @param s the string to unescape
      * @return an unescaped string
      * @throws NullPointerException if the string is null
@@ -66,71 +82,55 @@ public class MetaUtils {
         if (s == null) {
             throw new NullPointerException();
         }
-        
+
         s = s.replace("{SEP}", ".");
         s = s.replace("{FSEP}", "/");
         s = s.replace("{DSEP}", "$");
+        s = unescapeDelimiters(s, ".", "/", "-", "$");
 
         return s;
     }
 
     /**
      * Sets a meta value on a holder
+     *
      * @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 value the meta value
-     * @throws NullPointerException if the holder, node or value is null
+     * @param world  the world to apply the meta on, can be null
+     * @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");
-        }
-        
-        if (node == null) {
-            throw new NullPointerException("node");
-        }
+    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 (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);
             }
         }
-        
+
         for (Node n : toRemove) {
             try {
                 holder.unsetPermission(n);
             } 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 {
@@ -140,29 +140,20 @@ public class MetaUtils {
 
     /**
      * Gets a meta value for the holder
-     * @param holder the holder to get the meta from
-     * @param server the server to retrieve the meta on, can be null
-     * @param world the world to retrieve the meta on, can be null
-     * @param node the node to get
-     * @param defaultValue the default value to return if the node is not set
+     *
+     * @param holder        the holder to get the meta from
+     * @param server        the server to retrieve the meta on, can be null
+     * @param world         the world to retrieve the meta on, can be null
+     * @param node          the node to get
+     * @param defaultValue  the default value to return if the node is not set
      * @param includeGlobal if global nodes should be considered when retrieving the meta
      * @return a meta string, or the default value if the user does not have the meta node
-     * @throws NullPointerException if the holder or node is null
+     * @throws NullPointerException     if the holder or node is null
      * @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");
         }
@@ -170,23 +161,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)) {
@@ -198,21 +176,18 @@ 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 {
@@ -222,12 +197,13 @@ public class MetaUtils {
 
     /**
      * Adds a prefix to a holder on a specific server and world
-     * @param holder the holder to set the prefix for
-     * @param prefix the prefix value
+     *
+     * @param holder   the holder to set the prefix for
+     * @param prefix   the prefix value
      * @param priority the priority to set the prefix at
-     * @param server the server to set the prefix on, can be null
-     * @param world the world to set the prefix on, can be null
-     * @throws NullPointerException if the holder is null
+     * @param server   the server to set the prefix on, can be null
+     * @param world    the world to set the prefix on, can be null
+     * @throws NullPointerException     if the holder is null
      * @throws IllegalArgumentException if the prefix is null or empty
      */
     public static void setPrefix(PermissionHolder holder, String prefix, int priority, String server, String world) {
@@ -236,12 +212,13 @@ public class MetaUtils {
 
     /**
      * Adds a suffix to a holder on a specific server and world
-     * @param holder the holder to set the suffix for
-     * @param suffix the suffix value
+     *
+     * @param holder   the holder to set the suffix for
+     * @param suffix   the suffix value
      * @param priority the priority to set the suffix at
-     * @param server the server to set the suffix on, can be null
-     * @param world the world to set the suffix on, can be null
-     * @throws NullPointerException if the holder is null
+     * @param server   the server to set the suffix on, can be null
+     * @param world    the world to set the suffix on, can be null
+     * @throws NullPointerException     if the holder is null
      * @throws IllegalArgumentException if the suffix is null or empty
      */
     public static void setSuffix(PermissionHolder holder, String suffix, int priority, String server, String world) {
@@ -252,27 +229,15 @@ 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.shouldApplyOnServer(server, includeGlobal, false)) continue;
+            if (!n.shouldApplyOnWorld(world, includeGlobal, false)) continue;
 
-            if (!n.shouldApplyOnWorld(world, includeGlobal, false)) {
-                continue;
-            }
-            
             if (prefix ? !n.isPrefix() : !n.isSuffix()) {
                 continue;
             }
@@ -289,9 +254,10 @@ public class MetaUtils {
 
     /**
      * Returns a holders highest priority prefix, if they have one
-     * @param holder the holder
-     * @param server the server to retrieve the prefix on
-     * @param world the world to retrieve the prefix on
+     *
+     * @param holder        the holder
+     * @param server        the server to retrieve the prefix on
+     * @param world         the world to retrieve the prefix on
      * @param includeGlobal if global nodes should be considered when retrieving the prefix
      * @return a prefix string, if the holder has one, or an empty string if not.
      * @throws NullPointerException if the holder is null
@@ -302,9 +268,10 @@ public class MetaUtils {
 
     /**
      * Returns a holders highest priority suffix, if they have one
-     * @param holder the holder
-     * @param server the server to retrieve the suffix on
-     * @param world the world to retrieve the suffix on
+     *
+     * @param holder        the holder
+     * @param server        the server to retrieve the suffix on
+     * @param world         the world to retrieve the suffix on
      * @param includeGlobal if global nodes should be considered when retrieving the suffix
      * @return a suffix string, if the holder has one, or an empty string if not.
      * @throws NullPointerException if the holder is null
@@ -312,5 +279,8 @@ public class MetaUtils {
     public static String getSuffix(PermissionHolder holder, String server, String world, boolean includeGlobal) {
         return getChatMeta(false, holder, server, world, includeGlobal);
     }
-    
+
+    private MetaUtils() {
+    }
+
 }

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -24,181 +27,242 @@ package me.lucko.luckperms.api;
 
 import me.lucko.luckperms.api.context.ContextSet;
 
-import java.util.*;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
- * Represents an immutable node object
- * <p> Use {@link LuckPermsApi#buildNode(String)} to get an instance.
+ * An immutable permission node
+ *
+ * <p>Use {@link LuckPermsApi#buildNode(String)} to get an instance.</p>
+ *
  * @since 2.6
  */
-@SuppressWarnings("unused")
 public interface Node extends Map.Entry<String, Boolean> {
 
     /**
+     * Returns the actual permission string
+     *
      * @return the actual permission node
      */
+    @Nonnull
     String getPermission();
 
     /**
-     * Get what value the permission is set to. A negated node would return <code>false</code>.
+     * Gets what value the permission is set to. A negated node would return <code>false</code>.
+     *
      * @return the permission's value
      */
     @Override
+    @Nonnull
     Boolean getValue();
 
     /**
+     * Returns the value of this node as a tristate
+     *
      * @return the value of this node as a Tristate
      */
-    Tristate getTristate();
+    @Nonnull
+    default Tristate getTristate() {
+        return Tristate.fromBoolean(getValue());
+    }
 
     /**
+     * Returns if the node is negated
+     *
      * @return true if the node is negated
      */
-    boolean isNegated();
+    default boolean isNegated() {
+        return !getValue();
+    }
 
     /**
      * If this node is set to override explicitly.
      * This value does not persist across saves, and is therefore only useful for transient nodes
+     *
      * @return true if this node is set to override explicitly
      */
     boolean isOverride();
 
     /**
      * Gets the server this node applies on, if the node is server specific
+     *
      * @return an {@link Optional} containing the server, if one is defined
      */
+    @Nonnull
     Optional<String> getServer();
 
     /**
      * Gets the world this node applies on, if the node is world specific
+     *
      * @return an {@link Optional} containing the world, if one is defined
      */
+    @Nonnull
     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();
 
     /**
-     * If this node should apply on a specific server
-     * @param server the name of the server
-     * @param includeGlobal if global permissions should apply
+     * 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, @Nullable String server, @Nullable String world, @Nullable ContextSet context, boolean applyRegex);
+
+    /**
+     * If this node should apply on a specific server
+     *
+     * @param server        the name of the server
+     * @param includeGlobal if global permissions should apply
+     * @param applyRegex    if regex should be applied
      * @return true if the node should apply
      */
-    boolean shouldApplyOnServer(String server, boolean includeGlobal, boolean applyRegex);
+    boolean shouldApplyOnServer(@Nullable String server, boolean includeGlobal, boolean applyRegex);
 
     /**
      * If this node should apply on a specific world
-     * @param world the name of the world
+     *
+     * @param world         the name of the world
      * @param includeGlobal if global permissions should apply
-     * @param applyRegex if regex should be applied
+     * @param applyRegex    if regex should be applied
      * @return true if the node should apply
      */
-    boolean shouldApplyOnWorld(String world, boolean includeGlobal, boolean applyRegex);
+    boolean shouldApplyOnWorld(@Nullable String world, boolean includeGlobal, boolean applyRegex);
 
     /**
      * If this node should apply in the given context
-     * @param context the context key value pairs
+     *
+     * @param context        the context key value pairs
      * @param worldAndServer if world and server contexts should be checked
      * @return true if the node should apply
      * @since 2.13
      */
-    boolean shouldApplyWithContext(ContextSet context, boolean worldAndServer);
+    boolean shouldApplyWithContext(@Nonnull ContextSet context, boolean worldAndServer);
 
     /**
      * If this node should apply in the given context
+     *
      * @param context the context key value pairs
      * @return true if the node should apply
      * @since 2.13
      */
-    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));
-    }
+    boolean shouldApplyWithContext(@Nonnull ContextSet context);
 
     /**
      * Similar to {@link #shouldApplyOnServer(String, boolean, boolean)}, except this method accepts a List
-     * @param servers the list of servers
+     *
+     * @param servers       the list of servers
      * @param includeGlobal if global permissions should apply
      * @return true if the node should apply
      */
-    boolean shouldApplyOnAnyServers(List<String> servers, boolean includeGlobal);
+    boolean shouldApplyOnAnyServers(@Nonnull List<String> servers, boolean includeGlobal);
 
     /**
      * Similar to {@link #shouldApplyOnWorld(String, boolean, boolean)}, except this method accepts a List
-     * @param worlds the list of world
+     *
+     * @param worlds        the list of world
      * @param includeGlobal if global permissions should apply
      * @return true if the node should apply
      */
-    boolean shouldApplyOnAnyWorlds(List<String> worlds, boolean includeGlobal);
+    boolean shouldApplyOnAnyWorlds(@Nonnull List<String> worlds, boolean includeGlobal);
 
     /**
      * Resolves a list of wildcards that match this node
+     *
      * @param possibleNodes a list of possible permission nodes
      * @return a list of permissions that match this wildcard
      */
-    List<String> resolveWildcard(List<String> possibleNodes);
+    @Nonnull
+    List<String> resolveWildcard(@Nonnull List<String> possibleNodes);
 
     /**
      * Resolves any shorthand parts of this node and returns the full list
+     *
      * @return a list of full nodes
      */
+    @Nonnull
     List<String> resolveShorthand();
 
     /**
+     * Returns if this node will expire in the future
+     *
      * @return true if this node will expire in the future
      */
     boolean isTemporary();
 
     /**
+     * Returns if this node will not expire
+     *
      * @return true if this node will not expire
      */
-    boolean isPermanent();
+    default boolean isPermanent() {
+        return !isTemporary();
+    }
 
     /**
+     * Returns a unix timestamp in seconds when this node will expire
+     *
      * @return the time in Unix time when this node will expire
      * @throws IllegalStateException if the node is not temporary
      */
-    long getExpiryUnixTime();
+    long getExpiryUnixTime() throws IllegalStateException;
 
     /**
+     * Returns the date when this node will expire
+     *
      * @return the {@link Date} when this node will expire
      * @throws IllegalStateException if the node is not temporary
      */
-    Date getExpiry();
+    @Nonnull
+    Date getExpiry() throws IllegalStateException;
 
     /**
+     * Return the number of seconds until this permission will expire
+     *
      * @return the number of seconds until this permission will expire
      * @throws IllegalStateException if the node is not temporary
      */
-    long getSecondsTilExpiry();
+    long getSecondsTilExpiry() throws IllegalStateException;
 
     /**
      * Return true if the node has expired.
@@ -209,136 +273,190 @@ 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
      */
+    @Nonnull
     ContextSet getContexts();
 
     /**
-     * Converts this node into a serialized form
-     * @return a serialized node string
+     * 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
      */
+    @Nonnull
+    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
+    @Nonnull
     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();
+    @Nonnull
+    String getGroupName() throws IllegalStateException;
 
     /**
-     * @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();
 
     /**
      * Gets the level of this wildcard, higher is more specific
+     *
      * @return the wildcard level
      * @throws IllegalStateException if this is not a wildcard
      */
-    int getWildcardLevel();
+    int getWildcardLevel() throws IllegalStateException;
 
     /**
+     * Returns if this node is a meta node
+     *
      * @return true if this node is a meta node
      */
     boolean isMeta();
 
     /**
      * Gets the meta value from this node
+     *
      * @return the meta value
      * @throws IllegalStateException if this node is not a meta node
      */
-    Map.Entry<String, String> getMeta();
+    @Nonnull
+    Map.Entry<String, String> getMeta() throws IllegalStateException;
 
     /**
+     * Returns if this node is a prefix node
+     *
      * @return true if this node is a prefix node
      */
     boolean isPrefix();
 
     /**
      * Gets the prefix value from this node
+     *
      * @return the prefix value
      * @throws IllegalStateException if this node is a not a prefix node
      */
-    Map.Entry<Integer, String> getPrefix();
+    @Nonnull
+    Map.Entry<Integer, String> getPrefix() throws IllegalStateException;
 
     /**
+     * Returns if this node is a suffix node
+     *
      * @return true if this node is a suffix node
      */
     boolean isSuffix();
 
     /**
      * Gets the suffix value from this node
+     *
      * @return the suffix value
      * @throws IllegalStateException if this node is a not a suffix node
      */
-    Map.Entry<Integer, String> getSuffix();
+    @Nonnull
+    Map.Entry<Integer, String> getSuffix() throws IllegalStateException;
 
     /**
      * Checks if this Node is equal to another node
+     *
      * @param obj the other node
      * @return true if this node is equal to the other provided
      * @see #equalsIgnoringValue(Node) for a less strict implementation of this method
      */
+    @Override
     boolean equals(Object obj);
 
     /**
      * Similar to {@link Node#equals(Object)}, except doesn't take note of the value
+     *
      * @param other the other node
      * @return true if the two nodes are almost equal
      */
-    boolean equalsIgnoringValue(Node other);
+    boolean equalsIgnoringValue(@Nonnull Node other);
 
     /**
      * Similar to {@link Node#equals(Object)}, except doesn't take note of the expiry time or value
+     *
      * @param other the other node
      * @return true if the two nodes are almost equal
      */
-    boolean almostEquals(Node other);
+    boolean almostEquals(@Nonnull Node other);
 
     /**
      * Similar to {@link Node#equals(Object)}, except doesn't take note of the value or if the node is temporary
+     *
      * @param other the other node
      * @return true if the two nodes are almost equal
      * @since 2.8
      */
-    boolean equalsIgnoringValueOrTemp(Node other);
+    boolean equalsIgnoringValueOrTemp(@Nonnull Node other);
 
     /**
      * Builds a Node instance
      */
     interface Builder {
+
+        @Nonnull
         Builder setNegated(boolean negated);
+
+        @Nonnull
         Builder setValue(boolean value);
 
         /**
          * Warning: this value does not persist, and disappears when the holder is re-loaded.
          * It is therefore only useful for transient nodes.
          */
+        @Nonnull
         Builder setOverride(boolean override);
 
+        @Nonnull
         Builder setExpiry(long expireAt);
-        Builder setWorld(String world);
-        Builder setServer(String server) throws IllegalArgumentException;
-        Builder withExtraContext(String key, String value);
-        Builder withExtraContext(Map<String, String> map);
-        Builder withExtraContext(Set<Map.Entry<String, String>> context);
-        Builder withExtraContext(Map.Entry<String, String> entry);
-        Builder withExtraContext(ContextSet set);
+
+        @Nonnull
+        Builder setWorld(@Nonnull String world);
+
+        @Nonnull
+        Builder setServer(@Nonnull String server) throws IllegalArgumentException;
+
+        @Nonnull
+        Builder withExtraContext(@Nonnull String key, @Nonnull String value);
+
+        @Nonnull
+        Builder withExtraContext(@Nonnull Map<String, String> map);
+
+        @Nonnull
+        Builder withExtraContext(@Nonnull Set<Map.Entry<String, String>> context);
+
+        @Nonnull
+        Builder withExtraContext(@Nonnull Map.Entry<String, String> entry);
+
+        @Nonnull
+        Builder withExtraContext(@Nonnull ContextSet set);
+
+        @Nonnull
         Node build();
     }
 

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

@@ -0,0 +1,144 @@
+/*
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  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 javax.annotation.Nonnull;
+
+/**
+ * Builds {@link Node} instances
+ *
+ * @since 2.17
+ */
+public interface NodeFactory {
+
+    /**
+     * Creates a node from a serialised node string
+     *
+     * @param serialisedPermission the serialised permission string
+     * @param value                the value of the node
+     * @return a node instance
+     * @throws NullPointerException if the permission is null
+     * @deprecated since this format isn't used internally for permissions anymore
+     * @see Node#toSerializedNode()
+     */
+    @Deprecated
+    @Nonnull
+    Node fromSerialisedNode(@Nonnull String serialisedPermission, boolean value);
+
+
+    /**
+     * Creates a new node builder from a given base permission string
+     *
+     * @param permission the permission
+     * @return a node builder instance
+     * @throws NullPointerException if the permission is null
+     */
+    @Nonnull
+    Node.Builder newBuilder(@Nonnull String permission);
+
+    /**
+     * Creates a node builder instance from an existing node
+     *
+     * @param other the other node
+     * @return a node builder instance
+     * @throws NullPointerException if the other node is null
+     */
+    @Nonnull
+    Node.Builder newBuilderFromExisting(@Nonnull Node other);
+
+    /**
+     * Creates a node builder from a serialised node string
+     *
+     * @param serialisedPermission the serialised permission string
+     * @param value                the value of the node
+     * @return a node builder instance
+     * @throws NullPointerException if the permission is null
+     * @deprecated since this format isn't used internally for permissions anymore
+     * @see Node#toSerializedNode()
+     */
+    @Deprecated
+    @Nonnull
+    Node.Builder newBuilderFromSerialisedNode(@Nonnull 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
+     */
+    @Nonnull
+    Node.Builder makeGroupNode(@Nonnull Group group);
+
+    /**
+     * Creates a node builder from a key value pair
+     *
+     * @param key   the key
+     * @param value the value
+     * @return a node builder instance
+     * @throws NullPointerException if the key or value is null
+     */
+    @Nonnull
+    Node.Builder makeMetaNode(@Nonnull String key, @Nonnull String value);
+
+    /**
+     * Creates a node builder for the given chat meta type
+     *
+     * @param priority the priority
+     * @param value the value for the prefix/suffix
+     * @return a node builder instance
+     * @throws NullPointerException if the type or value is null
+     * @since 3.2
+     */
+    @Nonnull
+    Node.Builder makeChatMetaNode(@Nonnull ChatMetaType type, int priority, @Nonnull String value);
+
+    /**
+     * Creates a node builder from a prefix string and priority
+     *
+     * @param priority the priority
+     * @param prefix   the prefix string
+     * @return a node builder instance
+     * @throws NullPointerException if the prefix is null
+     */
+    @Nonnull
+    Node.Builder makePrefixNode(int priority, @Nonnull String prefix);
+
+    /**
+     * Creates a node builder from a prefix string and priority
+     *
+     * @param priority the priority
+     * @param suffix   the suffix string
+     * @return a node builder instance
+     * @throws NullPointerException if the suffix is null
+     */
+    @Nonnull
+    Node.Builder makeSuffixNode(int priority, @Nonnull String suffix);
+
+}

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -22,20 +25,18 @@
 
 package me.lucko.luckperms.api;
 
+import javax.annotation.Nonnull;
+
 /**
- * Represents the platform type that LuckPerms is running on
+ * The platforms which LuckPerms can run on
+ *
  * @since 2.7
  */
 public enum PlatformType {
 
     BUKKIT("Bukkit"),
     BUNGEE("Bungee"),
-    SPONGE("Sponge"),
-
-    /**
-     * @since 2.9
-     */
-    STANDALONE("Standalone");
+    SPONGE("Sponge");
 
     private final String friendlyName;
 
@@ -43,6 +44,7 @@ public enum PlatformType {
         this.friendlyName = friendlyName;
     }
 
+    @Nonnull
     public String getFriendlyName() {
         return friendlyName;
     }

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -22,21 +25,26 @@
 
 package me.lucko.luckperms.api;
 
+import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import java.util.function.Consumer;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
- * Interface for the internal Storage instance
+ * A means of loading and saving data to/from the Storage provider.
  *
- * 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.
+ * <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.</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()}.
+ * <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()}.</p>
  *
  * @since 2.14
  */
@@ -44,174 +52,263 @@ public interface Storage {
 
     /**
      * Get the name of the storage implementation.
+     *
      * @return the name of the implementation
      */
+    @Nonnull
     String getName();
 
     /**
      * Return whether the storage instance is allowing logins on the platform.
+     *
      * @return true if logins are enabled
      */
     boolean isAcceptingLogins();
 
     /**
      * Returns an executor which will run all passed runnables on the main server thread.
+     *
      * @return an executor instance
      */
+    @Nonnull
     Executor getSyncExecutor();
 
     /**
-     * Returns an executor which will run all passed runnables asynchronously using the platforms scheduler & thread pools.
+     * Returns an executor which will run all passed runnables asynchronously using the platforms scheduler and thread
+     * pools.
+     *
      * @return an executor instance
      */
+    @Nonnull
     Executor getAsyncExecutor();
 
     /**
      * Saves an action to storage
+     *
      * @param entry the log entry to be saved
      * @return true if the operation completed successfully.
      * @throws NullPointerException if entry is null
      */
-    CompletableFuture<Boolean> logAction(LogEntry entry);
+    @Nonnull
+    CompletableFuture<Boolean> logAction(@Nonnull LogEntry entry);
 
     /**
      * Loads and returns the entire log from storage
+     *
      * @return a log instance, could be null if loading failed
      */
+    @Nonnull
     CompletableFuture<Log> getLog();
 
     /**
      * Loads a user's data from the main storage into the plugins local storage.
-     * @param uuid the uuid of the user to load
-     * @param username the users username. (if you want to specify <code>null</code> here, just input "null" as a string.)
+     *
+     * @param uuid     the uuid of the user to load
+     * @param username the users username, or null if it is not known.
      * @return if the operation completed successfully
-     * @throws NullPointerException if uuid or username is null
+     * @throws NullPointerException if uuid is null
      */
-    CompletableFuture<Boolean> loadUser(UUID uuid, String username);
+    @Nonnull
+    CompletableFuture<Boolean> loadUser(@Nonnull UUID uuid, @Nullable String username);
+
+    /**
+     * Loads a user's data from the main storage into the plugins local storage.
+     *
+     * @param uuid the uuid of the user to load
+     * @return if the operation completed successfully
+     * @throws NullPointerException if uuid is null
+     */
+    @Nonnull
+    default CompletableFuture<Boolean> loadUser(@Nonnull UUID uuid) {
+        return loadUser(uuid, null);
+    }
 
     /**
      * Saves a user object back to storage. You should call this after you make any changes to a user.
+     *
      * @param user the user to save
      * @return true if the operation completed successfully.
-     * @throws NullPointerException if user is null
+     * @throws NullPointerException  if user is null
      * @throws IllegalStateException if the user instance was not obtained from LuckPerms.
      */
-    CompletableFuture<Boolean> saveUser(User user);
+    @Nonnull
+    CompletableFuture<Boolean> saveUser(@Nonnull User user);
 
     /**
      * Removes users from the main storage who are "default". This is called every time the plugin loads.
+     *
      * @return true if the operation completed successfully
      */
+    @Nonnull
     CompletableFuture<Boolean> cleanupUsers();
 
     /**
      * Gets a set all "unique" user UUIDs.
      * "Unique" meaning the user isn't just a member of the "default" group.
+     *
      * @return a set of uuids, or null if the operation failed.
      */
+    @Nonnull
     CompletableFuture<Set<UUID>> getUniqueUsers();
 
+    /**
+     * Searches for a list of users with a given permission.
+     *
+     * @param permission the permission to search for
+     * @return a list of held permissions, or null if the operation failed
+     * @throws NullPointerException if the permission is null
+     * @since 2.17
+     */
+    @Nonnull
+    CompletableFuture<List<HeldPermission<UUID>>> getUsersWithPermission(@Nonnull String permission);
+
     /**
      * Creates and loads a group into the plugins local storage
+     *
      * @param name the name of the group
      * @return true if the operation completed successfully
-     * @throws NullPointerException if name is null
+     * @throws NullPointerException     if name is null
      * @throws IllegalArgumentException if the name is invalid
      */
-    CompletableFuture<Boolean> createAndLoadGroup(String name);
+    @Nonnull
+    CompletableFuture<Boolean> createAndLoadGroup(@Nonnull String name);
 
     /**
      * Loads a group into the plugins local storage.
+     *
      * @param name the name of the group
      * @return true if the operation completed successfully
-     * @throws NullPointerException if name is null
+     * @throws NullPointerException     if name is null
      * @throws IllegalArgumentException if the name is invalid
      */
-    CompletableFuture<Boolean> loadGroup(String name);
+    @Nonnull
+    CompletableFuture<Boolean> loadGroup(@Nonnull String name);
 
     /**
      * Loads all groups from the storage into memory
+     *
      * @return true if the operation completed successfully.
      */
+    @Nonnull
     CompletableFuture<Boolean> loadAllGroups();
 
     /**
      * Saves a group back to storage. You should call this after you make any changes to a group.
+     *
      * @param group the group to save
      * @return true if the operation completed successfully.
-     * @throws NullPointerException if group is null
+     * @throws NullPointerException  if group is null
      * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
      */
-    CompletableFuture<Boolean> saveGroup(Group group);
+    @Nonnull
+    CompletableFuture<Boolean> saveGroup(@Nonnull Group group);
 
     /**
      * Permanently deletes a group from storage.
+     *
      * @param group the group to delete
      * @return true if the operation completed successfully.
-     * @throws NullPointerException if group is null
+     * @throws NullPointerException  if group is null
      * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
      */
-    CompletableFuture<Boolean> deleteGroup(Group group);
+    @Nonnull
+    CompletableFuture<Boolean> deleteGroup(@Nonnull Group group);
+
+    /**
+     * Searches for a list of groups with a given permission.
+     *
+     * @param permission the permission to search for
+     * @return a list of held permissions, or null if the operation failed
+     * @throws NullPointerException if the permission is null
+     * @since 2.17
+     */
+    @Nonnull
+    CompletableFuture<List<HeldPermission<String>>> getGroupsWithPermission(@Nonnull String permission);
 
     /**
      * Creates and loads a track into the plugins local storage
+     *
      * @param name the name of the track
      * @return true if the operation completed successfully
-     * @throws NullPointerException if name is null
+     * @throws NullPointerException     if name is null
      * @throws IllegalArgumentException if the name is invalid
      */
-    CompletableFuture<Boolean> createAndLoadTrack(String name);
+    @Nonnull
+    CompletableFuture<Boolean> createAndLoadTrack(@Nonnull String name);
 
     /**
      * Loads a track into the plugins local storage.
+     *
      * @param name the name of the track
      * @return true if the operation completed successfully
-     * @throws NullPointerException if name is null
+     * @throws NullPointerException     if name is null
      * @throws IllegalArgumentException if the name is invalid
      */
-    CompletableFuture<Boolean> loadTrack(String name);
+    @Nonnull
+    CompletableFuture<Boolean> loadTrack(@Nonnull String name);
 
     /**
      * Loads all tracks from the storage into memory
+     *
      * @return true if the operation completed successfully.
      */
+    @Nonnull
     CompletableFuture<Boolean> loadAllTracks();
 
     /**
      * Saves a track back to storage. You should call this after you make any changes to a track.
+     *
      * @param track the track to save
      * @return true if the operation completed successfully.
-     * @throws NullPointerException if track is null
+     * @throws NullPointerException  if track is null
      * @throws IllegalStateException if the track instance was not obtained from LuckPerms.
      */
-    CompletableFuture<Boolean> saveTrack(Track track);
+    @Nonnull
+    CompletableFuture<Boolean> saveTrack(@Nonnull Track track);
 
     /**
      * Permanently deletes a track from storage
+     *
      * @param track the track to delete
      * @return true if the operation completed successfully.
-     * @throws NullPointerException if track is null
+     * @throws NullPointerException  if track is null
      * @throws IllegalStateException if the track instance was not obtained from LuckPerms.
      */
-    CompletableFuture<Boolean> deleteTrack(Track track);
+    @Nonnull
+    CompletableFuture<Boolean> deleteTrack(@Nonnull Track track);
 
     /**
      * Saves UUID caching data to the global cache
+     *
      * @param username the users username
-     * @param uuid the users mojang unique id
+     * @param uuid     the users mojang unique id
      * @return true if the operation completed successfully.
-     * @throws NullPointerException if either parameters are null
+     * @throws NullPointerException     if either parameters are null
      * @throws IllegalArgumentException if the username is invalid
      */
-    CompletableFuture<Boolean> saveUUIDData(String username, UUID uuid);
+    @Nonnull
+    CompletableFuture<Boolean> saveUUIDData(@Nonnull String username, @Nonnull UUID uuid);
 
     /**
      * Gets a UUID from a username
+     *
      * @param username the corresponding username
      * @return a uuid object, could be null
-     * @throws NullPointerException if either parameters are null
+     * @throws NullPointerException     if either parameters are null
      * @throws IllegalArgumentException if the username is invalid
      */
-    CompletableFuture<UUID> getUUID(String username);
+    @Nonnull
+    CompletableFuture<UUID> getUUID(@Nonnull String username);
+
+    /**
+     * Gets a username from a UUID
+     *
+     * @param uuid the corresponding uuid
+     * @return a name string, could be null
+     * @throws NullPointerException if either parameters are null
+     * @since 2.17
+     */
+    @Nonnull
+    CompletableFuture<String> getName(@Nonnull UUID uuid);
 
 }

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -27,106 +30,124 @@ import me.lucko.luckperms.exceptions.ObjectLacksException;
 
 import java.util.List;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
- * Interface for internal Track instances
+ * An ordered collection of groups for easy promotions and demotions
  */
-@SuppressWarnings("unused")
 public interface Track {
 
     /**
+     * Gets the name of this track
      * @return the name of this track
      */
+    @Nonnull
     String getName();
 
     /**
      * Gets an ordered list of the groups on this track
-     * 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
      */
+    @Nonnull
     List<String> getGroups();
 
     /**
      * Gets the number of groups on this track
+     *
      * @return the number of groups on this track
      */
     int getSize();
 
     /**
      * Gets the next group on the track, after the one provided
+     *
      * @param current the group before the group being requested
      * @return the group name, or null if the end of the track has been reached
-     * @throws ObjectLacksException if the track does not contain the group given
-     * @throws NullPointerException if the group is null
+     * @throws ObjectLacksException  if the track does not contain the group given
+     * @throws NullPointerException  if the group is null
      * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
      */
-    String getNext(Group current) throws ObjectLacksException;
+    @Nullable
+    String getNext(@Nonnull Group current) throws ObjectLacksException;
 
     /**
      * Gets the previous group on the track, before the one provided
+     *
      * @param current the group after the group being requested
      * @return the group name, or null if the start of the track has been reached
-     * @throws ObjectLacksException if the track does not contain the group given
-     * @throws NullPointerException if the group is null
+     * @throws ObjectLacksException  if the track does not contain the group given
+     * @throws NullPointerException  if the group is null
      * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
      */
-    String getPrevious(Group current) throws ObjectLacksException;
+    @Nullable
+    String getPrevious(@Nonnull Group current) throws ObjectLacksException;
 
     /**
      * Appends a group to the end of this track
+     *
      * @param group the group to append
      * @throws ObjectAlreadyHasException if the group is already on this track somewhere
-     * @throws NullPointerException if the group is null
-     * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
+     * @throws NullPointerException      if the group is null
+     * @throws IllegalStateException     if the group instance was not obtained from LuckPerms.
      */
-    void appendGroup(Group group) throws ObjectAlreadyHasException;
+    void appendGroup(@Nonnull Group group) throws ObjectAlreadyHasException;
 
     /**
      * Inserts a group at a certain position on this track
-     * @param group the group to be inserted
+     *
+     * @param group    the group to be inserted
      * @param position the index position (a value of 0 inserts at the start)
      * @throws ObjectAlreadyHasException if the group is already on this track somewhere
      * @throws IndexOutOfBoundsException if the position is less than 0 or greater than the size of the track
-     * @throws NullPointerException if the group is null
-     * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
+     * @throws NullPointerException      if the group is null
+     * @throws IllegalStateException     if the group instance was not obtained from LuckPerms.
      */
-    void insertGroup(Group group, int position) throws ObjectAlreadyHasException, IndexOutOfBoundsException;
+    void insertGroup(@Nonnull Group group, int position) throws ObjectAlreadyHasException, IndexOutOfBoundsException;
 
     /**
      * Removes a group from this track
+     *
      * @param group the group to remove
-     * @throws ObjectLacksException if the group is not on this track
-     * @throws NullPointerException if the group is null
+     * @throws ObjectLacksException  if the group is not on this track
+     * @throws NullPointerException  if the group is null
      * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
      */
-    void removeGroup(Group group) throws ObjectLacksException;
+    void removeGroup(@Nonnull Group group) throws ObjectLacksException;
 
     /**
      * Removes a group from this track
+     *
      * @param group the group to remove
      * @throws ObjectLacksException if the group is not on this track
      * @throws NullPointerException if the group is null
      */
-    void removeGroup(String group) throws ObjectLacksException;
+    void removeGroup(@Nonnull String group) throws ObjectLacksException;
 
     /**
      * Checks if a group features on this track
+     *
      * @param group the group to check
      * @return true if the group is on this track
-     * @throws NullPointerException if the group is null
+     * @throws NullPointerException  if the group is null
      * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
      */
-    boolean containsGroup(Group group);
+    boolean containsGroup(@Nonnull Group group);
 
     /**
      * Checks if a group features on this track
+     *
      * @param group the group to check
      * @return true if the group is on this track
      * @throws NullPointerException if the group is null
      */
-    boolean containsGroup(String group);
+    boolean containsGroup(@Nonnull String group);
 
     /**
-     * Clear all of the groups within this track
+     * Clear all of the groups from this track
      */
     void clearGroups();
 

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -22,26 +25,56 @@
 
 package me.lucko.luckperms.api;
 
+import javax.annotation.Nonnull;
+
 /**
- * Represents a permission value
+ * Represents a permission setting.
+ *
+ * <p>Consider a value of {@link #TRUE} to be a positive setting, {@link #FALSE} to be a "negated" setting,
+ * and a value of {@link #UNDEFINED} to be a non-existent value.</p>
  */
 public enum Tristate {
 
+    /**
+     * A value indicating a holder has a permission set.
+     */
     TRUE(true),
+
+    /**
+     * A value indicating a holder has a negated value for a permission.
+     */
     FALSE(false),
+
+    /**
+     * A value indicating a holder doesn't have a value for a permission set.
+     */
     UNDEFINED(false);
 
+    /**
+     * Converts from {@link Boolean} a boolean
+     *
+     * @param b the boolean
+     * @return {@link #TRUE} or {@link #FALSE}, depending on the value of the boolean.
+     */
+    @Nonnull
+    public static Tristate fromBoolean(boolean b) {
+        return b ? TRUE : FALSE;
+    }
+
     private final boolean booleanValue;
 
     Tristate(boolean booleanValue) {
         this.booleanValue = booleanValue;
     }
 
+    /**
+     * Returns the value of the Tristate as a boolean.
+     *
+     * <p>A value of {@link #UNDEFINED} converts to false.</p>
+     *
+     * @return a boolean representation of the Tristate.
+     */
     public boolean asBoolean() {
         return booleanValue;
     }
-
-    public static Tristate fromBoolean(boolean b) {
-        return b ? TRUE : FALSE;
-    }
 }

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -23,6 +26,7 @@
 package me.lucko.luckperms.api;
 
 import me.lucko.luckperms.api.caching.UserData;
+import me.lucko.luckperms.api.context.ContextSet;
 import me.lucko.luckperms.exceptions.ObjectAlreadyHasException;
 import me.lucko.luckperms.exceptions.ObjectLacksException;
 
@@ -30,241 +34,343 @@ import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
- * Interface for internal User instances
+ * A player holding permission data
  */
-@SuppressWarnings("unused")
 public interface User extends PermissionHolder {
 
     /**
+     * Gets the users unique ID
+     *
      * @return the users Mojang assigned unique id
      */
+    @Nonnull
     UUID getUuid();
 
     /**
-     * @return the Users Username
+     * Gets the users username, or null if no username is associated with this user
+     *
+     * @return the users username
      */
+    @Nullable
     String getName();
 
     /**
-     * Gets the users primary group
+     * Gets the users current primary group.
+     *
+     * <p>The result of this method depends on which method is configured for primary group calculation. It may not
+     * be the same as any value set through {@link #setPrimaryGroup(String)}.</p>
+     *
      * @return the users primary group
      */
+    @Nonnull
     String getPrimaryGroup();
 
     /**
-     * Sets a users primary group
+     * Sets a users primary group. This will only take effect if platform is using stored primary groups.
+     *
      * @param group the new primary group
      * @throws ObjectAlreadyHasException if the user already has this set as their primary group
-     * @throws IllegalStateException if the user is not a member of that group
-     * @throws NullPointerException if the group is null
+     * @throws IllegalStateException     if the user is not a member of that group
+     * @throws NullPointerException      if the group is null
      */
-    void setPrimaryGroup(String group) throws ObjectAlreadyHasException;
+    void setPrimaryGroup(@Nonnull String group) throws ObjectAlreadyHasException;
 
     /**
-     * Refresh and re-assign the users permissions
+     * Refresh and re-assign the users permissions.
+     *
+     * <p>This request is not buffered, and the refresh call will be ran directly. This should be called on an
+     * asynchronous thread.</p>
      */
     void refreshPermissions();
 
+    /**
+     * Gets the user's {@link UserData} cache.
+     *
+     * @return the users cached data.
+     * @since 3.2
+     */
+    @Nonnull
+    UserData getCachedData();
+
+    /**
+     * Check to see if the user is a direct member of a group
+     *
+     * @param group The group to check membership of
+     * @return true if the user is a member of the group
+     * @throws NullPointerException if the group is null
+     * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
+     */
+    boolean isInGroup(@Nonnull Group group);
+
+    /**
+     * Check to see if the user is a direct member of a group in a specific context
+     *
+     * @param group the group to check membership of
+     * @param contextSet the context set to filter by
+     * @return true if the user is a member of the group
+     * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
+     * @since 3.2
+     */
+    boolean isInGroup(@Nonnull Group group, @Nonnull ContextSet contextSet);
+
     /**
      * Gets the user's {@link UserData} cache, if they have one setup.
+     *
      * @return an optional, possibly containing the user's cached lookup data.
      * @since 2.13
+     * @deprecated in version 3.2, as this cache is now always loaded
      */
+    @Deprecated
+    @Nonnull
     Optional<UserData> getUserDataCache();
 
     /**
-     * Check to see if the user is a member of a group
-     * @param group The group to check membership of
-     * @return true if the user is a member of the group
-     * @throws NullPointerException if the group is null
+     * Pre-calculates some values in the user's data cache.
+     *
+     * <p>Is it <b>not</b> necessary to call this method before
+     * using {@link #getCachedData()}.</p>
+     *
+     * @since 2.17
      */
-    boolean isInGroup(Group group);
+    void setupDataCache();
 
     /**
      * Check to see if a user is a member of a group on a specific server
-     * @param group The group to check membership of
+     *
+     * @param group  The group to check membership of
      * @param server The server to check on
      * @return true if the user is a member of the group
-     * @throws NullPointerException if the group or server is null
+     * @throws NullPointerException     if the group or server is null
      * @throws IllegalArgumentException if the server is invalid
+     * @deprecated in favour of {@link #isInGroup(Group, ContextSet)}
      */
-    boolean isInGroup(Group group, String server);
+    @Deprecated
+    boolean isInGroup(@Nonnull Group group, @Nonnull String server);
 
     /**
      * Check to see if a user is a member of a group on a specific server and world
-     * @param group The group to check membership of
+     *
+     * @param group  The group to check membership of
      * @param server The server to check on
-     * @param world The world to check on
+     * @param world  The world to check on
      * @return true if the user is a member of the group
-     * @throws NullPointerException if the group, server or world is null
+     * @throws NullPointerException     if the group, server or world is null
      * @throws IllegalArgumentException if the server or world is invalid
+     * @deprecated in favour of {@link #isInGroup(Group, ContextSet)}
      */
-    boolean isInGroup(Group group, String server, String world);
+    @Deprecated
+    boolean isInGroup(@Nonnull Group group, @Nonnull String server, @Nonnull String world);
 
     /**
      * Add a user to a group
+     *
      * @param group The group to add the user to
      * @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.
+     * @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)}
      */
-    void addGroup(Group group) throws ObjectAlreadyHasException;
+    @Deprecated
+    void addGroup(@Nonnull Group group) throws ObjectAlreadyHasException;
 
     /**
      * Add a user to a group on a specific server
-     * @param group The group to add the user to
+     *
+     * @param group  The group to add the user to
      * @param server The server to add the group on
      * @throws ObjectAlreadyHasException if the user is already a member of the group on that server
-     * @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
+     * @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)}
      */
-    void addGroup(Group group, String server) throws ObjectAlreadyHasException;
+    @Deprecated
+    void addGroup(@Nonnull Group group, @Nonnull String server) throws ObjectAlreadyHasException;
 
     /**
      * Add a user to a group on a specific server and world
-     * @param group The group to add the user to
+     *
+     * @param group  The group to add the user to
      * @param server The server to add the group on
-     * @param world The world to add the group on
+     * @param world  The world to add the group on
      * @throws ObjectAlreadyHasException if the user is already a member of the group on that server
-     * @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
+     * @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)}
      */
-    void addGroup(Group group, String server, String world) throws ObjectAlreadyHasException;
+    @Deprecated
+    void addGroup(@Nonnull Group group, @Nonnull String server, @Nonnull String world) throws ObjectAlreadyHasException;
 
     /**
      * Add a user to a group temporarily on a specific server
-     * @param group The group to add the user to
+     *
+     * @param group    The group to add the user to
      * @param expireAt when the group should expire
      * @throws ObjectAlreadyHasException if the user is already a member of the group on that server
-     * @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
+     * @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)}
      */
-    void addGroup(Group group, long expireAt) throws ObjectAlreadyHasException;
+    @Deprecated
+    void addGroup(@Nonnull Group group, long expireAt) throws ObjectAlreadyHasException;
 
     /**
      * Add a user to a group temporarily on a specific server
-     * @param group The group to add the user to
-     * @param server The server to add the group on
+     *
+     * @param group    The group to add the user to
+     * @param server   The server to add the group on
      * @param expireAt when the group should expire
      * @throws ObjectAlreadyHasException if the user is already a member of the group on that server
-     * @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
+     * @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)}
      */
-    void addGroup(Group group, String server, long expireAt) throws ObjectAlreadyHasException;
+    @Deprecated
+    void addGroup(@Nonnull Group group, @Nonnull String server, long expireAt) throws ObjectAlreadyHasException;
 
     /**
      * Add a user to a group temporarily on a specific server and world
-     * @param group The group to add the user to
-     * @param server The server to add the group on
-     * @param world The world to add the group on
+     *
+     * @param group    The group to add the user to
+     * @param server   The server to add the group on
+     * @param world    The world to add the group on
      * @param expireAt when the group should expire
      * @throws ObjectAlreadyHasException if the user is already a member of the group on that server
-     * @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
+     * @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)}
      */
-    void addGroup(Group group, String server, String world, long expireAt) throws ObjectAlreadyHasException;
+    @Deprecated
+    void addGroup(@Nonnull Group group, @Nonnull String server, @Nonnull String world, long expireAt) throws ObjectAlreadyHasException;
 
     /**
      * Remove the user from a group
+     *
      * @param group the group to remove the user from
-     * @throws ObjectLacksException if the user isn't a member of the group
-     * @throws NullPointerException if the group is null
+     * @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)}
      */
-    void removeGroup(Group group) throws ObjectLacksException;
+    @Deprecated
+    void removeGroup(@Nonnull Group group) throws ObjectLacksException;
 
     /**
      * Remove the user from a group
-     * @param group the group to remove the user from
+     *
+     * @param group     the group to remove the user from
      * @param temporary if the group being removed is temporary
-     * @throws ObjectLacksException if the user isn't a member of the group
-     * @throws NullPointerException if the group is null
+     * @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)}
      */
-    void removeGroup(Group group, boolean temporary) throws ObjectLacksException;
+    @Deprecated
+    void removeGroup(@Nonnull Group group, boolean temporary) throws ObjectLacksException;
 
     /**
      * Remove the user from a group on a specific server
-     * @param group The group to remove the user from
+     *
+     * @param group  The group to remove the user from
      * @param server The server to remove the group on
-     * @throws ObjectLacksException if the user isn't a member of the group
-     * @throws NullPointerException if the group or server is null
-     * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
+     * @throws ObjectLacksException     if the user isn't a member of the group
+     * @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)}
      */
-    void removeGroup(Group group, String server) throws ObjectLacksException;
+    @Deprecated
+    void removeGroup(@Nonnull Group group, @Nonnull String server) throws ObjectLacksException;
 
     /**
      * Remove the user from a group on a specific server and world
-     * @param group The group to remove the user from
+     *
+     * @param group  The group to remove the user from
      * @param server The server to remove the group on
-     * @param world The world to remove the group on
-     * @throws ObjectLacksException if the user isn't a member of the group
-     * @throws NullPointerException if the group, server or world is null
-     * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
+     * @param world  The world to remove the group on
+     * @throws ObjectLacksException     if the user isn't a member of the group
+     * @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)}
      */
-    void removeGroup(Group group, String server, String world) throws ObjectLacksException;
+    @Deprecated
+    void removeGroup(@Nonnull Group group, @Nonnull String server, @Nonnull String world) throws ObjectLacksException;
 
     /**
      * Remove the user from a group on a specific server
-     * @param group The group to remove the user from
-     * @param server The server to remove the group on
+     *
+     * @param group     The group to remove the user from
+     * @param server    The server to remove the group on
      * @param temporary if the group being removed is temporary
-     * @throws ObjectLacksException if the user isn't a member of the group
-     * @throws NullPointerException if the group or server is null
-     * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
+     * @throws ObjectLacksException     if the user isn't a member of the group
+     * @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)}
      */
-    void removeGroup(Group group, String server, boolean temporary) throws ObjectLacksException;
+    @Deprecated
+    void removeGroup(@Nonnull Group group, @Nonnull String server, boolean temporary) throws ObjectLacksException;
 
     /**
      * Remove the user from a group on a specific server and world
-     * @param group The group to remove the user from
-     * @param server The server to remove the group on
-     * @param world The world to remove the group on
+     *
+     * @param group     The group to remove the user from
+     * @param server    The server to remove the group on
+     * @param world     The world to remove the group on
      * @param temporary if the group being removed is temporary
-     * @throws ObjectLacksException if the user isn't a member of the group
-     * @throws NullPointerException if the group, server or world is null
-     * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
+     * @throws ObjectLacksException     if the user isn't a member of the group
+     * @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)}
      */
-    void removeGroup(Group group, String server, String world, boolean temporary) throws ObjectLacksException;
-
-    /**
-     * Clear all of the users permission nodes
-     */
-    void clearNodes();
+    @Deprecated
+    void removeGroup(@Nonnull Group group, @Nonnull String server, @Nonnull String world, boolean temporary) throws ObjectLacksException;
 
     /**
      * Get a {@link List} of all of the groups the user is a member of, on all servers
+     *
      * @return a {@link List} of group names
+     * @deprecated in favour of just querying a users permissions
      */
+    @Deprecated
+    @Nonnull
     List<String> getGroupNames();
 
     /**
      * Get a {@link List} of the groups the user is a member of on a specific server
+     *
      * @param server the server to check
-     * @param world the world to check
+     * @param world  the world to check
      * @return a {@link List} of group names
-     * @throws NullPointerException if the server or world is null
+     * @throws NullPointerException     if the server or world is null
      * @throws IllegalArgumentException if the server or world is invalid
+     * @deprecated in favour of just querying a users permissions
      */
-    List<String> getLocalGroups(String server, String world);
+    @Deprecated
+    @Nonnull
+    List<String> getLocalGroups(@Nonnull String server, @Nonnull String world);
 
     /**
      * Get a {@link List} of the groups the user is a member of on a specific server
+     *
      * @param server the server to check
      * @return a {@link List} of group names
-     * @throws NullPointerException if the server is null
+     * @throws NullPointerException     if the server is null
      * @throws IllegalArgumentException if the server is invalid
+     * @deprecated in favour of just querying a users permissions
      */
-    List<String> getLocalGroups(String server);
+    @Deprecated
+    @Nonnull
+    List<String> getLocalGroups(@Nonnull String server);
 
 }

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -24,34 +27,39 @@ package me.lucko.luckperms.api;
 
 import java.util.UUID;
 
+import javax.annotation.Nonnull;
+
 /**
  * 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 servers
- * or mixed offline mode and online mode servers. Platforms running in offline mode generate a random 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>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>
  *
- * <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>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>
  *
- * <p> WARNING: 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>
  */
-@SuppressWarnings("unused")
 public interface UuidCache {
 
     /**
      * Gets a users internal "LuckPerms" UUID, from the one given by the server.
+     *
      * @param external the UUID assigned by the server, through Player#getUniqueId or ProxiedPlayer#getUniqueId
      * @return the corresponding internal UUID
      */
-    UUID getUUID(UUID external);
+    @Nonnull
+    UUID getUUID(@Nonnull UUID external);
 
     /**
      * Gets a users external, server assigned or Mojang assigned unique id, from the internal one used within LuckPerms.
+     *
      * @param internal the UUID used within LuckPerms, through User#getUuid
      * @return the corresponding external UUID
      */
-    UUID getExternalUUID(UUID internal);
+    @Nonnull
+    UUID getExternalUUID(@Nonnull UUID internal);
 
 }

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

@@ -0,0 +1,116 @@
+/*
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  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.caching;
+
+import com.google.common.base.Preconditions;
+
+import me.lucko.luckperms.api.Contexts;
+import me.lucko.luckperms.api.metastacking.MetaStackDefinition;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Represents the context for a meta lookup, consisting of a standard {@link Contexts} element, plus options to define how
+ * the meta stack should be constructed.
+ *
+ * @since 3.2
+ */
+public final class MetaContexts {
+
+    /**
+     * Creates a new meta contexts instance
+     *
+     * @param contexts the standard contexts for the query
+     * @param prefixStackDefinition the prefix stack definition to be used
+     * @param suffixStackDefinition the suffix stack definition to be used
+     * @return the new instance
+     */
+    public static MetaContexts of(@Nonnull Contexts contexts, @Nonnull MetaStackDefinition prefixStackDefinition, @Nonnull MetaStackDefinition suffixStackDefinition) {
+        return new MetaContexts(contexts, prefixStackDefinition, suffixStackDefinition);
+    }
+
+    private final Contexts contexts;
+    private final MetaStackDefinition prefixStackDefinition;
+    private final MetaStackDefinition suffixStackDefinition;
+
+    /**
+     * Creates a new meta contexts instance
+     *
+     * @param contexts the standard contexts for the query
+     * @param prefixStackDefinition the prefix stack definition to be used
+     * @param suffixStackDefinition the suffix stack definition to be used
+     */
+    public MetaContexts(@Nonnull Contexts contexts, @Nonnull MetaStackDefinition prefixStackDefinition, @Nonnull MetaStackDefinition suffixStackDefinition) {
+        this.contexts = Preconditions.checkNotNull(contexts, "contexts");
+        this.prefixStackDefinition = Preconditions.checkNotNull(prefixStackDefinition, "prefixStackDefinition");
+        this.suffixStackDefinition = Preconditions.checkNotNull(suffixStackDefinition, "suffixStackDefinition");
+    }
+
+    @Nonnull
+    public Contexts getContexts() {
+        return this.contexts;
+    }
+
+    @Nonnull
+    public MetaStackDefinition getPrefixStackDefinition() {
+        return this.prefixStackDefinition;
+    }
+
+    @Nonnull
+    public MetaStackDefinition getSuffixStackDefinition() {
+        return this.suffixStackDefinition;
+    }
+
+    @Override
+    @Nonnull
+    public String toString() {
+        return "MetaContexts(" +
+                "contexts=" + this.getContexts() + ", " +
+                "prefixStackDefinition=" + this.getPrefixStackDefinition() + ", " +
+                "suffixStackDefinition=" + this.getSuffixStackDefinition() +
+                ")";
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == this) return true;
+        if (!(o instanceof MetaContexts)) return false;
+        final MetaContexts other = (MetaContexts) o;
+        return this.getContexts().equals(other.getContexts()) &&
+                this.getPrefixStackDefinition().equals(other.getPrefixStackDefinition()) &&
+                this.getSuffixStackDefinition().equals(other.getSuffixStackDefinition());
+    }
+
+    @Override
+    public int hashCode() {
+        final int PRIME = 59;
+        int result = 1;
+        result = result * PRIME + this.getContexts().hashCode();
+        result = result * PRIME + this.getPrefixStackDefinition().hashCode();
+        result = result * PRIME + this.getSuffixStackDefinition().hashCode();
+        return result;
+    }
+}

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -22,43 +25,99 @@
 
 package me.lucko.luckperms.api.caching;
 
+import com.google.common.collect.ListMultimap;
+
+import me.lucko.luckperms.api.metastacking.MetaStackDefinition;
+
 import java.util.Map;
 import java.util.SortedMap;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
  * Holds cached Meta lookup data for a specific set of contexts
+ *
  * @since 2.13
  */
 public interface MetaData {
 
     /**
-     * Gets an immutable copy of the meta this user has
+     * Gets an immutable copy of the meta this user has.
+     *
+     * <p>A list multimap is used because when inherited values are included, each key can be
+     * mapped to multiple values.</p>
+     *
+     * <p>The first value to be accumulated (and used to represent the key in {@link #getMeta()} is at index 0
+     * in the list. Any additional values are stored in order of accumulation.</p>
+     *
+     * @return an immutable multimap of meta
+     * @since 3.3
+     */
+    @Nonnull
+    ListMultimap<String, String> getMetaMultimap();
+
+    /**
+     * Gets an immutable copy of the meta this user has.
+     *
+     * <p>This map is formed by taking the entries in {@link #getMetaMultimap()}, and mapping each key
+     * to the value at index 0 in the corresponding list.</p>
+     *
      * @return an immutable map of meta
      */
+    @Nonnull
     Map<String, String> getMeta();
 
     /**
-     * Gets an immutable sorted map of all of the prefixes the user has, whereby the first value is the highest priority prefix.
+     * Gets an immutable sorted map of all of the prefixes the user has, whereby the first value is the highest priority
+     * prefix.
+     *
      * @return a sorted map of prefixes
      */
+    @Nonnull
     SortedMap<Integer, String> getPrefixes();
 
     /**
-     * Gets an immutable sorted map of all of the suffixes the user has, whereby the first value is the highest priority suffix.
+     * Gets an immutable sorted map of all of the suffixes the user has, whereby the first value is the highest priority
+     * suffix.
+     *
      * @return a sorted map of suffixes
      */
+    @Nonnull
     SortedMap<Integer, String> getSuffixes();
 
     /**
      * Gets the user's highest priority prefix, or null if the user has no prefixes
+     *
      * @return a prefix string, or null
      */
+    @Nullable
     String getPrefix();
 
     /**
      * Gets the user's highest priority suffix, or null if the user has no suffixes
+     *
      * @return a suffix string, or null
      */
+    @Nullable
     String getSuffix();
 
+    /**
+     * Gets the definition used for the prefix stack
+     *
+     * @return the definition used for the prefix stack
+     * @since 3.2
+     */
+    @Nonnull
+    MetaStackDefinition getPrefixStackDefinition();
+
+    /**
+     * Gets the definition used for the suffix stack
+     *
+     * @return the definition used for the suffix stack
+     * @since 3.2
+     */
+    @Nonnull
+    MetaStackDefinition getSuffixStackDefinition();
+
 }

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -26,30 +29,38 @@ import me.lucko.luckperms.api.Tristate;
 
 import java.util.Map;
 
+import javax.annotation.Nonnull;
+
 /**
  * Holds cached Permission lookup data for a specific set of contexts
+ *
  * @since 2.13
  */
 public interface PermissionData {
 
     /**
      * Gets a permission value for the given permission node
+     *
      * @param permission the permission node
      * @return a tristate result
      * @throws NullPointerException if permission is null
      */
-    Tristate getPermissionValue(String permission);
+    @Nonnull
+    Tristate getPermissionValue(@Nonnull String permission);
 
     /**
      * Invalidates the underlying permission calculator cache.
-     * Can be called to allow for an update in defaults.
+     *
+     * <p>Can be called to allow for an update in defaults.</p>
      */
     void invalidateCache();
 
     /**
      * Gets an immutable copy of the permission map backing the permission calculator
+     *
      * @return an immutable set of permissions
      */
+    @Nonnull
     Map<String, Boolean> getImmutableBacking();
 
 }

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -26,10 +29,17 @@ import me.lucko.luckperms.api.Contexts;
 
 import java.util.Set;
 
+import javax.annotation.Nonnull;
+
 /**
  * Holds cached permission and meta lookup data for a {@link me.lucko.luckperms.api.User}.
- * 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.
+ *
+ * <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.</p>
+ *
+ * <p>For meta, both methods accepting {@link Contexts} and {@link MetaContexts} are provided. The only difference is that
+ * the latter allows you to define how the meta stack should be structured internally. Where {@link Contexts} are passed, the
+ * values from the configuration are used.</p>
  *
  * @since 2.13
  */
@@ -37,53 +47,105 @@ public interface UserData {
 
     /**
      * Gets PermissionData from the cache, given a specified context.
-     * 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
      * @throws NullPointerException if contexts is null
      */
-    PermissionData getPermissionData(Contexts contexts);
+    @Nonnull
+    PermissionData getPermissionData(@Nonnull Contexts contexts);
 
     /**
      * Gets MetaData from the cache, given a specified context.
-     * 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
+     * @throws NullPointerException if contexts is null
+     * @since 3.2
+     */
+    @Nonnull
+    MetaData getMetaData(@Nonnull MetaContexts contexts);
+
+    /**
+     * 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>
+     *
      * @param contexts the contexts to get the permission data in
      * @return a meta data instance
      * @throws NullPointerException if contexts is null
      */
-    MetaData getMetaData(Contexts contexts);
+    @Nonnull
+    MetaData getMetaData(@Nonnull Contexts contexts);
 
     /**
      * Calculates permission data, bypassing the cache.
+     *
      * @param contexts the contexts to get permission data in
      * @return a permission data instance
      * @throws NullPointerException if contexts is null
      */
-    PermissionData calculatePermissions(Contexts contexts);
+    @Nonnull
+    PermissionData calculatePermissions(@Nonnull Contexts contexts);
 
     /**
      * Calculates meta data, bypassing the cache.
+     *
+     * @param contexts the contexts to get meta data in
+     * @return a meta data instance
+     * @throws NullPointerException if contexts is null
+     * @since 3.2
+     */
+    @Nonnull
+    MetaData calculateMeta(@Nonnull MetaContexts contexts);
+
+    /**
+     * Calculates meta data, bypassing the cache.
+     *
      * @param contexts the contexts to get meta data in
      * @return a meta data instance
      * @throws NullPointerException if contexts is null
      */
-    MetaData calculateMeta(Contexts contexts);
+    @Nonnull
+    MetaData calculateMeta(@Nonnull Contexts contexts);
 
     /**
-     * Calculates permission data and stores it in the cache. If there is already data cached for the given contexts,
-     * and if the resultant output is different, the cached value is updated.
+     * 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>
+     *
      * @param contexts the contexts to recalculate in.
      * @throws NullPointerException if contexts is null
      */
-    void recalculatePermissions(Contexts contexts);
+    void recalculatePermissions(@Nonnull Contexts contexts);
 
     /**
-     * Calculates meta data and stores it in the cache. If there is already data cached for the given contexts,
-     * and if the resultant output is different, the cached value is updated.
+     * 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>
+     *
+     * @param contexts the contexts to recalculate in.
+     * @throws NullPointerException if contexts is null
+     * @since 3.2
+     */
+    void recalculateMeta(@Nonnull MetaContexts contexts);
+
+    /**
+     * 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>
+     *
      * @param contexts the contexts to recalculate in.
      * @throws NullPointerException if contexts is null
      */
-    void recalculateMeta(Contexts contexts);
+    void recalculateMeta(@Nonnull Contexts contexts);
 
     /**
      * Calls {@link #recalculatePermissions(Contexts)} for all current loaded contexts
@@ -97,22 +159,26 @@ public interface UserData {
 
     /**
      * Calls {@link #preCalculate(Contexts)} for the given contexts
+     *
      * @param contexts a set of contexts
      * @throws NullPointerException if contexts is null
      */
-    void preCalculate(Set<Contexts> contexts);
+    void preCalculate(@Nonnull Set<Contexts> contexts);
 
     /**
-     * Ensures that PermissionData and MetaData is cached for a context. If the cache does not contain any data for the
-     * context, it will be calculated and saved.
+     * 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>
+     *
      * @param contexts the contexts to pre-calculate for
      * @throws NullPointerException if contexts is null
      */
-    void preCalculate(Contexts contexts);
+    void preCalculate(@Nonnull Contexts contexts);
 
     /**
      * 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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -22,53 +25,25 @@
 
 package me.lucko.luckperms.api.context;
 
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CopyOnWriteArrayList;
+import javax.annotation.Nonnull;
 
 /**
- * A simple implementation of the listener aspects of {@link IContextCalculator}
- * @param <T> the subject type
+ * Calculates whether contexts are applicable to {@link T}
+ *
+ * @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.
-     * @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
+     * 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
      */
-    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);
-    }
+    @Nonnull
+    MutableContextSet giveApplicableContext(@Nonnull T subject, @Nonnull MutableContextSet accumulator);
 
 }

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -22,134 +25,144 @@
 
 package me.lucko.luckperms.api.context;
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Multimap;
 
-import java.util.HashSet;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
-import java.util.stream.Collectors;
+
+import javax.annotation.Nonnull;
 
 /**
- * Holds contexts.
- * All contained contexts are immutable, and unlike {@link MutableContextSet}, contexts cannot be added or removed.
+ * Holder of contexts.
+ *
+ * <p>Implementations may be either mutable or immutable.</p>
  *
  * @since 2.13
  */
-public class ContextSet {
+public interface ContextSet {
 
     /**
-     * Make a singleton ContextSet from a context pair
-     * @param key the key
+     * Creates an ImmutableContextSet from a context pair
+     *
+     * @param key   the key
      * @param value the value
-     * @return a new ContextSet containing one KV pair
+     * @return a new ImmutableContextSet containing one KV pair
      * @throws NullPointerException if key or value is null
      */
-    public static ContextSet singleton(String key, String value) {
-        if (key == null) {
-            throw new NullPointerException("key");
-        }
-        if (value == null) {
-            throw new NullPointerException("value");
-        }
-
-        MutableContextSet set = new MutableContextSet();
-        set.add(key, value);
-        return set.immutableCopy();
+    @Nonnull
+    static ImmutableContextSet singleton(@Nonnull String key, @Nonnull String value) {
+        return ImmutableContextSet.singleton(key, value);
     }
 
     /**
-     * Creates a ContextSet 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
+     */
+    @Nonnull
+    static ImmutableContextSet of(@Nonnull String key1, @Nonnull String value1, @Nonnull String key2, @Nonnull 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 ContextSet representing the pairs from the map
+     * @return a new ImmutableContextSet representing the pairs from the map
      * @throws NullPointerException if the map is null
      */
-    public static ContextSet fromMap(Map<String, String> map) {
-        if (map == null) {
-            throw new NullPointerException("map");
-        }
-
-        MutableContextSet set = new MutableContextSet();
-        set.addAll(map);
-        return set.immutableCopy();
+    @Nonnull
+    static ImmutableContextSet fromMap(@Nonnull Map<String, String> map) {
+        return ImmutableContextSet.fromMap(map);
     }
 
     /**
-     * Creates a ContextSet 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 ContextSet representing the pairs in the iterable
+     * @return a new ImmutableContextSet representing the pairs in the iterable
      * @throws NullPointerException if the iterable is null
      */
-    public static ContextSet fromEntries(Iterable<Map.Entry<String, String>> iterable) {
-        if (iterable == null) {
-            throw new NullPointerException("iterable");
-        }
-
-        MutableContextSet set = new MutableContextSet();
-        set.addAll(iterable);
-        return set.immutableCopy();
+    @Nonnull
+    static ImmutableContextSet fromEntries(@Nonnull Iterable<? extends Map.Entry<String, String>> iterable) {
+        return ImmutableContextSet.fromEntries(iterable);
     }
 
     /**
-     * Creates a new ContextSet from an existing set.
+     * Creates an ImmutableContextSet from an existing multimap
+     *
+     * @param multimap the multimap to copy from
+     * @return a new ImmutableContextSet representing the pairs in the multimap
+     * @throws NullPointerException if the multimap is null
+     * @since 2.16
+     */
+    @Nonnull
+    static ImmutableContextSet fromMultimap(@Nonnull Multimap<String, String> multimap) {
+        return ImmutableContextSet.fromMultimap(multimap);
+    }
+
+    /**
+     * 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
-     * @return a new ContextSet with the same content and the one provided
+     * @return a new ImmutableContextSet with the same content and the one provided
      * @throws NullPointerException if contextSet is null
      */
-    public static ContextSet fromSet(ContextSet contextSet) {
-        if (contextSet == null) {
-            throw new NullPointerException("contextSet");
-        }
-
-        MutableContextSet set = new MutableContextSet();
-        set.addAll(contextSet.toSet());
-        return set.immutableCopy();
+    @Nonnull
+    static ImmutableContextSet fromSet(@Nonnull ContextSet contextSet) {
+        return ImmutableContextSet.fromSet(contextSet);
     }
 
     /**
-     * Creates a new empty ContextSet.
-     * @return a new ContextSet
+     * Creates a new empty ImmutableContextSet.
+     *
+     * @return a new ImmutableContextSet
      */
-    public static ContextSet empty() {
-        return new ContextSet();
-    }
-
-    final Set<Map.Entry<String, String>> contexts;
-
-    public ContextSet() {
-        this.contexts = new HashSet<>();
-    }
-
-    protected ContextSet(Set<Map.Entry<String, String>> contexts) {
-        this.contexts = contexts;
+    @Nonnull
+    static ImmutableContextSet empty() {
+        return ImmutableContextSet.empty();
     }
 
     /**
      * Check to see if this set is in an immutable form
+     *
      * @return true if the set is immutable
      */
-    public boolean isImmutable() {
-        return true;
-    }
+    boolean isImmutable();
 
     /**
      * If the set is mutable, this method will return an immutable copy. Otherwise just returns itself.
+     *
      * @return an immutable ContextSet
      */
-    public ContextSet makeImmutable() {
-        return this;
-    }
+    @Nonnull
+    ImmutableContextSet makeImmutable();
+
+    /**
+     * Creates a mutable copy of this set.
+     *
+     * @return a mutable ContextSet
+     * @since 2.16
+     */
+    @Nonnull
+    MutableContextSet mutableCopy();
 
     /**
      * Converts this ContextSet to an immutable {@link Set} of {@link Map.Entry}s.
+     *
      * @return an immutable set
      */
-    public Set<Map.Entry<String, String>> toSet() {
-        synchronized (contexts) {
-            return ImmutableSet.copyOf(contexts);
-        }
-    }
+    @Nonnull
+    Set<Map.Entry<String, String>> toSet();
 
     /**
      * Converts this ContextSet to an immutable {@link Map}
@@ -159,153 +172,111 @@ public class ContextSet {
      *
      * @return an immutable map
      */
-    public Map<String, String> toMap() {
-        synchronized (contexts) {
-            return ImmutableMap.copyOf(contexts.stream().collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)));
-        }
-    }
+    @Nonnull
+    Map<String, String> toMap();
+
+    /**
+     * Converts this ContextSet to an immutable {@link Multimap}
+     *
+     * @return a multimap
+     * @since 2.16
+     */
+    @Nonnull
+    Multimap<String, String> toMultimap();
 
     /**
      * Check if the set contains at least one value for the given key.
+     *
      * @param key the key to check for
      * @return true if the set contains a value for the key
      * @throws NullPointerException if the key is null
      */
-    public boolean containsKey(String key) {
-        if (key == null) {
-            throw new NullPointerException("key");
-        }
-
-        synchronized (contexts) {
-            for (Map.Entry<String, String> e : contexts) {
-                if (e.getKey().equalsIgnoreCase(key)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
+    boolean containsKey(@Nonnull String key);
 
     /**
      * Gets a set of all of the values mapped to the given key
+     *
      * @param key the key to find values for
      * @return a set of values
      * @throws NullPointerException if the key is null
      */
-    public Set<String> getValues(String key) {
-        if (key == null) {
-            throw new NullPointerException("key");
-        }
+    @Nonnull
+    Set<String> getValues(@Nonnull String key);
 
-        synchronized (contexts) {
-            return ImmutableSet.copyOf(contexts.stream()
-                    .filter(e -> e.getKey().equalsIgnoreCase(key))
-                    .map(Map.Entry::getValue)
-                    .collect(Collectors.toSet())
-            );
-        }
+    /**
+     * 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
+     */
+    @Nonnull
+    default Optional<String> getAnyValue(@Nonnull String key) {
+        return getValues(key).stream().findAny();
     }
 
     /**
      * Check if thr set contains a given key mapped to a given value
-     * @param key the key to look for
+     *
+     * @param key   the key to look for
      * @param value the value to look for (case sensitive)
      * @return true if the set contains the KV pair
      * @throws NullPointerException if the key or value is null
      */
-    public boolean has(String key, String value) {
-        if (key == null) {
-            throw new NullPointerException("key");
-        }
-        if (value == null) {
-            throw new NullPointerException("value");
-        }
-
-        synchronized (contexts) {
-            for (Map.Entry<String, String> e : contexts) {
-                if (!e.getKey().equalsIgnoreCase(key)) {
-                    continue;
-                }
-
-                if (!e.getValue().equals(value)) {
-                    continue;
-                }
-
-                return true;
-            }
-        }
-        return false;
-    }
+    boolean has(@Nonnull String key, @Nonnull String value);
 
     /**
      * Same as {@link #has(String, String)}, except ignores the case of the value.
-     * @param key the key to look for
+     *
+     * @param key   the key to look for
      * @param value the value to look for
      * @return true if the set contains the KV pair
      * @throws NullPointerException if the key or value is null
      */
-    public boolean hasIgnoreCase(String key, String value) {
-        if (key == null) {
-            throw new NullPointerException("key");
-        }
-        if (value == null) {
-            throw new NullPointerException("value");
-        }
+    boolean hasIgnoreCase(@Nonnull String key, @Nonnull String value);
 
-        synchronized (contexts) {
-            for (Map.Entry<String, String> e : contexts) {
-                if (!e.getKey().equalsIgnoreCase(key)) {
-                    continue;
+    /**
+     * 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(@Nonnull ContextSet other) {
+        Preconditions.checkNotNull(other, "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;
                 }
-
-                if (!e.getValue().equalsIgnoreCase(value)) {
-                    continue;
-                }
-
-                return true;
             }
+
+            return true;
         }
-        return false;
     }
 
     /**
      * Check if the set is empty
+     *
      * @return true if the set is empty
      */
-    public boolean isEmpty() {
-        synchronized (contexts) {
-            return contexts.isEmpty();
-        }
-    }
+    boolean isEmpty();
 
     /**
      * Gets the number of key-value context pairs in the set
+     *
      * @return the size of the set
      */
-    public int size() {
-        synchronized (contexts) {
-            return contexts.size();
-        }
-    }
+    int size();
 
-    @Override
-    public boolean equals(Object o) {
-        if (o == this) return true;
-        if (!(o instanceof ContextSet)) return false;
-        final ContextSet other = (ContextSet) o;
-
-        final Object thisContexts = this.contexts;
-        final Object otherContexts = other.contexts;
-        return thisContexts == null ? otherContexts == null : thisContexts.equals(otherContexts);
-    }
-
-    @Override
-    public int hashCode() {
-        return 59 + (this.contexts == null ? 43 : this.contexts.hashCode());
-    }
-
-    @Override
-    public String toString() {
-        return "ContextSet(contexts=" + this.contexts + ")";
-    }
 }

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

@@ -1,88 +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.HashMap;
-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
-     * @deprecated in favour of {@link #giveApplicableContext(Object, MutableContextSet)}. Older implementations of this interface
-     * will still work, as the replacement method is given as a default, and falls back to using this method.
-     */
-    @Deprecated
-    default Map<String, String> giveApplicableContext(T subject, Map<String, String> accumulator) {
-        MutableContextSet acc = new MutableContextSet();
-        giveApplicableContext(subject, acc);
-
-        accumulator.putAll(acc.toMap());
-        return accumulator;
-    }
-
-    /**
-     * Gives the subject all of the applicable contexts they meet
-     *
-     * <p><b>You MUST implement this method. The default is only provided for backwards compatibility with
-     * {@link #giveApplicableContext(Object, Map)}.</b>
-     *
-     * @param subject the subject to add contexts to
-     * @param accumulator a map of contexts to add to
-     * @return the map
-     * @since 2.13
-     */
-    @SuppressWarnings("deprecation")
-    default MutableContextSet giveApplicableContext(T subject, MutableContextSet accumulator) {
-        Map<String, String> acc = new HashMap<>();
-        giveApplicableContext(subject, acc);
-
-        accumulator.addAll(acc.entrySet());
-        return 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

@@ -0,0 +1,267 @@
+/*
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  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 com.google.common.base.Preconditions;
+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.SetMultimap;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+
+import javax.annotation.Nonnull;
+
+/**
+ * An immutable implementation of {@link ContextSet}.
+ *
+ * @since 2.16
+ */
+public final class ImmutableContextSet implements ContextSet {
+    private static final ImmutableContextSet EMPTY = new ImmutableContextSet(ImmutableSetMultimap.of());
+
+    /**
+     * Creates an ImmutableContextSet from a context pair
+     *
+     * @param key   the key
+     * @param value the value
+     * @return a new ImmutableContextSet containing one KV pair
+     * @throws NullPointerException if key or value is null
+     */
+    @Nonnull
+    public static ImmutableContextSet singleton(@Nonnull String key, @Nonnull String value) {
+        Preconditions.checkNotNull(key, "key");
+        Preconditions.checkNotNull(value, "value");
+        return new ImmutableContextSet(ImmutableSetMultimap.of(key.toLowerCase(), value));
+    }
+
+    /**
+     * 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
+     */
+    @Nonnull
+    public static ImmutableContextSet of(@Nonnull String key1, @Nonnull String value1, @Nonnull String key2, @Nonnull String value2) {
+        Preconditions.checkNotNull(key1, "key1");
+        Preconditions.checkNotNull(value1, "value1");
+        Preconditions.checkNotNull(key2, "key2");
+        Preconditions.checkNotNull(value2, "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
+     * @throws NullPointerException if the map is null
+     */
+    @Nonnull
+    public static ImmutableContextSet fromMap(@Nonnull Map<String, String> map) {
+        Preconditions.checkNotNull(map, "map");
+
+        ImmutableSetMultimap.Builder<String, String> b = ImmutableSetMultimap.builder();
+        for (Map.Entry<String, String> e : map.entrySet()) {
+            b.put(e.getKey().toLowerCase(), e.getValue());
+        }
+
+        return new ImmutableContextSet(b.build());
+    }
+
+    /**
+     * 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
+     * @throws NullPointerException if the iterable is null
+     */
+    @Nonnull
+    public static ImmutableContextSet fromEntries(@Nonnull Iterable<? extends Map.Entry<String, String>> iterable) {
+        Preconditions.checkNotNull(iterable, "iterable");
+        return MutableContextSet.fromEntries(iterable).makeImmutable();
+    }
+
+    /**
+     * Creates an ImmutableContextSet from an existing multimap
+     *
+     * @param multimap the multimap to copy from
+     * @return a new ImmutableContextSet representing the pairs in the multimap
+     * @throws NullPointerException if the multimap is null
+     */
+    @Nonnull
+    public static ImmutableContextSet fromMultimap(@Nonnull Multimap<String, String> multimap) {
+        Preconditions.checkNotNull(multimap, "multimap");
+        return MutableContextSet.fromMultimap(multimap).makeImmutable();
+    }
+
+    /**
+     * Creates a new ImmutableContextSet from an existing set.
+     * Only really useful for converting between mutable and immutable types.
+     *
+     * @param contextSet the context set to copy from
+     * @return a new ImmutableContextSet with the same content and the one provided
+     * @throws NullPointerException if contextSet is null
+     */
+    @Nonnull
+    public static ImmutableContextSet fromSet(@Nonnull ContextSet contextSet) {
+        return Preconditions.checkNotNull(contextSet, "contextSet").makeImmutable();
+    }
+
+    /**
+     * Creates an new empty ContextSet.
+     *
+     * @return a new ContextSet
+     */
+    @Nonnull
+    public static ImmutableContextSet empty() {
+        return EMPTY;
+    }
+
+    private final SetMultimap<String, String> map;
+
+    ImmutableContextSet(Multimap<String, String> contexts) {
+        this.map = ImmutableSetMultimap.copyOf(contexts);
+    }
+
+    @Override
+    public boolean isImmutable() {
+        return true;
+    }
+
+    @Override
+    @Deprecated // This set is already immutable!
+    @Nonnull
+    public ImmutableContextSet makeImmutable() {
+        return this;
+    }
+
+    @Override
+    @Nonnull
+    public MutableContextSet mutableCopy() {
+        return MutableContextSet.fromSet(this);
+    }
+
+    @Override
+    @Nonnull
+    public Set<Map.Entry<String, String>> toSet() {
+        return ImmutableSet.copyOf(map.entries());
+    }
+
+    @Override
+    @Nonnull
+    public Map<String, String> toMap() {
+        ImmutableMap.Builder<String, String> m = ImmutableMap.builder();
+        for (Map.Entry<String, String> e : map.entries()) {
+            m.put(e.getKey(), e.getValue());
+        }
+
+        return m.build();
+    }
+
+    @Override
+    @Nonnull
+    public Multimap<String, String> toMultimap() {
+        return map;
+    }
+
+    @Override
+    public boolean containsKey(@Nonnull String key) {
+        Preconditions.checkNotNull(key, "key");
+        return map.containsKey(key);
+    }
+
+    @Override
+    public Set<String> getValues(@Nonnull String key) {
+        Preconditions.checkNotNull(key, "key");
+        Collection<String> c = map.get(key);
+        return c != null && !c.isEmpty() ? ImmutableSet.copyOf(c) : ImmutableSet.of();
+    }
+
+    @Override
+    public boolean has(@Nonnull String key, @Nonnull String value) {
+        Preconditions.checkNotNull(key, "key");
+        Preconditions.checkNotNull(value, "value");
+        return map.containsEntry(key, value);
+    }
+
+    @Override
+    public boolean hasIgnoreCase(@Nonnull String key, @Nonnull String value) {
+        Preconditions.checkNotNull(key, "key");
+        Preconditions.checkNotNull(value, "value");
+
+        Collection<String> c = map.get(key);
+        if (c == null || c.isEmpty()) {
+            return false;
+        }
+
+        for (String val : c) {
+            if (val.equalsIgnoreCase(value)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return map.isEmpty();
+    }
+
+    @Override
+    public int size() {
+        return map.size();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == this) return true;
+        if (!(o instanceof ContextSet)) return false;
+        final ContextSet other = (ContextSet) o;
+
+        final Multimap<String, String> thisContexts = this.toMultimap();
+        final Multimap<String, String> otherContexts = other.toMultimap();
+        return thisContexts.equals(otherContexts);
+    }
+
+    @Override
+    public int hashCode() {
+        return 59 + (this.map == null ? 43 : this.map.hashCode());
+    }
+
+    @Override
+    public String toString() {
+        return "ImmutableContextSet(contexts=" + this.map + ")";
+    }
+}

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -22,39 +25,77 @@
 
 package me.lucko.luckperms.api.context;
 
-import com.google.common.collect.Maps;
+import com.google.common.base.Preconditions;
+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.HashSet;
+import java.util.Collection;
 import java.util.Map;
+import java.util.Set;
+
+import javax.annotation.Nonnull;
 
 /**
- * Holds contexts
- * All contained contexts are immutable, but contexts can be added or removed from the set.
+ * A mutable implementation of {@link ContextSet}.
  *
- * @since 2.13
+ * @since 2.16
  */
-public class MutableContextSet extends ContextSet {
+public final class MutableContextSet implements ContextSet {
 
     /**
      * Make a singleton MutableContextSet from a context pair
-     * @param key the key
+     *
+     * @param key   the key
      * @param value the value
      * @return a new MutableContextSet containing one KV pair
      * @throws NullPointerException if key or value is null
      */
-    public static MutableContextSet singleton(String key, String value) {
+    @Nonnull
+    public static MutableContextSet singleton(@Nonnull String key, @Nonnull String value) {
+        Preconditions.checkNotNull(key, "key");
+        Preconditions.checkNotNull(value, "value");
         MutableContextSet set = new MutableContextSet();
         set.add(key, value);
         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
+     */
+    @Nonnull
+    public static MutableContextSet of(@Nonnull String key1, @Nonnull String value1, @Nonnull String key2, @Nonnull String value2) {
+        Preconditions.checkNotNull(key1, "key1");
+        Preconditions.checkNotNull(value1, "value1");
+        Preconditions.checkNotNull(key2, "key2");
+        Preconditions.checkNotNull(value2, "value2");
+        MutableContextSet ret = singleton(key1, value1);
+        ret.add(key2, value2);
+        return ret;
+    }
+
     /**
      * Creates a MutableContextSet from an existing map
+     *
      * @param map the map to copy from
      * @return a new MutableContextSet representing the pairs from the map
      * @throws NullPointerException if the map is null
      */
-    public static MutableContextSet fromMap(Map<String, String> map) {
+    @Nonnull
+    public static MutableContextSet fromMap(@Nonnull Map<String, String> map) {
+        Preconditions.checkNotNull(map, "map");
         MutableContextSet set = new MutableContextSet();
         set.addAll(map);
         return set;
@@ -62,24 +103,43 @@ public class MutableContextSet extends ContextSet {
 
     /**
      * Creates a MutableContextSet from an existing iterable of Map Entries
+     *
      * @param iterable the iterable to copy from
      * @return a new MutableContextSet representing the pairs in the iterable
      * @throws NullPointerException if the iterable is null
      */
-    public static MutableContextSet fromEntries(Iterable<Map.Entry<String, String>> iterable) {
+    @Nonnull
+    public static MutableContextSet fromEntries(@Nonnull Iterable<? extends Map.Entry<String, String>> iterable) {
+        Preconditions.checkNotNull(iterable, "iterable");
         MutableContextSet set = new MutableContextSet();
         set.addAll(iterable);
         return set;
     }
 
+    /**
+     * Creates a MutableContextSet from an existing multimap
+     *
+     * @param multimap the multimap to copy from
+     * @return a new MutableContextSet representing the pairs in the multimap
+     * @throws NullPointerException if the multimap is null
+     */
+    @Nonnull
+    public static MutableContextSet fromMultimap(@Nonnull Multimap<String, String> multimap) {
+        Preconditions.checkNotNull(multimap, "multimap");
+        return fromEntries(multimap.entries());
+    }
+
     /**
      * Creates a new MutableContextSet from an existing set.
      * Only really useful for converting between mutable and immutable types.
+     *
      * @param contextSet the context set to copy from
      * @return a new MutableContextSet with the same content and the one provided
      * @throws NullPointerException if contextSet is null
      */
-    public static MutableContextSet fromSet(ContextSet contextSet) {
+    @Nonnull
+    public static MutableContextSet fromSet(@Nonnull ContextSet contextSet) {
+        Preconditions.checkNotNull(contextSet, "contextSet");
         MutableContextSet set = new MutableContextSet();
         set.addAll(contextSet.toSet());
         return set;
@@ -87,35 +147,126 @@ public class MutableContextSet extends ContextSet {
 
     /**
      * Creates a new empty MutableContextSet.
+     *
      * @return a new MutableContextSet
      */
-    public static MutableContextSet empty() {
+    @Nonnull
+    public static MutableContextSet create() {
         return new MutableContextSet();
     }
 
+    private final SetMultimap<String, String> map;
+
+    public MutableContextSet() {
+        this.map = Multimaps.synchronizedSetMultimap(HashMultimap.create());
+    }
+
+    private MutableContextSet(Multimap<String, String> contexts) {
+        this.map = Multimaps.synchronizedSetMultimap(HashMultimap.create(contexts));
+    }
+
     @Override
     public boolean isImmutable() {
         return false;
     }
 
     @Override
-    public ContextSet makeImmutable() {
-        return immutableCopy();
+    public ImmutableContextSet makeImmutable() {
+        return new ImmutableContextSet(map);
     }
 
-    /**
-     * Returns an immutable copy of this set.
-     * @return an immutable copy of this set
-     */
-    public ContextSet immutableCopy() {
-        synchronized (contexts) {
-            return new ContextSet(new HashSet<>(contexts));
+    @Override
+    public MutableContextSet mutableCopy() {
+        return new MutableContextSet(map);
+    }
+
+    @Override
+    public Set<Map.Entry<String, String>> toSet() {
+        return ImmutableSet.copyOf(map.entries());
+    }
+
+    @Override
+    public Map<String, String> toMap() {
+        ImmutableMap.Builder<String, String> m = ImmutableMap.builder();
+        for (Map.Entry<String, String> e : map.entries()) {
+            m.put(e.getKey(), e.getValue());
         }
+
+        return m.build();
+    }
+
+    @Override
+    public Multimap<String, String> toMultimap() {
+        return ImmutableSetMultimap.copyOf(map);
+    }
+
+    @Override
+    public boolean containsKey(String key) {
+        if (key == null) {
+            throw new NullPointerException("key");
+        }
+
+        return map.containsKey(key);
+    }
+
+    @Override
+    public Set<String> getValues(String key) {
+        if (key == null) {
+            throw new NullPointerException("key");
+        }
+
+        Collection<String> c = map.get(key);
+        return c != null && !c.isEmpty() ? ImmutableSet.copyOf(c) : ImmutableSet.of();
+    }
+
+    @Override
+    public boolean has(String key, String value) {
+        if (key == null) {
+            throw new NullPointerException("key");
+        }
+        if (value == null) {
+            throw new NullPointerException("value");
+        }
+
+        return map.containsEntry(key, value);
+    }
+
+    @Override
+    public boolean hasIgnoreCase(String key, String value) {
+        if (key == null) {
+            throw new NullPointerException("key");
+        }
+        if (value == null) {
+            throw new NullPointerException("value");
+        }
+
+        Collection<String> c = map.get(key);
+        if (c == null || c.isEmpty()) {
+            return false;
+        }
+
+        for (String val : c) {
+            if (val.equalsIgnoreCase(value)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return map.isEmpty();
+    }
+
+    @Override
+    public int size() {
+        return map.size();
     }
 
     /**
      * Adds a new key value pair to the set
-     * @param key the key to add
+     *
+     * @param key   the key to add
      * @param value the value to add
      * @throws NullPointerException if the key or value is null
      */
@@ -127,13 +278,12 @@ public class MutableContextSet extends ContextSet {
             throw new NullPointerException("value");
         }
 
-        synchronized (contexts) {
-            contexts.add(Maps.immutableEntry(key, value));
-        }
+        map.put(key.toLowerCase(), value);
     }
 
     /**
      * Adds a new key value pair to the set
+     *
      * @param entry the entry to add
      * @throws NullPointerException if the entry is null
      */
@@ -142,42 +292,41 @@ public class MutableContextSet extends ContextSet {
             throw new NullPointerException("context");
         }
 
-        synchronized (contexts) {
-            contexts.add(Maps.immutableEntry(entry.getKey(), entry.getValue()));
-        }
+        map.put(entry.getKey().toLowerCase(), entry.getValue());
     }
 
     /**
      * Adds an iterable containing contexts to the set
+     *
      * @param iterable an iterable of key value context pairs
      * @throws NullPointerException if iterable is null
      */
-    public void addAll(Iterable<Map.Entry<String, String>> iterable) {
+    public void addAll(Iterable<? extends Map.Entry<String, String>> iterable) {
         if (iterable == null) {
-            throw new NullPointerException("contexts");
+            throw new NullPointerException("iterable");
         }
 
-        synchronized (this.contexts) {
-            for (Map.Entry<String, String> e : iterable) {
-                this.contexts.add(Maps.immutableEntry(e.getKey(), e.getValue()));
-            }
+        for (Map.Entry<String, String> e : iterable) {
+            this.map.put(e.getKey().toLowerCase(), e.getValue());
         }
     }
 
     /**
      * Adds the entry set of a map to the set
+     *
      * @param map the map to add from
      * @throws NullPointerException if the map is null
      */
     public void addAll(Map<String, String> map) {
         if (map == null) {
-            throw new NullPointerException("contexts");
+            throw new NullPointerException("map");
         }
         addAll(map.entrySet());
     }
 
     /**
      * Adds of of the values in another ContextSet to this set
+     *
      * @param contextSet the set to add from
      * @throws NullPointerException if the contextSet is null
      */
@@ -186,14 +335,13 @@ public class MutableContextSet extends ContextSet {
             throw new NullPointerException("contextSet");
         }
 
-        synchronized (this.contexts) {
-            this.contexts.addAll(contextSet.toSet());
-        }
+        this.map.putAll(contextSet.toMultimap());
     }
 
     /**
      * Remove a key value pair from this set
-     * @param key the key to remove
+     *
+     * @param key   the key to remove
      * @param value the value to remove (case sensitive)
      * @throws NullPointerException if the key or value is null
      */
@@ -205,14 +353,13 @@ public class MutableContextSet extends ContextSet {
             throw new NullPointerException("value");
         }
 
-        synchronized (contexts) {
-            contexts.removeIf(e -> e.getKey().equalsIgnoreCase(key) && e.getValue().equals(value));
-        }
+        map.entries().removeIf(entry -> entry.getKey().equals(key) && entry.getValue().equals(value));
     }
 
     /**
      * Same as {@link #remove(String, String)}, except ignores the case of the value
-     * @param key the key to remove
+     *
+     * @param key   the key to remove
      * @param value the value to remove
      * @throws NullPointerException if the key or value is null
      */
@@ -224,13 +371,12 @@ public class MutableContextSet extends ContextSet {
             throw new NullPointerException("value");
         }
 
-        synchronized (contexts) {
-            contexts.removeIf(e -> e.getKey().equalsIgnoreCase(key) && e.getValue().equalsIgnoreCase(value));
-        }
+        map.entries().removeIf(e -> e.getKey().equalsIgnoreCase(key) && e.getValue().equalsIgnoreCase(value));
     }
 
     /**
      * Removes all pairs with the given key
+     *
      * @param key the key to remove
      * @throws NullPointerException if the key is null
      */
@@ -239,18 +385,14 @@ public class MutableContextSet extends ContextSet {
             throw new NullPointerException("key");
         }
 
-        synchronized (contexts) {
-            contexts.removeIf(e -> e.getKey().equalsIgnoreCase(key));
-        }
+        map.removeAll(key.toLowerCase());
     }
 
     /**
      * Clears the set
      */
     public void clear() {
-        synchronized (contexts) {
-            contexts.clear();
-        }
+        map.clear();
     }
 
     @Override
@@ -259,14 +401,18 @@ public class MutableContextSet extends ContextSet {
         if (!(o instanceof ContextSet)) return false;
         final ContextSet other = (ContextSet) o;
 
-        final Object thisContexts = this.contexts;
-        final Object otherContexts = other.contexts;
+        final Multimap<String, String> thisContexts = this.toMultimap();
+        final Multimap<String, String> otherContexts = other.toMultimap();
         return thisContexts == null ? otherContexts == null : thisContexts.equals(otherContexts);
     }
 
     @Override
     public int hashCode() {
-        return 59 + (this.contexts == null ? 43 : this.contexts.hashCode());
+        return 59 + (this.map == null ? 43 : this.map.hashCode());
     }
 
+    @Override
+    public String toString() {
+        return "MutableContextSet(contexts=" + this.map + ")";
+    }
 }

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

@@ -1,73 +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> {
-
-    /**
-     * Called when the operation completes.
-     * @param t the return value, may be null
-     */
-    void onComplete(T 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;
-    }
-
-}

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -22,16 +25,24 @@
 
 package me.lucko.luckperms.api.data;
 
+import javax.annotation.Nullable;
+
 /**
  * Represents the data section of the main LuckPerms configuration.
  * All methods could return null.
  */
-@SuppressWarnings("deprecation")
-public interface DatastoreConfiguration extends MySQLConfiguration {
+public interface DatastoreConfiguration {
 
+    @Nullable
     String getAddress();
+
+    @Nullable
     String getDatabase();
+
+    @Nullable
     String getUsername();
+
+    @Nullable
     String getPassword();
 
 }

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

@@ -1,57 +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;
-
-import me.lucko.luckperms.api.PermissionHolder;
-
-import java.util.Optional;
-
-public class AbstractPermissionAddEvent extends TargetedEvent<PermissionHolder> {
-
-    private final String server;
-    private final String world;
-    private final long expiry;
-
-    protected AbstractPermissionAddEvent(String eventName, PermissionHolder target, String server, String world, long expiry) {
-        super(eventName, target);
-        this.server = server;
-        this.world = world;
-        this.expiry = expiry;
-    }
-
-    public Optional<String> getServer() {
-        return Optional.ofNullable(server);
-    }
-
-    public Optional<String> getWorld() {
-        return Optional.ofNullable(world);
-    }
-
-    public boolean isTemporary() {
-        return expiry != 0L;
-    }
-
-    public long getExpiry() {
-        return expiry;
-    }
-}

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

@@ -0,0 +1,45 @@
+/*
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  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;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Represents an event that can be cancelled
+ */
+public interface Cancellable {
+
+    /**
+     * Gets an {@link AtomicBoolean} holding the cancellation state of the event
+     *
+     * @return the cancellation
+     */
+    @Nonnull
+    AtomicBoolean getCancellationState();
+
+}

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -22,41 +25,37 @@
 
 package me.lucko.luckperms.api.event;
 
-import me.lucko.luckperms.api.PermissionHolder;
+import java.util.Set;
+import java.util.function.Consumer;
 
-import java.util.Optional;
+import javax.annotation.Nonnull;
 
-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);
-    }
+/**
+ * The LuckPerms event bus. Used for subscribing (or registering listeners) to events.
+ *
+ * @since 3.0
+ */
+public interface EventBus {
 
     /**
-     * @deprecated use {@link #isTemporary()}
+     * 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
      */
-    @Deprecated
-    public boolean getTemporary() {
-        return temporary;
-    }
+    @Nonnull
+    <T extends LuckPermsEvent> EventHandler<T> subscribe(@Nonnull Class<T> eventClass, @Nonnull Consumer<T> handler);
 
-    public boolean isTemporary() {
-        return temporary;
-    }
+    /**
+     * 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
+     */
+    @Nonnull
+    <T extends LuckPermsEvent> Set<EventHandler<T>> getHandlers(@Nonnull Class<T> eventClass);
 
 }

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

@@ -0,0 +1,76 @@
+/*
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  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;
+
+import java.util.function.Consumer;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Represents a handler for a LuckPerms event
+ *
+ * @param <T> the event class
+ */
+public interface EventHandler<T extends LuckPermsEvent> {
+
+    /**
+     * Gets the class this handler is listening to
+     *
+     * @return the event class
+     */
+    @Nonnull
+    Class<T> getEventClass();
+
+    /**
+     * 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
+     */
+    @Nonnull
+    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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -22,22 +25,23 @@
 
 package me.lucko.luckperms.api.event;
 
+import me.lucko.luckperms.api.LuckPermsApi;
+
+import javax.annotation.Nonnull;
+
 /**
- * Event that allows listeners to set the cancelled state of an event.
+ * The base event interface
+ *
+ * @since 3.0
  */
-public abstract class CancellableEvent extends LPEvent {
+public interface LuckPermsEvent {
 
-    private boolean cancelled = false;
+    /**
+     * Get the API instance this event was dispatched from
+     *
+     * @return the api instance
+     */
+    @Nonnull
+    LuckPermsApi getApi();
 
-    protected CancellableEvent(String eventName) {
-        super(eventName);
-    }
-
-    public boolean isCancelled() {
-        return cancelled;
-    }
-
-    public void setCancelled(boolean cancelled) {
-        this.cancelled = cancelled;
-    }
 }

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

@@ -0,0 +1,48 @@
+/*
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  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,48 @@
+/*
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  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/PermissionNodeExpireEvent.java

@@ -1,37 +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.Node;
-import me.lucko.luckperms.api.PermissionHolder;
-import me.lucko.luckperms.api.event.AbstractPermissionEvent;
-
-/**
- * Called when a temporary permission node expires
- * @since 2.6
- */
-public class PermissionNodeExpireEvent extends AbstractPermissionEvent {
-    public PermissionNodeExpireEvent(PermissionHolder target, Node node) {
-        super("Permission Node Expire Event", target, node);
-    }
-}

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

@@ -1,58 +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.AbstractPermissionAddEvent;
-
-import java.util.AbstractMap;
-import java.util.Map;
-
-/**
- * Called whenever a user or group has a permission set.
- * @deprecated in favour of {@link PermissionNodeSetEvent}
- */
-@Deprecated
-public class PermissionSetEvent extends AbstractPermissionAddEvent {
-
-    private final String node;
-    private final boolean value;
-
-    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;
-        this.value = value;
-    }
-
-    public String getNode() {
-        return node;
-    }
-
-    public boolean getValue() {
-        return value;
-    }
-
-    public Map.Entry<String, Boolean> getEntry() {
-        return new AbstractMap.SimpleEntry<>(node, value);
-    }
-}

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

@@ -1,45 +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,55 @@
+/*
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  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;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Called when a group is created
+ */
+public interface GroupCreateEvent extends LuckPermsEvent {
+
+    /**
+     * Gets the new group
+     *
+     * @return the new group
+     */
+    @Nonnull
+    Group getGroup();
+
+    /**
+     * Gets the cause of the creation
+     *
+     * @return the cause of the creation
+     */
+    @Nonnull
+    CreationCause getCause();
+
+}

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

@@ -0,0 +1,65 @@
+/*
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  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.Node;
+import me.lucko.luckperms.api.event.LuckPermsEvent;
+import me.lucko.luckperms.api.event.cause.DeletionCause;
+
+import java.util.Set;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Called when a group is deleted
+ */
+public interface GroupDeleteEvent extends LuckPermsEvent {
+
+    /**
+     * Gets the name of the deleted group
+     *
+     * @return the name of the deleted group
+     */
+    @Nonnull
+    String getGroupName();
+
+    /**
+     * Gets an immutable copy of the groups existing data
+     *
+     * @return a copy of the groups existing data
+     */
+    @Nonnull
+    Set<Node> getExistingData();
+
+    /**
+     * Gets the cause of the deletion
+     *
+     * @return the cause of the deletion
+     */
+    @Nonnull
+    DeletionCause getCause();
+
+}

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -20,22 +23,15 @@
  *  SOFTWARE.
  */
 
-package me.lucko.luckperms.api.event;
+package me.lucko.luckperms.api.event.group;
+
+import me.lucko.luckperms.api.event.LuckPermsEvent;
 
 /**
- * Represents an event acting upon a target
- * @param <T> the target type
+ * Called when all groups have been loaded in from storage.
+ *
+ * <p>Usually only called on startup and in sync tasks.</p>
  */
-public class TargetedEvent<T> extends LPEvent {
+public interface GroupLoadAllEvent extends LuckPermsEvent {
 
-    private final T target;
-
-    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/group/GroupLoadEvent.java

@@ -0,0 +1,48 @@
+/*
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  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 javax.annotation.Nonnull;
+
+/**
+ * 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
+     */
+    @Nonnull
+    Group getGroup();
+
+}

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

@@ -0,0 +1,47 @@
+/*
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  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;
+
+import javax.annotation.Nonnull;
+
+/**
+ * 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
+     */
+    @Nonnull
+    LogEntry getEntry();
+
+}

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

@@ -0,0 +1,47 @@
+/*
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  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;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Called when a log is about to be published to the storage file/table
+ */
+public interface LogPublishEvent extends LuckPermsEvent, Cancellable {
+
+    /**
+     * Gets the log entry to be published
+     *
+     * @return the log entry to be published
+     */
+    @Nonnull
+    LogEntry getEntry();
+
+}

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -20,24 +23,23 @@
  *  SOFTWARE.
  */
 
-package me.lucko.luckperms.api.event;
+package me.lucko.luckperms.api.event.node;
 
 import me.lucko.luckperms.api.Node;
-import me.lucko.luckperms.api.PermissionHolder;
+
+import javax.annotation.Nonnull;
 
 /**
- * @since 2.6
+ * Called when a node is added to a holder
  */
-public class AbstractPermissionEvent extends TargetedEvent<PermissionHolder> {
+public interface NodeAddEvent extends NodeMutateEvent {
 
-    private final Node node;
+    /**
+     * Gets the node that was added
+     *
+     * @return the node that was added
+     */
+    @Nonnull
+    Node getNode();
 
-    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/NodeClearEvent.java

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -20,16 +23,11 @@
  *  SOFTWARE.
  */
 
-package me.lucko.luckperms.api.data;
+package me.lucko.luckperms.api.event.node;
 
 /**
- * @deprecated Use {@link DatastoreConfiguration}. This is now used by multiple datastores, not just MySQL.
+ * Called when a holder has their nodes cleared
  */
-@Deprecated
-public interface MySQLConfiguration {
+public interface NodeClearEvent extends NodeMutateEvent {
 
-    String getAddress();
-    String getDatabase();
-    String getUsername();
-    String getPassword();
 }

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

@@ -0,0 +1,83 @@
+/*
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  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;
+
+import javax.annotation.Nonnull;
+
+/**
+ * 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
+     */
+    @Nonnull
+    PermissionHolder getTarget();
+
+    /**
+     * Gets an immutable copy of the holders data before the change
+     *
+     * @return the data before the change
+     */
+    @Nonnull
+    Set<Node> getDataBefore();
+
+    /**
+     * Gets an immutable copy of the holders data after the change
+     *
+     * @return the data after the change
+     */
+    @Nonnull
+    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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -20,18 +23,23 @@
  *  SOFTWARE.
  */
 
-package me.lucko.luckperms.api.event.events;
+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.AbstractPermissionEvent;
+
+import javax.annotation.Nonnull;
 
 /**
- * Called when a permission node is set on a holder
- * @since 2.6
+ * Called when a node is removed from a holder
  */
-public class PermissionNodeSetEvent extends AbstractPermissionEvent {
-    public PermissionNodeSetEvent(PermissionHolder target, Node node) {
-        super("Permission Node Set Event", target, node);
-    }
+public interface NodeRemoveEvent extends NodeMutateEvent {
+
+    /**
+     * Gets the node that was removed
+     *
+     * @return the node that was removed
+     */
+    @Nonnull
+    Node getNode();
+
 }

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

@@ -0,0 +1,35 @@
+/*
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -20,17 +23,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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -20,22 +23,26 @@
  *  SOFTWARE.
  */
 
-package me.lucko.luckperms.api.context;
+package me.lucko.luckperms.api.event.sync;
 
-import java.util.Map;
+import me.lucko.luckperms.api.event.Cancellable;
+import me.lucko.luckperms.api.event.LuckPermsEvent;
+
+import java.util.UUID;
+
+import javax.annotation.Nonnull;
 
 /**
- * Listens to context changes
- * @param <T> the subject type, Is ALWAYS the player class of the platform.
+ * Called before a network sync task runs
  */
-public interface ContextListener<T> {
+public interface PreNetworkSyncEvent extends LuckPermsEvent, Cancellable {
 
     /**
-     * Called whenever a context changes on the
-     * @param subject the subject that had context changed
-     * @param before the context state before the change
-     * @param current the context state after the change (now)
+     * Gets the ID of the sync request
+     *
+     * @return the id of the sync request
      */
-    void onContextChange(T subject, Map.Entry<String, String> before, Map.Entry<String, String> current) throws Exception;
+    @Nonnull
+    UUID getSyncId();
 
 }

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -20,18 +23,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,55 @@
+/*
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  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;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Called when a track is created
+ */
+public interface TrackCreateEvent extends LuckPermsEvent {
+
+    /**
+     * Gets the new track
+     *
+     * @return the new track
+     */
+    @Nonnull
+    Track getTrack();
+
+    /**
+     * Gets the cause of the creation
+     *
+     * @return the cause of the creation
+     */
+    @Nonnull
+    CreationCause getCause();
+
+}

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

@@ -0,0 +1,64 @@
+/*
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  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;
+import me.lucko.luckperms.api.event.cause.DeletionCause;
+
+import java.util.List;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Called when a track is deleted
+ */
+public interface TrackDeleteEvent extends LuckPermsEvent {
+
+    /**
+     * Gets the name of the deleted track
+     *
+     * @return the name of the deleted track
+     */
+    @Nonnull
+    String getTrackName();
+
+    /**
+     * Gets an immutable copy of the tracks existing data
+     *
+     * @return a copy of the tracks existing data
+     */
+    @Nonnull
+    List<String> getExistingData();
+
+    /**
+     * Gets the cause of the deletion
+     *
+     * @return the cause of the deletion
+     */
+    @Nonnull
+    DeletionCause getCause();
+
+}

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

@@ -0,0 +1,37 @@
+/*
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  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,48 @@
+/*
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  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 javax.annotation.Nonnull;
+
+/**
+ * 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
+     */
+    @Nonnull
+    Track getTrack();
+
+}

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -20,19 +23,21 @@
  *  SOFTWARE.
  */
 
-package me.lucko.luckperms.api.event.events;
+package me.lucko.luckperms.api.event.track.mutate;
 
-import me.lucko.luckperms.api.Track;
-import me.lucko.luckperms.api.User;
-import me.lucko.luckperms.api.event.TrackEvent;
+import javax.annotation.Nonnull;
 
 /**
- * Called whenever a user is demoted down a track
+ * Called when a group is added to a track
  */
-public class UserDemoteEvent extends TrackEvent {
+public interface TrackAddGroupEvent extends TrackMutateEvent {
 
-    public UserDemoteEvent(Track track, User user, String from, String to) {
-        super("User Demote Event", track, user, from, to);
-    }
+    /**
+     * Gets the group that was added
+     *
+     * @return the group that was added
+     */
+    @Nonnull
+    String getGroup();
 
 }

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -20,10 +23,11 @@
  *  SOFTWARE.
  */
 
-package me.lucko.luckperms.api.event;
+package me.lucko.luckperms.api.event.track.mutate;
 
 /**
- * Used to mark a class that listens for LuckPerms events
+ * Called when a track is cleared
  */
-public interface LPListener {
+public interface TrackClearEvent extends TrackMutateEvent {
+
 }

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

@@ -0,0 +1,64 @@
+/*
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  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;
+
+import me.lucko.luckperms.api.Track;
+import me.lucko.luckperms.api.event.LuckPermsEvent;
+
+import java.util.List;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Called when a track is changed
+ */
+public interface TrackMutateEvent extends LuckPermsEvent {
+
+    /**
+     * Gets the track that was mutated
+     *
+     * @return the track that was mutated
+     */
+    @Nonnull
+    Track getTrack();
+
+    /**
+     * Gets an immutable copy of the tracks data before the change
+     *
+     * @return the data before the change
+     */
+    @Nonnull
+    List<String> getDataBefore();
+
+    /**
+     * Gets an immutable copy of the tracks data after the change
+     *
+     * @return the data after the change
+     */
+    @Nonnull
+    List<String> getDataAfter();
+
+}

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

@@ -0,0 +1,43 @@
+/*
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  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;
+
+import javax.annotation.Nonnull;
+
+/**
+ * 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
+     */
+    @Nonnull
+    String getGroup();
+
+}

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

@@ -0,0 +1,55 @@
+/*
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  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;
+
+import javax.annotation.Nonnull;
+
+/**
+ * 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
+     */
+    @Nonnull
+    User getUser();
+
+    /**
+     * Gets the data that was loaded
+     *
+     * @return the loaded data
+     */
+    @Nonnull
+    UserData getLoadedData();
+
+}

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

@@ -0,0 +1,55 @@
+/*
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  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;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Called when a users cached data is refreshed
+ */
+public interface UserDataRecalculateEvent extends LuckPermsEvent {
+
+    /**
+     * Gets the user whose data was recalculated
+     *
+     * @return the user
+     */
+    @Nonnull
+    User getUser();
+
+    /**
+     * Gets the data that was recalculated
+     *
+     * @return the data
+     */
+    @Nonnull
+    UserData getData();
+
+}

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -20,35 +23,41 @@
  *  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;
 
+import javax.annotation.Nonnull;
+
 /**
  * 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.
  *
- * <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.
+ * <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.</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
+     */
+    @Nonnull
+    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
+     */
+    @Nonnull
+    String getUsername();
 
-    public UUID getUuid() {
-        return uuid;
-    }
-
-    public String getUsername() {
-        return username;
-    }
 }

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -20,19 +23,24 @@
  *  SOFTWARE.
  */
 
-package me.lucko.luckperms.api.event.events;
+package me.lucko.luckperms.api.event.user;
 
 import me.lucko.luckperms.api.User;
-import me.lucko.luckperms.api.event.UserEvent;
+import me.lucko.luckperms.api.event.LuckPermsEvent;
+
+import javax.annotation.Nonnull;
 
 /**
- * Called after a user has their permissions refreshed.
- * If you cache user permissions within your own plugin, it's a good idea to update said cache whenever this event is called.
+ * Called when a user is loaded into memory from the storage.
  */
-public class UserPermissionRefreshEvent extends UserEvent {
+public interface UserLoadEvent extends LuckPermsEvent {
 
-    public UserPermissionRefreshEvent(User user) {
-        super("User Permission Refresh Event", user);
-    }
+    /**
+     * Gets the user that was loaded
+     *
+     * @return the user that was loaded
+     */
+    @Nonnull
+    User getUser();
 
 }

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -20,19 +23,21 @@
  *  SOFTWARE.
  */
 
-package me.lucko.luckperms.common.tracks;
+package me.lucko.luckperms.api.event.user.track;
 
-import me.lucko.luckperms.common.utils.AbstractManager;
-
-public class TrackManager extends AbstractManager<String, Track> {
+/**
+ * Represents the type of action performed in a {@link UserTrackEvent}
+ */
+public enum TrackAction {
 
     /**
-     * Makes a new track object
-     * @param name The name of the track
-     * @return a new {@link Track} object
+     * The user was promoted up a track
      */
-    @Override
-    public Track apply(String name) {
-        return new Track(name);
-    }
+    PROMOTION,
+
+    /**
+     * The user was demoted down a track
+     */
+    DEMOTION
+
 }

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -20,18 +23,13 @@
  *  SOFTWARE.
  */
 
-package me.lucko.luckperms;
+package me.lucko.luckperms.api.event.user.track;
 
-import me.lucko.luckperms.api.LuckPermsApi;
-
-public class ApiHandler {
-
-    public static void registerProvider(LuckPermsApi luckPermsApi) {
-        LuckPerms.registerProvider(luckPermsApi);
-    }
-
-    public static void unregisterProvider() {
-        LuckPerms.unregisterProvider();
-    }
+/**
+ * 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,35 @@
+/*
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  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,83 @@
+/*
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  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;
+
+import javax.annotation.Nonnull;
+
+/**
+ * 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
+     */
+    @Nonnull
+    Track getTrack();
+
+    /**
+     * Gets the user who was promoted or demoted
+     *
+     * @return the user involved in the event
+     */
+    @Nonnull
+    User getUser();
+
+    /**
+     * Gets the action performed
+     *
+     * @return the action performed
+     */
+    @Nonnull
+    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
+     */
+    @Nonnull
+    Optional<String> getGroupFrom();
+
+    /**
+     * Gets the group the user was promoted/demoted to
+     *
+     * @return the group the user was promoted/demoted to
+     */
+    @Nonnull
+    Optional<String> getGroupTo();
+
+}

api/src/main/java/me/lucko/luckperms/api/metastacking/MetaStackDefinition.java

@@ -0,0 +1,77 @@
+/*
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  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.metastacking;
+
+import java.util.List;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Represents a meta stack model, consisting of a chain of elements, separated by spacers.
+ *
+ * <p>The resultant string is constructed as:
+ * [start spacer] [element] [middle spacer] [element] [middle spacer] [element] [end spacer]</p>
+ *
+ * <p>Definitions can be passed to a users UserData instance using MetaContexts, and the result of this stack can be
+ * retrieved from the returned MetaData instance.</p>
+ *
+ * @since 2.3
+ */
+public interface MetaStackDefinition {
+
+    /**
+     * Gets an immutable list of the elements in this stack definition
+     *
+     * @return the elements in this stack
+     */
+    @Nonnull
+    List<MetaStackElement> getElements();
+
+    /**
+     * Gets the spacer string added before any stack elements
+     *
+     * @return the start spacer
+     */
+    @Nonnull
+    String getStartSpacer();
+
+    /**
+     * Gets the spacer added between stack elements
+     *
+     * @return the middle spacer
+     */
+    @Nonnull
+    String getMiddleSpacer();
+
+    /**
+     * Gets the spacer added after any stack elements
+     *
+     * @return the end spacer
+     */
+    @Nonnull
+    String getEndSpacer();
+
+}

api/src/main/java/me/lucko/luckperms/api/metastacking/MetaStackElement.java

@@ -0,0 +1,56 @@
+/*
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  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.metastacking;
+
+import me.lucko.luckperms.api.ChatMetaType;
+import me.lucko.luckperms.api.LocalizedNode;
+import me.lucko.luckperms.api.Node;
+
+import java.util.Map;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+/**
+ * Represents an element within a {@link MetaStackDefinition}.
+ *
+ * @since 3.2
+ */
+public interface MetaStackElement {
+
+    /**
+     * Returns if the given node should be accumulated onto the stack.
+     *
+     * <p>The element being considered can be retrieved using {@link ChatMetaType#getEntry(Node)}.</p>
+     *
+     * @param node the node being considered
+     * @param type the type of entry being accumulated
+     * @param current the current value being used. If this returns true, the current value will be replaced by this entry
+     * @return true if the node should be accumulated into this element, replacing the current value
+     */
+    boolean shouldAccumulate(@Nonnull LocalizedNode node, @Nonnull ChatMetaType type, @Nullable Map.Entry<Integer, String> current);
+
+}

api/src/main/java/me/lucko/luckperms/api/metastacking/MetaStackFactory.java

@@ -0,0 +1,72 @@
+/*
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  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.metastacking;
+
+import java.util.List;
+import java.util.Optional;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Factory to create meta stack elements and definitions.
+ *
+ * @since 3.2
+ */
+public interface MetaStackFactory {
+
+    /**
+     * Parses a standard {@link MetaStackElement} from string, using the pre-defined elements in the plugin.
+     *
+     * @param definition the definition
+     * @return the parsed element, if present
+     */
+    @Nonnull
+    Optional<MetaStackElement> fromString(@Nonnull String definition);
+
+    /**
+     * Parses a list of {@link MetaStackElement}s from string, using the pre-defined elements in the plugin.
+     *
+     * <p>If an element cannot be parsed, it will not be included in the resultant list.</p>
+     *
+     * @param definitions the definition strings
+     * @return a list of parsed elements
+     */
+    @Nonnull
+    List<MetaStackElement> fromStrings(@Nonnull List<String> definitions);
+
+    /**
+     * Creates a new {@link MetaStackDefinition} with the given properties.
+     *
+     * @param elements the elements to be included in the stack.
+     * @param startSpacer the spacer to be included at the start of the stacks output
+     * @param middleSpacer the spacer to be included between stack elements
+     * @param endSpacer the spacer to be included at the end of the stacks output
+     * @return the new stack definition instance
+     */
+    @Nonnull
+    MetaStackDefinition createDefinition(@Nonnull List<MetaStackElement> elements, @Nonnull String startSpacer, @Nonnull String middleSpacer, @Nonnull String endSpacer);
+
+}

api/src/main/java/me/lucko/luckperms/exceptions/MembershipException.java

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +26,9 @@
 package me.lucko.luckperms.exceptions;
 
 /**
- * Thrown when a permission holding object doesn't / already has a permission or isn't / is already is a member of a group
+ * Thrown when a permission holding object doesn't / already has a permission or isn't / is already is a member of a
+ * group
+ *
  * @since 2.7
  */
 public abstract class MembershipException extends Exception {

api/src/main/java/me/lucko/luckperms/exceptions/ObjectAlreadyHasException.java

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal

api/src/main/java/me/lucko/luckperms/exceptions/ObjectLacksException.java

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal

bukkit-legacy/pom.xml

@@ -1,29 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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.14-SNAPSHOT</version>
+        <version>3.3-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>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
+        <finalName>LuckPerms-Bukkit-Legacy-${full.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>
@@ -32,7 +27,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,32 +36,8 @@
                         </goals>
                         <configuration>
                             <minimizeJar>false</minimizeJar>
-                            <artifactSet>
-                                <excludes>
-                                    <exclude>org.xerial:*</exclude>
-                                </excludes>
-                            </artifactSet>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
                             <relocations>
-                                <relocation>
-                                    <pattern>org.slf4j</pattern>
-                                    <shadedPattern>me.lucko.luckperms.lib.slf4j</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.zaxxer.hikari</pattern>
-                                    <shadedPattern>me.lucko.luckperms.lib.hikari</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.mongodb</pattern>
-                                    <shadedPattern>me.lucko.luckperms.lib.mongodb</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.bson</pattern>
-                                    <shadedPattern>me.lucko.luckperms.lib.bson</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.h2</pattern>
-                                    <shadedPattern>me.lucko.luckperms.lib.h2</shadedPattern>
-                                </relocation>
                                 <relocation>
                                     <pattern>com.google.common</pattern>
                                     <shadedPattern>me.lucko.luckperms.lib.guava</shadedPattern>
@@ -76,40 +47,41 @@
                                     <shadedPattern>me.lucko.luckperms.lib.gson</shadedPattern>
                                 </relocation>
                                 <relocation>
-                                    <pattern>redis.clients.jedis</pattern>
-                                    <shadedPattern>me.lucko.luckperms.lib.jedis.jedis</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>redis.clients.util</pattern>
-                                    <shadedPattern>me.lucko.luckperms.lib.jedis.util</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.apache.commons.pool2</pattern>
-                                    <shadedPattern>me.lucko.luckperms.lib.jedis.pool2</shadedPattern>
+                                    <pattern>net.kyori.text</pattern>
+                                    <shadedPattern>me.lucko.luckperms.lib.text</shadedPattern>
                                 </relocation>
                             </relocations>
                         </configuration>
                     </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>
 
+    <profiles>
+        <profile>
+            <id>sign</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>1.6</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
     <dependencies>
         <!-- LuckPerms Bukkit -->
         <dependency>
@@ -117,6 +89,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="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         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.14-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>2.13-SNAPSHOT</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,215 +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.*;
-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 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;
-    }
-
-    private static String formatBoolean(boolean b) {
-        return b ? PlaceholderAPIPlugin.booleanTrue() : PlaceholderAPIPlugin.booleanFalse();
-    }
-}

bukkit/pom.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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.14-SNAPSHOT</version>
+        <version>3.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -14,8 +14,7 @@
 
     <build>
         <defaultGoal>clean package</defaultGoal>
-        <finalName>LuckPerms-${release.version}.${git.closest.tag.commit.count}</finalName>
-        <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+        <finalName>LuckPerms-Bukkit-${full.version}</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
@@ -26,7 +25,7 @@
             <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 +34,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,73 +43,50 @@
                         </goals>
                         <configuration>
                             <minimizeJar>false</minimizeJar>
-                            <artifactSet>
-                                <excludes>
-                                    <exclude>org.xerial:*</exclude>
-                                </excludes>
-                            </artifactSet>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
                             <relocations>
                                 <relocation>
-                                    <pattern>org.slf4j</pattern>
-                                    <shadedPattern>me.lucko.luckperms.lib.slf4j</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.zaxxer.hikari</pattern>
-                                    <shadedPattern>me.lucko.luckperms.lib.hikari</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.mongodb</pattern>
-                                    <shadedPattern>me.lucko.luckperms.lib.mongodb</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.bson</pattern>
-                                    <shadedPattern>me.lucko.luckperms.lib.bson</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.h2</pattern>
-                                    <shadedPattern>me.lucko.luckperms.lib.h2</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>redis.clients.jedis</pattern>
-                                    <shadedPattern>me.lucko.luckperms.lib.jedis.jedis</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>redis.clients.util</pattern>
-                                    <shadedPattern>me.lucko.luckperms.lib.jedis.util</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.apache.commons.pool2</pattern>
-                                    <shadedPattern>me.lucko.luckperms.lib.jedis.pool2</shadedPattern>
+                                    <pattern>net.kyori.text</pattern>
+                                    <shadedPattern>me.lucko.luckperms.lib.text</shadedPattern>
                                 </relocation>
                             </relocations>
                         </configuration>
                     </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>
 
+    <profiles>
+        <profile>
+            <id>sign</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>${gpg.version}</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
     <dependencies>
-        <!-- BukkitAPI -->
+        <!-- Spigot API -->
         <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>bukkit</artifactId>
-            <version>1.8.8-R0.1-SNAPSHOT</version>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.12-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <!-- Vault -->
@@ -119,6 +95,12 @@
             <artifactId>VaultAPI</artifactId>
             <version>1.6</version>
             <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bukkit</groupId>
+                    <artifactId>bukkit</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- LuckPerms Common -->
         <dependency>
@@ -138,20 +120,29 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.16.10</version>
+            <version>${lombok.version}</version>
             <scope>provided</scope>
         </dependency>
-        <!-- **************Migration Plugins************** -->
+        <!-- LilyPad -->
+        <dependency>
+            <groupId>lilypad.client.connect</groupId>
+            <artifactId>api</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- ************** Migration Plugins ************** -->
+        <!-- zPermissions -->
         <dependency>
             <groupId>org.tyrannyofheaven.bukkit</groupId>
             <artifactId>zPermissions</artifactId>
             <version>1.3</version>
             <scope>provided</scope>
         </dependency>
+        <!-- PermissionsEx -->
         <dependency>
             <groupId>ru.tehkode</groupId>
             <artifactId>PermissionsEx</artifactId>
-            <version>1.23</version>
+            <version>1.23.5</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
@@ -162,20 +153,41 @@
                     <groupId>net.gravitydevelopment.updater</groupId>
                     <artifactId>updater</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>commons-dbcp</groupId>
+                    <artifactId>commons-dbcp</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.mojang</groupId>
+                    <artifactId>AccountsClient</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
+        <!-- PowerfulPerms -->
         <dependency>
             <groupId>com.github.cheesesoftware</groupId>
             <artifactId>PowerfulPermsAPI</artifactId>
-            <version>1.0.1</version>
+            <version>1.4.0</version>
             <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>redis.clients</groupId>
+                    <artifactId>jedis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
+        <!-- GroupManager -->
         <dependency>
             <groupId>org.anjocaido</groupId>
             <artifactId>GroupManager</artifactId>
             <version>1.4</version>
             <scope>provided</scope>
         </dependency>
+        <!-- bPermissions -->
         <dependency>
             <groupId>de.bananaco</groupId>
             <artifactId>bpermissions-api</artifactId>

bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitCalculatorFactory.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.bukkit;
-
-import com.google.common.collect.ImmutableList;
-import lombok.AllArgsConstructor;
-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.inject.LPPermissible;
-import me.lucko.luckperms.common.calculators.*;
-import me.lucko.luckperms.common.users.User;
-
-import java.util.UUID;
-
-@AllArgsConstructor
-public class BukkitCalculatorFactory implements CalculatorFactory {
-    private final LPBukkitPlugin plugin;
-
-    @Override
-    public PermissionCalculator build(Contexts contexts, User user) {
-        UUID uuid = plugin.getUuidCache().getExternalUUID(user.getUuid());
-
-        ImmutableList.Builder<PermissionProcessor> processors = ImmutableList.builder();
-        processors.add(new MapProcessor());
-        processors.add(new ChildProcessor(plugin.getChildPermissionProvider()));
-        processors.add(new AttachmentProcessor(() -> {
-            LPPermissible permissible = Injector.getPermissible(uuid);
-            return permissible == null ? null : permissible.getAttachmentPermissions();
-        }));
-        if (plugin.getConfiguration().isApplyingWildcards()) {
-            processors.add(new WildcardProcessor());
-        }
-        if (plugin.getConfiguration().isApplyingRegex()) {
-            processors.add(new RegexProcessor());
-        }
-        processors.add(new DefaultsProcessor(contexts.isOp(), plugin.getDefaultsProvider()));
-
-        return new PermissionCalculator(plugin, user.getName(), processors.build());
-    }
-}

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -24,10 +27,10 @@ package me.lucko.luckperms.bukkit;
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
-import me.lucko.luckperms.api.data.Callback;
+
 import me.lucko.luckperms.common.commands.CommandManager;
 import me.lucko.luckperms.common.commands.utils.Util;
-import me.lucko.luckperms.common.constants.Patterns;
+
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -36,7 +39,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) {
@@ -49,8 +52,7 @@ class BukkitCommand extends CommandManager implements CommandExecutor, TabExecut
         onCommand(
                 plugin.getSenderFactory().wrap(sender),
                 label,
-                Util.stripQuotes(Splitter.on(Patterns.COMMAND_SEPARATOR).omitEmptyStrings().splitToList(Joiner.on(' ').join(args))),
-                Callback.empty()
+                Util.stripQuotes(Splitter.on(COMMAND_SEPARATOR_PATTERN).omitEmptyStrings().splitToList(Joiner.on(' ').join(args)))
         );
         return true;
     }

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -22,70 +25,80 @@
 
 package me.lucko.luckperms.bukkit;
 
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
 import me.lucko.luckperms.common.config.AbstractConfiguration;
+
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
+import java.util.Set;
+
+@RequiredArgsConstructor
+public class BukkitConfig extends AbstractConfiguration {
+
+    @Getter
+    private final LPBukkitPlugin plugin;
 
-class BukkitConfig extends AbstractConfiguration<LPBukkitPlugin> {
     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) {
-        return Optional.ofNullable(configuration.getStringList(path)).orElse(def);
+    public List<String> getList(String path, List<String> def) {
+        List<String> ret = configuration.getStringList(path);
+        return ret == null ? def : ret;
     }
 
     @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;
         }
 
-        return Optional.ofNullable(section.getKeys(false).stream().collect(Collectors.toList())).orElse(def);
+        Set<String> keys = section.getKeys(false);
+        return keys == null ? def : new ArrayList<>(keys);
     }
 
-    @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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -22,63 +25,133 @@
 
 package me.lucko.luckperms.bukkit;
 
-import me.lucko.luckperms.bukkit.inject.Injector;
-import me.lucko.luckperms.bukkit.inject.LPPermissible;
-import me.lucko.luckperms.common.constants.Message;
-import me.lucko.luckperms.common.users.User;
-import me.lucko.luckperms.common.utils.AbstractListener;
+import lombok.RequiredArgsConstructor;
+
+import me.lucko.luckperms.bukkit.model.Injector;
+import me.lucko.luckperms.bukkit.model.LPPermissible;
+import me.lucko.luckperms.common.config.ConfigKeys;
+import me.lucko.luckperms.common.locale.Message;
+import me.lucko.luckperms.common.model.User;
+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;
+import java.util.concurrent.TimeUnit;
 
-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.LOWEST)
+    @EventHandler(priority = EventPriority.LOW)
     public void onPlayerPreLogin(AsyncPlayerPreLoginEvent e) {
+        /* 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) */
+
+        /* wait for the plugin to enable. because these events are fired async, they can be called before
+           the plugin has enabled.  */
+        try {
+            plugin.getEnableLatch().await(30, TimeUnit.SECONDS);
+        } catch (InterruptedException ex) {
+            ex.printStackTrace();
+        }
+
+        /* 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()) {
 
-            // The datastore is disabled, prevent players from joining the server
-            e.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, Message.LOADING_ERROR.toString());
+            // 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. Denying connection from: " + e.getUniqueId() + " - " + e.getName());
+            e.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, Message.LOADING_ERROR.asString(plugin.getLocaleManager()));
             return;
         }
 
-        // Process login
-        onAsyncLogin(e.getUniqueId(), e.getName());
+        plugin.getUniqueConnections().add(e.getUniqueId());
+
+        /* 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(), false);
+        } 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())) {
+            // their data was never loaded at LOW priority, now check to see if they have been magically allowed since then.
+
+            // 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, "");
+            }
+
+            return;
+        }
+
+        // Login event was cancelled by another plugin, but it wasn't cancelled when we handled it at LOW
+        if (e.getLoginResult() != AsyncPlayerPreLoginEvent.Result.ALLOWED) {
+            // Schedule cleanup of this user.
+            plugin.getUserManager().scheduleUnload(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()));
+        /* Called when the player starts logging into the server.
+           At this point, the users data should be present and loaded. */
 
+        final Player player = e.getPlayer();
+        final User user = plugin.getUserManager().getIfLoaded(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) {
-            // User wasn't loaded for whatever reason.
-            e.disallow(PlayerLoginEvent.Result.KICK_OTHER, Message.LOADING_ERROR.toString());
+            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);
@@ -90,57 +163,90 @@ 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.
+        // We assume all users are not op, but those who are need extra calculation.
+        if (player.isOp()) {
             plugin.doAsync(() -> user.getUserData().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. Even if it was denied at LOW, their data will still be present.
+        boolean denied = false;
+        if (deniedLogin.remove(e.getPlayer().getUniqueId())) {
+            denied = true;
+
+            // 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, "");
+            }
         }
+
+        // Login event was cancelled by another plugin since we first loaded their data
+        if (denied || 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);
+        try {
+            Injector.unInject(player, true, true);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
 
         // 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()
-                .replace("/", "")
+        String s = e.getMessage().substring(1).toLowerCase()
                 .replace("bukkit:", "")
                 .replace("spigot:", "")
                 .replace("minecraft:", "");
 
-        if (s.startsWith("op") || s.startsWith("deop")) {
+        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()));
         }
     }
+
+    @EventHandler
+    public void onPluginEnable(PluginEnableEvent e) {
+        if (e.getPlugin().getName().equalsIgnoreCase("Vault")) {
+            plugin.tryVaultHook(true);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.LOWEST)
+    public void onWorldChange(PlayerChangedWorldEvent e) {
+        plugin.getContextManager().invalidateCache(e.getPlayer());
+        plugin.refreshAutoOp(e.getPlayer());
+    }
 }

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -22,17 +25,26 @@
 
 package me.lucko.luckperms.bukkit;
 
-import me.lucko.luckperms.common.LuckPermsPlugin;
+import me.lucko.luckperms.api.Tristate;
+import me.lucko.luckperms.bukkit.compat.MessageHandler;
 import me.lucko.luckperms.common.commands.sender.SenderFactory;
 import me.lucko.luckperms.common.constants.Constants;
+import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
+
+import net.kyori.text.Component;
+
+import org.bukkit.command.BlockCommandSender;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import java.util.UUID;
 
 public class BukkitSenderFactory extends SenderFactory<CommandSender> {
+    private final MessageHandler messageHandler;
+
     public BukkitSenderFactory(LuckPermsPlugin plugin) {
         super(plugin);
+        messageHandler = new MessageHandler();
     }
 
     @Override
@@ -40,7 +52,7 @@ public class BukkitSenderFactory extends SenderFactory<CommandSender> {
         if (sender instanceof Player) {
             return sender.getName();
         }
-        return Constants.getConsoleName();
+        return Constants.CONSOLE_NAME;
     }
 
     @Override
@@ -48,14 +60,34 @@ public class BukkitSenderFactory extends SenderFactory<CommandSender> {
         if (sender instanceof Player) {
             return ((Player) sender).getUniqueId();
         }
-        return Constants.getConsoleUUID();
+        return Constants.CONSOLE_UUID;
     }
 
     @Override
     protected void sendMessage(CommandSender sender, String s) {
+
+        // send sync if command block
+        if (sender instanceof BlockCommandSender) {
+            getPlugin().getScheduler().doSync(() -> sender.sendMessage(s));
+            return;
+        }
+
         sender.sendMessage(s);
     }
 
+    @Override
+    protected void sendMessage(CommandSender sender, Component message) {
+        messageHandler.sendJsonMessage(sender, message);
+    }
+
+    @Override
+    protected Tristate getPermissionValue(CommandSender sender, String node) {
+        boolean isSet = sender.isPermissionSet(node);
+        boolean val = sender.hasPermission(node);
+
+        return !isSet ? val ? Tristate.TRUE : Tristate.UNDEFINED : Tristate.fromBoolean(val);
+    }
+
     @Override
     protected boolean hasPermission(CommandSender sender, String node) {
         return sender.hasPermission(node);

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

@@ -1,5 +1,8 @@
 /*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
+ * This file is part of LuckPerms, licensed under the MIT License.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -23,128 +26,231 @@
 package me.lucko.luckperms.bukkit;
 
 import lombok.Getter;
-import me.lucko.luckperms.ApiHandler;
+
 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.ImmutableContextSet;
 import me.lucko.luckperms.api.context.MutableContextSet;
-import me.lucko.luckperms.bukkit.calculators.AutoOPListener;
-import me.lucko.luckperms.bukkit.calculators.ChildPermissionProvider;
-import me.lucko.luckperms.bukkit.calculators.DefaultsProvider;
-import me.lucko.luckperms.bukkit.vault.VaultHook;
-import me.lucko.luckperms.common.LuckPermsPlugin;
+import me.lucko.luckperms.bukkit.calculators.BukkitCalculatorFactory;
+import me.lucko.luckperms.bukkit.contexts.WorldCalculator;
+import me.lucko.luckperms.bukkit.messaging.BungeeMessagingService;
+import me.lucko.luckperms.bukkit.messaging.LilyPadMessagingService;
+import me.lucko.luckperms.bukkit.model.Injector;
+import me.lucko.luckperms.bukkit.model.LPPermissible;
+import me.lucko.luckperms.bukkit.processors.ChildPermissionProvider;
+import me.lucko.luckperms.bukkit.processors.DefaultsProvider;
+import me.lucko.luckperms.bukkit.vault.VaultHookManager;
+import me.lucko.luckperms.common.api.ApiHandler;
 import me.lucko.luckperms.common.api.ApiProvider;
+import me.lucko.luckperms.common.buffers.BufferedRequest;
+import me.lucko.luckperms.common.caching.handlers.CachedStateManager;
 import me.lucko.luckperms.common.calculators.CalculatorFactory;
-import me.lucko.luckperms.common.commands.ConsecutiveExecutor;
 import me.lucko.luckperms.common.commands.sender.Sender;
-import me.lucko.luckperms.common.config.LPConfiguration;
-import me.lucko.luckperms.common.constants.Permission;
+import me.lucko.luckperms.common.config.ConfigKeys;
+import me.lucko.luckperms.common.config.LuckPermsConfiguration;
+import me.lucko.luckperms.common.constants.CommandPermission;
 import me.lucko.luckperms.common.contexts.ContextManager;
-import me.lucko.luckperms.common.contexts.ServerCalculator;
-import me.lucko.luckperms.common.core.UuidCache;
-import me.lucko.luckperms.common.data.Importer;
-import me.lucko.luckperms.common.groups.GroupManager;
-import me.lucko.luckperms.common.messaging.RedisMessaging;
-import me.lucko.luckperms.common.runnables.ExpireTemporaryTask;
-import me.lucko.luckperms.common.runnables.UpdateTask;
+import me.lucko.luckperms.common.contexts.LuckPermsCalculator;
+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.logging.SenderLogger;
+import me.lucko.luckperms.common.managers.GenericGroupManager;
+import me.lucko.luckperms.common.managers.GenericTrackManager;
+import me.lucko.luckperms.common.managers.GenericUserManager;
+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.messaging.InternalMessagingService;
+import me.lucko.luckperms.common.messaging.NoopMessagingService;
+import me.lucko.luckperms.common.messaging.RedisMessagingService;
+import me.lucko.luckperms.common.model.User;
+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.tracks.TrackManager;
-import me.lucko.luckperms.common.users.UserManager;
-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.storage.StorageType;
+import me.lucko.luckperms.common.storage.backing.file.FileWatcher;
+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.LoginHelper;
+import me.lucko.luckperms.common.utils.UuidCache;
+import me.lucko.luckperms.common.verbose.VerboseHandler;
+
 import org.bukkit.World;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.entity.Player;
+import org.bukkit.event.HandlerList;
 import org.bukkit.permissions.PermissionDefault;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.ServicePriority;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.io.File;
-import java.util.*;
+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.ExecutorService;
-import java.util.concurrent.Executors;
+import java.util.concurrent.CountDownLatch;
 import java.util.stream.Collectors;
 
 @Getter
 public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
-    private ExecutorService executorService;
-    private Executor syncExecutor;
-    private Executor asyncExecutor;
-    private VaultHook vaultHook = null;
-
-    private final Set<UUID> ignoringLogs = ConcurrentHashMap.newKeySet();
-    private LPConfiguration configuration;
+    private Set<UUID> ignoringLogs;
+    private Set<UUID> uniqueConnections;
+    private long startTime;
+    private LPBukkitScheduler scheduler;
+    private BukkitCommand commandManager;
+    private VaultHookManager vaultHookManager = null;
+    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 ConsecutiveExecutor consecutiveExecutor;
     private DefaultsProvider defaultsProvider;
     private ChildPermissionProvider childPermissionProvider;
     private LocaleManager localeManager;
+    private CachedStateManager cachedStateManager;
     private ContextManager<Player> contextManager;
     private WorldCalculator worldCalculator;
     private CalculatorFactory calculatorFactory;
     private BufferedRequest<Void> updateTaskBuffer;
     private boolean started = false;
-    private DebugHandler debugHandler;
+    private CountDownLatch enableLatch = new CountDownLatch(1);
+    private VerboseHandler verboseHandler;
     private BukkitSenderFactory senderFactory;
+    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 SenderLogger(this, getConsoleSender());
+
+        DependencyManager.loadDependencies(this, Collections.singletonList(Dependency.CAFFEINE));
+    }
 
     @Override
     public void onEnable() {
-        // Used whilst the server is still starting
-        executorService = Executors.newCachedThreadPool();
-        asyncExecutor = executorService;
-        syncExecutor = r -> getServer().getScheduler().runTask(this, r);
+        try {
+            enable();
+            started = true;
+        } finally {
+            // count down the latch when onEnable has been called
+            // we don't care about the result here
+            enableLatch.countDown();
+        }
+    }
 
-        log = LogFactory.wrap(getLogger());
-        debugHandler = new DebugHandler();
-        senderFactory = new BukkitSenderFactory(this);
+    private void enable() {
+        startTime = System.currentTimeMillis();
+        LuckPermsPlugin.sendStartupBanner(getConsoleSender(), this);
+
+        ignoringLogs = ConcurrentHashMap.newKeySet();
+        uniqueConnections = ConcurrentHashMap.newKeySet();
+        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);
 
         // setup the Bukkit defaults hook
         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.syncLater(() -> {
             defaultsProvider.refresh();
             childPermissionProvider.setup();
+
+            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
-        PluginManager pm = getServer().getPluginManager();
-        pm.registerEvents(new BukkitListener(this), this);
+        listener = new BukkitListener(this);
+        getServer().getPluginManager().registerEvents(listener, this);
+
+        if (getConfiguration().get(ConfigKeys.WATCH_FILES)) {
+            fileWatcher = new FileWatcher(this);
+            getScheduler().asyncRepeating(fileWatcher, 30L);
+        }
 
         // initialise datastore
-        storage = StorageFactory.getInstance(this, "h2");
+        storage = StorageFactory.getInstance(this, StorageType.H2);
 
-        // initialise redis
-        if (getConfiguration().isRedisEnabled()) {
-            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();
+        // initialise messaging
+        String messagingType = getConfiguration().get(ConfigKeys.MESSAGING_SERVICE).toLowerCase();
+        if (messagingType.equals("none") && getConfiguration().get(ConfigKeys.REDIS_ENABLED)) {
+            messagingType = "redis";
+        }
+
+        if (!messagingType.equals("none")) {
+            getLog().info("Loading messaging service... [" + messagingType.toUpperCase() + "]");
+        }
+
+        if (messagingType.equals("redis")) {
+            if (getConfiguration().get(ConfigKeys.REDIS_ENABLED)) {
+                RedisMessagingService redis = new RedisMessagingService(this);
+                try {
+                    redis.init(getConfiguration().get(ConfigKeys.REDIS_ADDRESS), getConfiguration().get(ConfigKeys.REDIS_PASSWORD));
+                    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")) {
+            BungeeMessagingService bungeeMessaging = new BungeeMessagingService(this);
+            bungeeMessaging.init();
+            messagingService = bungeeMessaging;
+        } else if (messagingType.equals("lilypad")) {
+            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
@@ -157,10 +263,10 @@ 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.");
+            getLog().info("Found lang.yml - loading messages...");
             try {
                 localeManager.loadFromFile(locale);
             } catch (Exception e) {
@@ -169,118 +275,229 @@ 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);
-        main.setAliases(Arrays.asList("perms", "lp", "permissions", "p", "perm"));
+        main.setDescription("Manage permissions");
+        main.setAliases(Arrays.asList("lp", "perm", "perms", "permission", "permissions"));
 
         // load internal managers
         getLog().info("Loading internal permission managers...");
-        uuidCache = new UuidCache(getConfiguration().isOnlineMode());
-        userManager = new UserManager(this);
-        groupManager = new GroupManager(this);
-        trackManager = new TrackManager();
-        importer = new Importer(commandManager);
-        consecutiveExecutor = new ConsecutiveExecutor(commandManager);
+        uuidCache = new UuidCache(this);
+        userManager = new GenericUserManager(this);
+        groupManager = new GenericGroupManager(this);
+        trackManager = new GenericTrackManager(this);
         calculatorFactory = new BukkitCalculatorFactory(this);
+        cachedStateManager = new CachedStateManager();
+
+        contextManager = new ContextManager<Player>() {
+            @Override
+            public Contexts formContexts(Player player, ImmutableContextSet contextSet) {
+                return new Contexts(
+                        contextSet,
+                        getConfiguration().get(ConfigKeys.INCLUDING_GLOBAL_PERMS),
+                        getConfiguration().get(ConfigKeys.INCLUDING_GLOBAL_WORLD_PERMS),
+                        true,
+                        getConfiguration().get(ConfigKeys.APPLYING_GLOBAL_GROUPS),
+                        getConfiguration().get(ConfigKeys.APPLYING_GLOBAL_WORLD_GROUPS),
+                        player.isOp()
+                );
+            }
+        };
 
-        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());
-        }
+        LuckPermsCalculator<Player> staticCalculator = new LuckPermsCalculator<>(getConfiguration());
+        contextManager.registerCalculator(staticCalculator, true);
 
         // Provide vault support
-        getLog().info("Attempting to hook into Vault...");
-        try {
-            if (getServer().getPluginManager().isPluginEnabled("Vault")) {
-                vaultHook = new VaultHook();
-                vaultHook.hook(this);
-                getLog().info("Registered Vault permission & chat hook.");
-            } else {
-                getLog().info("Vault not found.");
-            }
-        } catch (Exception e) {
-            getLog().severe("Error occurred whilst hooking into Vault.");
-            e.printStackTrace();
-        }
+        tryVaultHook(false);
 
         // register with the LP API
-        getLog().info("Registering API...");
         apiProvider = new ApiProvider(this);
         ApiHandler.registerProvider(apiProvider);
         getServer().getServicesManager().register(LuckPermsApi.class, apiProvider, this, ServicePriority.Normal);
 
 
         // 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(), 20L, ticks);
+            scheduler.asyncRepeating(() -> updateTaskBuffer.request(), ticks);
         }
+        scheduler.asyncLater(() -> updateTaskBuffer.request(), 40L);
 
         // run an update instantly.
+        getLog().info("Performing initial data load...");
         updateTaskBuffer.requestDirectly();
 
         // register tasks
-        getServer().getScheduler().runTaskTimerAsynchronously(this, new ExpireTemporaryTask(this), 60L, 60L);
-        getServer().getScheduler().runTaskTimerAsynchronously(this, consecutiveExecutor, 20L, 20L);
+        scheduler.asyncRepeating(new ExpireTemporaryTask(this), 60L);
+        scheduler.asyncRepeating(new CacheHousekeepingTask(this), 2400L);
 
         // register permissions
-        registerPermissions(getConfiguration().isCommandsAllowOp() ? PermissionDefault.OP : PermissionDefault.FALSE);
-        if (!getConfiguration().isOpsEnabled()) {
-            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 = r -> getServer().getScheduler().runTaskAsynchronously(this, r);
-        });
+        getServer().getScheduler().runTaskAsynchronously(this, () -> scheduler.setUseBukkitAsync(true));
 
-        started = true;
-        getLog().info("Successfully loaded.");
+        // Load any online users (in the case of a reload)
+        for (Player player : getServer().getOnlinePlayers()) {
+            scheduler.doAsync(() -> {
+                LoginHelper.loadUser(this, player.getUniqueId(), player.getName(), false);
+                User user = getUserManager().getIfLoaded(getUuidCache().getUUID(player.getUniqueId()));
+                if (user != null) {
+                    scheduler.doSync(() -> {
+                        try {
+                            LPPermissible lpPermissible = new LPPermissible(player, user, this);
+                            Injector.inject(player, lpPermissible);
+                        } catch (Throwable t) {
+                            t.printStackTrace();
+                        }
+                    });
+                }
+            });
+        }
+
+        getLog().info("Successfully enabled. (took " + (System.currentTimeMillis() - startTime) + "ms)");
     }
 
     @Override
     public void onDisable() {
-        started = false;
-        getLog().info("Closing datastore...");
-        storage.shutdown();
+        // Switch back to the LP executor, the bukkit one won't allow new tasks
+        scheduler.setUseBukkitAsync(false);
 
-        if (redisMessaging != null) {
-            getLog().info("Closing redis...");
-            redisMessaging.shutdown();
+        started = false;
+
+        defaultsProvider.close();
+        permissionVault.setShutdown(true);
+        verboseHandler.setShutdown(true);
+
+        for (Player player : getServer().getOnlinePlayers()) {
+            try {
+                Injector.unInject(player, false, false);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+            if (getConfiguration().get(ConfigKeys.AUTO_OP)) {
+                player.setOp(false);
+            }
+
+            final User user = getUserManager().getIfLoaded(getUuidCache().getUUID(player.getUniqueId()));
+            if (user != null) {
+                user.unregisterData();
+                getUserManager().unload(user);
+            }
+        }
+
+        getLog().info("Closing storage...");
+        storage.shutdown();
+
+        if (fileWatcher != null) {
+            fileWatcher.close();
+        }
+
+        if (messagingService != null) {
+            getLog().info("Closing messaging service...");
+            messagingService.close();
         }
 
-        getLog().info("Unregistering API...");
         ApiHandler.unregisterProvider();
         getServer().getServicesManager().unregisterAll(this);
 
-        if (vaultHook != null) {
-            vaultHook.unhook(this);
+        if (vaultHookManager != null) {
+            vaultHookManager.unhook(this);
+        }
+
+        getLog().info("Shutting down internal scheduler...");
+        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;
+        vaultHookManager = null;
+        configuration = null;
+        userManager = null;
+        groupManager = null;
+        trackManager = null;
+        storage = null;
+        fileWatcher = null;
+        messagingService = null;
+        uuidCache = null;
+        listener = null;
+        apiProvider = null;
+        log = null;
+        defaultsProvider = null;
+        childPermissionProvider = null;
+        localeManager = null;
+        cachedStateManager = null;
+        contextManager = null;
+        worldCalculator = null;
+        calculatorFactory = null;
+        updateTaskBuffer = null;
+        verboseHandler = null;
+        senderFactory = null;
+        permissionVault = null;
+    }
+
+    public void tryVaultHook(boolean force) {
+        if (vaultHookManager != null) {
+            return; // already hooked
+        }
+
+        try {
+            if (force || getServer().getPluginManager().isPluginEnabled("Vault")) {
+                vaultHookManager = new VaultHookManager();
+                vaultHookManager.hook(this);
+                getLog().info("Registered Vault permission & chat hook.");
+            }
+        } catch (Exception e) {
+            vaultHookManager = null;
+            getLog().severe("Error occurred whilst hooking into Vault.");
+            e.printStackTrace();
         }
     }
 
     @Override
-    public void doAsync(Runnable r) {
-        asyncExecutor.execute(r);
+    public void onUserRefresh(User user) {
+        LPPermissible lpp = Injector.getPermissible(uuidCache.getExternalUUID(user.getUuid()));
+        if (lpp != null) {
+            lpp.updateSubscriptions();
+        }
     }
 
-    @Override
-    public void doSync(Runnable r) {
-        syncExecutor.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 doAsyncRepeating(Runnable r, long interval) {
-        getServer().getScheduler().runTaskTimerAsynchronously(this, r, interval, interval);
+                User user = permissible.getUser();
+                if (user == null) {
+                    return;
+                }
+
+                Map<String, Boolean> backing = user.getUserData().getPermissionData(permissible.calculateContexts()).getImmutableBacking();
+                boolean op = Optional.ofNullable(backing.get("luckperms.autoop")).orElse(false);
+                player.setOp(op);
+            } catch (Exception ignored) {}
+        }
     }
 
     @Override
@@ -289,13 +506,53 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
     }
 
     @Override
-    public PlatformType getType() {
+    public PlatformType getServerType() {
         return PlatformType.BUKKIT;
     }
 
     @Override
-    public File getMainDir() {
-        return getDataFolder();
+    public String getServerName() {
+        return getServer().getName();
+    }
+
+    @Override
+    public String getServerVersion() {
+        return getServer().getVersion() + " - " + getServer().getBukkitVersion();
+    }
+
+    @Override
+    public File getDataDirectory() {
+        return super.getDataFolder();
+    }
+
+    @Override
+    public InputStream getResourceStream(String path) {
+        return getResource(path);
+    }
+
+    @Override
+    public Player getPlayer(User user) {
+        return getServer().getPlayer(uuidCache.getExternalUUID(user.getUuid()));
+    }
+
+    @Override
+    public Optional<UUID> lookupUuid(String username) {
+        try {
+            //noinspection deprecation
+            return Optional.ofNullable(getServer().getOfflinePlayer(username)).flatMap(p -> Optional.ofNullable(p.getUniqueId()));
+        } catch (Exception e) {
+            e.printStackTrace();
+            return Optional.empty();
+        }
+    }
+
+    @Override
+    public Contexts getContextForUser(User user) {
+        Player player = getPlayer(user);
+        if (player == null) {
+            return null;
+        }
+        return contextManager.getApplicableContexts(player);
     }
 
     @Override
@@ -314,12 +571,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());
@@ -334,29 +592,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 = new MutableContextSet();
-                    set.add("server", getConfiguration().getServer());
+                    MutableContextSet set = MutableContextSet.create();
+                    set.add("server", getConfiguration().get(ConfigKeys.SERVER));
                     set.add("world", s);
+                    set.addAll(configuration.getContextsFile().getStaticContexts());
                     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 = new MutableContextSet();
-                        set.add("server", getConfiguration().getVaultServer());
+                        MutableContextSet set = MutableContextSet.create();
+                        set.add("server", getConfiguration().get(ConfigKeys.VAULT_SERVER));
                         set.add("world", s);
+                        set.addAll(configuration.getContextsFile().getStaticContexts());
                         return set.makeImmutable();
                     })
                     .collect(Collectors.toList())
@@ -369,25 +629,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())
             );
         }
@@ -396,37 +656,19 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
     }
 
     @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);
+    public LinkedHashMap<String, Object> getExtraInfo() {
+        LinkedHashMap<String, Object> map = new LinkedHashMap<>();
+        map.put("Vault Enabled", vaultHookManager != null);
+        map.put("Bukkit Defaults count", defaultsProvider.size());
+        map.put("Bukkit Child Permissions count", childPermissionProvider.getPermissions().size());
+        return map;
     }
 
     private void registerPermissions(PermissionDefault def) {
         PluginManager pm = getServer().getPluginManager();
 
-        for (Permission p : Permission.values()) {
-            for (String node : p.getNodes()) {
-                pm.addPermission(new org.bukkit.permissions.Permission(node, def));
-            }
+        for (CommandPermission p : CommandPermission.values()) {
+            pm.addPermission(new org.bukkit.permissions.Permission(p.getPermission(), def));
         }
     }
 }