Add tracing to /lp verbose, API updates/cleanup, add login process event, and utilise string interning for faster context/node comparisons

- 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

@@ -13,6 +13,7 @@ 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}"
@@ -25,13 +26,10 @@ 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."
@@ -56,6 +54,16 @@ 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."
@@ -84,52 +92,37 @@ update-task-push-success: "&aOther servers were notified via &b{0} Messaging &as
 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: >
+info-top: >
   {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}
+  {PREFIX}&f-  &3Server Brand: &f{2}\n
+  {PREFIX}&f-  &3Server Version: &f{3}
+info-middle: >
+  {PREFIX}&f-  &bMessaging Type: &f{0}\n
+  {PREFIX}&f-  &bInstance:\n
+  {PREFIX}&f-     &3Server Name: &f{1}\n
+  {PREFIX}&f-     &3Online Players: &a{2}\n
+  {PREFIX}&f-     &3Unique Connections: &a{3}\n
+  {PREFIX}&f-     &3Uptime: &7{4}\n
+  {PREFIX}&f-     &3Local Data: &a{5} &7users, &a{6} &7groups, &a{7} &7tracks\n
+  {PREFIX}&f-     &3Context Calculators: &a{8}\n
+  {PREFIX}&f-     &3Known permissions: &a{9}\n
+  {PREFIX}&f-     &3Active processors: &7{10}
 create-group-error: "There was an error whilst creating the group."
 delete-group-error: "There was an error whilst deleting the group."
 delete-group-error-default: "You cannot delete the default group."
-groups-list: "&aGroups: {0}"
+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:\n
-  {1}
-listparents: >
-  &b{0}'s Parent Groups:\n
-  {1}
-listparents-temp: >
-  &b{0}'s Temporary Parent Groups:\n
-  {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}
@@ -139,6 +132,7 @@ 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."
+check-inherits-permission: "&b{0}&a has permission &b{1}&a set to {2}&a in context {3}&a. &7(inherited from &a{4}&7)"
 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."
@@ -151,12 +145,12 @@ unset-inherit-success: "&b{0}&a no longer inherits permissions from &b{1}&a in c
 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.)"
+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 matching type &b{1}&a was cleared in context {2}&a. (&b{3}&a nodes were removed.)"
+meta-clear-success-singular: "&b{0}&a's meta matching type &b{1}&a was cleared in context {2}&a. (&b{3}&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"
@@ -253,6 +247,7 @@ 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-console: "&cCannot toggle notifications for console."
 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."
@@ -288,3 +283,444 @@ import-end-error-header: >
   {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 meta"
+    args:
+      "type": "the type of meta to remove"
+      "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/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/zh-CN.yml

@@ -9,85 +9,94 @@ 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服务器管理员状态在安装权限插件时无效,请直接编辑用户数据."
+loading-error: "无法加载权限数据，请稍后再试。"
+op-disabled: "&b此服务器上禁用了vanilla OP系统。"
+op-disabled-sponge: "&2安装了权限插件时，服务器OP状态无效，请直接编辑用户数据。"
 log: "&3日志 &3&l> {0}"
+verbose-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-not-recognised: "命令未被识别。"
 command-no-permission: "你没有权限使用这个命令!"
 already-haspermission: "{0}已经有这个权限!"
-does-not-havepermission: "{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任何数据."
+does-not-have-temp-permission: "{0}没有设置此临时权限。"
+user-not-found: "&b找不到用户。"
+user-not-online: "&b用户&a{0}&b不在线。"
 user-save-success: "&7(保存用户数据到文件)"
-user-save-error: "保存用户数据时出错."
-user-create-fail: "创建新用户时出错."
-group-not-found: "&b找不到组."
+user-save-error: "保存用户数据时出错。"
+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'命令,而不是指定节点."
+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-world-invalid-entry: "服务器/世界名称只能包含字母数字字符，长度不能超过36个字符。"
+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-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-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-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}"
+apply-edits-invalid-code: "&a无效的代码。&7({0})"
+apply-edits-unable-to-read: "&a无法使用给定代码读取数据。&7({0})"
+apply-edits-no-target: "&a无法解析编辑的目标。请提供它作为一个额外的参数。"
+apply-edits-target-group-not-exists: "&a目标组&b{0}&a不存在。"
+apply-edits-target-user-not-uuid: "&a目标用户&b{0}&a不是一个有效的uuid。"
+apply-edits-target-user-unable-to-load: "&a无法加载目标用户&b{0}&a。"
+apply-edits-target-unknown: "&a目标无效。&7({0})"
+apply-edits-success: "&a成功应用&b{0}&a节点到&b{1}&a。"
+editor-upload-failure: "&c无法将权限数据上传到编辑器。"
+editor-url: "&a编辑器URL:"
 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: "指定的用户是此轨道上多个组的成员,无法确定他们的位置."
+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(一些选项将仅在服务器重新启动后才应用.)"
+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}&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
@@ -97,7 +106,7 @@ info: >
   {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{9}\n
   {PREFIX}&f-     &3日志大小: &a{10}\n
   {PREFIX}&f-     &3UUID缓存大小: &a{11}\n
   {PREFIX}&f-     &3翻译加载: &a{12}\n
@@ -114,57 +123,49 @@ info: >
   {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}"
+create-group-error: "创建组时出错。"
+delete-group-error: "删除组时出错。"
+delete-group-error-default: "您不能删除默认组。"
+groups-list: "&a组: &7(名字，权重，权限组轨道)"
+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: "创建权限组轨道时出错。"
+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}
+listnodes-temp: "&b{0}的临时节点:"
+listnodes-temp-with-page: "&b{0}的临时节点:  {1}"
+listparents: "&b{0}的父组"
+listparents-temp: "&b{0}的临时父组:"
 list-tracks: >
-  &b{0}的轨道:\n
+  &b{0}的权限组轨道:\n
   {1}
-list-tracks-empty: "{0}不在任何轨道上."
+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-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}'."
+check-permission: "&b在环境&b{3}&b中，&b{0}&b的权限&b{1}&b被设置为&b{2}&b。"
+setpermission-success: "&a在环境&b{3}&a中将&b{2}&a的&b{0}&a权限设置为&b{1}&a。"
+setpermission-temp-success: "&a在环境&b{4}&a中将&b{2}&a的&b{0}&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。"
+set-track-parent-success: "在权限组轨道&b{1}&a上&b{0}&a现有的父组被清除，现在只在&b{3}&a中继承&b{2}&a。"
+unset-inherit-success: "&b{0}&a不再继承环境&b{2}&a中&b{1}&a的权限。"
+unset-temp-inherit-success: "&b{0}&a在环境&b{2}&a中不再继承临时权限&b{1}&a。"
+clear-success: "&b{0}&a的权限在环境&b{1}&a中被清除。(&b{2}&a节点已被删除。)"
+clear-success-singular: "&b{0}&a的权限在环境&b{1}&a中被清除。(&b{2}&a节点已被删除。)"
+parent-clear-success: "&b{0}&a的父组在环境&b{1}&a中被清除。&b{2}&a节点被删除。)"
+parent-clear-success-singular: "&b{0}&a的父组在环境&b{1}&a中被清除。&b{2}&a节点被删除。)"
+parent-clear-track-success: "在权限组轨道&b{1}&a上，&b{0}&a的父组在环境&b{2}&a中被清除。&b{3}&a节点被删除。)"
+parent-clear-track-success-singular: "在权限组轨道&b{1}&a上，&b{0}&a的父组在环境&b{2}&a中被清除。&b{3}&a节点被删除。)"
+meta-clear-success: "&b{0}&a的元数据在环境&b{1}&a中被清除。&b{2}&a节点已被删除。)"
+meta-clear-success-singular: "&b{0}&a的元数据在环境&b{1}&a中被清除。&b{2}&a节点已被删除。)"
+illegal-date-error: "无法解析日期'{0}'。"
 past-date-error: "您不能设定一个过去的日期!"
 chat-meta-prefix-header: "&b{0}的前缀"
 chat-meta-suffix-header: "&b{0}的后缀"
@@ -173,36 +174,34 @@ 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}记录已更改."
+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{4}&a中将&b{0}&a的{1}设置为&f\"{2}&f\"，优先级&b{3}&a。"
+add-temp-chatmeta-success: "在环境&b{5}&a中将&b{0}&a的{1}设置为&f\"{2}&f\"&a，优先级&b{3}&a，持续时间为&b{4}&a。"
+remove-chatmeta-success: "在环境&b{3}&a中删除了&b{0}&a优先级为&b{3}&a的{1} &f\"{2}&f\"&a。"
+bulk-remove-chatmeta-success: "在环境&b{3}&a中删除了&b{0}&a优先级&b{2}&a的所有&b{1}&a。"
+remove-temp-chatmeta-success: "在环境&b{4}&a中删除了&b{0}&a优先级&b{3}&a的临时{1} &f\"{2}&f\"&a。"
+bulk-remove-temp-chatmeta-success: "在环境&b{3}&a中删除了&b{0}&a优先级&b{2}&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: "类型无效。期望类型是'全部'、'用户'或'组'。"
+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: "&c批量更新失败。检查控制台是否有错误。"
 user-info-general: >
-  {PREFIX}&b&l> &bUser Info: &f{0}\n
+  {PREFIX}&b&l> &b用户信息: &f{0}\n
   {PREFIX}&f- &3UUID: &f{1}\n
   {PREFIX}&f- &3状态: {2}\n
   {PREFIX}&f- &3主组: &f{3}\n
@@ -213,34 +212,30 @@ user-info-general: >
   {PREFIX}&f-    &3后缀: &a{7}\n
   {PREFIX}&f-    &3元信息: &a{8}
 user-info-data: >
-  {PREFIX}&f- &aCached Data:\n
+  {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: "&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-removegroup-error-primary: "您不能从其主组中删除用户。"
+user-primarygroup-success: "&b{0}&a的主组已设为&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中移除."
+  {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}
+  {PREFIX}权限组轨道上的上一组{0}不存在。无法降级用户。\n
+  {PREFIX}创建组，或将其从权限组轨道中删除，然后重试。
 group-info-general: >
   {PREFIX}&b&l> &b组信息: &f{0}\n
   {PREFIX}&f- &3显示名称: &f{1}\n
@@ -251,53 +246,493 @@ group-info-general: >
   {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."
+group-set-weight: "&a将组&b{1}&a的权重设置为&b{0}&a。"
 track-info: >
-  {PREFIX}&b&l> &b显示轨道: &f{0}\n
+  {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没有日志条目显示."
+track-clear: "&b{0}&a的权限组轨道已被清除。"
+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} 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}错误."
+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}完成 &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执行: &3命令 #{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<------------------------------------------>"
+import-end-error-footer: "&b(导入) &7<------------------------------------------>"
+
+command-specs:
+  user:
+    description: "用户命令"
+    usage: "/%s user <用户>"
+  group:
+    description: "组命令"
+    usage: "/%s group <组>"
+  track:
+    description: "权限组轨道指令"
+    usage: "/%s track <权限组轨道>"
+  log:
+    description: "日志命令"
+    usage: "/%s log"
+  sync:
+    description: "与存储同步更改"
+    usage: "/%s sync"
+  info:
+    description: "打印通用插件信息"
+    usage: "/%s info"
+  verbose:
+    description: "管理详细权限检查"
+    usage: "/%s verbose <true|false> [filter]"
+    args:
+      "on|record|off|paste": "是否启用/禁用日志记录，或粘贴记录的输出"
+      "filter": "过滤器匹配项"
+  tree:
+    description: "生成权限的树视图"
+    usage: "/%s tree [selection] [max level] [player]"
+    args:
+      "selection": "树的根，指定\".\"包括所有权限"
+      "max level": "应该返回多少分支级别"
+      "player": "要检查的在线玩家的名称"
+  search:
+    description: "搜索具有特定权限的用户/组"
+    usage: "/%s search <permission>"
+    args:
+      "permission": "权限搜索"
+      "page": "页面查看"
+  check:
+    description: "对用户执行标准的权限检查"
+    usage: "/%s check <user> <permission>"
+    args:
+      "user": "检查用户"
+      "permission": "允许检查"
+  network-sync:
+    description: "与存储同步更改并请求网络上所有其他服务器都同步"
+    usage: "/%s networksync"
+  import:
+    description: "从文件导入数据"
+    usage: "/%s import <file>"
+    args:
+      "file": "要导入的文件"
+  export:
+    description: "将数据导出到文件"
+    usage: "/%s export <file>"
+    args:
+      "file": "要导出的文件"
+  reload-config:
+    description: "重新加载部分配置选项"
+    usage: "/%s reloadconfig"
+  bulk-update:
+    description: "对所有数据执行批量更改查询"
+    usage: "/%s bulkupdate"
+    args:
+      "data type": "正在更改的数据类型。('all'、'users'、'groups')"
+      "action": "对数据执行的操作。('update' or 'delete')"
+      "action field": "要采取行动的领域。只需要'update'。('permission'、'server'、'world')"
+      "action value": "替换的值。只需要'update'。"
+      "constraint...": "更新所需的限制"
+  migration:
+    description: "迁移命令"
+    usage: "/%s migration"
+  apply-edits:
+    description: "应用从Web编辑器进行的权限更改"
+    usage: "/%s applyedits <code> [target]"
+    args:
+      "code": "数据的唯一代码"
+      "target": "应用数据到谁"
+  create-group:
+    description: "创建新组"
+    usage: "/%s creategroup <group>"
+    args:
+      "name": "组的名称"
+  delete-group:
+    description: "删除组"
+    usage: "/%s deletegroup <group>"
+    args:
+      "name": "组的名称"
+  list-groups:
+    description: "列出平台上的所有组"
+    usage: "/%s listgroups"
+  create-track:
+    description: "创建新权限组轨道"
+    usage: "/%s createtrack <track>"
+    args:
+      "name": "权限组轨道的名称"
+  delete-track:
+    description: "删除权限组轨道"
+    usage: "/%s deletetrack <track>"
+    args:
+      "name": "权限组轨道的名称"
+  list-tracks:
+    description: "列出平台上的所有权限组轨道"
+    usage: "/%s listtracks"
+  user-info:
+    description: "显示有关用户的信息"
+  user-switchprimarygroup:
+    description: "切换用户的主组"
+    args:
+      "group": "组切换到"
+  user-promote:
+    description: "在权限组轨道提升用户"
+    args:
+      "track": "提升用户的权限组轨道"
+      "context...": "提升用户使用的环境"
+  user-demote:
+    description: "在权限组轨道降低用户"
+    args:
+      "track": "降低用户的权限组轨道"
+      "context...": "降低用户使用的环境"
+  group-info:
+    description: "提供有关组的信息"
+  group-listmembers:
+    description: "显示从该组继承的用户/组"
+    args:
+      "page": "页面查看"
+  group-setweight:
+    description: "设置组权重"
+    args:
+      "weight": "设定权重"
+  group-rename:
+    description: "重命名组"
+    args:
+      "name": "新名字"
+  group-clone:
+    description: "克隆组"
+    args:
+      "name": "要克隆到的组的名称"
+  holder-editor:
+    description: "打开网页权限编辑器"
+  holder-showtracks:
+    description: "列出对象所在的权限组轨道"
+  holder-clear:
+    description: "删除所有权限，父组和元"
+    args:
+      "context...": "过滤的环境"
+  permission:
+    description: "编辑权限"
+  parent:
+    description: "编辑继承"
+  meta:
+    description: "编辑元数据值"
+  permission-info:
+    description: "列出对象拥有的权限节点"
+    args:
+      "page": "页面查看"
+      "filter": "要过滤的字符串"
+  permission-set:
+    description: "设置对象的权限"
+    args:
+      "node": "要添加的权限"
+      "true|false": "节点的值"
+      "context...": "添加权限的环境"
+  permission-unset:
+    description: "取消对象的权限"
+    args:
+      "node": "取消的权限节点"
+      "context...": "删除权限的环境"
+  permission-settemp:
+    description: "设置对象的临时权限"
+    args:
+      "node": "要添加的权限"
+      "true|false": "节点的值"
+      "duration": "到期时间"
+      "context...": "权限的环境"
+  permission-unsettemp:
+    description: "取消对对象的临时权限"
+    args:
+      "node": "要取消的权限"
+      "context...": "权限的环境"
+  permission-check:
+    description: "检查对象是否具有某个权限节点"
+    args:
+      "node": "要检查的权限"
+      "context...": "权限的环境"
+  permission-check-inherits:
+    description: "检查对象是否继承某个权限节点"
+    args:
+      "node": "要检查的权限"
+      "context...": "权限的环境"
+  parent-info:
+    description: "列出此对象从哪里继承的组"
+  parent-set:
+    description: "删除对象已经继承的所有其他组，并将其添加到给定的对象组中。"
+    args:
+      "group": "组设为"
+      "context...": "设置组的环境"
+  parent-add:
+    description: "为该对象设置另一个组来继承权限"
+    args:
+      "group": "要继承的组"
+      "context...": "继承该组的环境"
+  parent-remove:
+    description: "删除先前设置的继承规则"
+    args:
+      "group": "删除的组"
+      "context...": "删除组的环境"
+  parent-set-track:
+    description: "删除对象在给定权限组轨道上继承的所有其他组，并将其添加到给定的权限组轨道上。"
+    args:
+      "track": "设置的权限组轨道"
+      "group": "组中设置的组，或与组中在给定权限组轨道上的位置相关的数字"
+      "context...": "设置组的环境"
+  parent-add-temp:
+    description: "为对象设置另一个组，以便从临时继承权限"
+    args:
+      "group": "要继承的组"
+      "duration": "持续时间"
+      "context...": "继承该组的环境"
+  parent-remove-temp:
+    description: "删除以前设置的临时继承规则"
+    args:
+      "group": "组删除"
+      "context...": "删除组的环境"
+  parent-clear:
+    description: "清除所有的父组"
+    args:
+      "context...": "过滤的环境"
+  parent-clear-track:
+    description: "清除给定权限组轨道上的所有父组"
+    args:
+      "track": "删除的权限组轨道"
+      "contexts...": "选择的环境"
+  meta-info:
+    description: "显示所有聊天元"
+  meta-set:
+    description: "设置元值"
+    args:
+      "key": "设定的键"
+      "value": "要设置的值"
+      "context...": "将元添加到"
+  meta-unset:
+    description: "取消设定元值"
+    args:
+      "key": "要取消的键"
+      "context...": "删除元的环境"
+  meta-settemp:
+    description: "暂时设置一个元值"
+    args:
+      "key": "设定的键"
+      "value": "要设置的值"
+      "duration": "持续时间"
+      "context...": "将元组添加到"
+  meta-unsettemp:
+    description: "取消设置临时元值"
+    args:
+      "key": "要取消的键"
+      "context...": "删除元的环境"
+  meta-addprefix:
+    description: "添加前缀"
+    args:
+      "priority": "添加的前缀优先级"
+      "prefix": "前缀字符串"
+      "context...": "添加前缀的环境"
+  meta-addsuffix:
+    description: "添加后缀"
+    args:
+      "priority": "添加的后缀优先级"
+      "suffix": "后缀字符串"
+      "context...": "添加后缀的环境"
+  meta-removeprefix:
+    description: "删除前缀"
+    args:
+      "priority": "删除的前缀优先级"
+      "prefix": "前缀字符串"
+      "context...": "删除前缀的环境"
+  meta-removesuffix:
+    description: "删除后缀"
+    args:
+      "priority": "删除的后缀优先级"
+      "suffix": "后缀字符串"
+      "context...": "删除后缀的环境"
+  meta-addtemp-prefix:
+    description: "添加临时前缀"
+    args:
+      "priority": "删除的前缀优先级"
+      "prefix": "前缀字符串"
+      "duration": "持续时间"
+      "context...": "添加前缀的环境"
+  meta-addtemp-suffix:
+    description: "添加临时后缀"
+    args:
+      "priority": "添加的后缀优先级"
+      "suffix": "后缀字符串"
+      "duration": "持续时间"
+      "context...": "添加后缀的环境"
+  meta-removetemp-prefix:
+    description: "删除临时前缀"
+    args:
+      "priority": "删除的前缀优先级"
+      "prefix": "前缀字符串"
+      "context...": "删除前缀的环境"
+  meta-removetemp-suffix:
+    description: "删除临时后缀"
+    args:
+      "priority": "删除的后缀优先级"
+      "suffix": "后缀字符串"
+      "context...": "删除后缀的环境"
+  meta-clear:
+    description: "清除所有聊天元"
+    args:
+      "context...": "过滤的环境"
+  track-info:
+    description: "提供有关权限组轨道的信息"
+  track-append:
+    description: "追加一个组到权限组轨道的最后"
+    args:
+      "group": "追加的组"
+  track-insert:
+    description: "在权限组轨道上的给定位置插入一个组"
+    args:
+      "group": "插入的组"
+      "position": "插入组的位置（权限组轨道上的第一个位置为1）"
+  track-remove:
+    description: "从权限组轨道中删除一个组"
+    args:
+      "group": "删除的组"
+  track-clear:
+    description: "清除权限组轨道上的组"
+  track-rename:
+    description: "重命名权限组轨道"
+    args:
+      "name": "新名字"
+  track-clone:
+    description: "克隆权限组轨道"
+    args:
+      "name": "要克隆的权限组轨道的名称"
+  log-recent:
+    description: "查看最近的登陆"
+    args:
+      "user": "用户的名称/uuid"
+      "page": "要查看的页码"
+  log-search:
+    description: "搜索日志中的条目"
+    args:
+      "query": "搜索的查询"
+      "page": "要查看的页码"
+  log-notify:
+    description: "切换日志通知"
+    args:
+      "on|off": "是否打开或关闭"
+  log-user-history:
+    description: "查看用户的历史记录"
+    args:
+      "user": "用户名/ uuid"
+      "page": "要查看的页码"
+  log-group-history:
+    description: "查看组的历史"
+    args:
+      "group": "组名"
+      "page": "要查看的页码"
+  log-track-history:
+    description: "查看权限组轨道的历史"
+    args:
+      "track": "权限组轨道的名称"
+      "page": "要查看的页码"
+  sponge:
+    description: "编辑额外的Sponge数据"
+    usage: "/%s sponge <collection> <subject>"
+    args:
+      "collection": "要查询的集合"
+      "subject": "修改的主题"
+  sponge-permission-info:
+    description: "显示有关主题权限的信息"
+    args:
+      "contexts...": "选择的环境"
+  sponge-permission-set:
+    description: "设置一个主题的权限"
+    args:
+      "node": "要设置的权限节点"
+      "tristate": "设置允许值"
+      "contexts...": "选择的环境"
+  sponge-permission-clear:
+    description: "清除一个主题的权限"
+    args:
+      "contexts...": "清除的环境"
+  sponge-parent-info:
+    description: "显示关于该主题父项的信息"
+    args:
+      "contexts...": "选择的环境"
+  sponge-parent-add:
+    description: "向主题添加父项"
+    args:
+      "collection": "父主题的主题集合"
+      "subject": "父主题的名称"
+      "contexts...": "添加父项的环境"
+  sponge-parent-remove:
+    description: "从主题中删除父项"
+    args:
+      "collection": "父主题的主题集合"
+      "subject": "父主题的名称"
+      "contexts...": "删除父项的环境"
+  sponge-parent-clear:
+    description: "清除主题父项"
+    args:
+      "contexts...": "清除父项的主题"
+  sponge-option-info:
+    description: "显示有关主题选项的信息"
+    args:
+      "contexts...": "选择的环境"
+  sponge-option-set:
+    description: "为主题设置一个选项"
+    args:
+      "key": "设定键"
+      "value": "设置的键"
+      "contexts...": "设置选项的环境"
+  sponge-option-unset:
+    description: "取消主题一个选项"
+    args:
+      "key": "取消的键"
+      "contexts...": "取消选项的环境"
+  sponge-option-clear:
+    description: "清除对象的选择"
+    args:
+      "contexts...": "清除选项的环境"
+  migration-command:
+    description: "迁移命令"
+  migration-groupmanager:
+    description: "迁移命令"
+    args:
+      "migrate as global": "如果世界权限应该被忽略，并且刚刚迁移为全局"
+  migration-powerfulperms:
+    description: "迁移命令"
+    args:
+      "address": "PP数据库的地址"
+      "database": "PP数据库的名称"
+      "username": "登录DB的用户名"
+      "password": "登录DB的用密码"
+      "db table": "存储用户数据的PP表的名称"

README.md

@@ -18,15 +18,34 @@ LuckPerms also includes an extensive API for developers, and support for a varie
 LuckPerms uses Maven to handle dependencies.
 
 #### 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.
 

api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>luckperms</artifactId>
         <groupId>me.lucko.luckperms</groupId>
-        <version>3.2-SNAPSHOT</version>
+        <version>3.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -35,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>
@@ -43,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,48 +29,62 @@ import me.lucko.luckperms.api.LuckPermsApi;
 
 import java.util.Optional;
 
+import javax.annotation.Nonnull;
+
 /**
- * Singleton for the {@link LuckPermsApi}.
+ * Provides static access to 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>
+ * <p>Ideally, the ServiceManager for the platform should be used to obtain an instance,
+ * however, this provider can be used if you need static access.</p>
  */
 public final class LuckPerms {
-    private static LuckPermsApi api = null;
+    private static LuckPermsApi instance = null;
 
     /**
-     * Gets an instance of {@link LuckPermsApi}, throwing {@link IllegalStateException} if the API is not loaded.
+     * Gets an instance of the {@link LuckPermsApi},
+     * throwing {@link IllegalStateException} if an instance is not yet loaded.
+     *
+     * <p>Will never return null.</p>
      *
      * @return an api instance
      * @throws IllegalStateException if the api is not loaded
      */
+    @Nonnull
     public static LuckPermsApi getApi() {
-        if (api == null) {
+        if (instance == null) {
             throw new IllegalStateException("API is not loaded.");
         }
-        return api;
+        return instance;
     }
 
     /**
      * 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}.
+     * <p>Unlike {@link LuckPerms#getApi}, this method will not throw an
+     * {@link IllegalStateException} if an instance is not yet loaded, rather return
+     * an empty {@link Optional}.
      *
      * @return an optional api instance
      */
+    @Nonnull
     public static Optional<LuckPermsApi> getApiSafe() {
-        return Optional.ofNullable(api);
+        return Optional.ofNullable(instance);
     }
 
-    /* method used by the implementation to set the singleton instance */
-    static void registerProvider(LuckPermsApi luckPermsApi) {
-        api = luckPermsApi;
+    /**
+     * Registers an instance of the {@link LuckPermsApi} with this provider.
+     *
+     * @param instance the instance
+     */
+    static void registerProvider(LuckPermsApi instance) {
+        LuckPerms.instance = instance;
     }
 
-    /* method used by the implementation to remove any previous instance */
+    /**
+     * Removes the current instance from this provider.
+     */
     static void unregisterProvider() {
-        api = null;
+        LuckPerms.instance = null;
     }
 
     private LuckPerms() {

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

@@ -25,7 +25,12 @@
 
 package me.lucko.luckperms.api;
 
+import com.google.common.base.Preconditions;
+
 import java.util.Map;
+import java.util.Optional;
+
+import javax.annotation.Nonnull;
 
 /**
  * Represents a type of chat meta
@@ -40,17 +45,17 @@ public enum ChatMetaType {
     PREFIX {
         @Override
         public boolean matches(Node node) {
-            return node.isPrefix();
+            return Preconditions.checkNotNull(node, "node").isPrefix();
         }
 
         @Override
         public boolean shouldIgnore(Node node) {
-            return !node.isPrefix();
+            return !Preconditions.checkNotNull(node, "node").isPrefix();
         }
 
         @Override
         public Map.Entry<Integer, String> getEntry(Node node) {
-            return node.getPrefix();
+            return Preconditions.checkNotNull(node, "node").getPrefix();
         }
     },
 
@@ -60,17 +65,17 @@ public enum ChatMetaType {
     SUFFIX {
         @Override
         public boolean matches(Node node) {
-            return node.isSuffix();
+            return Preconditions.checkNotNull(node, "node").isSuffix();
         }
 
         @Override
         public boolean shouldIgnore(Node node) {
-            return !node.isSuffix();
+            return !Preconditions.checkNotNull(node, "node").isSuffix();
         }
 
         @Override
         public Map.Entry<Integer, String> getEntry(Node node) {
-            return node.getSuffix();
+            return Preconditions.checkNotNull(node, "node").getSuffix();
         }
     };
 
@@ -80,7 +85,7 @@ public enum ChatMetaType {
      * @param node the node to test
      * @return true if the node has the same type
      */
-    public abstract boolean matches(Node node);
+    public abstract boolean matches(@Nonnull Node node);
 
     /**
      * Returns if the passed node should be ignored when searching for meta of this type
@@ -88,7 +93,7 @@ public enum ChatMetaType {
      * @param node the node to test
      * @return true if the node does not share the same type
      */
-    public abstract boolean shouldIgnore(Node node);
+    public abstract boolean shouldIgnore(@Nonnull Node node);
 
     /**
      * Maps the corresponding entry from the given node
@@ -97,6 +102,25 @@ public enum ChatMetaType {
      * @return the entry
      * @throws IllegalStateException if the node does not share the same type
      */
-    public abstract Map.Entry<Integer, String> getEntry(Node node);
+    @Nonnull
+    public abstract Map.Entry<Integer, String> getEntry(@Nonnull Node node);
+
+    /**
+     * Parses a ChatMetaType from the given node.
+     *
+     * @param node the node
+     * @return the parsed chat meta type
+     * @since 3.4
+     */
+    @Nonnull
+    public static Optional<ChatMetaType> ofNode(@Nonnull Node node) {
+        if (node.isPrefix()) {
+            return Optional.of(PREFIX);
+        } else if (node.isSuffix()) {
+            return Optional.of(SUFFIX);
+        } else {
+            return Optional.empty();
+        }
+    }
 
 }

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,6 +27,8 @@ package me.lucko.luckperms.api;
 
 import me.lucko.luckperms.api.context.ContextSet;
 
+import javax.annotation.Nonnull;
+
 /**
  * Context and options for a permission lookup.
  *
@@ -34,18 +39,31 @@ import me.lucko.luckperms.api.context.ContextSet;
 public class Contexts {
     public static final String SERVER_KEY = "server";
     public static final String WORLD_KEY = "world";
-    private static final Contexts ALLOW_ALL = new Contexts(ContextSet.empty(), true, true, true, true, true, true);
+
+    private static final Contexts GLOBAL = new Contexts(ContextSet.empty(), true, true, true, true, true, false);
 
     /**
-     * Gets a context that will allow all nodes
+     * Gets the {@link FullySatisfiedContexts} instance.
      *
-     * @return a context that will not apply any filters
+     * @return a context that will satisfy all contextual requirements.
      */
+    @Nonnull
     public static Contexts allowAll() {
-        return ALLOW_ALL;
+        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);
     }
 
@@ -87,7 +105,7 @@ public class Contexts {
      */
     private final boolean applyGlobalWorldGroups;
 
-    public Contexts(ContextSet context, boolean includeGlobal, boolean includeGlobalWorld, boolean applyGroups, boolean applyGlobalGroups, boolean applyGlobalWorldGroups, boolean op) {
+    public Contexts(@Nonnull ContextSet context, boolean includeGlobal, boolean includeGlobalWorld, boolean applyGroups, boolean applyGlobalGroups, boolean applyGlobalWorldGroups, boolean op) {
         if (context == null) {
             throw new NullPointerException("context");
         }
@@ -107,6 +125,7 @@ public class Contexts {
      * @return an immutable set of context key value pairs
      * @since 2.13
      */
+    @Nonnull
     public ContextSet getContexts() {
         return this.context;
     }
@@ -166,6 +185,7 @@ public class Contexts {
     }
 
     @Override
+    @Nonnull
     public String toString() {
         return "Contexts(" +
                 "context=" + this.getContexts() + ", " +
@@ -185,7 +205,9 @@ public class Contexts {
     @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;
         return this.getContexts().equals(other.getContexts()) &&
                 this.isOp() == other.isOp() &&
@@ -201,7 +223,7 @@ public class Contexts {
         final int PRIME = 59;
         int result = 1;
         final Object contexts = this.getContexts();
-        result = result * PRIME + (contexts == null ? 43 : contexts.hashCode());
+        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

@@ -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,11 +30,29 @@ import me.lucko.luckperms.exceptions.ObjectLacksException;
 
 import java.util.function.Supplier;
 
+/**
+ * Represents the result of a mutation call.
+ */
 public enum DataMutateResult {
 
+    /**
+     * Indicates the mutation was a success
+     */
     SUCCESS(true, null),
+
+    /**
+     * Indicates the mutation failed because the subject already has something
+     */
     ALREADY_HAS(false, ObjectAlreadyHasException::new),
+
+    /**
+     * Indicates the mutation failed because the subject lacks something
+     */
     LACKS(false, ObjectLacksException::new),
+
+    /**
+     * Indicates the mutation failed
+     */
     FAIL(false, RuntimeException::new);
 
     private boolean value;
@@ -48,10 +69,35 @@ public enum DataMutateResult {
         }
     }
 
+    /**
+     * Gets a boolean representation of the result.
+     *
+     * @return a boolean representation
+     */
     public boolean asBoolean() {
         return value;
     }
 
+    /**
+     * Gets if the result indicates a success
+     *
+     * @return if the result indicates a success
+     * @since 3.4
+     */
+    public boolean wasSuccess() {
+        return value;
+    }
+
+    /**
+     * Gets if the result indicates a failure
+     *
+     * @return if the result indicates a failure
+     * @since 3.4
+     */
+    public boolean wasFailure() {
+        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) {

api/src/main/java/me/lucko/luckperms/api/FullySatisfiedContexts.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;
+
+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></p>
+ * <ul>
+ *     <li>{@link UserData#getPermissionData(Contexts)}</li>
+ *     <li>{@link UserData#getMetaData(Contexts)}</li>
+ *     <li>{@link UserData#getMetaData(MetaContexts)}</li>
+ * </ul>
+ *
+ * <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
@@ -29,8 +32,10 @@ import me.lucko.luckperms.exceptions.ObjectLacksException;
 import java.util.List;
 import java.util.OptionalInt;
 
+import javax.annotation.Nonnull;
+
 /**
- * A group which holds permission data.
+ * An inheritable holder of permission data.
  */
 public interface Group extends PermissionHolder {
 
@@ -39,6 +44,7 @@ public interface Group extends PermissionHolder {
      *
      * @return the name of the group
      */
+    @Nonnull
     String getName();
 
     /**
@@ -49,7 +55,7 @@ public interface Group extends PermissionHolder {
      * @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
@@ -61,7 +67,7 @@ public interface Group extends PermissionHolder {
      * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
      * @since 3.2
      */
-    boolean inheritsGroup(Group group, ContextSet contextSet);
+    boolean inheritsGroup(@Nonnull Group group, @Nonnull ContextSet contextSet);
 
     /**
      * Gets the weight of this group, if present.
@@ -69,6 +75,7 @@ public interface Group extends PermissionHolder {
      * @return the group weight
      * @since 2.17
      */
+    @Nonnull
     OptionalInt getWeight();
 
     /**
@@ -83,7 +90,7 @@ public interface Group extends PermissionHolder {
      * @deprecated in favour of {@link #inheritsGroup(Group, ContextSet)}
      */
     @Deprecated
-    boolean inheritsGroup(Group group, String server);
+    boolean inheritsGroup(@Nonnull Group group, @Nonnull String server);
 
     /**
      * Check to see if the group inherits a group on a specific server and world
@@ -98,7 +105,7 @@ public interface Group extends PermissionHolder {
      * @deprecated in favour of {@link #inheritsGroup(Group, ContextSet)}
      */
     @Deprecated
-    boolean inheritsGroup(Group group, String server, String world);
+    boolean inheritsGroup(@Nonnull Group group, @Nonnull String server, @Nonnull String world);
 
     /**
      * Make this group inherit another group
@@ -110,7 +117,7 @@ public interface Group extends PermissionHolder {
      * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
     @Deprecated
-    void setInheritGroup(Group group) throws ObjectAlreadyHasException;
+    void setInheritGroup(@Nonnull Group group) throws ObjectAlreadyHasException;
 
     /**
      * Make this group inherit another group on a specific server
@@ -124,7 +131,7 @@ public interface Group extends PermissionHolder {
      * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
     @Deprecated
-    void setInheritGroup(Group group, String server) throws ObjectAlreadyHasException;
+    void setInheritGroup(@Nonnull Group group, @Nonnull String server) throws ObjectAlreadyHasException;
 
     /**
      * Make this group inherit another group on a specific server and world
@@ -139,7 +146,7 @@ public interface Group extends PermissionHolder {
      * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
     @Deprecated
-    void setInheritGroup(Group group, String server, String world) throws ObjectAlreadyHasException;
+    void setInheritGroup(@Nonnull Group group, @Nonnull String server, @Nonnull String world) throws ObjectAlreadyHasException;
 
     /**
      * Make this group inherit another group temporarily
@@ -153,7 +160,7 @@ public interface Group extends PermissionHolder {
      * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
     @Deprecated
-    void setInheritGroup(Group group, long expireAt) throws ObjectAlreadyHasException;
+    void setInheritGroup(@Nonnull Group group, long expireAt) throws ObjectAlreadyHasException;
 
     /**
      * Make this group inherit another group on a specific server temporarily
@@ -168,7 +175,7 @@ public interface Group extends PermissionHolder {
      * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
     @Deprecated
-    void setInheritGroup(Group group, String server, long expireAt) throws ObjectAlreadyHasException;
+    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
@@ -184,7 +191,7 @@ public interface Group extends PermissionHolder {
      * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
     @Deprecated
-    void setInheritGroup(Group group, String server, String world, long expireAt) throws ObjectAlreadyHasException;
+    void setInheritGroup(@Nonnull Group group, @Nonnull String server, @Nonnull String world, long expireAt) throws ObjectAlreadyHasException;
 
     /**
      * Remove a previously set inheritance rule
@@ -196,7 +203,7 @@ public interface Group extends PermissionHolder {
      * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
     @Deprecated
-    void unsetInheritGroup(Group group) throws ObjectLacksException;
+    void unsetInheritGroup(@Nonnull Group group) throws ObjectLacksException;
 
     /**
      * Remove a previously set inheritance rule
@@ -209,7 +216,7 @@ public interface Group extends PermissionHolder {
      * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
     @Deprecated
-    void unsetInheritGroup(Group group, boolean temporary) throws ObjectLacksException;
+    void unsetInheritGroup(@Nonnull Group group, boolean temporary) throws ObjectLacksException;
 
     /**
      * Remove a previously set inheritance rule on a specific server
@@ -223,7 +230,7 @@ public interface Group extends PermissionHolder {
      * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
     @Deprecated
-    void unsetInheritGroup(Group group, String server) throws ObjectLacksException;
+    void unsetInheritGroup(@Nonnull Group group, @Nonnull String server) throws ObjectLacksException;
 
     /**
      * Remove a previously set inheritance rule on a specific server and world
@@ -238,7 +245,7 @@ public interface Group extends PermissionHolder {
      * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
     @Deprecated
-    void unsetInheritGroup(Group group, String server, String world) throws ObjectLacksException;
+    void unsetInheritGroup(@Nonnull Group group, @Nonnull String server, @Nonnull String world) throws ObjectLacksException;
 
     /**
      * Remove a previously set inheritance rule on a specific server
@@ -253,7 +260,7 @@ public interface Group extends PermissionHolder {
      * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
     @Deprecated
-    void unsetInheritGroup(Group group, String server, boolean temporary) throws ObjectLacksException;
+    void unsetInheritGroup(@Nonnull Group group, @Nonnull String server, boolean temporary) throws ObjectLacksException;
 
     /**
      * Remove a previously set inheritance rule on a specific server and world
@@ -269,7 +276,7 @@ public interface Group extends PermissionHolder {
      * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
     @Deprecated
-    void unsetInheritGroup(Group group, String server, String world, boolean temporary) throws ObjectLacksException;
+    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
@@ -278,6 +285,7 @@ public interface Group extends PermissionHolder {
      * @deprecated in favour of just querying a users permissions
      */
     @Deprecated
+    @Nonnull
     List<String> getGroupNames();
 
     /**
@@ -290,7 +298,8 @@ public interface Group extends PermissionHolder {
      * @deprecated in favour of just querying a users permissions
      */
     @Deprecated
-    List<String> getLocalGroups(String server);
+    @Nonnull
+    List<String> getLocalGroups(@Nonnull String server);
 
 
     /**
@@ -304,6 +313,7 @@ public interface Group extends PermissionHolder {
      * @deprecated in favour of just querying a users permissions
      */
     @Deprecated
-    List<String> getLocalGroups(String server, String world);
+    @Nonnull
+    List<String> getLocalGroups(@Nonnull String server, @Nonnull String world);
 
 }

api/src/main/java/me/lucko/luckperms/api/HeldPermission.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,11 +27,15 @@ package me.lucko.luckperms.api;
 
 import com.google.common.collect.Multimap;
 
+import me.lucko.luckperms.api.context.ContextSet;
+
 import java.util.Optional;
 import java.util.OptionalLong;
 
+import javax.annotation.Nonnull;
+
 /**
- * A relationship between a Holder and a permission
+ * A relationship between a PermissionHolder and a permission
  *
  * @param <T> the identifier type of the holder
  * @since 2.17
@@ -40,6 +47,7 @@ public interface HeldPermission<T> {
      *
      * @return the holder
      */
+    @Nonnull
     T getHolder();
 
     /**
@@ -47,6 +55,7 @@ public interface HeldPermission<T> {
      *
      * @return the permission
      */
+    @Nonnull
     String getPermission();
 
     /**
@@ -61,6 +70,7 @@ public interface HeldPermission<T> {
      *
      * @return the server
      */
+    @Nonnull
     Optional<String> getServer();
 
     /**
@@ -68,6 +78,7 @@ public interface HeldPermission<T> {
      *
      * @return the world
      */
+    @Nonnull
     Optional<String> getWorld();
 
     /**
@@ -81,14 +92,25 @@ public interface HeldPermission<T> {
      * Gets the context for the permission.
      *
      * @return the context
+     * @deprecated in favour of {@link #getContexts()}.
      */
+    @Nonnull
+    @Deprecated
     Multimap<String, String> getContext();
 
+    /**
+     * Gets the extra context for the permission.
+     *
+     * @return the extra context
+     */
+    ContextSet getContexts();
+
     /**
      * 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
@@ -26,141 +29,188 @@ import me.lucko.luckperms.api.data.DatastoreConfiguration;
 
 import java.util.Map;
 
+import javax.annotation.Nonnull;
+
 /**
- * Read-only access to the LuckPerms configuration settings
+ * Wrapper around parts of the LuckPerms configuration file
  */
 public interface LPConfiguration {
 
     /**
-     * Returns the name of this server
+     * Gets the name of this server
+     *
      * @return the name of this server
      */
+    @Nonnull
     String getServer();
 
     /**
-     * Returns how often a sync task will run in minutes
+     * Gets how often a sync task will run in minutes
+     *
      * @return how often a sync task will run in minutes
      */
     int getSyncTime();
 
     /**
-     * Returns if the users on this server will have their global permissions applied
+     * Gets 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
+     * Gets 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
+     * Gets 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
+     * Gets if the platform is applying global world groups
+     *
      * @return true if the platform is applying global world groups
      * @since 2.9
      */
     boolean getApplyGlobalWorldGroups();
 
     /**
-     * Returns the online mode setting
+     * Gets the online mode setting
+     *
      * @return the online mode setting
      */
     boolean getOnlineMode();
 
     /**
-     * Returns if LuckPerms is applying wildcard permissions
+     * Gets 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
+     * Gets 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
+     * Gets 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();
 
     /**
-     * Returns true if the vanilla op system is enabled
+     * Gets 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
+     * Gets 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
+     * Gets 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
+     * Gets 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
+     * Gets 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();
 
     /**
-     * Returns the values set for data storage in the configuration
+     * Gets 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
+     * Gets 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
+     * Gets true if split storage is enabled
+     *
      * @return true if split storage is enabled
      * @since 2.7
      */
     boolean getSplitStorage();
 
     /**
-     * Returns a map of split storage options
+     * Gets 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,6 +25,8 @@
 
 package me.lucko.luckperms.api;
 
+import javax.annotation.Nonnull;
+
 /**
  * A node with a traceable origin
  *
@@ -34,6 +39,7 @@ public interface LocalizedNode extends Node {
      *
      * @return the node this instance is representing
      */
+    @Nonnull
     Node getNode();
 
     /**
@@ -42,6 +48,7 @@ public interface LocalizedNode extends Node {
      * @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,22 +29,34 @@ import java.util.SortedMap;
 import java.util.SortedSet;
 import java.util.UUID;
 
+import javax.annotation.Nonnull;
+
 /**
  * Represents the internal LuckPerms log.
  *
- * <p>The returned instance provides a copy of the data at the time of retrieval. Any changes made to log entries will
- * only apply to this instance of the log. You can add to the log using the {@link Storage}, and then request an updated copy.</p>
+ * <p>The returned instance provides a copy of the data at the time of retrieval.</p>
+ *
+ * <p>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>
+ *
+ * <p>All methods are thread safe, and return immutable & thread safe collections.</p>
  */
 public interface Log {
 
     /**
+     * Get the content of the log
+     *
      * @return a {@link SortedSet} of all of the {@link LogEntry} objects in this {@link Log}
      */
+    @Nonnull
     SortedSet<LogEntry> getContent();
 
     /**
+     * Get the content of the log
+     *
      * @return all content in this log
      */
+    @Nonnull
     SortedSet<LogEntry> getRecent();
 
     /**
@@ -50,120 +65,150 @@ public interface Log {
      * @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()}}
+     * @throws IllegalStateException if the log doesn't contain enough entries to populate the page. See {@link #getRecentMaxPages()}
      */
+    @Nonnull
     SortedMap<Integer, LogEntry> getRecent(int pageNo);
 
     /**
+     * Gets the max page number for the recent pages.
+     *
      * @return the max page number allowed in the {@link #getRecent(int)} method
      */
     int getRecentMaxPages();
 
 
     /**
+     * Gets the recent content for a given actor
+     *
      * @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
+     * Gets the recent content for a given actor, separated by page
      *
      * @param pageNo the page number
      * @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)}}
+     * @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);
 
     /**
+     * Gets the max page number for the recent pages.
+     *
      * @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);
 
 
     /**
+     * Gets the log content for a given user
+     *
      * @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
+     * Gets the log content for a given user, separated by page
      *
      * @param pageNo the page number
      * @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)}}
+     * @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);
 
     /**
+     * Gets the max page number for the user history pages.
+     *
      * @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);
 
 
     /**
+     * Gets the log content for a given group
+     *
      * @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
+     * Gets the log content for a given group, separated by page
      *
      * @param pageNo the page number
      * @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)}}
+     * @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);
 
     /**
+     * Gets the max page number for the group history pages.
+     *
      * @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);
 
 
     /**
+     * Gets the log content for a given track
+     *
      * @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
+     * Gets the log content for a given track, separated by page
      *
      * @param pageNo the page number
      * @param name   the name of the acted track 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 #getTrackHistoryMaxPages(String)}
      */
-    SortedMap<Integer, LogEntry> getTrackHistory(int pageNo, String name);
+    @Nonnull
+    SortedMap<Integer, LogEntry> getTrackHistory(int pageNo, @Nonnull String name);
 
     /**
+     * Gets the max page number for the track history pages.
+     *
      * @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);
 
 
     /**
+     * Gets the log content for a given search query
+     *
      * @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
+     * Gets the log content for a given search query, separated by page
      *
      * @param pageNo the page number
      * @param query  the query to filter by
@@ -171,11 +216,15 @@ public interface Log {
      * @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);
 
     /**
+     * Gets the max page number for the search query pages.
+     *
      * @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
@@ -22,41 +25,115 @@
 
 package me.lucko.luckperms.api;
 
+import com.google.common.base.Preconditions;
+
+import java.util.Comparator;
 import java.util.UUID;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
- * A single entry in the log
- *
- * <p>Implements {@link Comparable} ordering based upon the timestamp of the entry.</p>
+ * A single entry in the log.
  */
 public class LogEntry implements Comparable<LogEntry> {
+
+    /**
+     * Compares two LogEntries
+     *
+     * @since 3.3
+     */
+    public static final Comparator<LogEntry> COMPARATOR = Comparator
+            .comparingLong(LogEntry::getTimestamp)
+            .thenComparing(LogEntry::getActor)
+            .thenComparing(LogEntry::getActorName, String.CASE_INSENSITIVE_ORDER)
+            .thenComparing(LogEntry::getEntryType)
+            .thenComparing(e -> {
+                UUID u = e.getActed();
+                return u == null ? "" : u.toString();
+            })
+            .thenComparing(LogEntry::getActedName, String.CASE_INSENSITIVE_ORDER)
+            .thenComparing(LogEntry::getAction);
+
+    /**
+     * Compares two LogEntries in reverse order
+     *
+     * @since 3.3
+     * @see #COMPARATOR
+     */
+    public static final Comparator<LogEntry> REVERSE_ORDER = COMPARATOR.reversed();
+
     private static final String FORMAT = "&8(&e%s&8) [&a%s&8] (&b%s&8) &7--> &f%s";
 
+    /**
+     * Creates a new LogEntry builder
+     *
+     * @return a new builder
+     */
+    @Nonnull
     public static LogEntryBuilder builder() {
         return new LogEntryBuilder();
     }
 
+    /**
+     * The time when the log event occurred in unix seconds.
+     */
     private long timestamp;
+
+    /**
+     * The player who enacted the change
+     */
+    @Nonnull
     private UUID actor;
+
+    /**
+     * The name of the player who enacted the change
+     */
+    @Nonnull
     private String actorName;
-    private char type;
+
+    /**
+     * The entry type.
+     */
+    @Nonnull
+    private Type type;
+
+    /**
+     * The user who was acted upon
+     */
+    @Nullable
     private UUID acted;
+
+    /**
+     * The name of the object who was acted upon
+     */
+    @Nonnull
     private String actedName;
+
+    /**
+     * A description of the action
+     */
+    @Nonnull
     private String action;
 
-    public LogEntry(long timestamp, UUID actor, String actorName, char type, UUID acted, String actedName, String action) {
-        if (actor == null) {
-            throw new NullPointerException("actor");
-        }
-        if (actorName == null) {
-            throw new NullPointerException("actorName");
-        }
-        if (actedName == null) {
-            throw new NullPointerException("actedName");
-        }
-        if (action == null) {
-            throw new NullPointerException("action");
-        }
+    /**
+     * Creates a new log entry
+     *
+     * @param timestamp the timestamp
+     * @param actor the actor
+     * @param actorName the actorName
+     * @param type the type
+     * @param acted the acted object, or null
+     * @param actedName the acted object name
+     * @param action the action
+     * @since 3.3
+     */
+    public LogEntry(long timestamp, @Nonnull UUID actor, @Nonnull String actorName, @Nonnull Type type, @Nullable UUID acted, @Nonnull String actedName, @Nonnull String action) {
+        Preconditions.checkNotNull(actor, "actor");
+        Preconditions.checkNotNull(actorName, "actorName");
+        Preconditions.checkNotNull(type, "type");
+        Preconditions.checkNotNull(actedName, "actedName");
+        Preconditions.checkNotNull(action, "action");
 
         this.timestamp = timestamp;
         this.actor = actor;
@@ -67,34 +144,72 @@ public class LogEntry implements Comparable<LogEntry> {
         this.action = action;
     }
 
+    /**
+     * Creates a new log entry
+     *
+     * @param timestamp the timestamp
+     * @param actor the actor
+     * @param actorName the actorName
+     * @param type the type code
+     * @param acted the acted object, or null
+     * @param actedName the acted object name
+     * @param action the action
+     */
+    public LogEntry(long timestamp, @Nonnull UUID actor, @Nonnull String actorName, char type, @Nullable UUID acted, @Nonnull String actedName, @Nonnull String action) {
+        Preconditions.checkNotNull(actor, "actor");
+        Preconditions.checkNotNull(actorName, "actorName");
+        Preconditions.checkNotNull(actedName, "actedName");
+        Preconditions.checkNotNull(action, "action");
+
+        this.timestamp = timestamp;
+        this.actor = actor;
+        this.actorName = actorName;
+        this.type = Type.valueOf(type);
+        this.acted = acted;
+        this.actedName = actedName;
+        this.action = action;
+    }
+
+    /**
+     * Creates a new LogEntry and copies the values from another
+     *
+     * @param other the entry to copy values from
+     * @since 3.3
+     */
+    protected LogEntry(@Nonnull LogEntry other) {
+        this.timestamp = other.timestamp;
+        this.actor = other.actor;
+        this.actorName = other.actorName;
+        this.type = other.type;
+        this.acted = other.acted;
+        this.actedName = other.actedName;
+        this.action = other.action;
+    }
+
     protected LogEntry() {
         this.timestamp = 0L;
         this.actor = null;
         this.actorName = null;
-        this.type = Character.MIN_VALUE;
+        this.type = null;
         this.acted = null;
         this.actedName = null;
         this.action = null;
     }
 
     @Override
-    public int compareTo(LogEntry o) {
-        return equals(o) ? 0 : (Long.compare(timestamp, o.getTimestamp()) == 0 ? 1 : Long.compare(timestamp, o.getTimestamp()));
+    public int compareTo(@Nonnull LogEntry other) {
+        Preconditions.checkNotNull(other, "other");
+        return COMPARATOR.compare(this, other);
     }
 
-    public boolean matchesSearch(String query) {
-        query = query.toLowerCase();
-        return actorName.toLowerCase().contains(query) || actedName.toLowerCase().contains(query)
-                || action.toLowerCase().contains(query);
-    }
-
-    public String getFormatted() {
-        return String.format(FORMAT,
-                String.valueOf(actorName).equals("null") ? actor.toString() : actorName,
-                Character.toString(type),
-                String.valueOf(actedName).equals("null") && acted != null ? acted.toString() : actedName,
-                action
-        );
+    /**
+     * Creates a copy of this log entry
+     *
+     * @return a copy of this log entry
+     * @since 3.3
+     */
+    public LogEntry copy() {
+        return new LogEntry(this);
     }
 
     public long getTimestamp() {
@@ -105,52 +220,109 @@ public class LogEntry implements Comparable<LogEntry> {
         this.timestamp = timestamp;
     }
 
+    @Nonnull
     public UUID getActor() {
-        return actor;
+        return Preconditions.checkNotNull(actor, "actor");
     }
 
-    void setActor(UUID actor) {
-        this.actor = actor;
+    void setActor(@Nonnull UUID actor) {
+        this.actor = Preconditions.checkNotNull(actor, "actor");
     }
 
+    @Nonnull
     public String getActorName() {
-        return actorName;
+        return Preconditions.checkNotNull(actorName, "actorName");
     }
 
-    void setActorName(String actorName) {
-        this.actorName = actorName;
+    void setActorName(@Nonnull String actorName) {
+        this.actorName = Preconditions.checkNotNull(actorName, "actorName");
     }
 
+    /**
+     * Gets the type of this entry
+     *
+     * @return the type of this entry
+     * @since 3.3
+     */
+    @Nonnull
+    public Type getEntryType() {
+        return Preconditions.checkNotNull(type, "type");
+    }
+
+    /**
+     * Sets the type of this entry
+     *
+     * @param type the new type
+     * @since 3.3
+     */
+    public void setEntryType(@Nonnull Type type) {
+        this.type = Preconditions.checkNotNull(type, "type");
+    }
+
+    /**
+     * Gets the code representing this entry type
+     *
+     * @return the code representing this entry type
+     * @deprecated in favour of {@link #getEntryType()}
+     */
+    @Deprecated
     public char getType() {
-        return type;
+        return getEntryType().getCode();
     }
 
-    void setType(char type) {
-        this.type = type;
+    /**
+     * Sets the type of this entry by code
+     *
+     * @param code the code type
+     * @deprecated in favour of {@link #setEntryType(Type)}
+     */
+    @Deprecated
+    void setType(char code) {
+        setEntryType(Type.valueOf(code));
     }
 
+    @Nullable
     public UUID getActed() {
         return acted;
     }
 
-    void setActed(UUID acted) {
+    void setActed(@Nullable UUID acted) {
         this.acted = acted;
     }
 
+    @Nonnull
     public String getActedName() {
-        return actedName;
+        return Preconditions.checkNotNull(actedName, "actedName");
     }
 
-    void setActedName(String actedName) {
-        this.actedName = actedName;
+    void setActedName(@Nonnull String actedName) {
+        this.actedName = Preconditions.checkNotNull(actedName, "actedName");
     }
 
+    @Nonnull
     public String getAction() {
-        return action;
+        return Preconditions.checkNotNull(action, "action");
     }
 
-    void setAction(String action) {
-        this.action = action;
+    void setAction(@Nonnull String action) {
+        this.action = Preconditions.checkNotNull(action, "action");
+    }
+
+    public boolean matchesSearch(@Nonnull String query) {
+        query = Preconditions.checkNotNull(query, "query").toLowerCase();
+        return actorName.toLowerCase().contains(query) ||
+                actedName.toLowerCase().contains(query) ||
+                action.toLowerCase().contains(query);
+    }
+
+    @Nonnull
+    public String getFormatted() {
+        return String.format(FORMAT,
+                String.valueOf(actorName).equals("null") ? actor.toString() : actorName,
+                Character.toString(type.getCode()),
+                String.valueOf(actedName).equals("null") && acted != null ? acted.toString() : actedName,
+                action
+        );
     }
 
     @Override
@@ -159,11 +331,10 @@ public class LogEntry implements Comparable<LogEntry> {
                 "timestamp=" + this.getTimestamp() + ", " +
                 "actor=" + this.getActor() + ", " +
                 "actorName=" + this.getActorName() + ", " +
-                "type=" + this.getType() + ", " +
+                "type=" + this.getEntryType() + ", " +
                 "acted=" + this.getActed() + ", " +
                 "actedName=" + this.getActedName() + ", " +
-                "action=" + this.getAction() +
-                ")";
+                "action=" + this.getAction() + ")";
     }
 
     @Override
@@ -171,13 +342,14 @@ public class LogEntry implements Comparable<LogEntry> {
         if (o == this) return true;
         if (!(o instanceof LogEntry)) return false;
         final LogEntry other = (LogEntry) o;
+
         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.getActor().equals(other.getActor()) &&
+                this.getActorName().equals(other.getActorName()) &&
+                this.getEntryType() == other.getEntryType() &&
                 (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()));
+                this.getActedName().equals(other.getActedName()) &&
+                this.getAction().equals(other.getAction());
     }
 
     @Override
@@ -185,118 +357,183 @@ public class LogEntry implements Comparable<LogEntry> {
         final int PRIME = 59;
         int result = 1;
         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();
+        result = result * PRIME + this.getActor().hashCode();
+        result = result * PRIME + this.getActorName().hashCode();
+        result = result * PRIME + this.getEntryType().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());
+        result = result * PRIME + this.getActedName().hashCode();
+        result = result * PRIME + this.getAction().hashCode();
         return result;
     }
 
+    /**
+     * The LogEntry type
+     * @since 3.3
+     */
+    public enum Type {
+        USER('U'),
+        GROUP('G'),
+        TRACK('T');
+
+        private final char code;
+
+        Type(char code) {
+            this.code = code;
+        }
+
+        public char getCode() {
+            return this.code;
+        }
+
+        public static Type valueOf(char code) {
+            switch (code) {
+                case 'U':
+                case 'u':
+                    return USER;
+                case 'G':
+                case 'g':
+                    return GROUP;
+                case 'T':
+                case 't':
+                    return TRACK;
+                default:
+                    throw new IllegalArgumentException("Unknown code: " + code);
+            }
+        }
+    }
+
+    /**
+     * Builds LogEntry instances
+     */
     public static class LogEntryBuilder extends AbstractLogEntryBuilder<LogEntry, LogEntry.LogEntryBuilder> {
 
         @Override
-        protected LogEntry createObj() {
+        protected LogEntry createEmptyLog() {
             return new LogEntry();
         }
 
         @Override
-        protected LogEntryBuilder getThis() {
+        protected LogEntryBuilder getThisBuilder() {
             return this;
         }
 
     }
 
+    /**
+     * An abstract log entry builder
+     *
+     * @param <T> the log type
+     * @param <B> the log builder type
+     */
     public static abstract class AbstractLogEntryBuilder<T extends LogEntry, B extends AbstractLogEntryBuilder<T, B>> {
         private T obj;
         private B thisObj;
 
         public AbstractLogEntryBuilder() {
-            obj = createObj();
-            thisObj = getThis();
+            obj = createEmptyLog();
+            thisObj = getThisBuilder();
         }
 
-        protected abstract T createObj();
+        protected abstract T createEmptyLog();
 
-        protected abstract B getThis();
+        protected abstract B getThisBuilder();
 
         public long getTimestamp() {
             return obj.getTimestamp();
         }
 
+        @Nonnull
         public UUID getActor() {
             return obj.getActor();
         }
 
+        @Nonnull
         public String getActorName() {
             return obj.getActorName();
         }
 
+        @Nonnull
+        public Type getEntryType() {
+            return obj.getEntryType();
+        }
+
+        @Nonnull
+        @Deprecated
         public char getType() {
             return obj.getType();
         }
 
+        @Nullable
         public UUID getActed() {
             return obj.getActed();
         }
 
+        @Nonnull
         public String getActedName() {
             return obj.getActedName();
         }
 
+        @Nonnull
         public String getAction() {
             return obj.getAction();
         }
 
+        @Nonnull
         public B timestamp(long timestamp) {
             obj.setTimestamp(timestamp);
             return thisObj;
         }
 
-        public B actor(UUID actor) {
+        @Nonnull
+        public B actor(@Nonnull UUID actor) {
             obj.setActor(actor);
             return thisObj;
         }
 
-        public B actorName(String actorName) {
+        @Nonnull
+        public B actorName(@Nonnull String actorName) {
             obj.setActorName(actorName);
             return thisObj;
         }
 
+        @Nonnull
+        public B entryType(@Nonnull Type type) {
+            obj.setEntryType(type);
+            return thisObj;
+        }
+
+        @Nonnull
+        @Deprecated
         public B type(char type) {
             obj.setType(type);
             return thisObj;
         }
 
-        public B acted(UUID acted) {
+        @Nonnull
+        public B acted(@Nullable UUID acted) {
             obj.setActed(acted);
             return thisObj;
         }
 
-        public B actedName(String actedName) {
+        @Nonnull
+        public B actedName(@Nonnull String actedName) {
             obj.setActedName(actedName);
             return thisObj;
         }
 
-        public B action(String action) {
+        @Nonnull
+        public B action(@Nonnull String action) {
             obj.setAction(action);
             return thisObj;
         }
 
+        @Nonnull
         public T build() {
-            if (getActor() == null) {
-                throw new NullPointerException("actor");
-            }
-            if (getActorName() == null) {
-                throw new NullPointerException("actorName");
-            }
-            if (getActedName() == null) {
-                throw new NullPointerException("actedName");
-            }
-            if (getAction() == null) {
-                throw new NullPointerException("action");
-            }
+            Preconditions.checkNotNull(getActor(), "actor");
+            Preconditions.checkNotNull(getActorName(), "actorName");
+            Preconditions.checkNotNull(getEntryType(), "type");
+            Preconditions.checkNotNull(getActedName(), "actedName");
+            Preconditions.checkNotNull(getAction(), "action");
 
             return obj;
         }
@@ -307,11 +544,10 @@ public class LogEntry implements Comparable<LogEntry> {
                     "timestamp=" + this.getTimestamp() + ", " +
                     "actor=" + this.getActor() + ", " +
                     "actorName=" + this.getActorName() + ", " +
-                    "type=" + this.getType() + ", " +
+                    "type=" + this.getEntryType() + ", " +
                     "acted=" + this.getActed() + ", " +
                     "actedName=" + this.getActedName() + ", " +
-                    "action=" + this.getAction() +
-                    ")";
+                    "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,6 +25,8 @@
 
 package me.lucko.luckperms.api;
 
+import javax.annotation.Nonnull;
+
 /**
  * Represents the logger instance being used by LuckPerms on the platform.
  *
@@ -30,10 +35,10 @@ package me.lucko.luckperms.api;
  */
 public interface Logger {
 
-    void info(String s);
+    void info(@Nonnull String s);
 
-    void warn(String s);
+    void warn(@Nonnull String s);
 
-    void severe(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,6 +25,7 @@
 
 package me.lucko.luckperms.api;
 
+import me.lucko.luckperms.LuckPerms;
 import me.lucko.luckperms.api.context.ContextCalculator;
 import me.lucko.luckperms.api.context.ContextSet;
 import me.lucko.luckperms.api.event.EventBus;
@@ -31,8 +35,17 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
- * The root API interface for LuckPerms
+ * The LuckPerms API.
+ *
+ * <p>This interface is the base of the entire API package. All API functions
+ * are accessed via this interface.</p>
+ *
+ * <p>An instance can be obtained via {@link LuckPerms#getApi()}, or the platforms
+ * Services Manager.</p>
  */
 public interface LuckPermsApi {
 
@@ -54,6 +67,7 @@ public interface LuckPermsApi {
      *
      * @return the version of the plugin running on the platform
      */
+    @Nonnull
     String getVersion();
 
     /**
@@ -62,6 +76,7 @@ public interface LuckPermsApi {
      * @return the platform LuckPerms is running on
      * @since 2.7
      */
+    @Nonnull
     PlatformType getPlatformType();
 
     /**
@@ -70,6 +85,7 @@ public interface LuckPermsApi {
      * @return the event bus
      * @since 3.0
      */
+    @Nonnull
     EventBus getEventBus();
 
     /**
@@ -77,6 +93,7 @@ public interface LuckPermsApi {
      *
      * @return a configuration instance
      */
+    @Nonnull
     LPConfiguration getConfiguration();
 
     /**
@@ -85,6 +102,7 @@ public interface LuckPermsApi {
      * @return a storage instance
      * @since 2.14
      */
+    @Nonnull
     Storage getStorage();
 
     /**
@@ -92,6 +110,7 @@ public interface LuckPermsApi {
      *
      * @return an optional that may contain a messaging service instance.
      */
+    @Nonnull
     Optional<MessagingService> getMessagingService();
 
     /**
@@ -99,6 +118,7 @@ public interface LuckPermsApi {
      *
      * @return the logger instance
      */
+    @Nonnull
     Logger getLogger();
 
     /**
@@ -106,6 +126,7 @@ public interface LuckPermsApi {
      *
      * @return a uuid cache instance
      */
+    @Nonnull
     UuidCache getUuidCache();
 
     /**
@@ -115,7 +136,8 @@ public interface LuckPermsApi {
      * @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.
@@ -126,7 +148,8 @@ public interface LuckPermsApi {
      * @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
@@ -135,7 +158,8 @@ public interface LuckPermsApi {
      * @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.
@@ -146,13 +170,15 @@ public interface LuckPermsApi {
      * @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();
 
     /**
@@ -162,7 +188,7 @@ public interface LuckPermsApi {
      * @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.
@@ -171,7 +197,7 @@ public interface LuckPermsApi {
      * @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
@@ -180,7 +206,8 @@ public interface LuckPermsApi {
      * @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.
@@ -191,13 +218,15 @@ public interface LuckPermsApi {
      * @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();
 
     /**
@@ -207,7 +236,7 @@ public interface LuckPermsApi {
      * @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
@@ -216,7 +245,8 @@ public interface LuckPermsApi {
      * @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.
@@ -227,13 +257,15 @@ public interface LuckPermsApi {
      * @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();
 
     /**
@@ -243,13 +275,14 @@ public interface LuckPermsApi {
      * @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();
 
     /**
@@ -258,6 +291,7 @@ public interface LuckPermsApi {
      * @return the meta stack factory
      * @since 3.2
      */
+    @Nonnull
     MetaStackFactory getMetaStackFactory();
 
     /**
@@ -269,7 +303,8 @@ public interface LuckPermsApi {
      * @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
@@ -277,7 +312,7 @@ public interface LuckPermsApi {
      * @param contextCalculator the context calculator to register. The type MUST be the player class of the platform.
      * @throws ClassCastException if the type is not the player class of the platform.
      */
-    void registerContextCalculator(ContextCalculator<?> contextCalculator);
+    void registerContextCalculator(@Nonnull ContextCalculator<?> contextCalculator);
 
     /**
      * Gets a calculated context instance for the user using the rules of the platform.
@@ -287,7 +322,8 @@ public interface LuckPermsApi {
      * @param user the user to get contexts for
      * @return an optional containing contexts. Will return empty if the user is not online.
      */
-    Optional<Contexts> getContextForUser(User user);
+    @Nonnull
+    Optional<Contexts> getContextForUser(@Nonnull User user);
 
     /**
      * Gets set of contexts applicable to a player using the platforms {@link ContextCalculator}s.
@@ -296,6 +332,34 @@ public interface LuckPermsApi {
      * @return a set of contexts.
      * @since 2.17
      */
-    ContextSet getContextForPlayer(Object player);
+    @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

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
@@ -38,6 +41,7 @@ import java.util.Set;
  */
 @Deprecated
 public class MetaUtils {
+    private static final String[] DELIMS = new String[]{".", "/", "-", "$"};
 
     private static String escapeDelimiters(String s, String... delims) {
         for (String delim : delims) {
@@ -65,7 +69,7 @@ public class MetaUtils {
             throw new NullPointerException();
         }
 
-        return escapeDelimiters(s, ".", "/", "-", "$");
+        return escapeDelimiters(s, DELIMS);
     }
 
     /**
@@ -83,7 +87,7 @@ public class MetaUtils {
         s = s.replace("{SEP}", ".");
         s = s.replace("{FSEP}", "/");
         s = s.replace("{DSEP}", "$");
-        s = unescapeDelimiters(s, ".", "/", "-", "$");
+        s = unescapeDelimiters(s, DELIMS);
 
         return s;
     }
@@ -158,7 +162,7 @@ public class MetaUtils {
         node = escapeCharacters(node);
 
         for (Node n : holder.getPermissions()) {
-            if (!n.getValue() || !n.isMeta()) continue;
+            if (!n.getValuePrimitive() || !n.isMeta()) continue;
 
             if (!n.shouldApplyOnServer(server, includeGlobal, false)) continue;
             if (!n.shouldApplyOnWorld(world, includeGlobal, false)) continue;
@@ -230,7 +234,7 @@ public class MetaUtils {
         int priority = Integer.MIN_VALUE;
         String meta = null;
         for (Node n : holder.getAllNodes(Contexts.allowAll())) {
-            if (!n.getValue()) continue;
+            if (!n.getValuePrimitive()) continue;
 
             if (!n.shouldApplyOnServer(server, includeGlobal, false)) continue;
             if (!n.shouldApplyOnWorld(world, includeGlobal, false)) continue;

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
@@ -30,51 +33,73 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
- * An immutable permission node
+ * Represents a permission node.
  *
- * <p>Use {@link LuckPermsApi#buildNode(String)} to get an instance.</p>
+ * <p>All implementations of this interface must be immutable.</p>
+ *
+ * <p>Use the {@link NodeFactory} to obtain and construct instances.</p>
  *
  * @since 2.6
  */
 public interface Node extends Map.Entry<String, Boolean> {
 
     /**
-     * Returns the actual permission string
+     * Gets the permission string
      *
      * @return the actual permission node
      */
+    @Nonnull
     String getPermission();
 
     /**
-     * Gets what value the permission is set to. A negated node would return <code>false</code>.
+     * Gets the value.
+     *
+     * <p>A negated node would return a value of <code>false</code>.</p>
      *
      * @return the permission's value
      */
     @Override
-    Boolean getValue();
-
-    /**
-     * Returns the value of this node as a tristate
-     *
-     * @return the value of this node as a Tristate
-     */
-    default Tristate getTristate() {
-        return Tristate.fromBoolean(getValue());
+    @Nonnull
+    default Boolean getValue() {
+        return getValuePrimitive();
     }
 
     /**
-     * Returns if the node is negated
+     * Gets the value.
+     *
+     * <p>A negated node would return a value of <code>false</code>.</p>
+     *
+     * @return the permission's value
+     */
+    boolean getValuePrimitive();
+
+    /**
+     * Gets the value of this node as a {@link Tristate}
+     *
+     * @return the value of this node as a Tristate
+     */
+    @Nonnull
+    default Tristate getTristate() {
+        return Tristate.fromBoolean(getValuePrimitive());
+    }
+
+    /**
+     * Gets if the node is negated
      *
      * @return true if the node is negated
      */
     default boolean isNegated() {
-        return !getValue();
+        return !getValuePrimitive();
     }
 
     /**
-     * If this node is set to override explicitly.
-     * This value does not persist across saves, and is therefore only useful for transient nodes
+     * Gets if this node is set to override explicitly.
+     *
+     * <p>This value does not persist across saves, and is therefore only useful for transient nodes</p>
      *
      * @return true if this node is set to override explicitly
      */
@@ -85,6 +110,7 @@ public interface Node extends Map.Entry<String, Boolean> {
      *
      * @return an {@link Optional} containing the server, if one is defined
      */
+    @Nonnull
     Optional<String> getServer();
 
     /**
@@ -92,24 +118,25 @@ public interface Node extends Map.Entry<String, Boolean> {
      *
      * @return an {@link Optional} containing the world, if one is defined
      */
+    @Nonnull
     Optional<String> getWorld();
 
     /**
-     * Returns if this node is server specific
+     * Gets if this node is server specific
      *
      * @return true if this node is server specific
      */
     boolean isServerSpecific();
 
     /**
-     * Returns if this node is server specific
+     * Gets if this node is server specific
      *
      * @return true if this node is server specific
      */
     boolean isWorldSpecific();
 
     /**
-     * Returns if this node applies globally, and has no specific context
+     * Gets if this node applies globally, and therefore has no specific context
      *
      * @return true if this node applies globally, and has no specific context
      * @since 3.1
@@ -117,7 +144,7 @@ public interface Node extends Map.Entry<String, Boolean> {
     boolean appliesGlobally();
 
     /**
-     * Returns if this node has any specific context in order to apply.
+     * Gets if this node has any specific context in order for it to apply
      *
      * @return true if this node has specific context
      * @since 3.1
@@ -125,7 +152,7 @@ public interface Node extends Map.Entry<String, Boolean> {
     boolean hasSpecificContext();
 
     /**
-     * Returns if this node is able to apply in the given context
+     * Gets 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
@@ -136,46 +163,46 @@ public interface Node extends Map.Entry<String, Boolean> {
      * @return true if the node should apply, otherwise false
      * @since 3.1
      */
-    boolean shouldApply(boolean includeGlobal, boolean includeGlobalWorld, String server, String world, ContextSet context, boolean applyRegex);
+    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
+     * Gets 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
+     * Gets if this node should apply on a specific world
      *
      * @param world         the name of the world
      * @param includeGlobal if global permissions should apply
      * @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
+     * Gets 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
      * @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
+     * Gets 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);
+    boolean shouldApplyWithContext(@Nonnull ContextSet context);
 
     /**
      * Similar to {@link #shouldApplyOnServer(String, boolean, boolean)}, except this method accepts a List
@@ -184,7 +211,7 @@ public interface Node extends Map.Entry<String, Boolean> {
      * @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
@@ -193,32 +220,36 @@ public interface Node extends Map.Entry<String, Boolean> {
      * @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
+     * @deprecated as this is no longer used internally to resolve wildcards
      */
-    List<String> resolveWildcard(List<String> possibleNodes);
+    @Nonnull
+    @Deprecated
+    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
+     * Gets 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
+     * Gets if this node will not expire
      *
      * @return true if this node will not expire
      */
@@ -227,32 +258,34 @@ public interface Node extends Map.Entry<String, Boolean> {
     }
 
     /**
-     * Returns a unix timestamp in seconds when this node will expire
+     * Gets 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
+     * Gets 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
+     * Gets 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.
-     * This also returns false if the node is not temporary
+     * Gets if the node has expired.
+     *
+     * <p>This also returns false if the node is not temporary.</p>
      *
      * @return true if this node has expired
      */
@@ -264,6 +297,7 @@ public interface Node extends Map.Entry<String, Boolean> {
      * @return the extra contexts required for this node to apply
      * @since 2.13
      */
+    @Nonnull
     ContextSet getContexts();
 
     /**
@@ -272,6 +306,7 @@ public interface Node extends Map.Entry<String, Boolean> {
      * @return the full contexts required for this node to apply
      * @since 3.1
      */
+    @Nonnull
     ContextSet getFullContexts();
 
     /**
@@ -281,25 +316,27 @@ public interface Node extends Map.Entry<String, Boolean> {
      * @deprecated because this serialized form is no longer used by the implementation.
      */
     @Deprecated
+    @Nonnull
     String toSerializedNode();
 
     /**
-     * Returns if this is a group node
+     * Gets if this is a group node
      *
      * @return true if this is a group node
      */
     boolean isGroupNode();
 
     /**
-     * Returns the name of the group
+     * Gets the name of the group, if this is a group node.
      *
      * @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;
 
     /**
-     * Returns if this node is a wildcard node
+     * Gets if this node is a wildcard node
      *
      * @return true if this node is a wildcard node
      */
@@ -311,10 +348,10 @@ public interface Node extends Map.Entry<String, Boolean> {
      * @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
+     * Gets if this node is a meta node
      *
      * @return true if this node is a meta node
      */
@@ -326,10 +363,11 @@ public interface Node extends Map.Entry<String, Boolean> {
      * @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
+     * Gets if this node is a prefix node
      *
      * @return true if this node is a prefix node
      */
@@ -341,10 +379,11 @@ public interface Node extends Map.Entry<String, Boolean> {
      * @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
+     * Gets if this node is a suffix node
      *
      * @return true if this node is a suffix node
      */
@@ -356,7 +395,8 @@ public interface Node extends Map.Entry<String, Boolean> {
      * @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
@@ -365,6 +405,7 @@ public interface Node extends Map.Entry<String, Boolean> {
      * @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);
 
     /**
@@ -373,7 +414,7 @@ public interface Node extends Map.Entry<String, Boolean> {
      * @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
@@ -381,7 +422,7 @@ public interface Node extends Map.Entry<String, Boolean> {
      * @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
@@ -390,38 +431,51 @@ public interface Node extends Map.Entry<String, Boolean> {
      * @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);
+        @Nonnull
+        Builder setWorld(@Nonnull String world);
 
-        Builder setServer(String server) throws IllegalArgumentException;
+        @Nonnull
+        Builder setServer(@Nonnull String server) throws IllegalArgumentException;
 
-        Builder withExtraContext(String key, String value);
+        @Nonnull
+        Builder withExtraContext(@Nonnull String key, @Nonnull String value);
 
-        Builder withExtraContext(Map<String, String> map);
+        @Nonnull
+        Builder withExtraContext(@Nonnull Map<String, String> map);
 
-        Builder withExtraContext(Set<Map.Entry<String, String>> context);
+        @Nonnull
+        Builder withExtraContext(@Nonnull Set<Map.Entry<String, String>> context);
 
-        Builder withExtraContext(Map.Entry<String, String> entry);
+        @Nonnull
+        Builder withExtraContext(@Nonnull Map.Entry<String, String> entry);
 
-        Builder withExtraContext(ContextSet set);
+        @Nonnull
+        Builder withExtraContext(@Nonnull ContextSet set);
 
+        @Nonnull
         Node build();
     }
 

api/src/main/java/me/lucko/luckperms/api/NodeFactory.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,99 @@
 
 package me.lucko.luckperms.api;
 
+import javax.annotation.Nonnull;
+
 /**
- * Builds {@link Node} instances
+ * Assists with constructing {@link Node} instances.
  *
  * @since 2.17
  */
 public interface NodeFactory {
 
+    /**
+     * 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 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);
+
+
     /**
      * Creates a node from a serialised node string
      *
+     * <p>This format is what was previously used in YAML/JSON storage files.</p>
+     *
      * @param serialisedPermission the serialised permission string
      * @param value                the value of the node
      * @return a node instance
@@ -40,26 +126,8 @@ public interface NodeFactory {
      * @see Node#toSerializedNode()
      */
     @Deprecated
-    Node fromSerialisedNode(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
-     */
-    Node.Builder newBuilder(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
-     */
-    Node.Builder newBuilderFromExisting(Node other);
+    @Nonnull
+    Node fromSerialisedNode(@Nonnull String serialisedPermission, boolean value);
 
     /**
      * Creates a node builder from a serialised node string
@@ -72,59 +140,7 @@ public interface NodeFactory {
      * @see Node#toSerializedNode()
      */
     @Deprecated
-    Node.Builder newBuilderFromSerialisedNode(String serialisedPermission, boolean value);
-
-
-    /**
-     * Creates a node builder from a group
-     *
-     * @param group the group
-     * @return a node builder instance
-     * @throws NullPointerException  if the group is null
-     * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
-     * @since 3.1
-     */
-    Node.Builder makeGroupNode(Group group);
-
-    /**
-     * Creates a node builder from a key value pair
-     *
-     * @param key   the key
-     * @param value the value
-     * @return a node builder instance
-     * @throws NullPointerException if the key or value is null
-     */
-    Node.Builder makeMetaNode(String key, 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
-     */
-    Node.Builder makeChatMetaNode(ChatMetaType type, int priority, 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
-     */
-    Node.Builder makePrefixNode(int priority, 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
-     */
-    Node.Builder makeSuffixNode(int priority, String suffix);
+    @Nonnull
+    Node.Builder newBuilderFromSerialisedNode(@Nonnull String serialisedPermission, boolean value);
 
 }

api/src/main/java/me/lucko/luckperms/api/PermissionHolder.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,30 +25,40 @@
 
 package me.lucko.luckperms.api;
 
+import com.google.common.collect.ImmutableSetMultimap;
+import com.google.common.collect.Multimap;
+
 import me.lucko.luckperms.api.context.ContextSet;
+import me.lucko.luckperms.api.context.ImmutableContextSet;
 import me.lucko.luckperms.exceptions.ObjectAlreadyHasException;
 import me.lucko.luckperms.exceptions.ObjectLacksException;
 
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.function.Predicate;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
- * An object capable of holding permissions
+ * An object which holds permissions.
  *
- * <p>Any changes made will be lost unless the instance is saved back to the {@link Storage}.</p>
+ * <p>Any changes made to permission holding objects will be lost unless the
+ * instance is saved back to the {@link Storage}.</p>
  */
 public interface PermissionHolder {
 
     /**
-     * Gets the objects name
+     * Gets the objects name.
      *
      * <p>{@link User#getUuid()}, {@link User#getName()} or {@link Group#getName()} should normally be used instead of
      * this method.</p>
      *
      * @return the identifier for this object. Either a uuid string or name.
      */
+    @Nonnull
     String getObjectName();
 
     /**
@@ -57,34 +70,79 @@ public interface PermissionHolder {
      * @return a friendly identifier for this holder
      * @since 3.2
      */
+    @Nonnull
     String getFriendlyName();
 
+    /**
+     * Gets the backing multimap containing every permission this holder has.
+     *
+     * <p>This method <b>does not</b> resolve inheritance rules, and returns a
+     * view of what's 'in the file'.</p>
+     *
+     * @return the holders own permissions
+     * @since 3.3
+     */
+    @Nonnull
+    ImmutableSetMultimap<ImmutableContextSet, Node> getNodes();
+
+    /**
+     * Gets the backing multimap containing every transient permission this holder has.
+     *
+     * <p>This method <b>does not</b> resolve inheritance rules.</p>
+     *
+     * <p>Transient permissions only exist for the duration of the session.</p>
+     *
+     * @return the holders own permissions
+     * @since 3.3
+     */
+    @Nonnull
+    ImmutableSetMultimap<ImmutableContextSet, Node> getTransientNodes();
+
+    /**
+     * Gets a flattened/squashed view of the holders permissions.
+     *
+     * <p>This list is constructed using the {@link Multimap#values()} method
+     * of both the transient and enduring backing multimaps.</p>
+     *
+     * <p>This means that it <b>may contain</b> duplicate entries.</p>
+     *
+     * <p>Use {@link #getPermissions()} for a view without duplicates.</p>
+     *
+     * @return a list of the holders own nodes.
+     * @since 3.3
+     */
+    @Nonnull
+    List<Node> getOwnNodes();
+
     /**
      * Gets a sorted set of all held permissions.
      *
      * @return an immutable set of permissions in priority order
      * @since 2.6
      */
+    @Nonnull
     SortedSet<? extends Node> getPermissions();
 
     /**
-     * Similar to {@link #getPermissions()}, except without transient permissions
+     * Similar to {@link #getPermissions()}, except without transient permissions.
      *
      * <p>Unlike transient permissions, enduring permissions will be saved to storage, and exist after the session.</p>
      *
      * @return a set of nodes
      * @since 2.6
      */
+    @Nonnull
     Set<? extends Node> getEnduringPermissions();
 
     /**
-     * Similar to {@link #getPermissions()}, except without enduring permissions
+     * Similar to {@link #getPermissions()}, except without enduring permissions.
      *
      * <p>Transient permissions only exist for the duration of the session.</p>
      *
      * @return a set of nodes
      * @since 2.6
      */
+    @Nonnull
     Set<? extends Node> getTransientPermissions();
 
     /**
@@ -93,6 +151,7 @@ public interface PermissionHolder {
      * @return a set of permanent nodes
      * @since 2.6
      */
+    @Nonnull
     Set<Node> getPermanentPermissionNodes();
 
     /**
@@ -101,8 +160,41 @@ public interface PermissionHolder {
      * @return a set of temporary nodes
      * @since 2.6
      */
+    @Nonnull
     Set<Node> getTemporaryPermissionNodes();
 
+    /**
+     * Recursively resolves this holders permissions.
+     *
+     * <p>The returned list will contain every inherited
+     * node the holder has, in the order that they were inherited in.</p>
+     *
+     * <p>This means the list will contain duplicates.</p>
+     *
+     * @param contexts the contexts for the lookup
+     * @return a list of nodes
+     * @since 3.3
+     */
+    @Nonnull
+    List<LocalizedNode> resolveInheritances(Contexts contexts);
+
+    /**
+     * Recursively resolves this holders permissions.
+     *
+     * <p>The returned list will contain every inherited
+     * node the holder has, in the order that they were inherited in.</p>
+     *
+     * <p>This means the list will contain duplicates.</p>
+     *
+     * <p>Unlike {@link #resolveInheritances(Contexts)}, this method does not
+     * filter by context, at all.</p>
+     *
+     * @return a list of nodes
+     * @since 3.3
+     */
+    @Nonnull
+    List<LocalizedNode> resolveInheritances();
+
     /**
      * Gets a mutable sorted set of the nodes that this object has and inherits, filtered by context
      *
@@ -116,7 +208,22 @@ public interface PermissionHolder {
      * @throws NullPointerException if the context is null
      * @since 2.11
      */
-    SortedSet<LocalizedNode> getAllNodes(Contexts contexts);
+    @Nonnull
+    SortedSet<LocalizedNode> getAllNodes(@Nonnull Contexts contexts);
+
+    /**
+     * Gets a mutable sorted set of the nodes that this object has and inherits.
+     *
+     * <p>Unlike {@link #getAllNodes(Contexts)}, this method does not filter by context, at all.</p>
+     *
+     * <p>Nodes are sorted into priority order.</p>
+     *
+     * @return a mutable sorted set of permissions
+     * @throws NullPointerException if the context is null
+     * @since 3.3
+     */
+    @Nonnull
+    SortedSet<LocalizedNode> getAllNodes();
 
     /**
      * Gets a mutable set of the nodes that this object has and inherits, filtered by context.
@@ -129,7 +236,8 @@ public interface PermissionHolder {
      * @throws NullPointerException if the context is null
      * @since 2.11
      */
-    Set<LocalizedNode> getAllNodesFiltered(Contexts contexts);
+    @Nonnull
+    Set<LocalizedNode> getAllNodesFiltered(@Nonnull Contexts contexts);
 
     /**
      * Converts the output of {@link #getAllNodesFiltered(Contexts)}, and expands shorthand permissions.
@@ -138,7 +246,8 @@ public interface PermissionHolder {
      * @param lowerCase if the keys should be made lowercase whilst being exported
      * @return a mutable map of permissions
      */
-    Map<String, Boolean> exportNodes(Contexts contexts, boolean lowerCase);
+    @Nonnull
+    Map<String, Boolean> exportNodes(@Nonnull Contexts contexts, boolean lowerCase);
 
     /**
      * Removes temporary permissions that have expired
@@ -153,7 +262,8 @@ public interface PermissionHolder {
      * @throws NullPointerException if the node is null
      * @since 2.6
      */
-    Tristate hasPermission(Node node);
+    @Nonnull
+    Tristate hasPermission(@Nonnull Node node);
 
     /**
      * Checks to see if the object has a certain permission
@@ -163,7 +273,8 @@ public interface PermissionHolder {
      * @throws NullPointerException if the node is null
      * @since 2.6
      */
-    Tristate hasTransientPermission(Node node);
+    @Nonnull
+    Tristate hasTransientPermission(@Nonnull Node node);
 
     /**
      * Checks to see if the object inherits a certain permission
@@ -173,7 +284,8 @@ public interface PermissionHolder {
      * @throws NullPointerException if the node is null
      * @since 2.6
      */
-    Tristate inheritsPermission(Node node);
+    @Nonnull
+    Tristate inheritsPermission(@Nonnull Node node);
 
     /**
      * Sets a permission for the object
@@ -183,7 +295,7 @@ public interface PermissionHolder {
      * @throws NullPointerException      if the node is null
      * @since 2.6
      */
-    void setPermission(Node node) throws ObjectAlreadyHasException;
+    void setPermission(@Nonnull Node node) throws ObjectAlreadyHasException;
 
     /**
      * Sets a permission for the object
@@ -193,7 +305,8 @@ public interface PermissionHolder {
      * @return the result of the operation
      * @since 3.1
      */
-    DataMutateResult setPermissionUnchecked(Node node);
+    @Nonnull
+    DataMutateResult setPermissionUnchecked(@Nonnull Node node);
 
     /**
      * Sets a transient permission for the object
@@ -212,7 +325,7 @@ public interface PermissionHolder {
      * @throws NullPointerException      if the node is null
      * @since 2.6
      */
-    void setTransientPermission(Node node) throws ObjectAlreadyHasException;
+    void setTransientPermission(@Nonnull Node node) throws ObjectAlreadyHasException;
 
     /**
      * Sets a transient permission for the object
@@ -231,7 +344,8 @@ public interface PermissionHolder {
      * @return the result of the operation
      * @since 3.1
      */
-    DataMutateResult setTransientPermissionUnchecked(Node node);
+    @Nonnull
+    DataMutateResult setTransientPermissionUnchecked(@Nonnull Node node);
 
     /**
      * Unsets a permission for the object
@@ -241,7 +355,7 @@ public interface PermissionHolder {
      * @throws NullPointerException if the node is null
      * @since 2.6
      */
-    void unsetPermission(Node node) throws ObjectLacksException;
+    void unsetPermission(@Nonnull Node node) throws ObjectLacksException;
 
     /**
      * Unsets a permission for the object
@@ -251,7 +365,8 @@ public interface PermissionHolder {
      * @return the result of the operation
      * @since 3.1
      */
-    DataMutateResult unsetPermissionUnchecked(Node node);
+    @Nonnull
+    DataMutateResult unsetPermissionUnchecked(@Nonnull Node node);
 
     /**
      * Unsets a transient permission for the object
@@ -261,7 +376,7 @@ public interface PermissionHolder {
      * @throws NullPointerException if the node is null
      * @since 2.6
      */
-    void unsetTransientPermission(Node node) throws ObjectLacksException;
+    void unsetTransientPermission(@Nonnull Node node) throws ObjectLacksException;
 
     /**
      * Unsets a transient permission for the object
@@ -271,7 +386,8 @@ public interface PermissionHolder {
      * @return the result of the operation
      * @since 3.1
      */
-    DataMutateResult unsetTransientPermissionUnchecked(Node node);
+    @Nonnull
+    DataMutateResult unsetTransientPermissionUnchecked(@Nonnull Node node);
 
     /**
      * Clears any nodes from the holder which pass the predicate
@@ -279,7 +395,7 @@ public interface PermissionHolder {
      * @param test the predicate to test for nodes which should be removed
      * @since 3.2
      */
-    void clearMatching(Predicate<Node> test);
+    void clearMatching(@Nonnull Predicate<Node> test);
 
     /**
      * Clears any transient nodes from the holder which pass the predicate
@@ -287,7 +403,7 @@ public interface PermissionHolder {
      * @param test the predicate to test for nodes which should be removed
      * @since 3.2
      */
-    void clearMatchingTransient(Predicate<Node> test);
+    void clearMatchingTransient(@Nonnull Predicate<Node> test);
 
     /**
      * Clears all nodes held by the object
@@ -302,7 +418,7 @@ public interface PermissionHolder {
      * @param contextSet the contexts to filter by
      * @since 3.2
      */
-    void clearNodes(ContextSet contextSet);
+    void clearNodes(@Nonnull ContextSet contextSet);
 
     /**
      * Clears all parent groups
@@ -317,7 +433,7 @@ public interface PermissionHolder {
      * @param contextSet the contexts to filter by
      * @since 3.2
      */
-    void clearParents(ContextSet contextSet);
+    void clearParents(@Nonnull ContextSet contextSet);
 
     /**
      * Clears all meta held by the object
@@ -332,7 +448,7 @@ public interface PermissionHolder {
      * @param contextSet the contexts to filter by
      * @since 3.2
      */
-    void clearMeta(ContextSet contextSet);
+    void clearMeta(@Nonnull ContextSet contextSet);
 
     /**
      * Clears all transient permissions the holder has.
@@ -350,7 +466,7 @@ public interface PermissionHolder {
      * @deprecated in favour of {@link #hasPermission(Node)}
      */
     @Deprecated
-    boolean hasPermission(String node, boolean b);
+    boolean hasPermission(@Nonnull String node, boolean b);
 
     /**
      * Checks to see the the object has a permission on a certain server
@@ -364,7 +480,7 @@ public interface PermissionHolder {
      * @deprecated in favour of {@link #hasPermission(Node)}
      */
     @Deprecated
-    boolean hasPermission(String node, boolean b, String server);
+    boolean hasPermission(@Nonnull String node, boolean b, @Nonnull String server);
 
     /**
      * Checks to see the the object has a permission on a certain server and world
@@ -379,7 +495,7 @@ public interface PermissionHolder {
      * @deprecated in favour of {@link #hasPermission(Node)}
      */
     @Deprecated
-    boolean hasPermission(String node, boolean b, String server, String world);
+    boolean hasPermission(@Nonnull String node, boolean b, @Nonnull String server, @Nonnull String world);
 
     /**
      * Checks to see the the object has a permission
@@ -393,7 +509,7 @@ public interface PermissionHolder {
      * @deprecated in favour of {@link #hasPermission(Node)}
      */
     @Deprecated
-    boolean hasPermission(String node, boolean b, boolean temporary);
+    boolean hasPermission(@Nonnull String node, boolean b, boolean temporary);
 
     /**
      * Checks to see the the object has a permission on a certain server
@@ -408,7 +524,7 @@ public interface PermissionHolder {
      * @deprecated in favour of {@link #hasPermission(Node)}
      */
     @Deprecated
-    boolean hasPermission(String node, boolean b, String server, boolean temporary);
+    boolean hasPermission(@Nonnull String node, boolean b, @Nonnull String server, boolean temporary);
 
     /**
      * Checks to see the the object has a permission on a certain server and world
@@ -424,7 +540,7 @@ public interface PermissionHolder {
      * @deprecated in favour of {@link #hasPermission(Node)}
      */
     @Deprecated
-    boolean hasPermission(String node, boolean b, String server, String world, boolean temporary);
+    boolean hasPermission(@Nonnull String node, boolean b, @Nonnull String server, @Nonnull String world, boolean temporary);
 
     /**
      * Checks to see if the object inherits a certain permission
@@ -437,7 +553,7 @@ public interface PermissionHolder {
      * @deprecated in favour of {@link #hasPermission(Node)}
      */
     @Deprecated
-    boolean inheritsPermission(String node, boolean b);
+    boolean inheritsPermission(@Nonnull String node, boolean b);
 
     /**
      * Checks to see the the object inherits a permission on a certain server
@@ -451,7 +567,7 @@ public interface PermissionHolder {
      * @deprecated in favour of {@link #hasPermission(Node)}
      */
     @Deprecated
-    boolean inheritsPermission(String node, boolean b, String server);
+    boolean inheritsPermission(@Nonnull String node, boolean b, @Nonnull String server);
 
     /**
      * Checks to see the the object inherits a permission on a certain server and world
@@ -466,7 +582,7 @@ public interface PermissionHolder {
      * @deprecated in favour of {@link #hasPermission(Node)}
      */
     @Deprecated
-    boolean inheritsPermission(String node, boolean b, String server, String world);
+    boolean inheritsPermission(@Nonnull String node, boolean b, @Nonnull String server, @Nonnull String world);
 
     /**
      * Checks to see if the object inherits a permission
@@ -480,7 +596,7 @@ public interface PermissionHolder {
      * @deprecated in favour of {@link #hasPermission(Node)}
      */
     @Deprecated
-    boolean inheritsPermission(String node, boolean b, boolean temporary);
+    boolean inheritsPermission(@Nonnull String node, boolean b, boolean temporary);
 
     /**
      * Checks to see if the object inherits a permission on a certain server
@@ -495,7 +611,7 @@ public interface PermissionHolder {
      * @deprecated in favour of {@link #hasPermission(Node)}
      */
     @Deprecated
-    boolean inheritsPermission(String node, boolean b, String server, boolean temporary);
+    boolean inheritsPermission(@Nonnull String node, boolean b, @Nonnull String server, boolean temporary);
 
     /**
      * Checks to see if the object inherits a permission on a certain server and world
@@ -511,7 +627,7 @@ public interface PermissionHolder {
      * @deprecated in favour of {@link #hasPermission(Node)}
      */
     @Deprecated
-    boolean inheritsPermission(String node, boolean b, String server, String world, boolean temporary);
+    boolean inheritsPermission(@Nonnull String node, boolean b, @Nonnull String server, @Nonnull String world, boolean temporary);
 
     /**
      * Sets a permission for the object
@@ -524,7 +640,7 @@ public interface PermissionHolder {
      * @deprecated in favour of {@link #setPermission(Node)}
      */
     @Deprecated
-    void setPermission(String node, boolean value) throws ObjectAlreadyHasException;
+    void setPermission(@Nonnull String node, boolean value) throws ObjectAlreadyHasException;
 
     /**
      * Sets a permission for the object on a specific server
@@ -538,7 +654,7 @@ public interface PermissionHolder {
      * @deprecated in favour of {@link #setPermission(Node)}
      */
     @Deprecated
-    void setPermission(String node, boolean value, String server) throws ObjectAlreadyHasException;
+    void setPermission(@Nonnull String node, boolean value, @Nonnull String server) throws ObjectAlreadyHasException;
 
     /**
      * Sets a permission for the object on a specific server and world
@@ -553,7 +669,7 @@ public interface PermissionHolder {
      * @deprecated in favour of {@link #setPermission(Node)}
      */
     @Deprecated
-    void setPermission(String node, boolean value, String server, String world) throws ObjectAlreadyHasException;
+    void setPermission(@Nonnull String node, boolean value, @Nonnull String server, @Nonnull String world) throws ObjectAlreadyHasException;
 
     /**
      * Sets a temporary permission for the object
@@ -567,7 +683,7 @@ public interface PermissionHolder {
      * @deprecated in favour of {@link #setPermission(Node)}
      */
     @Deprecated
-    void setPermission(String node, boolean value, long expireAt) throws ObjectAlreadyHasException;
+    void setPermission(@Nonnull String node, boolean value, long expireAt) throws ObjectAlreadyHasException;
 
     /**
      * Sets a temporary permission for the object on a specific server
@@ -582,7 +698,7 @@ public interface PermissionHolder {
      * @deprecated in favour of {@link #setPermission(Node)}
      */
     @Deprecated
-    void setPermission(String node, boolean value, String server, long expireAt) throws ObjectAlreadyHasException;
+    void setPermission(@Nonnull String node, boolean value, @Nonnull String server, long expireAt) throws ObjectAlreadyHasException;
 
     /**
      * Sets a temporary permission for the object on a specific server and world
@@ -598,7 +714,7 @@ public interface PermissionHolder {
      * @deprecated in favour of {@link #setPermission(Node)}
      */
     @Deprecated
-    void setPermission(String node, boolean value, String server, String world, long expireAt) throws ObjectAlreadyHasException;
+    void setPermission(String node, boolean value, @Nonnull String server, @Nonnull String world, long expireAt) throws ObjectAlreadyHasException;
 
     /**
      * Unsets a permission for the object
@@ -611,7 +727,7 @@ public interface PermissionHolder {
      * @deprecated in favour of {@link #unsetPermission(Node)}
      */
     @Deprecated
-    void unsetPermission(String node, boolean temporary) throws ObjectLacksException;
+    void unsetPermission(@Nonnull String node, boolean temporary) throws ObjectLacksException;
 
     /**
      * Unsets a permission for the object
@@ -623,7 +739,7 @@ public interface PermissionHolder {
      * @deprecated in favour of {@link #unsetPermission(Node)}
      */
     @Deprecated
-    void unsetPermission(String node) throws ObjectLacksException;
+    void unsetPermission(@Nonnull String node) throws ObjectLacksException;
 
     /**
      * Unsets a permission for the object on a specific server
@@ -636,7 +752,7 @@ public interface PermissionHolder {
      * @deprecated in favour of {@link #unsetPermission(Node)}
      */
     @Deprecated
-    void unsetPermission(String node, String server) throws ObjectLacksException;
+    void unsetPermission(@Nonnull String node, @Nonnull String server) throws ObjectLacksException;
 
     /**
      * Unsets a permission for the object on a specific server and world
@@ -650,7 +766,7 @@ public interface PermissionHolder {
      * @deprecated in favour of {@link #unsetPermission(Node)}
      */
     @Deprecated
-    void unsetPermission(String node, String server, String world) throws ObjectLacksException;
+    void unsetPermission(@Nonnull String node, @Nonnull String server, @Nonnull String world) throws ObjectLacksException;
 
     /**
      * Unsets a permission for the object on a specific server
@@ -664,7 +780,7 @@ public interface PermissionHolder {
      * @deprecated in favour of {@link #unsetPermission(Node)}
      */
     @Deprecated
-    void unsetPermission(String node, String server, boolean temporary) throws ObjectLacksException;
+    void unsetPermission(@Nonnull String node, @Nonnull String server, boolean temporary) throws ObjectLacksException;
 
     /**
      * Unsets a permission for the object on a specific server and world
@@ -679,7 +795,7 @@ public interface PermissionHolder {
      * @deprecated in favour of {@link #unsetPermission(Node)}
      */
     @Deprecated
-    void unsetPermission(String node, String server, String world, boolean temporary) throws ObjectLacksException;
+    void unsetPermission(@Nonnull String node, @Nonnull String server, @Nonnull String world, boolean temporary) throws ObjectLacksException;
 
     /**
      * Clears all nodes held by the object on a specific server
@@ -689,7 +805,7 @@ public interface PermissionHolder {
      * @deprecated in favour of {@link #clearNodes(ContextSet)}
      */
     @Deprecated
-    void clearNodes(String server);
+    void clearNodes(@Nullable String server);
 
     /**
      * Clears all nodes held by the object on a specific server and world
@@ -700,7 +816,7 @@ public interface PermissionHolder {
      * @deprecated in favour of {@link #clearNodes(ContextSet)}
      */
     @Deprecated
-    void clearNodes(String server, String world);
+    void clearNodes(@Nullable String server, @Nullable String world);
 
     /**
      * Clears all parents on a specific server
@@ -710,7 +826,7 @@ public interface PermissionHolder {
      * @deprecated in favour of {@link #clearParents(ContextSet)}
      */
     @Deprecated
-    void clearParents(String server);
+    void clearParents(@Nullable String server);
 
     /**
      * Clears all parents on a specific server and world
@@ -721,7 +837,7 @@ public interface PermissionHolder {
      * @deprecated in favour of {@link #clearParents(ContextSet)}
      */
     @Deprecated
-    void clearParents(String server, String world);
+    void clearParents(@Nullable String server, @Nullable String world);
 
     /**
      * Clears all meta held by the object on a specific server
@@ -731,7 +847,7 @@ public interface PermissionHolder {
      * @deprecated in favour of {@link #clearMeta(ContextSet)}
      */
     @Deprecated
-    void clearMeta(String server);
+    void clearMeta(@Nullable String server);
 
     /**
      * Clears all meta held by the object on a specific server and world
@@ -742,7 +858,7 @@ public interface PermissionHolder {
      * @deprecated in favour of {@link #clearMeta(ContextSet)}
      */
     @Deprecated
-    void clearMeta(String server, String world);
+    void clearMeta(@Nullable String server, @Nullable String world);
 
     /**
      * Clears all meta for a given key.
@@ -751,9 +867,9 @@ public interface PermissionHolder {
      * @param server the server to filter by, can be null
      * @param world the world to filter by, can be null
      * @param temporary whether the query is for temporary nodes or not.
-     * @deprecated in favour of {@link #removeIf(Predicate)}
+     * @deprecated in favour of {@link #clearMatching(Predicate)}
      */
     @Deprecated
-    void clearMetaKeys(String key, String server, String world, boolean temporary);
+    void clearMetaKeys(@Nonnull String key, @Nullable String server, @Nullable String world, boolean temporary);
 
 }

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,8 +25,10 @@
 
 package me.lucko.luckperms.api;
 
+import javax.annotation.Nonnull;
+
 /**
- * The platforms which LuckPerms can run on
+ * Represents a type of platform which LuckPerms can run on.
  *
  * @since 2.7
  */
@@ -39,6 +44,12 @@ public enum PlatformType {
         this.friendlyName = friendlyName;
     }
 
+    /**
+     * Gets a readable name for the platform type.
+     *
+     * @return a readable name
+     */
+    @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
@@ -29,15 +32,18 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import java.util.function.Consumer;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
- * A means of loading and saving data to/from the Storage provider.
+ * A means of loading and saving permission data to/from the backend.
  *
- * <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
+ * <p>All blocking methods return {@link CompletableFuture}s, which will be populated with the result once the data has been
+ * loaded/saved asynchronously. Care should be taken when using such methods to ensure that the main server thread is not
  * blocked.</p>
  *
  * <p>Methods such as {@link CompletableFuture#get()} and equivalent should <strong>not</strong> be called on the main
- * server thread. If you need to use the result of these operations on the main server thread, please register a
+ * server thread. If you need to use the result of these operations on the main server thread, register a
  * callback using {@link CompletableFuture#thenAcceptAsync(Consumer, Executor)} and {@link #getSyncExecutor()}.</p>
  *
  * @since 2.14
@@ -49,10 +55,11 @@ public interface Storage {
      *
      * @return the name of the implementation
      */
+    @Nonnull
     String getName();
 
     /**
-     * Return whether the storage instance is allowing logins on the platform.
+     * Gets whether the storage instance is allowing logins on the platform.
      *
      * @return true if logins are enabled
      */
@@ -63,6 +70,7 @@ public interface Storage {
      *
      * @return an executor instance
      */
+    @Nonnull
     Executor getSyncExecutor();
 
     /**
@@ -71,6 +79,7 @@ public interface Storage {
      *
      * @return an executor instance
      */
+    @Nonnull
     Executor getAsyncExecutor();
 
     /**
@@ -80,13 +89,15 @@ public interface Storage {
      * @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();
 
     /**
@@ -97,7 +108,8 @@ public interface Storage {
      * @return if the operation completed successfully
      * @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.
@@ -106,7 +118,8 @@ public interface Storage {
      * @return if the operation completed successfully
      * @throws NullPointerException if uuid is null
      */
-    default CompletableFuture<Boolean> loadUser(UUID uuid) {
+    @Nonnull
+    default CompletableFuture<Boolean> loadUser(@Nonnull UUID uuid) {
         return loadUser(uuid, null);
     }
 
@@ -118,21 +131,25 @@ public interface Storage {
      * @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.
+     *
+     * <p>"Unique" meaning the user isn't just a member of the "default" group.</p>
      *
      * @return a set of uuids, or null if the operation failed.
      */
+    @Nonnull
     CompletableFuture<Set<UUID>> getUniqueUsers();
 
     /**
@@ -143,7 +160,8 @@ public interface Storage {
      * @throws NullPointerException if the permission is null
      * @since 2.17
      */
-    CompletableFuture<List<HeldPermission<UUID>>> getUsersWithPermission(String permission);
+    @Nonnull
+    CompletableFuture<List<HeldPermission<UUID>>> getUsersWithPermission(@Nonnull String permission);
 
     /**
      * Creates and loads a group into the plugins local storage
@@ -153,7 +171,8 @@ public interface Storage {
      * @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.
@@ -163,13 +182,15 @@ public interface Storage {
      * @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();
 
     /**
@@ -180,7 +201,8 @@ public interface Storage {
      * @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.
@@ -190,7 +212,8 @@ public interface Storage {
      * @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.
@@ -200,7 +223,8 @@ public interface Storage {
      * @throws NullPointerException if the permission is null
      * @since 2.17
      */
-    CompletableFuture<List<HeldPermission<String>>> getGroupsWithPermission(String permission);
+    @Nonnull
+    CompletableFuture<List<HeldPermission<String>>> getGroupsWithPermission(@Nonnull String permission);
 
     /**
      * Creates and loads a track into the plugins local storage
@@ -210,7 +234,8 @@ public interface Storage {
      * @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.
@@ -220,13 +245,15 @@ public interface Storage {
      * @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();
 
     /**
@@ -237,7 +264,8 @@ public interface Storage {
      * @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
@@ -247,7 +275,8 @@ public interface Storage {
      * @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
@@ -258,7 +287,8 @@ public interface Storage {
      * @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
@@ -268,7 +298,8 @@ public interface Storage {
      * @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
@@ -278,6 +309,7 @@ public interface Storage {
      * @throws NullPointerException if either parameters are null
      * @since 2.17
      */
-    CompletableFuture<String> getName(UUID uuid);
+    @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,24 +30,32 @@ import me.lucko.luckperms.exceptions.ObjectLacksException;
 
 import java.util.List;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
- * An ordered collection of groups for easy promotions and demotions
+ * An ordered chain of {@link Group}s.
  */
 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
+     * Gets a list of the groups on this track
      *
-     * <p>Index 0 is the first/lowest group in (or start of) the track</p>
+     * <p>Index 0 is the first/lowest group in (or start of) the track.</p>
+     *
+     * <p>The returned collection is immutable, and cannot be modified.</p>
      *
      * @return an ordered {@link List} of the groups on this track
      */
+    @Nonnull
     List<String> getGroups();
 
     /**
@@ -63,7 +74,8 @@ public interface Track {
      * @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
@@ -74,7 +86,8 @@ public interface Track {
      * @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
@@ -84,7 +97,7 @@ public interface Track {
      * @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
@@ -96,7 +109,7 @@ public interface Track {
      * @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
@@ -106,7 +119,7 @@ public interface 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
@@ -115,7 +128,7 @@ public interface Track {
      * @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
@@ -125,7 +138,7 @@ public interface Track {
      * @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
@@ -134,7 +147,7 @@ public interface Track {
      * @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 from this track

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,37 +25,45 @@
 
 package me.lucko.luckperms.api;
 
+import javax.annotation.Nonnull;
+
 /**
- * Represents a permission setting.
+ * Represents three different states of a 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>
+ * <p>Possible values:</p>
+ * <p></p>
+ * <ul>
+ *     <li>{@link #TRUE} - a positive setting</li>
+ *     <li>{@link #FALSE} - a negative (negated) setting</li>
+ *     <li>{@link #UNDEFINED} - a non-existent setting</li>
+ * </ul>
  */
 public enum Tristate {
 
     /**
-     * A value indicating a holder has a permission set.
+     * A value indicating a positive setting
      */
     TRUE(true),
 
     /**
-     * A value indicating a holder has a negated value for a permission.
+     * A value indicating a negative (negated) setting
      */
     FALSE(false),
 
     /**
-     * A value indicating a holder doesn't have a value for a permission set.
+     * A value indicating a non-existent setting
      */
     UNDEFINED(false);
 
     /**
-     * Converts from {@link Boolean} a boolean
+     * Returns a {@link Tristate} from a boolean
      *
-     * @param b the boolean
+     * @param val the boolean value
      * @return {@link #TRUE} or {@link #FALSE}, depending on the value of the boolean.
      */
-    public static Tristate fromBoolean(boolean b) {
-        return b ? TRUE : FALSE;
+    @Nonnull
+    public static Tristate fromBoolean(boolean val) {
+        return val ? TRUE : FALSE;
     }
 
     private final boolean booleanValue;

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
@@ -31,8 +34,11 @@ import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
- * A player holding permission data
+ * A player which holds permission data.
  */
 public interface User extends PermissionHolder {
 
@@ -41,23 +47,28 @@ public interface User extends PermissionHolder {
      *
      * @return the users Mojang assigned unique id
      */
+    @Nonnull
     UUID getUuid();
 
     /**
-     * Gets the users username, or null if no username is associated with this user
+     * Gets the users username
+     *
+     * <p>Returns null if no username is associated with this user.</p>
      *
      * @return the users username
      */
+    @Nullable
     String getName();
 
     /**
-     * Gets the users  current 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();
 
     /**
@@ -68,7 +79,7 @@ public interface User extends PermissionHolder {
      * @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.
@@ -84,8 +95,19 @@ public interface User extends PermissionHolder {
      * @return the users cached data.
      * @since 3.2
      */
+    @Nonnull
     UserData getCachedData();
 
+    /**
+     * 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
+     */
+    void setupDataCache();
+
     /**
      * Check to see if the user is a direct member of a group
      *
@@ -94,7 +116,7 @@ public interface User extends PermissionHolder {
      * @throws NullPointerException if the group is null
      * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
      */
-    boolean isInGroup(Group group);
+    boolean isInGroup(@Nonnull Group group);
 
     /**
      * Check to see if the user is a direct member of a group in a specific context
@@ -105,7 +127,7 @@ public interface User extends PermissionHolder {
      * @throws IllegalStateException if the group instance was not obtained from LuckPerms.
      * @since 3.2
      */
-    boolean isInGroup(Group group, ContextSet contextSet);
+    boolean isInGroup(@Nonnull Group group, @Nonnull ContextSet contextSet);
 
     /**
      * Gets the user's {@link UserData} cache, if they have one setup.
@@ -115,17 +137,9 @@ public interface User extends PermissionHolder {
      * @deprecated in version 3.2, as this cache is now always loaded
      */
     @Deprecated
+    @Nonnull
     Optional<UserData> getUserDataCache();
 
-    /**
-     * Sets up the users data cache, if the don't have one setup already.
-     *
-     * @since 2.17
-     * @deprecated in version 3.2, as this cache is now always loaded.
-     */
-    @Deprecated
-    void setupDataCache();
-
     /**
      * Check to see if a user is a member of a group on a specific server
      *
@@ -137,7 +151,7 @@ public interface User extends PermissionHolder {
      * @deprecated in favour of {@link #isInGroup(Group, ContextSet)}
      */
     @Deprecated
-    boolean isInGroup(Group group, String server);
+    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
@@ -151,7 +165,7 @@ public interface User extends PermissionHolder {
      * @deprecated in favour of {@link #isInGroup(Group, ContextSet)}
      */
     @Deprecated
-    boolean isInGroup(Group group, String server, String world);
+    boolean isInGroup(@Nonnull Group group, @Nonnull String server, @Nonnull String world);
 
     /**
      * Add a user to a group
@@ -163,7 +177,7 @@ public interface User extends PermissionHolder {
      * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
     @Deprecated
-    void addGroup(Group group) throws ObjectAlreadyHasException;
+    void addGroup(@Nonnull Group group) throws ObjectAlreadyHasException;
 
     /**
      * Add a user to a group on a specific server
@@ -177,7 +191,7 @@ public interface User extends PermissionHolder {
      * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
     @Deprecated
-    void addGroup(Group group, String server) throws ObjectAlreadyHasException;
+    void addGroup(@Nonnull Group group, @Nonnull String server) throws ObjectAlreadyHasException;
 
     /**
      * Add a user to a group on a specific server and world
@@ -192,7 +206,7 @@ public interface User extends PermissionHolder {
      * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
     @Deprecated
-    void addGroup(Group group, String server, String world) throws ObjectAlreadyHasException;
+    void addGroup(@Nonnull Group group, @Nonnull String server, @Nonnull String world) throws ObjectAlreadyHasException;
 
     /**
      * Add a user to a group temporarily on a specific server
@@ -206,7 +220,7 @@ public interface User extends PermissionHolder {
      * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
     @Deprecated
-    void addGroup(Group group, long expireAt) throws ObjectAlreadyHasException;
+    void addGroup(@Nonnull Group group, long expireAt) throws ObjectAlreadyHasException;
 
     /**
      * Add a user to a group temporarily on a specific server
@@ -221,7 +235,7 @@ public interface User extends PermissionHolder {
      * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
     @Deprecated
-    void addGroup(Group group, String server, long expireAt) throws ObjectAlreadyHasException;
+    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
@@ -237,7 +251,7 @@ public interface User extends PermissionHolder {
      * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
     @Deprecated
-    void addGroup(Group group, String server, String world, long expireAt) throws ObjectAlreadyHasException;
+    void addGroup(@Nonnull Group group, @Nonnull String server, @Nonnull String world, long expireAt) throws ObjectAlreadyHasException;
 
     /**
      * Remove the user from a group
@@ -249,7 +263,7 @@ public interface User extends PermissionHolder {
      * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
     @Deprecated
-    void removeGroup(Group group) throws ObjectLacksException;
+    void removeGroup(@Nonnull Group group) throws ObjectLacksException;
 
     /**
      * Remove the user from a group
@@ -262,7 +276,7 @@ public interface User extends PermissionHolder {
      * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
     @Deprecated
-    void removeGroup(Group group, boolean temporary) throws ObjectLacksException;
+    void removeGroup(@Nonnull Group group, boolean temporary) throws ObjectLacksException;
 
     /**
      * Remove the user from a group on a specific server
@@ -276,7 +290,7 @@ public interface User extends PermissionHolder {
      * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
     @Deprecated
-    void removeGroup(Group group, String server) throws ObjectLacksException;
+    void removeGroup(@Nonnull Group group, @Nonnull String server) throws ObjectLacksException;
 
     /**
      * Remove the user from a group on a specific server and world
@@ -291,7 +305,7 @@ public interface User extends PermissionHolder {
      * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
     @Deprecated
-    void removeGroup(Group group, String server, String world) throws ObjectLacksException;
+    void removeGroup(@Nonnull Group group, @Nonnull String server, @Nonnull String world) throws ObjectLacksException;
 
     /**
      * Remove the user from a group on a specific server
@@ -306,7 +320,7 @@ public interface User extends PermissionHolder {
      * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
     @Deprecated
-    void removeGroup(Group group, String server, boolean temporary) throws ObjectLacksException;
+    void removeGroup(@Nonnull Group group, @Nonnull String server, boolean temporary) throws ObjectLacksException;
 
     /**
      * Remove the user from a group on a specific server and world
@@ -322,7 +336,7 @@ public interface User extends PermissionHolder {
      * @deprecated in favour of {@link NodeFactory#makeGroupNode(Group)}
      */
     @Deprecated
-    void removeGroup(Group group, String server, String world, boolean temporary) throws ObjectLacksException;
+    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
@@ -331,6 +345,7 @@ public interface User extends PermissionHolder {
      * @deprecated in favour of just querying a users permissions
      */
     @Deprecated
+    @Nonnull
     List<String> getGroupNames();
 
     /**
@@ -344,7 +359,8 @@ public interface User extends PermissionHolder {
      * @deprecated in favour of just querying a users permissions
      */
     @Deprecated
-    List<String> getLocalGroups(String server, String world);
+    @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
@@ -356,6 +372,7 @@ public interface User extends PermissionHolder {
      * @deprecated in favour of just querying a users permissions
      */
     @Deprecated
-    List<String> getLocalGroups(String server);
+    @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,35 +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 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>A user's internal LuckPerms UUID is always the same as their Mojang one,
+ * unless <code>use-server-uuids</code> is disabled.</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>
+ * <p>When this setting is disabled, this cache becomes active, and allows you to convert
+ * between 'internal' and 'server provided' uuids.</p>
  *
  * <p><strong>This is only effective for online players. Use {@link Storage#getUUID(String)} for offline players.</strong></p>
  */
 public interface UuidCache {
 
     /**
-     * Gets a users internal "LuckPerms" UUID, from the one given by the server.
+     * 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
+     * <p>When <code>use-server-uuids</code> is true, this returns the same UUID instance.</p>
+     *
+     * @param mojangUuid the UUID assigned by the server, through <code>Player#getUniqueId</code> or <code>ProxiedPlayer#getUniqueId</code>
      * @return the corresponding internal UUID
      */
-    UUID getUUID(UUID external);
+    @Nonnull
+    UUID getUUID(@Nonnull UUID mojangUuid);
 
     /**
-     * Gets a users external, server assigned or Mojang assigned unique id, from the internal one used within LuckPerms.
+     * Gets a users "external", server assigned unique id, from the internal one used within LuckPerms.
      *
-     * @param internal the UUID used within LuckPerms, through User#getUuid
+     * @param internalUuid the UUID used within LuckPerms, through <code>User#getUuid</code>
      * @return the corresponding external UUID
      */
-    UUID getExternalUUID(UUID internal);
+    @Nonnull
+    UUID getExternalUUID(@Nonnull UUID internalUuid);
 
 }

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

@@ -30,9 +30,13 @@ 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.
+ * Represents the context for a meta lookup.
+ *
+ * <p>Consisting of a standard {@link Contexts} element, plus options to define how
+ * the meta stack should be constructed.</p>
  *
  * @since 3.2
  */
@@ -46,7 +50,7 @@ public final class MetaContexts {
      * @param suffixStackDefinition the suffix stack definition to be used
      * @return the new instance
      */
-    public static MetaContexts of(Contexts contexts, MetaStackDefinition prefixStackDefinition, MetaStackDefinition suffixStackDefinition) {
+    public static MetaContexts of(@Nonnull Contexts contexts, @Nonnull MetaStackDefinition prefixStackDefinition, @Nonnull MetaStackDefinition suffixStackDefinition) {
         return new MetaContexts(contexts, prefixStackDefinition, suffixStackDefinition);
     }
 
@@ -61,25 +65,29 @@ public final class MetaContexts {
      * @param prefixStackDefinition the prefix stack definition to be used
      * @param suffixStackDefinition the suffix stack definition to be used
      */
-    public MetaContexts(Contexts contexts, MetaStackDefinition prefixStackDefinition, MetaStackDefinition suffixStackDefinition) {
+    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() + ", " +

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,11 +25,16 @@
 
 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
  *
@@ -35,10 +43,29 @@ import java.util.SortedMap;
 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();
 
     /**
@@ -47,6 +74,7 @@ public interface MetaData {
      *
      * @return a sorted map of prefixes
      */
+    @Nonnull
     SortedMap<Integer, String> getPrefixes();
 
     /**
@@ -55,6 +83,7 @@ public interface MetaData {
      *
      * @return a sorted map of suffixes
      */
+    @Nonnull
     SortedMap<Integer, String> getSuffixes();
 
     /**
@@ -62,6 +91,7 @@ public interface MetaData {
      *
      * @return a prefix string, or null
      */
+    @Nullable
     String getPrefix();
 
     /**
@@ -69,6 +99,7 @@ public interface MetaData {
      *
      * @return a suffix string, or null
      */
+    @Nullable
     String getSuffix();
 
     /**
@@ -77,6 +108,7 @@ public interface MetaData {
      * @return the definition used for the prefix stack
      * @since 3.2
      */
+    @Nonnull
     MetaStackDefinition getPrefixStackDefinition();
 
     /**
@@ -85,6 +117,7 @@ public interface MetaData {
      * @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,6 +29,8 @@ 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
  *
@@ -40,7 +45,8 @@ public interface PermissionData {
      * @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.
@@ -54,6 +60,7 @@ public interface PermissionData {
      *
      * @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,6 +29,8 @@ 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}.
  *
@@ -49,7 +54,8 @@ public interface UserData {
      * @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.
@@ -61,7 +67,8 @@ public interface UserData {
      * @throws NullPointerException if contexts is null
      * @since 3.2
      */
-    MetaData getMetaData(MetaContexts contexts);
+    @Nonnull
+    MetaData getMetaData(@Nonnull MetaContexts contexts);
 
     /**
      * Gets MetaData from the cache, given a specified context.
@@ -72,7 +79,8 @@ public interface UserData {
      * @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.
@@ -81,7 +89,8 @@ public interface UserData {
      * @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.
@@ -91,7 +100,8 @@ public interface UserData {
      * @throws NullPointerException if contexts is null
      * @since 3.2
      */
-    MetaData calculateMeta(MetaContexts contexts);
+    @Nonnull
+    MetaData calculateMeta(@Nonnull MetaContexts contexts);
 
     /**
      * Calculates meta data, bypassing the cache.
@@ -100,7 +110,8 @@ public interface UserData {
      * @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.
@@ -111,7 +122,7 @@ public interface UserData {
      * @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.
@@ -123,7 +134,7 @@ public interface UserData {
      * @throws NullPointerException if contexts is null
      * @since 3.2
      */
-    void recalculateMeta(MetaContexts contexts);
+    void recalculateMeta(@Nonnull MetaContexts contexts);
 
     /**
      * Calculates meta data and stores it in the cache.
@@ -134,7 +145,7 @@ public interface UserData {
      * @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
@@ -152,7 +163,7 @@ public interface UserData {
      * @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.
@@ -162,7 +173,7 @@ public interface UserData {
      * @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.

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,6 +25,8 @@
 
 package me.lucko.luckperms.api.context;
 
+import javax.annotation.Nonnull;
+
 /**
  * Calculates whether contexts are applicable to {@link T}
  *
@@ -38,6 +43,7 @@ public interface ContextCalculator<T> {
      * @return the map
      * @since 2.13
      */
-    MutableContextSet giveApplicableContext(T subject, MutableContextSet accumulator);
+    @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,14 +25,23 @@
 
 package me.lucko.luckperms.api.context;
 
+import com.google.common.base.Preconditions;
 import com.google.common.collect.Multimap;
 
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
+import javax.annotation.Nonnull;
+
 /**
- * Holder of contexts.
+ * A set of context pairs.
+ *
+ * <p>You can think of ContextSets as a wrapped <code>Multimap&lt;String, String&gt;</code>.
+ * Each key can be mapped to multiple values.</p>
+ *
+ * <p>Keys are automatically converted to lowercase when added, and are therefore
+ * case-insensitive. Values however are not.</p>
  *
  * <p>Implementations may be either mutable or immutable.</p>
  *
@@ -45,7 +57,8 @@ public interface ContextSet {
      * @return a new ImmutableContextSet containing one KV pair
      * @throws NullPointerException if key or value is null
      */
-    static ImmutableContextSet singleton(String key, String value) {
+    @Nonnull
+    static ImmutableContextSet singleton(@Nonnull String key, @Nonnull String value) {
         return ImmutableContextSet.singleton(key, value);
     }
 
@@ -60,21 +73,11 @@ public interface ContextSet {
      * @throws NullPointerException if any of the keys or values are null
      * @since 3.1
      */
-    static ImmutableContextSet of(String key1, String value1, String key2, String value2) {
+    @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 ImmutableContextSet representing the pairs from the map
-     * @throws NullPointerException if the map is null
-     */
-    static ImmutableContextSet fromMap(Map<String, String> map) {
-        return ImmutableContextSet.fromMap(map);
-    }
-
     /**
      * Creates an ImmutableContextSet from an existing iterable of Map Entries
      *
@@ -82,10 +85,23 @@ public interface ContextSet {
      * @return a new ImmutableContextSet representing the pairs in the iterable
      * @throws NullPointerException if the iterable is null
      */
-    static ImmutableContextSet fromEntries(Iterable<? extends Map.Entry<String, String>> iterable) {
+    @Nonnull
+    static ImmutableContextSet fromEntries(@Nonnull Iterable<? extends Map.Entry<String, String>> iterable) {
         return ImmutableContextSet.fromEntries(iterable);
     }
 
+    /**
+     * 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
+    static ImmutableContextSet fromMap(@Nonnull Map<String, String> map) {
+        return ImmutableContextSet.fromMap(map);
+    }
+
     /**
      * Creates an ImmutableContextSet from an existing multimap
      *
@@ -94,7 +110,8 @@ public interface ContextSet {
      * @throws NullPointerException if the multimap is null
      * @since 2.16
      */
-    static ImmutableContextSet fromMultimap(Multimap<String, String> multimap) {
+    @Nonnull
+    static ImmutableContextSet fromMultimap(@Nonnull Multimap<String, String> multimap) {
         return ImmutableContextSet.fromMultimap(multimap);
     }
 
@@ -106,7 +123,8 @@ public interface ContextSet {
      * @return a new ImmutableContextSet with the same content and the one provided
      * @throws NullPointerException if contextSet is null
      */
-    static ImmutableContextSet fromSet(ContextSet contextSet) {
+    @Nonnull
+    static ImmutableContextSet fromSet(@Nonnull ContextSet contextSet) {
         return ImmutableContextSet.fromSet(contextSet);
     }
 
@@ -115,12 +133,13 @@ public interface ContextSet {
      *
      * @return a new ImmutableContextSet
      */
+    @Nonnull
     static ImmutableContextSet empty() {
         return ImmutableContextSet.empty();
     }
 
     /**
-     * Check to see if this set is in an immutable form
+     * Gets if this set is in an immutable form
      *
      * @return true if the set is immutable
      */
@@ -131,6 +150,7 @@ public interface ContextSet {
      *
      * @return an immutable ContextSet
      */
+    @Nonnull
     ImmutableContextSet makeImmutable();
 
     /**
@@ -139,6 +159,7 @@ public interface ContextSet {
      * @return a mutable ContextSet
      * @since 2.16
      */
+    @Nonnull
     MutableContextSet mutableCopy();
 
     /**
@@ -146,16 +167,20 @@ public interface ContextSet {
      *
      * @return an immutable set
      */
+    @Nonnull
     Set<Map.Entry<String, String>> toSet();
 
     /**
      * Converts this ContextSet to an immutable {@link Map}
      *
-     * <b>NOTE: Use of this method may result in data being lost. ContextSets can contain lots of different values for
+     * <b>IMPORTANT: Use of this method may result in data being lost. ContextSets can contain lots of different values for
      * one key.</b>
      *
      * @return an immutable map
+     * @deprecated because the resultant map may not contain all data in the ContextSet
      */
+    @Nonnull
+    @Deprecated
     Map<String, String> toMap();
 
     /**
@@ -164,6 +189,7 @@ public interface ContextSet {
      * @return a multimap
      * @since 2.16
      */
+    @Nonnull
     Multimap<String, String> toMultimap();
 
     /**
@@ -173,7 +199,7 @@ public interface ContextSet {
      * @return true if the set contains a value for the key
      * @throws NullPointerException if the key is null
      */
-    boolean containsKey(String key);
+    boolean containsKey(@Nonnull String key);
 
     /**
      * Gets a set of all of the values mapped to the given key
@@ -182,7 +208,8 @@ public interface ContextSet {
      * @return a set of values
      * @throws NullPointerException if the key is null
      */
-    Set<String> getValues(String key);
+    @Nonnull
+    Set<String> getValues(@Nonnull String key);
 
     /**
      * Returns any value from this set matching the key, if present.
@@ -191,7 +218,8 @@ public interface ContextSet {
      * @return an optional containing any match
      * @since 3.1
      */
-    default Optional<String> getAnyValue(String key) {
+    @Nonnull
+    default Optional<String> getAnyValue(@Nonnull String key) {
         return getValues(key).stream().findAny();
     }
 
@@ -203,7 +231,20 @@ public interface ContextSet {
      * @return true if the set contains the KV pair
      * @throws NullPointerException if the key or value is null
      */
-    boolean has(String key, String value);
+    boolean has(@Nonnull String key, @Nonnull String value);
+
+    /**
+     * Check if thr set contains a given key mapped to a given value
+     *
+     * @param entry the entry to look for
+     * @return true if the set contains the KV pair
+     * @throws NullPointerException if the key or value is null
+     * @since 3.4
+     */
+    default boolean has(@Nonnull Map.Entry<String, String> entry) {
+        Preconditions.checkNotNull(entry, "entry");
+        return has(entry.getKey(), entry.getValue());
+    }
 
     /**
      * Same as {@link #has(String, String)}, except ignores the case of the value.
@@ -213,7 +254,20 @@ public interface ContextSet {
      * @return true if the set contains the KV pair
      * @throws NullPointerException if the key or value is null
      */
-    boolean hasIgnoreCase(String key, String value);
+    boolean hasIgnoreCase(@Nonnull String key, @Nonnull String value);
+
+    /**
+     * Same as {@link #has(Map.Entry)}, except ignores the case of the value.
+     *
+     * @param entry the entry to look for
+     * @return true if the set contains the KV pair
+     * @throws NullPointerException if the key or value is null
+     * @since 3.4
+     */
+    default boolean hasIgnoreCase(@Nonnull Map.Entry<String, String> entry) {
+        Preconditions.checkNotNull(entry, "entry");
+        return hasIgnoreCase(entry.getKey(), entry.getValue());
+    }
 
     /**
      * Checks to see if all entries in this context set are also included in another set.
@@ -222,7 +276,20 @@ public interface ContextSet {
      * @return true if all entries in this set are also in the other set
      * @since 3.1
      */
-    default boolean isSatisfiedBy(ContextSet other) {
+    default boolean isSatisfiedBy(@Nonnull ContextSet other) {
+        return isSatisfiedBy(other, true);
+    }
+
+    /**
+     * Checks to see if all entries in this context set are also included in another set.
+     *
+     * @param other the other set to check
+     * @param caseSensitive if the lookup should be case sensitive. see {@link #has(Map.Entry)} and {@link #hasIgnoreCase(Map.Entry)}.
+     * @return true if all entries in this set are also in the other set
+     * @since 3.4
+     */
+    default boolean isSatisfiedBy(@Nonnull ContextSet other, boolean caseSensitive) {
+        Preconditions.checkNotNull(other, "other");
         if (this.isEmpty()) {
             // this is empty, so is therefore always satisfied.
             return true;
@@ -235,8 +302,14 @@ public interface ContextSet {
         } 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 (caseSensitive) {
+                    if (!other.has(pair)) {
+                        return false;
+                    }
+                } else {
+                    if (!other.hasIgnoreCase(pair)) {
+                        return false;
+                    }
                 }
             }
 

api/src/main/java/me/lucko/luckperms/api/context/ImmutableContextSet.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,15 +29,21 @@ 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;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * An immutable implementation of {@link ContextSet}.
  *
+ * <p>On construction, all keys/values are {@link String#intern()}ed, in order to increase
+ * comparison speed.</p>
+ *
  * @since 2.16
  */
 public final class ImmutableContextSet implements ContextSet {
@@ -48,15 +57,12 @@ public final class ImmutableContextSet implements ContextSet {
      * @return a new ImmutableContextSet containing one KV pair
      * @throws NullPointerException if key or value is null
      */
-    public static ImmutableContextSet singleton(String key, String value) {
-        if (key == null) {
-            throw new NullPointerException("key");
-        }
-        if (value == null) {
-            throw new NullPointerException("value");
-        }
-
-        return new ImmutableContextSet(ImmutableSetMultimap.of(key.toLowerCase(), value));
+    @Nonnull
+    public static ImmutableContextSet singleton(@Nonnull String key, @Nonnull String value) {
+        return new ImmutableContextSet(ImmutableSetMultimap.of(
+                checkNotNull(key, "key").toLowerCase().intern(),
+                checkNotNull(value, "value").intern()
+        ));
     }
 
     /**
@@ -70,41 +76,14 @@ public final class ImmutableContextSet implements ContextSet {
      * @throws NullPointerException if any of the keys or values are null
      * @since 3.1
      */
-    public static ImmutableContextSet of(String key1, String value1, String key2, String value2) {
-        if (key1 == null) {
-            throw new NullPointerException("key1");
-        }
-        if (value1 == null) {
-            throw new NullPointerException("value1");
-        }
-        if (key2 == null) {
-            throw new NullPointerException("key2");
-        }
-        if (value2 == null) {
-            throw new NullPointerException("value2");
-        }
-
-        return new ImmutableContextSet(ImmutableSetMultimap.of(key1.toLowerCase(), value1, key2.toLowerCase(), value2));
-    }
-
-    /**
-     * Creates an ImmutableContextSet from an existing map
-     *
-     * @param map the map to copy from
-     * @return a new ImmutableContextSet representing the pairs from the map
-     * @throws NullPointerException if the map is null
-     */
-    public static ImmutableContextSet fromMap(Map<String, String> map) {
-        if (map == null) {
-            throw new NullPointerException("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());
+    @Nonnull
+    public static ImmutableContextSet of(@Nonnull String key1, @Nonnull String value1, @Nonnull String key2, @Nonnull String value2) {
+        return new ImmutableContextSet(ImmutableSetMultimap.of(
+                checkNotNull(key1, "key1").toLowerCase().intern(),
+                checkNotNull(value1, "value1").intern(),
+                checkNotNull(key2, "key2").toLowerCase().intern(),
+                checkNotNull(value2, "value2").intern()
+        ));
     }
 
     /**
@@ -114,12 +93,28 @@ public final class ImmutableContextSet implements ContextSet {
      * @return a new ImmutableContextSet representing the pairs in the iterable
      * @throws NullPointerException if the iterable is null
      */
-    public static ImmutableContextSet fromEntries(Iterable<? extends Map.Entry<String, String>> iterable) {
-        if (iterable == null) {
-            throw new NullPointerException("iterable");
+    @Nonnull
+    public static ImmutableContextSet fromEntries(@Nonnull Iterable<? extends Map.Entry<String, String>> iterable) {
+        checkNotNull(iterable, "iterable");
+
+        ImmutableSetMultimap.Builder<String, String> b = ImmutableSetMultimap.builder();
+        for (Map.Entry<String, String> e : iterable) {
+            b.put(checkNotNull(e.getKey()).toLowerCase().intern(), checkNotNull(e.getValue()).intern());
         }
 
-        return MutableContextSet.fromEntries(iterable).makeImmutable();
+        return new ImmutableContextSet(b.build());
+    }
+
+    /**
+     * 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) {
+        return fromEntries(checkNotNull(map, "map").entrySet());
     }
 
     /**
@@ -129,12 +124,9 @@ public final class ImmutableContextSet implements ContextSet {
      * @return a new ImmutableContextSet representing the pairs in the multimap
      * @throws NullPointerException if the multimap is null
      */
-    public static ImmutableContextSet fromMultimap(Multimap<String, String> multimap) {
-        if (multimap == null) {
-            throw new NullPointerException("multimap");
-        }
-
-        return MutableContextSet.fromMultimap(multimap).makeImmutable();
+    @Nonnull
+    public static ImmutableContextSet fromMultimap(@Nonnull Multimap<String, String> multimap) {
+        return fromEntries(checkNotNull(multimap, "multimap").entries());
     }
 
     /**
@@ -145,8 +137,9 @@ public final class ImmutableContextSet implements ContextSet {
      * @return a new ImmutableContextSet with the same content and the one provided
      * @throws NullPointerException if contextSet is null
      */
-    public static ImmutableContextSet fromSet(ContextSet contextSet) {
-        return contextSet.makeImmutable();
+    @Nonnull
+    public static ImmutableContextSet fromSet(@Nonnull ContextSet contextSet) {
+        return checkNotNull(contextSet, "contextSet").makeImmutable();
     }
 
     /**
@@ -154,14 +147,15 @@ public final class ImmutableContextSet implements ContextSet {
      *
      * @return a new ContextSet
      */
+    @Nonnull
     public static ImmutableContextSet empty() {
         return EMPTY;
     }
 
-    private final SetMultimap<String, String> map;
+    private final ImmutableSetMultimap<String, String> map;
 
-    ImmutableContextSet(Multimap<String, String> contexts) {
-        this.map = ImmutableSetMultimap.copyOf(contexts);
+    ImmutableContextSet(ImmutableSetMultimap<String, String> contexts) {
+        this.map = contexts;
     }
 
     @Override
@@ -171,21 +165,25 @@ public final class ImmutableContextSet implements ContextSet {
 
     @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());
+        return map.entries();
     }
 
     @Override
+    @Nonnull
     public Map<String, String> toMap() {
         ImmutableMap.Builder<String, String> m = ImmutableMap.builder();
         for (Map.Entry<String, String> e : map.entries()) {
@@ -196,56 +194,41 @@ public final class ImmutableContextSet implements ContextSet {
     }
 
     @Override
+    @Nonnull
     public Multimap<String, String> toMultimap() {
         return map;
     }
 
     @Override
-    public boolean containsKey(String key) {
-        if (key == null) {
-            throw new NullPointerException("key");
-        }
-
-        return map.containsKey(key);
+    @Nonnull
+    public boolean containsKey(@Nonnull String key) {
+        return map.containsKey(checkNotNull(key, "key").toLowerCase().intern());
     }
 
     @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();
+    @Nonnull
+    public Set<String> getValues(@Nonnull String key) {
+        Collection<String> values = map.get(checkNotNull(key, "key").toLowerCase().intern());
+        return values != null ? ImmutableSet.copyOf(values) : 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);
+    @Nonnull
+    public boolean has(@Nonnull String key, @Nonnull String value) {
+        return map.containsEntry(checkNotNull(key, "key").toLowerCase().intern(), checkNotNull(value, "value").intern());
     }
 
     @Override
-    public boolean hasIgnoreCase(String key, String value) {
-        if (key == null) {
-            throw new NullPointerException("key");
-        }
-        if (value == null) {
-            throw new NullPointerException("value");
-        }
+    @Nonnull
+    public boolean hasIgnoreCase(@Nonnull String key, @Nonnull String value) {
+        value = checkNotNull(value, "value").intern();
+        Collection<String> values = map.get(checkNotNull(key, "key").toLowerCase().intern());
 
-        Collection<String> c = map.get(key);
-        if (c == null || c.isEmpty()) {
+        if (values == null || values.isEmpty()) {
             return false;
         }
 
-        for (String val : c) {
+        for (String val : values) {
             if (val.equalsIgnoreCase(value)) {
                 return true;
             }
@@ -269,14 +252,19 @@ public final class ImmutableContextSet implements ContextSet {
         if (!(o instanceof ContextSet)) return false;
         final ContextSet other = (ContextSet) o;
 
+        // saves on copying the multimap
+        if (other instanceof MutableContextSet) {
+            return other.equals(this);
+        }
+
         final Multimap<String, String> thisContexts = this.toMultimap();
         final Multimap<String, String> otherContexts = other.toMultimap();
-        return thisContexts == null ? otherContexts == null : thisContexts.equals(otherContexts);
+        return thisContexts.equals(otherContexts);
     }
 
     @Override
     public int hashCode() {
-        return 59 + (this.map == null ? 43 : this.map.hashCode());
+        return map.hashCode();
     }
 
     @Override

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,6 +25,7 @@
 
 package me.lucko.luckperms.api.context;
 
+import com.google.common.base.Preconditions;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -34,9 +38,16 @@ import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 
+import javax.annotation.Nonnull;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * A mutable implementation of {@link ContextSet}.
  *
+ * <p>On construction, all keys/values are {@link String#intern()}ed, in order to increase
+ * comparison speed.</p>
+ *
  * @since 2.16
  */
 public final class MutableContextSet implements ContextSet {
@@ -49,15 +60,11 @@ public final class MutableContextSet implements ContextSet {
      * @return a new MutableContextSet containing one KV pair
      * @throws NullPointerException if key or value is null
      */
-    public static MutableContextSet singleton(String key, String value) {
-        if (key == null) {
-            throw new NullPointerException("key");
-        }
-        if (value == null) {
-            throw new NullPointerException("value");
-        }
-
-        MutableContextSet set = new MutableContextSet();
+    @Nonnull
+    public static MutableContextSet singleton(@Nonnull String key, @Nonnull String value) {
+        checkNotNull(key, "key");
+        checkNotNull(value, "value");
+        MutableContextSet set = MutableContextSet.create();
         set.add(key, value);
         return set;
     }
@@ -73,39 +80,15 @@ public final class MutableContextSet implements ContextSet {
      * @throws NullPointerException if any of the keys or values are null
      * @since 3.1
      */
-    public static MutableContextSet of(String key1, String value1, String key2, String value2) {
-        if (key1 == null) {
-            throw new NullPointerException("key1");
-        }
-        if (value1 == null) {
-            throw new NullPointerException("value1");
-        }
-        if (key2 == null) {
-            throw new NullPointerException("key2");
-        }
-        if (value2 == null) {
-            throw new NullPointerException("value2");
-        }
-
-        MutableContextSet ret = singleton(key1, value1);
-        ret.add(key2, value2);
-        return ret;
-    }
-
-    /**
-     * Creates a MutableContextSet from an existing map
-     *
-     * @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) {
-        if (map == null) {
-            throw new NullPointerException("map");
-        }
-
-        MutableContextSet set = new MutableContextSet();
-        set.addAll(map);
+    @Nonnull
+    public static MutableContextSet of(@Nonnull String key1, @Nonnull String value1, @Nonnull String key2, @Nonnull String value2) {
+        checkNotNull(key1, "key1");
+        checkNotNull(value1, "value1");
+        checkNotNull(key2, "key2");
+        checkNotNull(value2, "value2");
+        MutableContextSet set = MutableContextSet.create();
+        set.add(key1, value1);
+        set.add(key2, value2);
         return set;
     }
 
@@ -116,16 +99,29 @@ public final class MutableContextSet implements ContextSet {
      * @return a new MutableContextSet representing the pairs in the iterable
      * @throws NullPointerException if the iterable is null
      */
-    public static MutableContextSet fromEntries(Iterable<? extends Map.Entry<String, String>> iterable) {
-        if (iterable == null) {
-            throw new NullPointerException("iterable");
-        }
-
-        MutableContextSet set = new MutableContextSet();
+    @Nonnull
+    public static MutableContextSet fromEntries(@Nonnull Iterable<? extends Map.Entry<String, String>> iterable) {
+        checkNotNull(iterable, "iterable");
+        MutableContextSet set = MutableContextSet.create();
         set.addAll(iterable);
         return set;
     }
 
+    /**
+     * 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
+     */
+    @Nonnull
+    public static MutableContextSet fromMap(@Nonnull Map<String, String> map) {
+        checkNotNull(map, "map");
+        MutableContextSet set = MutableContextSet.create();
+        set.addAll(map);
+        return set;
+    }
+
     /**
      * Creates a MutableContextSet from an existing multimap
      *
@@ -133,12 +129,12 @@ public final class MutableContextSet implements ContextSet {
      * @return a new MutableContextSet representing the pairs in the multimap
      * @throws NullPointerException if the multimap is null
      */
-    public static MutableContextSet fromMultimap(Multimap<String, String> multimap) {
-        if (multimap == null) {
-            throw new NullPointerException("multimap");
-        }
-
-        return fromEntries(multimap.entries());
+    @Nonnull
+    public static MutableContextSet fromMultimap(@Nonnull Multimap<String, String> multimap) {
+        checkNotNull(multimap, "multimap");
+        MutableContextSet set = MutableContextSet.create();
+        set.addAll(multimap);
+        return set;
     }
 
     /**
@@ -149,11 +145,9 @@ public final class MutableContextSet implements ContextSet {
      * @return a new MutableContextSet with the same content and the one provided
      * @throws NullPointerException if contextSet is null
      */
-    public static MutableContextSet fromSet(ContextSet contextSet) {
-        if (contextSet == null) {
-            throw new NullPointerException("contextSet");
-        }
-
+    @Nonnull
+    public static MutableContextSet fromSet(@Nonnull ContextSet contextSet) {
+        Preconditions.checkNotNull(contextSet, "contextSet");
         MutableContextSet set = new MutableContextSet();
         set.addAll(contextSet.toSet());
         return set;
@@ -164,6 +158,7 @@ public final class MutableContextSet implements ContextSet {
      *
      * @return a new MutableContextSet
      */
+    @Nonnull
     public static MutableContextSet create() {
         return new MutableContextSet();
     }
@@ -174,8 +169,8 @@ public final class MutableContextSet implements ContextSet {
         this.map = Multimaps.synchronizedSetMultimap(HashMultimap.create());
     }
 
-    private MutableContextSet(Multimap<String, String> contexts) {
-        this.map = Multimaps.synchronizedSetMultimap(HashMultimap.create(contexts));
+    private MutableContextSet(MutableContextSet other) {
+        this.map = Multimaps.synchronizedSetMultimap(HashMultimap.create(other.map));
     }
 
     @Override
@@ -183,21 +178,25 @@ public final class MutableContextSet implements ContextSet {
         return false;
     }
 
+    @Nonnull
     @Override
     public ImmutableContextSet makeImmutable() {
-        return new ImmutableContextSet(map);
+        return new ImmutableContextSet(ImmutableSetMultimap.copyOf(map));
     }
 
+    @Nonnull
     @Override
     public MutableContextSet mutableCopy() {
-        return new MutableContextSet(map);
+        return new MutableContextSet(this);
     }
 
+    @Nonnull
     @Override
     public Set<Map.Entry<String, String>> toSet() {
         return ImmutableSet.copyOf(map.entries());
     }
 
+    @Nonnull
     @Override
     public Map<String, String> toMap() {
         ImmutableMap.Builder<String, String> m = ImmutableMap.builder();
@@ -208,57 +207,42 @@ public final class MutableContextSet implements ContextSet {
         return m.build();
     }
 
+    @Nonnull
     @Override
     public Multimap<String, String> toMultimap() {
         return ImmutableSetMultimap.copyOf(map);
     }
 
+    @Nonnull
     @Override
-    public boolean containsKey(String key) {
-        if (key == null) {
-            throw new NullPointerException("key");
-        }
-
-        return map.containsKey(key);
+    public boolean containsKey(@Nonnull String key) {
+        return map.containsKey(checkNotNull(key, "key").toLowerCase().intern());
     }
 
+    @Nonnull
     @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();
+    public Set<String> getValues(@Nonnull String key) {
+        Collection<String> values = map.get(checkNotNull(key, "key").toLowerCase().intern());
+        return values != null ? ImmutableSet.copyOf(values) : ImmutableSet.of();
     }
 
+    @Nonnull
     @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);
+    public boolean has(@Nonnull String key, @Nonnull String value) {
+        return map.containsEntry(checkNotNull(key, "key").toLowerCase().intern(), checkNotNull(value, "value").intern());
     }
 
+    @Nonnull
     @Override
-    public boolean hasIgnoreCase(String key, String value) {
-        if (key == null) {
-            throw new NullPointerException("key");
-        }
-        if (value == null) {
-            throw new NullPointerException("value");
-        }
+    public boolean hasIgnoreCase(@Nonnull String key, @Nonnull String value) {
+        value = checkNotNull(value, "value").intern();
+        Collection<String> values = map.get(checkNotNull(key, "key").toLowerCase().intern());
 
-        Collection<String> c = map.get(key);
-        if (c == null || c.isEmpty()) {
+        if (values == null || values.isEmpty()) {
             return false;
         }
 
-        for (String val : c) {
+        for (String val : values) {
             if (val.equalsIgnoreCase(value)) {
                 return true;
             }
@@ -283,15 +267,8 @@ public final class MutableContextSet implements ContextSet {
      * @param value the value to add
      * @throws NullPointerException if the key or value is null
      */
-    public void add(String key, String value) {
-        if (key == null) {
-            throw new NullPointerException("key");
-        }
-        if (value == null) {
-            throw new NullPointerException("value");
-        }
-
-        map.put(key.toLowerCase(), value);
+    public void add(@Nonnull String key, @Nonnull String value) {
+        map.put(checkNotNull(key, "key").toLowerCase().intern(), checkNotNull(value, "value").intern());
     }
 
     /**
@@ -300,12 +277,9 @@ public final class MutableContextSet implements ContextSet {
      * @param entry the entry to add
      * @throws NullPointerException if the entry is null
      */
-    public void add(Map.Entry<String, String> entry) {
-        if (entry == null) {
-            throw new NullPointerException("context");
-        }
-
-        map.put(entry.getKey().toLowerCase(), entry.getValue());
+    public void add(@Nonnull Map.Entry<String, String> entry) {
+        checkNotNull(entry, "entry");
+        add(entry.getKey(), entry.getValue());
     }
 
     /**
@@ -314,13 +288,9 @@ public final class MutableContextSet implements ContextSet {
      * @param iterable an iterable of key value context pairs
      * @throws NullPointerException if iterable is null
      */
-    public void addAll(Iterable<? extends Map.Entry<String, String>> iterable) {
-        if (iterable == null) {
-            throw new NullPointerException("iterable");
-        }
-
-        for (Map.Entry<String, String> e : iterable) {
-            this.map.put(e.getKey().toLowerCase(), e.getValue());
+    public void addAll(@Nonnull Iterable<? extends Map.Entry<String, String>> iterable) {
+        for (Map.Entry<String, String> e : checkNotNull(iterable, "iterable")) {
+            add(e);
         }
     }
 
@@ -330,11 +300,19 @@ public final class MutableContextSet implements ContextSet {
      * @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("map");
-        }
-        addAll(map.entrySet());
+    public void addAll(@Nonnull Map<String, String> map) {
+        addAll(checkNotNull(map, "map").entrySet());
+    }
+
+    /**
+     * Adds the entries of a multimap to the set
+     *
+     * @param multimap the multimap to add from
+     * @throws NullPointerException if the map is null
+     * @since 3.4
+     */
+    public void addAll(@Nonnull Multimap<String, String> multimap) {
+        addAll(checkNotNull(multimap, "multimap").entries());
     }
 
     /**
@@ -343,12 +321,14 @@ public final class MutableContextSet implements ContextSet {
      * @param contextSet the set to add from
      * @throws NullPointerException if the contextSet is null
      */
-    public void addAll(ContextSet contextSet) {
-        if (contextSet == null) {
-            throw new NullPointerException("contextSet");
+    public void addAll(@Nonnull ContextSet contextSet) {
+        checkNotNull(contextSet, "contextSet");
+        if (contextSet instanceof MutableContextSet) {
+            MutableContextSet other = ((MutableContextSet) contextSet);
+            this.map.putAll(other.map);
+        } else {
+            addAll(contextSet.toMultimap());
         }
-
-        this.map.putAll(contextSet.toMultimap());
     }
 
     /**
@@ -358,15 +338,12 @@ public final class MutableContextSet implements ContextSet {
      * @param value the value to remove (case sensitive)
      * @throws NullPointerException if the key or value is null
      */
-    public void remove(String key, String value) {
-        if (key == null) {
-            throw new NullPointerException("key");
-        }
-        if (value == null) {
-            throw new NullPointerException("value");
-        }
+    public void remove(@Nonnull String key, @Nonnull String value) {
+        String k = checkNotNull(key, "key").toLowerCase().intern();
+        String v = checkNotNull(value, "value").intern();
 
-        map.entries().removeIf(entry -> entry.getKey().equals(key) && entry.getValue().equals(value));
+        //noinspection StringEquality
+        map.entries().removeIf(entry -> entry.getKey() == k && entry.getValue() == v);
     }
 
     /**
@@ -376,15 +353,12 @@ public final class MutableContextSet implements ContextSet {
      * @param value the value to remove
      * @throws NullPointerException if the key or value is null
      */
-    public void removeIgnoreCase(String key, String value) {
-        if (key == null) {
-            throw new NullPointerException("key");
-        }
-        if (value == null) {
-            throw new NullPointerException("value");
-        }
+    public void removeIgnoreCase(@Nonnull String key, @Nonnull String value) {
+        String k = checkNotNull(key, "key").toLowerCase().intern();
+        String v = checkNotNull(value, "value").intern();
 
-        map.entries().removeIf(e -> e.getKey().equalsIgnoreCase(key) && e.getValue().equalsIgnoreCase(value));
+        //noinspection StringEquality
+        map.entries().removeIf(e -> e.getKey() == k && e.getValue().equalsIgnoreCase(v));
     }
 
     /**
@@ -393,12 +367,8 @@ public final class MutableContextSet implements ContextSet {
      * @param key the key to remove
      * @throws NullPointerException if the key is null
      */
-    public void removeAll(String key) {
-        if (key == null) {
-            throw new NullPointerException("key");
-        }
-
-        map.removeAll(key.toLowerCase());
+    public void removeAll(@Nonnull String key) {
+        map.removeAll(checkNotNull(key, "key").toLowerCase());
     }
 
     /**
@@ -414,14 +384,20 @@ public final class MutableContextSet implements ContextSet {
         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 == null ? otherContexts == null : thisContexts.equals(otherContexts);
+        final Multimap<String, String> otherContexts;
+
+        if (other instanceof MutableContextSet) {
+            otherContexts = ((MutableContextSet) other).map;
+        } else {
+            otherContexts = other.toMultimap();
+        }
+
+        return this.map.equals(otherContexts);
     }
 
     @Override
     public int hashCode() {
-        return 59 + (this.map == null ? 43 : this.map.hashCode());
+        return map.hashCode();
     }
 
     @Override

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,18 +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.
  */
 public interface DatastoreConfiguration {
 
+    @Nullable
     String getAddress();
 
+    @Nullable
     String getDatabase();
 
+    @Nullable
     String getUsername();
 
+    @Nullable
     String getPassword();
 
 }

api/src/main/java/me/lucko/luckperms/api/event/Cancellable.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,6 +27,8 @@ package me.lucko.luckperms.api.event;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import javax.annotation.Nonnull;
+
 /**
  * Represents an event that can be cancelled
  */
@@ -34,6 +39,7 @@ public interface Cancellable {
      *
      * @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
@@ -25,6 +28,8 @@ package me.lucko.luckperms.api.event;
 import java.util.Set;
 import java.util.function.Consumer;
 
+import javax.annotation.Nonnull;
+
 /**
  * The LuckPerms event bus. Used for subscribing (or registering listeners) to events.
  *
@@ -40,7 +45,8 @@ public interface EventBus {
      * @param <T>        the event class
      * @return an event handler instance representing this subscription
      */
-    <T extends LuckPermsEvent> EventHandler<T> subscribe(Class<T> eventClass, Consumer<T> handler);
+    @Nonnull
+    <T extends LuckPermsEvent> EventHandler<T> subscribe(@Nonnull Class<T> eventClass, @Nonnull Consumer<T> handler);
 
     /**
      * Gets a set of all registered handlers for a given event
@@ -49,6 +55,7 @@ public interface EventBus {
      * @param <T>        the event class
      * @return an immutable set of event handlers
      */
-    <T extends LuckPermsEvent> Set<EventHandler<T>> getHandlers(Class<T> eventClass);
+    @Nonnull
+    <T extends LuckPermsEvent> Set<EventHandler<T>> getHandlers(@Nonnull Class<T> eventClass);
 
 }

api/src/main/java/me/lucko/luckperms/api/event/EventHandler.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,6 +27,8 @@ package me.lucko.luckperms.api.event;
 
 import java.util.function.Consumer;
 
+import javax.annotation.Nonnull;
+
 /**
  * Represents a handler for a LuckPerms event
  *
@@ -36,6 +41,7 @@ public interface EventHandler<T extends LuckPermsEvent> {
      *
      * @return the event class
      */
+    @Nonnull
     Class<T> getEventClass();
 
     /**
@@ -57,6 +63,7 @@ public interface EventHandler<T extends LuckPermsEvent> {
      *
      * @return the event consumer
      */
+    @Nonnull
     Consumer<T> getConsumer();
 
     /**

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
@@ -24,6 +27,8 @@ package me.lucko.luckperms.api.event;
 
 import me.lucko.luckperms.api.LuckPermsApi;
 
+import javax.annotation.Nonnull;
+
 /**
  * The base event interface
  *
@@ -36,6 +41,7 @@ public interface LuckPermsEvent {
      *
      * @return the api instance
      */
+    @Nonnull
     LuckPermsApi getApi();
 
 }

api/src/main/java/me/lucko/luckperms/api/event/cause/CreationCause.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/api/event/cause/DeletionCause.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/api/event/group/GroupCreateEvent.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,6 +29,8 @@ 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
  */
@@ -36,6 +41,7 @@ public interface GroupCreateEvent extends LuckPermsEvent {
      *
      * @return the new group
      */
+    @Nonnull
     Group getGroup();
 
     /**
@@ -43,6 +49,7 @@ public interface GroupCreateEvent extends LuckPermsEvent {
      *
      * @return the cause of the creation
      */
+    @Nonnull
     CreationCause getCause();
 
 }

api/src/main/java/me/lucko/luckperms/api/event/group/GroupDeleteEvent.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
@@ -28,6 +31,8 @@ import me.lucko.luckperms.api.event.cause.DeletionCause;
 
 import java.util.Set;
 
+import javax.annotation.Nonnull;
+
 /**
  * Called when a group is deleted
  */
@@ -38,6 +43,7 @@ public interface GroupDeleteEvent extends LuckPermsEvent {
      *
      * @return the name of the deleted group
      */
+    @Nonnull
     String getGroupName();
 
     /**
@@ -45,6 +51,7 @@ public interface GroupDeleteEvent extends LuckPermsEvent {
      *
      * @return a copy of the groups existing data
      */
+    @Nonnull
     Set<Node> getExistingData();
 
     /**
@@ -52,6 +59,7 @@ public interface GroupDeleteEvent extends LuckPermsEvent {
      *
      * @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

api/src/main/java/me/lucko/luckperms/api/event/group/GroupLoadEvent.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
@@ -25,6 +28,8 @@ 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.
  *
@@ -37,6 +42,7 @@ public interface GroupLoadEvent extends LuckPermsEvent {
      *
      * @return the group that was loaded
      */
+    @Nonnull
     Group getGroup();
 
 }

api/src/main/java/me/lucko/luckperms/api/event/log/LogBroadcastEvent.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,6 +29,8 @@ 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
  */
@@ -36,6 +41,34 @@ public interface LogBroadcastEvent extends LuckPermsEvent, Cancellable {
      *
      * @return the log entry to be broadcasted
      */
+    @Nonnull
     LogEntry getEntry();
 
+    /**
+     * Gets where the log entry originated from.
+     *
+     * @return the origin of the log
+     * @since 3.3
+     */
+    @Nonnull
+    Origin getOrigin();
+
+    /**
+     * Represents where a log entry is from
+     *
+     * @since 3.3
+     */
+    enum Origin {
+
+        /**
+         * Represents a log entry which originated from the current server instance
+         */
+        LOCAL,
+
+        /**
+         * Represents a log entry which was sent to this server via the messaging service
+         */
+        REMOTE
+    }
+
 }

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

@@ -0,0 +1,59 @@
+/*
+ * 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 java.util.UUID;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Called when a log is about to be published to the network via the MessagingService
+ *
+ * @since 3.3
+ */
+public interface LogNetworkPublishEvent extends LuckPermsEvent, Cancellable {
+
+    /**
+     * Gets the ID of the log entry being published
+     *
+     * @return the id of the log entry being published
+     */
+    @Nonnull
+    UUID getLogId();
+
+    /**
+     * 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/log/LogPublishEvent.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,6 +29,8 @@ 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
  */
@@ -36,6 +41,7 @@ public interface LogPublishEvent extends LuckPermsEvent, Cancellable {
      *
      * @return the log entry to be published
      */
+    @Nonnull
     LogEntry getEntry();
 
 }

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

@@ -0,0 +1,58 @@
+/*
+ * 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.LuckPermsEvent;
+
+import java.util.UUID;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Called when a log entry is received via the MessagingService
+ *
+ * @since 3.3
+ */
+public interface LogReceiveEvent extends LuckPermsEvent {
+
+    /**
+     * Gets the ID of the log entry being received
+     *
+     * @return the id of the log entry being received
+     */
+    @Nonnull
+    UUID getLogId();
+
+    /**
+     * Gets the log entry being received
+     *
+     * @return the log entry being received
+     */
+    @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
@@ -24,6 +27,8 @@ package me.lucko.luckperms.api.event.node;
 
 import me.lucko.luckperms.api.Node;
 
+import javax.annotation.Nonnull;
+
 /**
  * Called when a node is added to a holder
  */
@@ -34,6 +39,7 @@ public interface NodeAddEvent extends NodeMutateEvent {
      *
      * @return the node that was added
      */
+    @Nonnull
     Node getNode();
 
 }

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

api/src/main/java/me/lucko/luckperms/api/event/node/NodeMutateEvent.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
@@ -28,6 +31,8 @@ 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
  */
@@ -38,6 +43,7 @@ public interface NodeMutateEvent extends LuckPermsEvent {
      *
      * @return the event target
      */
+    @Nonnull
     PermissionHolder getTarget();
 
     /**
@@ -45,6 +51,7 @@ public interface NodeMutateEvent extends LuckPermsEvent {
      *
      * @return the data before the change
      */
+    @Nonnull
     Set<Node> getDataBefore();
 
     /**
@@ -52,6 +59,7 @@ public interface NodeMutateEvent extends LuckPermsEvent {
      *
      * @return the data after the change
      */
+    @Nonnull
     Set<Node> getDataAfter();
 
     /**

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
@@ -24,6 +27,8 @@ package me.lucko.luckperms.api.event.node;
 
 import me.lucko.luckperms.api.Node;
 
+import javax.annotation.Nonnull;
+
 /**
  * Called when a node is removed from a holder
  */
@@ -34,6 +39,7 @@ public interface NodeRemoveEvent extends NodeMutateEvent {
      *
      * @return the node that was removed
      */
+    @Nonnull
     Node getNode();
 
 }

api/src/main/java/me/lucko/luckperms/api/event/sync/ConfigReloadEvent.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/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

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
@@ -27,8 +30,10 @@ import me.lucko.luckperms.api.event.LuckPermsEvent;
 
 import java.util.UUID;
 
+import javax.annotation.Nonnull;
+
 /**
- * Called before a network sync task runs
+ * Called before a received network sync task runs
  */
 public interface PreNetworkSyncEvent extends LuckPermsEvent, Cancellable {
 
@@ -37,6 +42,7 @@ public interface PreNetworkSyncEvent extends LuckPermsEvent, Cancellable {
      *
      * @return the id of the sync request
      */
+    @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

api/src/main/java/me/lucko/luckperms/api/event/track/TrackCreateEvent.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,6 +29,8 @@ 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
  */
@@ -36,6 +41,7 @@ public interface TrackCreateEvent extends LuckPermsEvent {
      *
      * @return the new track
      */
+    @Nonnull
     Track getTrack();
 
     /**
@@ -43,6 +49,7 @@ public interface TrackCreateEvent extends LuckPermsEvent {
      *
      * @return the cause of the creation
      */
+    @Nonnull
     CreationCause getCause();
 
 }

api/src/main/java/me/lucko/luckperms/api/event/track/TrackDeleteEvent.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,6 +30,8 @@ import me.lucko.luckperms.api.event.cause.DeletionCause;
 
 import java.util.List;
 
+import javax.annotation.Nonnull;
+
 /**
  * Called when a track is deleted
  */
@@ -37,6 +42,7 @@ public interface TrackDeleteEvent extends LuckPermsEvent {
      *
      * @return the name of the deleted track
      */
+    @Nonnull
     String getTrackName();
 
     /**
@@ -44,6 +50,7 @@ public interface TrackDeleteEvent extends LuckPermsEvent {
      *
      * @return a copy of the tracks existing data
      */
+    @Nonnull
     List<String> getExistingData();
 
     /**
@@ -51,6 +58,7 @@ public interface TrackDeleteEvent extends LuckPermsEvent {
      *
      * @return the cause of the deletion
      */
+    @Nonnull
     DeletionCause getCause();
 
 }

api/src/main/java/me/lucko/luckperms/api/event/track/TrackLoadAllEvent.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/api/event/track/TrackLoadEvent.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
@@ -25,6 +28,8 @@ 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.
  *
@@ -37,6 +42,7 @@ public interface TrackLoadEvent extends LuckPermsEvent {
      *
      * @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
@@ -22,6 +25,8 @@
 
 package me.lucko.luckperms.api.event.track.mutate;
 
+import javax.annotation.Nonnull;
+
 /**
  * Called when a group is added to a track
  */
@@ -32,6 +37,7 @@ public interface TrackAddGroupEvent extends TrackMutateEvent {
      *
      * @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

api/src/main/java/me/lucko/luckperms/api/event/track/mutate/TrackMutateEvent.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,6 +30,8 @@ import me.lucko.luckperms.api.event.LuckPermsEvent;
 
 import java.util.List;
 
+import javax.annotation.Nonnull;
+
 /**
  * Called when a track is changed
  */
@@ -37,6 +42,7 @@ public interface TrackMutateEvent extends LuckPermsEvent {
      *
      * @return the track that was mutated
      */
+    @Nonnull
     Track getTrack();
 
     /**
@@ -44,6 +50,7 @@ public interface TrackMutateEvent extends LuckPermsEvent {
      *
      * @return the data before the change
      */
+    @Nonnull
     List<String> getDataBefore();
 
     /**
@@ -51,6 +58,7 @@ public interface TrackMutateEvent extends LuckPermsEvent {
      *
      * @return the data after the change
      */
+    @Nonnull
     List<String> getDataAfter();
 
 }

api/src/main/java/me/lucko/luckperms/api/event/track/mutate/TrackRemoveGroupEvent.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,6 +25,8 @@
 
 package me.lucko.luckperms.api.event.track.mutate;
 
+import javax.annotation.Nonnull;
+
 /**
  * Called when a group is removed from a track
  */
@@ -32,6 +37,7 @@ public interface TrackRemoveGroupEvent extends TrackMutateEvent {
      *
      * @return the group that was removed
      */
+    @Nonnull
     String getGroup();
 
 }

api/src/main/java/me/lucko/luckperms/api/event/user/UserCacheLoadEvent.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,6 +29,8 @@ 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.
  */
@@ -36,6 +41,7 @@ public interface UserCacheLoadEvent extends LuckPermsEvent {
      *
      * @return the user
      */
+    @Nonnull
     User getUser();
 
     /**
@@ -43,6 +49,7 @@ public interface UserCacheLoadEvent extends LuckPermsEvent {
      *
      * @return the loaded data
      */
+    @Nonnull
     UserData getLoadedData();
 
 }

api/src/main/java/me/lucko/luckperms/api/event/user/UserDataRecalculateEvent.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,6 +29,8 @@ 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
  */
@@ -36,6 +41,7 @@ public interface UserDataRecalculateEvent extends LuckPermsEvent {
      *
      * @return the user
      */
+    @Nonnull
     User getUser();
 
     /**
@@ -43,6 +49,7 @@ public interface UserDataRecalculateEvent extends LuckPermsEvent {
      *
      * @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
@@ -26,6 +29,8 @@ 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.
  *
@@ -44,6 +49,7 @@ public interface UserFirstLoginEvent extends LuckPermsEvent {
      *
      * @return the uuid of the user
      */
+    @Nonnull
     UUID getUuid();
 
     /**
@@ -51,6 +57,7 @@ public interface UserFirstLoginEvent extends LuckPermsEvent {
      *
      * @return the username of the user
      */
+    @Nonnull
     String getUsername();
 
 }

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
@@ -25,6 +28,8 @@ package me.lucko.luckperms.api.event.user;
 import me.lucko.luckperms.api.User;
 import me.lucko.luckperms.api.event.LuckPermsEvent;
 
+import javax.annotation.Nonnull;
+
 /**
  * Called when a user is loaded into memory from the storage.
  */
@@ -35,6 +40,7 @@ public interface UserLoadEvent extends LuckPermsEvent {
      *
      * @return the user that was loaded
      */
+    @Nonnull
     User getUser();
 
 }

api/src/main/java/me/lucko/luckperms/api/event/user/UserLoginProcessEvent.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.event.user;
+
+import me.lucko.luckperms.api.User;
+import me.lucko.luckperms.api.event.LuckPermsEvent;
+
+import java.util.UUID;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Called when LuckPerms has finished processing a certain Player's connection.
+ *
+ * <p>This event will always execute during the platforms async login/auth event.
+ * All handlers will be called instantly.</p>
+ *
+ * <p>This, among other things, allows you to wait until permission data is loaded
+ * for a User during the BungeeCord 'LoginEvent', as event priorities are ignored
+ * by the current implementation.</p>
+ *
+ * @since 3.4
+ */
+public interface UserLoginProcessEvent extends LuckPermsEvent {
+
+    /**
+     * Gets the UUID of the connection which was processed
+     *
+     * @return the uuid of the connection which was processed
+     */
+    @Nonnull
+    UUID getUuid();
+
+    /**
+     * Gets the username of the connection which was processed
+     *
+     * @return the username of the connection which was processed
+     */
+    @Nonnull
+    String getUsername();
+
+    /**
+     * Gets the resultant User instance which was loaded.
+     *
+     * @return the user instance
+     */
+    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

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

api/src/main/java/me/lucko/luckperms/api/event/user/track/UserPromoteEvent.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/api/event/user/track/UserTrackEvent.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
@@ -28,6 +31,8 @@ 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
  */
@@ -38,6 +43,7 @@ public interface UserTrackEvent extends LuckPermsEvent {
      *
      * @return the track involved in the event
      */
+    @Nonnull
     Track getTrack();
 
     /**
@@ -45,6 +51,7 @@ public interface UserTrackEvent extends LuckPermsEvent {
      *
      * @return the user involved in the event
      */
+    @Nonnull
     User getUser();
 
     /**
@@ -52,6 +59,7 @@ public interface UserTrackEvent extends LuckPermsEvent {
      *
      * @return the action performed
      */
+    @Nonnull
     TrackAction getAction();
 
     /**
@@ -61,6 +69,7 @@ public interface UserTrackEvent extends LuckPermsEvent {
      *
      * @return the group the user was promoted/demoted from
      */
+    @Nonnull
     Optional<String> getGroupFrom();
 
     /**
@@ -68,6 +77,7 @@ public interface UserTrackEvent extends LuckPermsEvent {
      *
      * @return the group the user was promoted/demoted to
      */
+    @Nonnull
     Optional<String> getGroupTo();
 
 }

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

@@ -27,6 +27,8 @@ 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.
  *
@@ -45,6 +47,7 @@ public interface MetaStackDefinition {
      *
      * @return the elements in this stack
      */
+    @Nonnull
     List<MetaStackElement> getElements();
 
     /**
@@ -52,6 +55,7 @@ public interface MetaStackDefinition {
      *
      * @return the start spacer
      */
+    @Nonnull
     String getStartSpacer();
 
     /**
@@ -59,6 +63,7 @@ public interface MetaStackDefinition {
      *
      * @return the middle spacer
      */
+    @Nonnull
     String getMiddleSpacer();
 
     /**
@@ -66,6 +71,7 @@ public interface MetaStackDefinition {
      *
      * @return the end spacer
      */
+    @Nonnull
     String getEndSpacer();
 
 }

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

@@ -31,6 +31,9 @@ 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}.
  *
@@ -48,6 +51,6 @@ public interface MetaStackElement {
      * @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(LocalizedNode node, ChatMetaType type, Map.Entry<Integer, String> current);
+    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

@@ -28,6 +28,8 @@ 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.
  *
@@ -41,7 +43,8 @@ public interface MetaStackFactory {
      * @param definition the definition
      * @return the parsed element, if present
      */
-    Optional<MetaStackElement> fromString(String definition);
+    @Nonnull
+    Optional<MetaStackElement> fromString(@Nonnull String definition);
 
     /**
      * Parses a list of {@link MetaStackElement}s from string, using the pre-defined elements in the plugin.
@@ -51,7 +54,8 @@ public interface MetaStackFactory {
      * @param definitions the definition strings
      * @return a list of parsed elements
      */
-    List<MetaStackElement> fromStrings(List<String> definitions);
+    @Nonnull
+    List<MetaStackElement> fromStrings(@Nonnull List<String> definitions);
 
     /**
      * Creates a new {@link MetaStackDefinition} with the given properties.
@@ -62,6 +66,7 @@ public interface MetaStackFactory {
      * @param endSpacer the spacer to be included at the end of the stacks output
      * @return the new stack definition instance
      */
-    MetaStackDefinition createDefinition(List<MetaStackElement> elements, String startSpacer, String middleSpacer, String endSpacer);
+    @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,8 +26,16 @@
 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 certain membership state is / isn't met.
+ *
+ * For example, when:
+ * <p></p>
+ * <ul>
+ *     <li>a permission holding object doesn't have a permission</li>
+ *     <li>a permission holding object already has a permission</li>
+ *     <li>a permission holding object is already a member of a group</li>
+ *     <li>a permission holding object isn't already a member of a group</li>
+ * </ul>
  *
  * @since 2.7
  */

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
@@ -23,8 +26,15 @@
 package me.lucko.luckperms.exceptions;
 
 /**
- * Thrown when a permission holding object already has a permission, is already a member of a group, or when a track
- * already contains a group.
+ * Thrown when an object already has something.
+ *
+ * <p>For example, when:</p>
+ * <p></p>
+ * <ul>
+ *     <li>a permission holding object already has a permission</li>
+ *     <li>a permission holding object is already a member of a group</li>
+ *     <li>a track already contains a group</li>
+ * </ul>
  */
 public class ObjectAlreadyHasException extends MembershipException {
 }

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
@@ -23,8 +26,15 @@
 package me.lucko.luckperms.exceptions;
 
 /**
- * Thrown when a permission holding object does not already have a permission, is not already a member of a group,
- * or when a track doesn't contain a group.
+ * Thrown when an object lacks something.
+ *
+ * <p>For example, when:</p>
+ * <p></p>
+ * <ul>
+ *     <li>a permission holding object doesn't have a permission</li>
+ *     <li>a permission holding object isn't already a member of a group</li>
+ *     <li>a track doesn't contain a group</li>
+ * </ul>
  */
 public class ObjectLacksException extends MembershipException {
 }

bukkit-legacy/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>luckperms</artifactId>
         <groupId>me.lucko.luckperms</groupId>
-        <version>3.2-SNAPSHOT</version>
+        <version>3.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -47,8 +47,8 @@
                                     <shadedPattern>me.lucko.luckperms.lib.gson</shadedPattern>
                                 </relocation>
                                 <relocation>
-                                    <pattern>io.github.mkremins.fanciful</pattern>
-                                    <shadedPattern>me.lucko.luckperms.lib.fanciful</shadedPattern>
+                                    <pattern>net.kyori.text</pattern>
+                                    <shadedPattern>me.lucko.luckperms.lib.text</shadedPattern>
                                 </relocation>
                             </relocations>
                         </configuration>
@@ -58,6 +58,30 @@
         </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>

bukkit/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>luckperms</artifactId>
         <groupId>me.lucko.luckperms</groupId>
-        <version>3.2-SNAPSHOT</version>
+        <version>3.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -46,8 +46,8 @@
                             <createDependencyReducedPom>false</createDependencyReducedPom>
                             <relocations>
                                 <relocation>
-                                    <pattern>io.github.mkremins.fanciful</pattern>
-                                    <shadedPattern>me.lucko.luckperms.lib.fanciful</shadedPattern>
+                                    <pattern>net.kyori.text</pattern>
+                                    <shadedPattern>me.lucko.luckperms.lib.text</shadedPattern>
                                 </relocation>
                             </relocations>
                         </configuration>
@@ -57,12 +57,36 @@
         </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>
         <!-- Spigot API -->
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.11.2-R0.1-SNAPSHOT</version>
+            <version>1.12-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <!-- Vault -->

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

@@ -30,8 +30,8 @@ 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.constants.Message;
-import me.lucko.luckperms.common.core.model.User;
+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;
@@ -71,12 +71,8 @@ public class BukkitListener implements Listener {
             ex.printStackTrace();
         }
 
-        /* the player was denied entry to the server before this priority.
-           log this, so we can handle appropriately later. */
-        if (e.getLoginResult() != AsyncPlayerPreLoginEvent.Result.ALLOWED) {
-            plugin.getLog().warn("Connection from " + e.getUniqueId() + " was already denied. No permissions data will be loaded.");
-            deniedAsyncLogin.add(e.getUniqueId());
-            return;
+        if (plugin.getConfiguration().get(ConfigKeys.DEBUG_LOGINS)) {
+            plugin.getLog().info("Processing pre-login for " + e.getUniqueId() + " - " + e.getName());
         }
 
         /* there was an issue connecting to the DB, performing file i/o, etc.
@@ -89,11 +85,13 @@ public class BukkitListener implements Listener {
             deniedAsyncLogin.add(e.getUniqueId());
 
             // actually deny the connection.
-            plugin.getLog().warn("Permissions storage is not loaded yet. Denying connection from: " + e.getUniqueId() + " - " + e.getName());
+            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;
         }
 
+        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.
@@ -104,7 +102,8 @@ public class BukkitListener implements Listener {
            - creating a user instance in the UserManager for this connection.
            - setting up cached data. */
         try {
-            LoginHelper.loadUser(plugin, e.getUniqueId(), e.getName(), false);
+            User user = LoginHelper.loadUser(plugin, e.getUniqueId(), e.getName(), false);
+            plugin.getApiProvider().getEventFactory().handleUserLoginProcess(e.getUniqueId(), e.getName(), user);
         } catch (Exception ex) {
             ex.printStackTrace();
 
@@ -121,6 +120,7 @@ public class BukkitListener implements Listener {
 
         // 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) {
@@ -131,28 +131,24 @@ public class BukkitListener implements Listener {
             return;
         }
 
-        // Login event was cancelled by another plugin
+        // 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.LOW)
+    @EventHandler(priority = EventPriority.LOWEST)
     public void onPlayerLogin(PlayerLoginEvent e) {
         /* Called when the player starts logging into the server.
-           At this point, the users data should be present and loaded.
-           Listening on LOW priority to allow plugins to further modify data here. (auth plugins, etc.) */
-
-        /* the player was denied entry to the server before this priority.
-           log this, so we can handle appropriately later. */
-        if (e.getResult() != PlayerLoginEvent.Result.ALLOWED) {
-            plugin.getLog().warn("Login from " + e.getPlayer().getUniqueId() + " was denied before an attachment could be injected.");
-            deniedLogin.add(e.getPlayer().getUniqueId());
-            return;
-        }
+           At this point, the users data should be present and loaded. */
 
         final Player player = e.getPlayer();
+
+        if (plugin.getConfiguration().get(ConfigKeys.DEBUG_LOGINS)) {
+            plugin.getLog().info("Processing login for " + player.getUniqueId() + " - " + player.getName());
+        }
+
         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. */
@@ -190,20 +186,20 @@ public class BukkitListener implements Listener {
         /* 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. */
 
-        // Check to see if this connection was denied at LOW.
+        // 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, "");
             }
-
-            return;
         }
 
-        // Login event was cancelled by another plugin
-        if (e.getResult() != PlayerLoginEvent.Result.ALLOWED) {
+        // 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;
@@ -219,7 +215,11 @@ public class BukkitListener implements Listener {
         final Player player = e.getPlayer();
 
         // Remove the custom permissible
-        Injector.unInject(player, true, true);
+        try {
+            Injector.unInject(player, true, true);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
 
         // Handle auto op
         if (plugin.getConfiguration().get(ConfigKeys.AUTO_OP)) {
@@ -236,8 +236,7 @@ public class BukkitListener implements Listener {
             return;
         }
 
-        String s = e.getMessage().toLowerCase()
-                .replace("/", "")
+        String s = e.getMessage().substring(1).toLowerCase()
                 .replace("bukkit:", "")
                 .replace("spigot:", "")
                 .replace("minecraft:", "");
@@ -255,8 +254,9 @@ public class BukkitListener implements Listener {
         }
     }
 
-    @EventHandler
+    @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

@@ -25,16 +25,18 @@
 
 package me.lucko.luckperms.bukkit;
 
+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 io.github.mkremins.fanciful.FancyMessage;
-
 import java.util.UUID;
 
 public class BukkitSenderFactory extends SenderFactory<CommandSender> {
@@ -63,14 +65,29 @@ public class BukkitSenderFactory extends SenderFactory<CommandSender> {
 
     @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, FancyMessage message) {
+    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

@@ -33,51 +33,52 @@ import me.lucko.luckperms.api.LuckPermsApi;
 import me.lucko.luckperms.api.PlatformType;
 import me.lucko.luckperms.api.context.ContextSet;
 import me.lucko.luckperms.api.context.MutableContextSet;
-import me.lucko.luckperms.bukkit.messaging.BungeeMessagingService;
-import me.lucko.luckperms.bukkit.messaging.LilyPadMessagingService;
-import me.lucko.luckperms.bukkit.model.ChildPermissionProvider;
-import me.lucko.luckperms.bukkit.model.DefaultsProvider;
+import me.lucko.luckperms.bukkit.calculators.BukkitCalculatorFactory;
+import me.lucko.luckperms.bukkit.contexts.BukkitContextManager;
+import me.lucko.luckperms.bukkit.contexts.WorldCalculator;
+import me.lucko.luckperms.bukkit.messaging.BukkitMessagingFactory;
 import me.lucko.luckperms.bukkit.model.Injector;
 import me.lucko.luckperms.bukkit.model.LPPermissible;
-import me.lucko.luckperms.bukkit.vault.VaultHook;
+import me.lucko.luckperms.bukkit.processors.ChildPermissionProvider;
+import me.lucko.luckperms.bukkit.processors.DefaultsProvider;
+import me.lucko.luckperms.bukkit.vault.VaultHookManager;
+import me.lucko.luckperms.common.actionlog.LogDispatcher;
 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.buffers.UpdateTaskBuffer;
 import me.lucko.luckperms.common.caching.handlers.CachedStateManager;
 import me.lucko.luckperms.common.calculators.CalculatorFactory;
 import me.lucko.luckperms.common.commands.sender.Sender;
 import me.lucko.luckperms.common.config.ConfigKeys;
 import me.lucko.luckperms.common.config.LuckPermsConfiguration;
-import me.lucko.luckperms.common.constants.Permission;
+import me.lucko.luckperms.common.constants.CommandPermission;
 import me.lucko.luckperms.common.contexts.ContextManager;
-import me.lucko.luckperms.common.contexts.StaticCalculator;
-import me.lucko.luckperms.common.core.UuidCache;
-import me.lucko.luckperms.common.core.model.User;
+import me.lucko.luckperms.common.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.managers.impl.GenericGroupManager;
-import me.lucko.luckperms.common.managers.impl.GenericTrackManager;
-import me.lucko.luckperms.common.managers.impl.GenericUserManager;
 import me.lucko.luckperms.common.messaging.InternalMessagingService;
-import me.lucko.luckperms.common.messaging.NoopMessagingService;
-import me.lucko.luckperms.common.messaging.RedisMessaging;
+import me.lucko.luckperms.common.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.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.BufferedRequest;
-import me.lucko.luckperms.common.utils.FileWatcher;
 import me.lucko.luckperms.common.utils.LoginHelper;
-import me.lucko.luckperms.common.utils.SenderLogger;
+import me.lucko.luckperms.common.utils.UuidCache;
 import me.lucko.luckperms.common.verbose.VerboseHandler;
 
 import org.bukkit.World;
@@ -106,10 +107,11 @@ import java.util.stream.Collectors;
 
 @Getter
 public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
-    private Set<UUID> ignoringLogs;
+
+    private long startTime;
     private LPBukkitScheduler scheduler;
     private BukkitCommand commandManager;
-    private VaultHook vaultHook = null;
+    private VaultHookManager vaultHookManager = null;
     private LuckPermsConfiguration configuration;
     private UserManager userManager;
     private GroupManager groupManager;
@@ -126,7 +128,6 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
     private LocaleManager localeManager;
     private CachedStateManager cachedStateManager;
     private ContextManager<Player> contextManager;
-    private WorldCalculator worldCalculator;
     private CalculatorFactory calculatorFactory;
     private BufferedRequest<Void> updateTaskBuffer;
     private boolean started = false;
@@ -134,20 +135,38 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
     private VerboseHandler verboseHandler;
     private BukkitSenderFactory senderFactory;
     private PermissionVault permissionVault;
+    private LogDispatcher logDispatcher;
+    private Set<UUID> uniqueConnections = ConcurrentHashMap.newKeySet();
 
     @Override
     public void onLoad() {
+        if (checkInvalidVersion()) {
+            return;
+        }
+
         // setup minimal functionality in order to load initial dependencies
         scheduler = new LPBukkitScheduler(this);
         localeManager = new NoopLocaleManager();
         senderFactory = new BukkitSenderFactory(this);
-        log = new SenderLogger(getConsoleSender());
+        log = new SenderLogger(this, getConsoleSender());
 
         DependencyManager.loadDependencies(this, Collections.singletonList(Dependency.CAFFEINE));
     }
 
     @Override
     public void onEnable() {
+        if (checkInvalidVersion()) {
+            getLogger().severe("----------------------------------------------------------------------");
+            getLogger().severe("Your server version is not compatible with this build of LuckPerms. :(");
+            getLogger().severe("");
+            getLogger().severe("If your server is running 1.8, please update to 1.8.8 or higher.");
+            getLogger().severe("If your server is running 1.7.10, please download the Bukkit-Legacy version of LuckPerms from here:");
+            getLogger().severe("==> https://ci.lucko.me/job/LuckPerms/");
+            getLogger().severe("----------------------------------------------------------------------");
+            getServer().getPluginManager().disablePlugin(this);
+            return;
+        }
+
         try {
             enable();
             started = true;
@@ -159,11 +178,11 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
     }
 
     private void enable() {
+        startTime = System.currentTimeMillis();
         LuckPermsPlugin.sendStartupBanner(getConsoleSender(), this);
-
-        ignoringLogs = ConcurrentHashMap.newKeySet();
-        verboseHandler = new VerboseHandler(scheduler.getAsyncBukkitExecutor(), getVersion());
-        permissionVault = new PermissionVault(scheduler.getAsyncBukkitExecutor());
+        verboseHandler = new VerboseHandler(scheduler.asyncBukkit(), getVersion());
+        permissionVault = new PermissionVault(scheduler.asyncBukkit());
+        logDispatcher = new LogDispatcher(this);
 
         getLog().info("Loading configuration...");
         configuration = new BukkitConfig(this);
@@ -192,9 +211,8 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
         }, 1L);
 
         // register events
-        PluginManager pm = getServer().getPluginManager();
         listener = new BukkitListener(this);
-        pm.registerEvents(listener, this);
+        getServer().getPluginManager().registerEvents(listener, this);
 
         if (getConfiguration().get(ConfigKeys.WATCH_FILES)) {
             fileWatcher = new FileWatcher(this);
@@ -205,71 +223,16 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
         storage = StorageFactory.getInstance(this, StorageType.H2);
 
         // initialise messaging
-        String messagingType = getConfiguration().get(ConfigKeys.MESSAGING_SERVICE).toLowerCase();
-        if (messagingType.equals("none") && getConfiguration().get(ConfigKeys.REDIS_ENABLED)) {
-            messagingType = "redis";
-        }
-        if (messagingType.equals("redis")) {
-            getLog().info("Loading redis...");
-            if (getConfiguration().get(ConfigKeys.REDIS_ENABLED)) {
-                RedisMessaging redis = new RedisMessaging(this);
-                try {
-                    redis.init(getConfiguration().get(ConfigKeys.REDIS_ADDRESS), getConfiguration().get(ConfigKeys.REDIS_PASSWORD));
-                    getLog().info("Loaded redis successfully...");
-
-                    messagingService = redis;
-                } catch (Exception e) {
-                    getLog().warn("Couldn't load redis...");
-                    e.printStackTrace();
-                }
-            } else {
-                getLog().warn("Messaging Service was set to redis, but redis is not enabled!");
-            }
-        } else if (messagingType.equals("bungee")) {
-            getLog().info("Loading bungee messaging service...");
-            BungeeMessagingService bungeeMessaging = new BungeeMessagingService(this);
-            bungeeMessaging.init();
-            messagingService = bungeeMessaging;
-        } else if (messagingType.equals("lilypad")) {
-            getLog().info("Loading LilyPad messaging service...");
-            if (getServer().getPluginManager().getPlugin("LilyPad-Connect") == null) {
-                getLog().warn("LilyPad-Connect plugin not present.");
-            } else {
-                LilyPadMessagingService lilyPadMessaging = new LilyPadMessagingService(this);
-                lilyPadMessaging.init();
-                messagingService = lilyPadMessaging;
-            }
-        } else if (!messagingType.equals("none")) {
-            getLog().warn("Messaging service '" + messagingType + "' not recognised.");
-        }
-
-        if (messagingService == null) {
-            messagingService = new NoopMessagingService();
-        }
+        messagingService = new BukkitMessagingFactory(this).getInstance();
 
         // setup the update task buffer
-        updateTaskBuffer = new BufferedRequest<Void>(1000L, this::doAsync) {
-            @Override
-            protected Void perform() {
-                new UpdateTask(LPBukkitPlugin.this).run();
-                return null;
-            }
-        };
+        updateTaskBuffer = new UpdateTaskBuffer(this);
 
         // load locale
         localeManager = new SimpleLocaleManager();
-        File locale = new File(getDataFolder(), "lang.yml");
-        if (locale.exists()) {
-            getLog().info("Found locale file. Attempting to load from it.");
-            try {
-                localeManager.loadFromFile(locale);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
+        localeManager.tryLoad(this, new File(getDataFolder(), "lang.yml"));
 
         // register commands
-        getLog().info("Registering commands...");
         commandManager = new BukkitCommand(this);
         PluginCommand main = getServer().getPluginCommand("luckperms");
         main.setExecutor(commandManager);
@@ -284,21 +247,17 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
         groupManager = new GenericGroupManager(this);
         trackManager = new GenericTrackManager(this);
         calculatorFactory = new BukkitCalculatorFactory(this);
-        cachedStateManager = new CachedStateManager(this);
+        cachedStateManager = new CachedStateManager();
 
-        contextManager = new ContextManager<>();
-        worldCalculator = new WorldCalculator(this);
-        contextManager.registerCalculator(worldCalculator);
-
-        StaticCalculator<Player> staticCalculator = new StaticCalculator<>(getConfiguration());
-        contextManager.registerCalculator(staticCalculator);
-        contextManager.registerStaticCalculator(staticCalculator);
+        // setup context manager
+        contextManager = new BukkitContextManager(this);
+        contextManager.registerCalculator(new WorldCalculator(this));
+        contextManager.registerCalculator(new LuckPermsCalculator<>(getConfiguration()), true);
 
         // Provide vault support
         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);
@@ -313,6 +272,7 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
         scheduler.asyncLater(() -> updateTaskBuffer.request(), 40L);
 
         // run an update instantly.
+        getLog().info("Performing initial data load...");
         updateTaskBuffer.requestDirectly();
 
         // register tasks
@@ -351,11 +311,15 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
             });
         }
 
-        getLog().info("Successfully loaded.");
+        getLog().info("Successfully enabled. (took " + (System.currentTimeMillis() - startTime) + "ms)");
     }
 
     @Override
     public void onDisable() {
+        if (checkInvalidVersion()) {
+            return;
+        }
+
         // Switch back to the LP executor, the bukkit one won't allow new tasks
         scheduler.setUseBukkitAsync(false);
 
@@ -366,7 +330,12 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
         verboseHandler.setShutdown(true);
 
         for (Player player : getServer().getOnlinePlayers()) {
-            Injector.unInject(player, false, false);
+            try {
+                Injector.unInject(player, false, false);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
             if (getConfiguration().get(ConfigKeys.AUTO_OP)) {
                 player.setOp(false);
             }
@@ -378,7 +347,7 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
             }
         }
 
-        getLog().info("Closing datastore...");
+        getLog().info("Closing storage...");
         storage.shutdown();
 
         if (fileWatcher != null) {
@@ -390,14 +359,14 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
             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.
@@ -405,8 +374,7 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
         HandlerList.unregisterAll(this);
 
         // Null everything
-        ignoringLogs = null;
-        vaultHook = null;
+        vaultHookManager = null;
         configuration = null;
         userManager = null;
         groupManager = null;
@@ -423,30 +391,27 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
         localeManager = null;
         cachedStateManager = null;
         contextManager = null;
-        worldCalculator = null;
         calculatorFactory = null;
         updateTaskBuffer = null;
         verboseHandler = null;
         senderFactory = null;
         permissionVault = null;
+        logDispatcher = null;
     }
 
     public void tryVaultHook(boolean force) {
-        if (vaultHook != null) {
+        if (vaultHookManager != null) {
             return; // already hooked
         }
 
-        if (force) {
-            getLog().info("Attempting to hook with Vault...");
-        }
         try {
             if (force || getServer().getPluginManager().isPluginEnabled("Vault")) {
-                vaultHook = new VaultHook();
-                vaultHook.hook(this);
+                vaultHookManager = new VaultHookManager();
+                vaultHookManager.hook(this);
                 getLog().info("Registered Vault permission & chat hook.");
             }
         } catch (Exception e) {
-            vaultHook = null;
+            vaultHookManager = null;
             getLog().severe("Error occurred whilst hooking into Vault.");
             e.printStackTrace();
         }
@@ -515,21 +480,24 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
         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 new Contexts(
-                getContextManager().getApplicableContext(player),
-                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()
-        );
+        return contextManager.getApplicableContexts(player);
     }
 
     @Override
@@ -635,27 +603,26 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
     @Override
     public LinkedHashMap<String, Object> getExtraInfo() {
         LinkedHashMap<String, Object> map = new LinkedHashMap<>();
-        map.put("Vault Enabled", vaultHook != null);
-        map.put("Vault Server", configuration.get(ConfigKeys.VAULT_SERVER));
+        map.put("Vault Enabled", vaultHookManager != null);
         map.put("Bukkit Defaults count", defaultsProvider.size());
         map.put("Bukkit Child Permissions count", childPermissionProvider.getPermissions().size());
-        map.put("Vault Including Global", configuration.get(ConfigKeys.VAULT_INCLUDING_GLOBAL));
-        map.put("Vault Ignoring World", configuration.get(ConfigKeys.VAULT_IGNORE_WORLD));
-        map.put("Vault Primary Group Overrides", configuration.get(ConfigKeys.VAULT_PRIMARY_GROUP_OVERRIDES));
-        map.put("Vault Debug", configuration.get(ConfigKeys.VAULT_DEBUG));
-        map.put("OPs Enabled", configuration.get(ConfigKeys.OPS_ENABLED));
-        map.put("Auto OP", configuration.get(ConfigKeys.AUTO_OP));
-        map.put("Commands Allow OPs", configuration.get(ConfigKeys.COMMANDS_ALLOW_OP));
         return map;
     }
 
     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));
+        }
+    }
+
+    private static boolean checkInvalidVersion() {
+        try {
+            Class.forName("com.google.gson.JsonElement");
+            return false;
+        } catch (ClassNotFoundException e) {
+            return true;
         }
     }
 }

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

@@ -27,6 +27,7 @@ package me.lucko.luckperms.bukkit;
 
 import lombok.Getter;
 import lombok.Setter;
+import lombok.experimental.Accessors;
 
 import me.lucko.luckperms.common.plugin.LuckPermsScheduler;
 
@@ -43,10 +44,16 @@ public class LPBukkitScheduler implements LuckPermsScheduler {
     private final LPBukkitPlugin plugin;
 
     @Getter
-    private ExecutorService asyncLpExecutor;
+    @Accessors(fluent = true)
+    private ExecutorService asyncLp;
+
     @Getter
-    private Executor asyncBukkitExecutor;
-    private Executor syncExecutor;
+    @Accessors(fluent = true)
+    private Executor asyncBukkit;
+
+    @Getter
+    @Accessors(fluent = true)
+    private Executor sync;
 
     @Getter
     @Setter
@@ -57,19 +64,14 @@ public class LPBukkitScheduler implements LuckPermsScheduler {
     public LPBukkitScheduler(LPBukkitPlugin plugin) {
         this.plugin = plugin;
 
-        this.asyncLpExecutor = Executors.newCachedThreadPool();
-        this.asyncBukkitExecutor = r -> plugin.getServer().getScheduler().runTaskAsynchronously(plugin, r);
-        this.syncExecutor = r -> plugin.getServer().getScheduler().runTask(plugin, r);
+        this.asyncLp = Executors.newCachedThreadPool();
+        this.asyncBukkit = r -> plugin.getServer().getScheduler().runTaskAsynchronously(plugin, r);
+        this.sync = r -> plugin.getServer().getScheduler().runTask(plugin, r);
     }
 
     @Override
     public Executor async() {
-        return useBukkitAsync ? asyncBukkitExecutor : asyncLpExecutor;
-    }
-
-    @Override
-    public Executor sync() {
-        return syncExecutor;
+        return useBukkitAsync ? asyncBukkit : asyncLp;
     }
 
     @Override
@@ -108,9 +110,9 @@ public class LPBukkitScheduler implements LuckPermsScheduler {
     public void shutdown() {
         tasks.forEach(BukkitTask::cancel);
         // wait for executor
-        asyncLpExecutor.shutdown();
+        asyncLp.shutdown();
         try {
-            asyncLpExecutor.awaitTermination(30, TimeUnit.SECONDS);
+            asyncLp.awaitTermination(30, TimeUnit.SECONDS);
         } catch (InterruptedException e) {
             e.printStackTrace();
         }

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

@@ -23,27 +23,30 @@
  *  SOFTWARE.
  */
 
-package me.lucko.luckperms.bukkit;
+package me.lucko.luckperms.bukkit.calculators;
 
 import lombok.AllArgsConstructor;
 
 import com.google.common.collect.ImmutableList;
 
 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.LPBukkitPlugin;
 import me.lucko.luckperms.bukkit.model.Injector;
 import me.lucko.luckperms.bukkit.model.LPPermissible;
+import me.lucko.luckperms.bukkit.processors.AttachmentProcessor;
+import me.lucko.luckperms.bukkit.processors.ChildProcessor;
+import me.lucko.luckperms.bukkit.processors.DefaultsProcessor;
 import me.lucko.luckperms.common.calculators.AbstractCalculatorFactory;
 import me.lucko.luckperms.common.calculators.PermissionCalculator;
-import me.lucko.luckperms.common.calculators.PermissionProcessor;
-import me.lucko.luckperms.common.calculators.processors.MapProcessor;
-import me.lucko.luckperms.common.calculators.processors.RegexProcessor;
-import me.lucko.luckperms.common.calculators.processors.WildcardProcessor;
+import me.lucko.luckperms.common.calculators.PermissionCalculatorMetadata;
 import me.lucko.luckperms.common.config.ConfigKeys;
-import me.lucko.luckperms.common.core.model.User;
+import me.lucko.luckperms.common.model.User;
+import me.lucko.luckperms.common.processors.MapProcessor;
+import me.lucko.luckperms.common.processors.PermissionProcessor;
+import me.lucko.luckperms.common.processors.RegexProcessor;
+import me.lucko.luckperms.common.processors.WildcardProcessor;
 
+import java.util.List;
 import java.util.UUID;
 
 @AllArgsConstructor
@@ -80,6 +83,22 @@ public class BukkitCalculatorFactory extends AbstractCalculatorFactory {
             processors.add(new DefaultsProcessor(contexts.isOp(), plugin.getDefaultsProvider()));
         }
 
-        return registerCalculator(new PermissionCalculator(plugin, user.getFriendlyName(), processors.build()));
+        return registerCalculator(new PermissionCalculator(
+                plugin,
+                PermissionCalculatorMetadata.of(user.getFriendlyName(), contexts.getContexts()),
+                processors.build()
+        ));
+    }
+
+    @Override
+    public List<String> getActiveProcessors() {
+        ImmutableList.Builder<String> ret = ImmutableList.builder();
+        ret.add("Map");
+        if (plugin.getConfiguration().get(ConfigKeys.APPLY_BUKKIT_CHILD_PERMISSIONS)) ret.add("Child");
+        if (plugin.getConfiguration().get(ConfigKeys.APPLY_BUKKIT_ATTACHMENT_PERMISSIONS)) ret.add("Attachment");
+        if (plugin.getConfiguration().get(ConfigKeys.APPLYING_REGEX)) ret.add("Regex");
+        if (plugin.getConfiguration().get(ConfigKeys.APPLYING_WILDCARDS)) ret.add("Wildcard");
+        if (plugin.getConfiguration().get(ConfigKeys.APPLY_BUKKIT_DEFAULT_PERMISSIONS)) ret.add("Defaults");
+        return ret.build();
     }
 }

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

@@ -91,7 +91,7 @@ public class BukkitJsonMessageHandler {
             setup(player);
             setup = true;
             return true;
-        } catch (Exception e) {
+        } catch (Throwable e) {
             triedAndFailed = true;
             return false;
         }

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

@@ -25,11 +25,17 @@
 
 package me.lucko.luckperms.bukkit.compat;
 
+import me.lucko.luckperms.common.utils.TextUtils;
+
+import net.kyori.text.Component;
+import net.kyori.text.serializer.ComponentSerializers;
+
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import io.github.mkremins.fanciful.FancyMessage;
-
+/**
+ * Sends a json message to a command sender.
+ */
 public class MessageHandler {
     private final BukkitJsonMessageHandler bukkitHandler;
     private final SpigotJsonMessageHandler spigotHandler;
@@ -39,10 +45,10 @@ public class MessageHandler {
         spigotHandler = isSpigot() ? new SpigotJsonMessageHandler() : null;
     }
 
-    public void sendJsonMessage(CommandSender sender, FancyMessage message) {
+    public void sendJsonMessage(CommandSender sender, Component message) {
         if (ReflectionUtil.isChatCompatible() && sender instanceof Player) {
             Player player = (Player) sender;
-            String json = message.exportToJson();
+            String json = ComponentSerializers.JSON.serialize(message);
 
             // Try Bukkit.
             if (bukkitHandler.sendJsonMessage(player, json)) {
@@ -56,7 +62,7 @@ public class MessageHandler {
         }
 
         // Fallback to Bukkit
-        sender.sendMessage(message.toOldMessageFormat());
+        sender.sendMessage(TextUtils.toLegacy(message));
     }
 
     private static boolean isSpigot() {

bukkit/src/main/java/me/lucko/luckperms/bukkit/contexts/BukkitContextManager.java

@@ -0,0 +1,54 @@
+/*
+ * 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.bukkit.contexts;
+
+import lombok.RequiredArgsConstructor;
+
+import me.lucko.luckperms.api.Contexts;
+import me.lucko.luckperms.api.context.ImmutableContextSet;
+import me.lucko.luckperms.bukkit.LPBukkitPlugin;
+import me.lucko.luckperms.common.config.ConfigKeys;
+import me.lucko.luckperms.common.contexts.ContextManager;
+
+import org.bukkit.entity.Player;
+
+@RequiredArgsConstructor
+public class BukkitContextManager extends ContextManager<Player> {
+    private final LPBukkitPlugin plugin;
+
+    @Override
+    public Contexts formContexts(Player subject, ImmutableContextSet contextSet) {
+        return new Contexts(
+                contextSet,
+                plugin.getConfiguration().get(ConfigKeys.INCLUDING_GLOBAL_PERMS),
+                plugin.getConfiguration().get(ConfigKeys.INCLUDING_GLOBAL_WORLD_PERMS),
+                true,
+                plugin.getConfiguration().get(ConfigKeys.APPLYING_GLOBAL_GROUPS),
+                plugin.getConfiguration().get(ConfigKeys.APPLYING_GLOBAL_WORLD_GROUPS),
+                subject.isOp()
+        );
+    }
+}

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

@@ -23,7 +23,7 @@
  *  SOFTWARE.
  */
 
-package me.lucko.luckperms.bukkit;
+package me.lucko.luckperms.bukkit.contexts;
 
 import lombok.RequiredArgsConstructor;
 

bukkit/src/main/java/me/lucko/luckperms/bukkit/messaging/BukkitMessagingFactory.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.bukkit.messaging;
+
+import me.lucko.luckperms.bukkit.LPBukkitPlugin;
+import me.lucko.luckperms.common.messaging.InternalMessagingService;
+import me.lucko.luckperms.common.messaging.MessagingFactory;
+
+public class BukkitMessagingFactory extends MessagingFactory<LPBukkitPlugin> {
+    public BukkitMessagingFactory(LPBukkitPlugin plugin) {
+        super(plugin);
+    }
+
+    @Override
+    protected InternalMessagingService getServiceFor(String messagingType) {
+        if (messagingType.equals("bungee")) {
+            BungeeMessagingService bungeeMessaging = new BungeeMessagingService(getPlugin());
+            bungeeMessaging.init();
+            return bungeeMessaging;
+        } else if (messagingType.equals("lilypad")) {
+            if (getPlugin().getServer().getPluginManager().getPlugin("LilyPad-Connect") == null) {
+                getPlugin().getLog().warn("LilyPad-Connect plugin not present.");
+            } else {
+                LilyPadMessagingService lilyPadMessaging = new LilyPadMessagingService(getPlugin());
+                lilyPadMessaging.init();
+                return lilyPadMessaging;
+            }
+        }
+
+        return super.getServiceFor(messagingType);
+    }
+}

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

@@ -39,12 +39,14 @@ import me.lucko.luckperms.common.commands.CommandResult;
 import me.lucko.luckperms.common.commands.abstraction.SubCommand;
 import me.lucko.luckperms.common.commands.impl.migration.MigrationUtils;
 import me.lucko.luckperms.common.commands.sender.Sender;
-import me.lucko.luckperms.common.core.NodeFactory;
-import me.lucko.luckperms.common.core.model.PermissionHolder;
-import me.lucko.luckperms.common.core.model.User;
+import me.lucko.luckperms.common.locale.CommandSpec;
+import me.lucko.luckperms.common.locale.LocaleManager;
+import me.lucko.luckperms.common.logging.ProgressLogger;
+import me.lucko.luckperms.common.model.PermissionHolder;
+import me.lucko.luckperms.common.model.User;
+import me.lucko.luckperms.common.node.NodeFactory;
 import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.utils.Predicates;
-import me.lucko.luckperms.common.utils.ProgressLogger;
 
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.ConfigurationSection;
@@ -57,7 +59,7 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static me.lucko.luckperms.common.constants.Permission.MIGRATION;
+import static me.lucko.luckperms.common.constants.CommandPermission.MIGRATION;
 
 public class MigrationBPermissions extends SubCommand<Object> {
     private static Field uConfigField;
@@ -70,8 +72,8 @@ public class MigrationBPermissions extends SubCommand<Object> {
         }
     }
 
-    public MigrationBPermissions() {
-        super("bpermissions", "Migration from bPermissions", MIGRATION, Predicates.alwaysFalse(), null);
+    public MigrationBPermissions(LocaleManager locale) {
+        super(CommandSpec.MIGRATION_COMMAND.spec(locale), "bpermissions", MIGRATION, Predicates.alwaysFalse());
     }
 
     @Override
@@ -137,7 +139,7 @@ public class MigrationBPermissions extends SubCommand<Object> {
 
                 // Make a LuckPerms group for the one being migrated.
                 plugin.getStorage().createAndLoadGroup(groupName, CreationCause.INTERNAL).join();
-                me.lucko.luckperms.common.core.model.Group lpGroup = plugin.getGroupManager().getIfLoaded(groupName);
+                me.lucko.luckperms.common.model.Group lpGroup = plugin.getGroupManager().getIfLoaded(groupName);
 
                 MigrationUtils.setGroupWeight(lpGroup, group.getPriority());
                 migrateHolder(world, group, lpGroup);

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

@@ -28,17 +28,18 @@ package me.lucko.luckperms.bukkit.migration;
 import me.lucko.luckperms.api.ChatMetaType;
 import me.lucko.luckperms.api.Node;
 import me.lucko.luckperms.api.event.cause.CreationCause;
-import me.lucko.luckperms.common.commands.Arg;
 import me.lucko.luckperms.common.commands.CommandException;
 import me.lucko.luckperms.common.commands.CommandResult;
 import me.lucko.luckperms.common.commands.abstraction.SubCommand;
 import me.lucko.luckperms.common.commands.impl.migration.MigrationUtils;
 import me.lucko.luckperms.common.commands.sender.Sender;
-import me.lucko.luckperms.common.constants.Permission;
-import me.lucko.luckperms.common.core.NodeFactory;
+import me.lucko.luckperms.common.constants.CommandPermission;
+import me.lucko.luckperms.common.locale.CommandSpec;
+import me.lucko.luckperms.common.locale.LocaleManager;
+import me.lucko.luckperms.common.logging.ProgressLogger;
+import me.lucko.luckperms.common.node.NodeFactory;
 import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.utils.Predicates;
-import me.lucko.luckperms.common.utils.ProgressLogger;
 
 import org.anjocaido.groupmanager.GlobalGroups;
 import org.anjocaido.groupmanager.GroupManager;
@@ -60,10 +61,8 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 public class MigrationGroupManager extends SubCommand<Object> {
-    public MigrationGroupManager() {
-        super("groupmanager", "Migration from GroupManager", Permission.MIGRATION, Predicates.is(0),
-                Arg.list(Arg.create("migrate as global", true, "if world permissions should be ignored, and just migrated as global"))
-        );
+    public MigrationGroupManager(LocaleManager locale) {
+        super(CommandSpec.MIGRATION_GROUPMANAGER.spec(locale), "groupmanager", CommandPermission.MIGRATION, Predicates.is(0));
     }
 
     @Override
@@ -98,7 +97,7 @@ public class MigrationGroupManager extends SubCommand<Object> {
             String groupName = MigrationUtils.standardizeName(g.getName());
 
             plugin.getStorage().createAndLoadGroup(groupName, CreationCause.INTERNAL).join();
-            me.lucko.luckperms.common.core.model.Group group = plugin.getGroupManager().getIfLoaded(groupName);
+            me.lucko.luckperms.common.model.Group group = plugin.getGroupManager().getIfLoaded(groupName);
 
             for (String node : g.getPermissionList()) {
                 if (node.isEmpty()) {
@@ -249,7 +248,7 @@ public class MigrationGroupManager extends SubCommand<Object> {
         AtomicInteger groupCount = new AtomicInteger(0);
         for (Map.Entry<String, Set<Node>> e : groups.entrySet()) {
             plugin.getStorage().createAndLoadGroup(e.getKey(), CreationCause.INTERNAL).join();
-            me.lucko.luckperms.common.core.model.Group group = plugin.getGroupManager().getIfLoaded(e.getKey());
+            me.lucko.luckperms.common.model.Group group = plugin.getGroupManager().getIfLoaded(e.getKey());
 
             for (Node node : e.getValue()) {
                 group.setPermission(node);
@@ -264,14 +263,14 @@ public class MigrationGroupManager extends SubCommand<Object> {
         AtomicInteger userCount = new AtomicInteger(0);
         for (Map.Entry<UUID, Set<Node>> e : users.entrySet()) {
             plugin.getStorage().loadUser(e.getKey(), "null").join();
-            me.lucko.luckperms.common.core.model.User user = plugin.getUserManager().getIfLoaded(e.getKey());
+            me.lucko.luckperms.common.model.User user = plugin.getUserManager().getIfLoaded(e.getKey());
 
             for (Node node : e.getValue()) {
                 user.setPermission(node);
             }
 
             String primaryGroup = primaryGroups.get(e.getKey());
-            if (primaryGroup != null) {
+            if (primaryGroup != null && !primaryGroup.isEmpty()) {
                 user.setPermission(NodeFactory.make("group." + primaryGroup));
                 user.getPrimaryGroup().setStoredValue(primaryGroup);
                 user.unsetPermission(NodeFactory.make("group.default"));

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

@@ -31,18 +31,21 @@ import me.lucko.luckperms.common.commands.CommandResult;
 import me.lucko.luckperms.common.commands.abstraction.SubCommand;
 import me.lucko.luckperms.common.commands.impl.migration.MigrationUtils;
 import me.lucko.luckperms.common.commands.sender.Sender;
-import me.lucko.luckperms.common.constants.Permission;
-import me.lucko.luckperms.common.core.NodeFactory;
-import me.lucko.luckperms.common.core.model.Group;
-import me.lucko.luckperms.common.core.model.User;
+import me.lucko.luckperms.common.constants.CommandPermission;
+import me.lucko.luckperms.common.locale.CommandSpec;
+import me.lucko.luckperms.common.locale.LocaleManager;
+import me.lucko.luckperms.common.logging.ProgressLogger;
+import me.lucko.luckperms.common.model.Group;
+import me.lucko.luckperms.common.model.PermissionHolder;
+import me.lucko.luckperms.common.model.User;
+import me.lucko.luckperms.common.node.NodeFactory;
 import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.utils.Predicates;
-import me.lucko.luckperms.common.utils.ProgressLogger;
 
 import org.bukkit.Bukkit;
-import org.bukkit.World;
 
 import ru.tehkode.permissions.NativeInterface;
+import ru.tehkode.permissions.PermissionEntity;
 import ru.tehkode.permissions.PermissionGroup;
 import ru.tehkode.permissions.PermissionManager;
 import ru.tehkode.permissions.PermissionUser;
@@ -50,13 +53,13 @@ import ru.tehkode.permissions.bukkit.PermissionsEx;
 
 import java.lang.reflect.Field;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
 
 public class MigrationPermissionsEx extends SubCommand<Object> {
-    public MigrationPermissionsEx() {
-        super("permissionsex", "Migration from PermissionsEx", Permission.MIGRATION, Predicates.alwaysFalse(), null);
+    public MigrationPermissionsEx(LocaleManager locale) {
+        super(CommandSpec.MIGRATION_COMMAND.spec(locale), "permissionsex", CommandPermission.MIGRATION, Predicates.alwaysFalse());
     }
 
     @SuppressWarnings("deprecation")
@@ -73,8 +76,6 @@ public class MigrationPermissionsEx extends SubCommand<Object> {
             return CommandResult.STATE_ERROR;
         }
 
-        List<String> worlds = Bukkit.getWorlds().stream().map(World::getName).map(String::toLowerCase).collect(Collectors.toList());
-
         PermissionsEx pex = (PermissionsEx) Bukkit.getPluginManager().getPlugin("PermissionsEx");
         PermissionManager manager = pex.getPermissionsManager();
 
@@ -107,56 +108,8 @@ public class MigrationPermissionsEx extends SubCommand<Object> {
 
             MigrationUtils.setGroupWeight(lpGroup, groupWeight);
 
-            try {
-                for (String node : group.getOwnPermissions(null)) {
-                    if (node.isEmpty()) {
-                        continue;
-                    }
-
-                    lpGroup.setPermission(MigrationUtils.parseNode(node, true).build());
-                }
-            } catch (NullPointerException ignored) {
-                // No docs on if #getOwnPermissions(null) is ok. Should be fine though.
-            }
-
-            for (String world : worlds) {
-                if (world.isEmpty()) {
-                    continue;
-                }
-
-                for (String node : group.getOwnPermissions(world)) {
-                    if (node.isEmpty()) {
-                        continue;
-                    }
-
-                    lpGroup.setPermission(MigrationUtils.parseNode(node, true).setWorld(world.toLowerCase()).build());
-                }
-            }
-
-            for (PermissionGroup g : group.getParents()) {
-                lpGroup.setPermission(NodeFactory.make("group." + MigrationUtils.standardizeName(g.getName())));
-            }
-
-            for (String world : worlds) {
-                if (world.isEmpty()) {
-                    continue;
-                }
-
-                for (PermissionGroup g : group.getParents(world)) {
-                    lpGroup.setPermission(NodeFactory.make("group." + MigrationUtils.standardizeName(g.getName()), true, "global", world.toLowerCase()));
-                }
-            }
-
-            String prefix = group.getOwnPrefix();
-            String suffix = group.getOwnSuffix();
-
-            if (prefix != null && !prefix.equals("")) {
-                lpGroup.setPermission(NodeFactory.makePrefixNode(groupWeight, prefix).build());
-            }
-
-            if (suffix != null && !suffix.equals("")) {
-                lpGroup.setPermission(NodeFactory.makeSuffixNode(groupWeight, suffix).build());
-            }
+            // migrate data
+            migrateEntity(group, lpGroup, groupWeight);
 
             plugin.getStorage().saveGroup(lpGroup);
             log.logAllProgress("Migrated {} groups so far.", groupCount.incrementAndGet());
@@ -193,64 +146,8 @@ public class MigrationPermissionsEx extends SubCommand<Object> {
             plugin.getStorage().loadUser(u, user.getName()).join();
             User lpUser = plugin.getUserManager().getIfLoaded(u);
 
-            try {
-                for (String node : user.getOwnPermissions(null)) {
-                    if (node.isEmpty()) {
-                        continue;
-                    }
-
-                    lpUser.setPermission(MigrationUtils.parseNode(node, true).build());
-                }
-            } catch (NullPointerException ignored) {
-                // No docs on if #getOwnPermissions(null) is ok. Should be fine though.
-            }
-
-            for (String world : worlds) {
-                if (world.isEmpty()) {
-                    continue;
-                }
-
-                for (String node : user.getOwnPermissions(world)) {
-                    if (node.isEmpty()) {
-                        continue;
-                    }
-
-                    lpUser.setPermission(MigrationUtils.parseNode(node, true).setWorld(world.toLowerCase()).build());
-                }
-            }
-
-            for (String g : user.getGroupNames()) {
-                if (g.isEmpty()) {
-                    continue;
-                }
-
-                lpUser.setPermission(NodeFactory.make("group." + MigrationUtils.standardizeName(g)));
-            }
-
-            for (String world : worlds) {
-                if (world.isEmpty()) {
-                    continue;
-                }
-
-                for (String g : user.getGroupNames(world)) {
-                    if (g.isEmpty()) {
-                        continue;
-                    }
-
-                    lpUser.setPermission(NodeFactory.make("group." + MigrationUtils.standardizeName(g), true, "global", world.toLowerCase()));
-                }
-            }
-
-            String prefix = user.getOwnPrefix();
-            String suffix = user.getOwnSuffix();
-
-            if (prefix != null && !prefix.equals("")) {
-                lpUser.setPermission(NodeFactory.makePrefixNode(maxWeight, prefix).build());
-            }
-
-            if (suffix != null && !suffix.equals("")) {
-                lpUser.setPermission(NodeFactory.makeSuffixNode(maxWeight, suffix).build());
-            }
+            // migrate data
+            migrateEntity(user, lpUser, maxWeight);
 
             // Lowest rank is the highest group #logic
             String primary = null;
@@ -262,7 +159,7 @@ public class MigrationPermissionsEx extends SubCommand<Object> {
                 }
             }
 
-            if (primary != null && !primary.equalsIgnoreCase("default")) {
+            if (primary != null && !primary.isEmpty() && !primary.equalsIgnoreCase("default")) {
                 lpUser.setPermission(NodeFactory.make("group." + primary.toLowerCase()));
                 lpUser.getPrimaryGroup().setStoredValue(primary);
                 lpUser.unsetPermission(NodeFactory.make("group.default"));
@@ -277,4 +174,79 @@ public class MigrationPermissionsEx extends SubCommand<Object> {
         log.log("Success! Migration complete.");
         return CommandResult.SUCCESS;
     }
+
+    private static void migrateEntity(PermissionEntity entity, PermissionHolder holder, int weight) {
+        // migrate permissions
+        Map<String, List<String>> permissions = entity.getAllPermissions();
+        for (Map.Entry<String, List<String>> worldData : permissions.entrySet()) {
+            String world = worldData.getKey();
+            if (world != null && (world.equals("") || world.equals("*"))) {
+                world = null;
+            }
+            if (world != null) {
+                world = world.toLowerCase();
+            }
+
+            for (String node : worldData.getValue()) {
+                if (node.isEmpty()) {
+                    continue;
+                }
+
+                holder.setPermission(MigrationUtils.parseNode(node, true).setWorld(world).build());
+            }
+        }
+
+        // migrate parents
+        Map<String, List<PermissionGroup>> parents = entity.getAllParents();
+        for (Map.Entry<String, List<PermissionGroup>> worldData : parents.entrySet()) {
+            String world = worldData.getKey();
+            if (world != null && (world.equals("") || world.equals("*"))) {
+                world = null;
+            }
+            if (world != null) {
+                world = world.toLowerCase();
+            }
+
+            for (PermissionGroup parent : worldData.getValue()) {
+                holder.setPermission(NodeFactory.newBuilder("group." + MigrationUtils.standardizeName(parent.getName())).setWorld(world).build());
+            }
+        }
+
+        // migrate prefix / suffix
+        String prefix = entity.getOwnPrefix();
+        String suffix = entity.getOwnSuffix();
+
+        if (prefix != null && !prefix.isEmpty()) {
+            holder.setPermission(NodeFactory.makePrefixNode(weight, prefix).build());
+        }
+
+        if (suffix != null && !suffix.isEmpty()) {
+            holder.setPermission(NodeFactory.makeSuffixNode(weight, suffix).build());
+        }
+
+        // migrate options
+        Map<String, Map<String, String>> options = entity.getAllOptions();
+        for (Map.Entry<String, Map<String, String>> worldData : options.entrySet()) {
+            String world = worldData.getKey();
+            if (world != null && (world.isEmpty() || world.equals("*"))) {
+                world = null;
+            }
+            if (world != null) {
+                world = world.toLowerCase();
+            }
+
+            for (Map.Entry<String, String> opt : worldData.getValue().entrySet()) {
+                if (opt.getKey() == null || opt.getKey().isEmpty() || opt.getValue() == null || opt.getValue().isEmpty()) {
+                    continue;
+                }
+
+                String key = opt.getKey().toLowerCase();
+                if (key.equals("prefix") || key.equals("suffix") || key.equals("weight") || key.equals("rank") || key.equals("name") || key.equals("username")) {
+                    continue;
+                }
+
+                holder.setPermission(NodeFactory.makeMetaNode(opt.getKey(), opt.getValue()).setWorld(world).build());
+            }
+        }
+    }
 }

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

@@ -35,22 +35,23 @@ import com.github.cheesesoftware.PowerfulPermsAPI.PowerfulPermsPlugin;
 
 import me.lucko.luckperms.api.Node;
 import me.lucko.luckperms.api.event.cause.CreationCause;
-import me.lucko.luckperms.common.commands.Arg;
 import me.lucko.luckperms.common.commands.CommandException;
 import me.lucko.luckperms.common.commands.CommandResult;
 import me.lucko.luckperms.common.commands.abstraction.SubCommand;
 import me.lucko.luckperms.common.commands.impl.migration.MigrationUtils;
 import me.lucko.luckperms.common.commands.sender.Sender;
 import me.lucko.luckperms.common.config.ConfigKeys;
-import me.lucko.luckperms.common.core.NodeFactory;
-import me.lucko.luckperms.common.core.model.PermissionHolder;
-import me.lucko.luckperms.common.core.model.User;
 import me.lucko.luckperms.common.dependencies.DependencyManager;
+import me.lucko.luckperms.common.locale.CommandSpec;
+import me.lucko.luckperms.common.locale.LocaleManager;
+import me.lucko.luckperms.common.logging.ProgressLogger;
+import me.lucko.luckperms.common.model.PermissionHolder;
+import me.lucko.luckperms.common.model.User;
+import me.lucko.luckperms.common.node.NodeFactory;
 import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.storage.StorageType;
 import me.lucko.luckperms.common.utils.HikariSupplier;
 import me.lucko.luckperms.common.utils.Predicates;
-import me.lucko.luckperms.common.utils.ProgressLogger;
 
 import org.bukkit.Bukkit;
 
@@ -67,20 +68,12 @@ import java.util.UUID;
 import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static me.lucko.luckperms.common.constants.Permission.MIGRATION;
+import static me.lucko.luckperms.common.constants.CommandPermission.MIGRATION;
 
 // Only supports the latest versions of the PP API. (it seems to change randomly almost every release)
 public class MigrationPowerfulPerms extends SubCommand<Object> {
-    public MigrationPowerfulPerms() {
-        super("powerfulperms", "Migration from PowerfulPerms", MIGRATION, Predicates.not(5),
-                Arg.list(
-                        Arg.create("address", true, "the address of the PP database"),
-                        Arg.create("database", true, "the name of the PP database"),
-                        Arg.create("username", true, "the username to log into the DB"),
-                        Arg.create("password", true, "the password to log into the DB"),
-                        Arg.create("db table", true, "the name of the PP table where player data is stored")
-                )
-        );
+    public MigrationPowerfulPerms(LocaleManager locale) {
+        super(CommandSpec.MIGRATION_POWERFULPERMS.spec(locale), "powerfulperms", MIGRATION, Predicates.not(5));
     }
 
     @Override
@@ -174,7 +167,7 @@ public class MigrationPowerfulPerms extends SubCommand<Object> {
 
             final String groupName = MigrationUtils.standardizeName(g.getName());
             plugin.getStorage().createAndLoadGroup(groupName, CreationCause.INTERNAL).join();
-            final me.lucko.luckperms.common.core.model.Group group = plugin.getGroupManager().getIfLoaded(groupName);
+            final me.lucko.luckperms.common.model.Group group = plugin.getGroupManager().getIfLoaded(groupName);
 
             MigrationUtils.setGroupWeight(group, g.getRank());
 
@@ -188,6 +181,10 @@ public class MigrationPowerfulPerms extends SubCommand<Object> {
 
             // server --> prefix afaik
             for (Map.Entry<String, String> prefix : g.getPrefixes().entrySet()) {
+                if (prefix.getValue().isEmpty()) {
+                    continue;
+                }
+
                 String server = prefix.getKey().toLowerCase();
                 if (prefix.getKey().equals("*") || prefix.getKey().equals("all")) {
                     server = null;
@@ -201,6 +198,10 @@ public class MigrationPowerfulPerms extends SubCommand<Object> {
             }
 
             for (Map.Entry<String, String> suffix : g.getSuffixes().entrySet()) {
+                if (suffix.getValue().isEmpty()) {
+                    continue;
+                }
+
                 String server = suffix.getKey().toLowerCase();
                 if (suffix.getKey().equals("*") || suffix.getKey().equals("all")) {
                     server = null;
@@ -254,11 +255,11 @@ public class MigrationPowerfulPerms extends SubCommand<Object> {
             String prefix = joinFuture(pm.getPlayerOwnPrefix(uuid));
             String suffix = joinFuture(pm.getPlayerOwnSuffix(uuid));
 
-            if (prefix != null && !prefix.equals("")) {
+            if (prefix != null && !prefix.isEmpty()) {
                 user.setPermission(NodeFactory.makePrefixNode(maxWeight, prefix).build());
             }
 
-            if (suffix != null && !suffix.equals("")) {
+            if (suffix != null && !suffix.isEmpty()) {
                 user.setPermission(NodeFactory.makeSuffixNode(maxWeight, suffix).build());
             }
 
@@ -286,6 +287,10 @@ public class MigrationPowerfulPerms extends SubCommand<Object> {
             value = false;
         }
 
+        if (node.isEmpty()) {
+            return;
+        }
+
         String server = p.getServer();
         if (server != null && (server.equalsIgnoreCase("all") || server.equalsIgnoreCase("*"))) {
             server = null;
@@ -306,18 +311,9 @@ public class MigrationPowerfulPerms extends SubCommand<Object> {
         }
 
         Node.Builder nb = NodeFactory.newBuilder(node).setValue(value);
-
-        if (expireAt != 0) {
-            nb.setExpiry(expireAt);
-        }
-
-        if (server != null) {
-            nb.setServer(server);
-        }
-
-        if (world != null) {
-            nb.setWorld(world);
-        }
+        if (expireAt != 0) nb.setExpiry(expireAt);
+        if (server != null) nb.setServer(server);
+        if (world != null) nb.setWorld(world);
 
         holder.setPermission(nb.build());
     }

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

@@ -34,15 +34,17 @@ import me.lucko.luckperms.common.commands.abstraction.SubCommand;
 import me.lucko.luckperms.common.commands.impl.migration.MigrationUtils;
 import me.lucko.luckperms.common.commands.sender.Sender;
 import me.lucko.luckperms.common.commands.utils.Util;
-import me.lucko.luckperms.common.constants.Permission;
-import me.lucko.luckperms.common.core.NodeFactory;
-import me.lucko.luckperms.common.core.model.Group;
-import me.lucko.luckperms.common.core.model.PermissionHolder;
-import me.lucko.luckperms.common.core.model.Track;
-import me.lucko.luckperms.common.core.model.User;
+import me.lucko.luckperms.common.constants.CommandPermission;
+import me.lucko.luckperms.common.locale.CommandSpec;
+import me.lucko.luckperms.common.locale.LocaleManager;
+import me.lucko.luckperms.common.logging.ProgressLogger;
+import me.lucko.luckperms.common.model.Group;
+import me.lucko.luckperms.common.model.PermissionHolder;
+import me.lucko.luckperms.common.model.Track;
+import me.lucko.luckperms.common.model.User;
+import me.lucko.luckperms.common.node.NodeFactory;
 import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
 import me.lucko.luckperms.common.utils.Predicates;
-import me.lucko.luckperms.common.utils.ProgressLogger;
 
 import org.bukkit.Bukkit;
 import org.tyrannyofheaven.bukkit.zPermissions.ZPermissionsService;
@@ -62,8 +64,8 @@ import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class MigrationZPermissions extends SubCommand<Object> {
-    public MigrationZPermissions() {
-        super("zpermissions", "Migration from zPermissions", Permission.MIGRATION, Predicates.alwaysFalse(), null);
+    public MigrationZPermissions(LocaleManager locale) {
+        super(CommandSpec.MIGRATION_COMMAND.spec(locale), "zpermissions", CommandPermission.MIGRATION, Predicates.alwaysFalse());
     }
 
     @Override
@@ -194,6 +196,10 @@ public class MigrationZPermissions extends SubCommand<Object> {
 
     private void migrateEntity(PermissionHolder holder, PermissionEntity entity, int weight) {
         for (Entry e : entity.getPermissions()) {
+            if (e.getPermission().isEmpty()) {
+                continue;
+            }
+
             if (e.getWorld() != null && !e.getWorld().getName().equals("")) {
                 holder.setPermission(NodeFactory.newBuilder(e.getPermission()).setValue(e.isValue()).setWorld(e.getWorld().getName()).build());
             } else {
@@ -213,6 +219,10 @@ public class MigrationZPermissions extends SubCommand<Object> {
         for (EntityMetadata metadata : entity.getMetadata()) {
             String key = metadata.getName().toLowerCase();
 
+            if (key.isEmpty() || metadata.getStringValue().isEmpty()) {
+                continue;
+            }
+
             if (key.equals("prefix") || key.equals("suffix")) {
                 ChatMetaType type = ChatMetaType.valueOf(key.toUpperCase());
                 holder.setPermission(NodeFactory.makeChatMetaNode(type, weight, metadata.getStringValue()).build());