Add modrinth

disableAutoTargetJvm in gradle

.github/CODEOWNERS

@@ -0,0 +1,9 @@
+#
+# Assigns extendedclip and PiggyPiglet for any PR unless a check below matches.
+#
+*    @PiggyPiglet @darbyjack
+
+#
+# Assigns Andre601 to any PR that targets the wiki folder.
+#
+*.md @Andre601

.github/CONTRIBUTING.md

@@ -0,0 +1,67 @@
+[issue]: https://github.com/PlaceholderAPI/PlaceholderAPI/issues/new
+[discord]: https://helpch.at/discord
+[code of conduct]: https://github.com/PlaceholderAPI/PlaceholderAPI/blob/master/CODE_OF_CONDUCT.md
+[wiki]: https://github.com/PlaceholderAPI/PlaceholderAPI/blob/wiki
+[master]: https://github.com/PlaceholderAPI/PlaceholderAPI/tree/master
+[docs-wiki]: https://github.com/PlaceholderAPI/PlaceholderAPI/tree/docs/wiki
+[style]: https://github.com/PlaceholderAPI/PlaceholderAPI/tree/master/config/style
+
+# Contributing Guidelines
+We welcome everyone to contribute towards the PlaceholderAPI Project, but doing so will require you to follow specific rules to keep a consistent and welcoming way of contributing.
+
+If you have any questions about contributions towards the project, feel free to contact us on our [Discord Server][discord].
+
+## Issues
+Like any other project can you encounter bugs or a feature is missing for you in the plugin.  
+For that, you can open an [issue] to report a bug, or suggest a new feature to be added.
+
+When doing so, make sure you follow rules below:
+
+### Follow the template
+We have issue templates to help us get the required information more easily. Please follow the provided template when either filing a bug report or feature request.  
+Your issue may be closed without warning for not following the template.
+
+### Use the latest version
+When it comes to bug reports should you always check first, that you're using the latest release of PlaceholderAPI.  
+Often the bug you've encountered, is fixed in a newer version.
+
+The same rules apply when making a feature request.
+
+### No duplicate issue
+Make sure that there aren't any existing issues relating to the problem, which are still open, or are closed with a solution/explanation.  
+Opening a separate issue for a bug report or feature request, that already exists on the issue tracker only slows down the process of fixing the bug or implementing the feature.
+
+If an issue with the bug or feature you want to report/suggest exists, comment on it with your info (bug reports) or give it a :thumbsup: (Feature Request) to show that this is important for you.
+
+### Issue isn't caused by external source
+PlaceholderAPI provides a feature to have expansions (separate jar files) for placeholders. This gives it a possability that an issue you encounter is caused by said expansions or a separate plugin that uses those expansions.  
+In those cases should you report the issue to the issue tracker of the expansion or plugin.
+
+## Pull requests
+As an open source project are we welcoming all contributions to improve PlaceholderAPI, being it changes to its code, or contributions to its documentation such as the [Wiki] or the Javadocs.
+
+> [!IMPORTANT]
+> When contributing, make sure to both base of and target the mentioned branch. Pull requests targeting the wrong branch may get closed without a warning.
+
+### Code contributions
+> **Source and Target Branch:** [`master`][master]
+
+When contributing towards the code of PlaceholderAPI, be it new features or just bug fixes, your changes should follow the general code styling used in the project.  
+You can find the necessary files in the [`config/style`][style] directory of this repository.
+
+### Javadocs contributions
+> **Source and Target Branch:** [`master`][master]*
+
+Javadocs changes should usually be combined with [code contributions](#code-contributions) when possible, but if not, make sure the changes are significant enough to warrant a new build on our CI server.
+
+\*This branch may change in the future.
+
+### Wiki contributions
+> **Source and Target Branch:** [`wiki`][docs-wiki]
+
+The Wiki of PlaceholderAPI is located on its own dedicated branch, hosting all the assets and files that get used to create it through the usage of GitHub Actions and GitHub Pages.  
+We welcome contributions that update outdated information, add new expansions/plugins supporting PlaceholderAPI or even correct spelling mistakes and typos.
+
+## Code of Conduct
+We have a [Code of Conduct] to maintain a welcoming atmosphere in this project.  
+If your contributions go against the Code of Conduct, linked above, we reserve the right to deny or revert your contributions.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,38 +0,0 @@
----
-name: Bug Report  
-about: Found a bug with PlaceholderAPI? Report it through this form!
-
----
-
-[New placeholders/plugin]: https://github.com/PlaceholderAPI/PlaceholderAPI/issues/new?template=feature_request.md
-[Request change]: https://github.com/PlaceholderAPI/PlaceholderAPI/issues/new?template=change_request.md
-[Spigot page]: https://www.spigotmc.org/resources/6245/
-[Jenkins page]: http://ci.extendedclip.com/job/PlaceholderAPI/
-[issue]: https://github.com/PlaceholderAPI/PlaceholderAPI/issues
-
-### Notes
-This template is for **reporting a bug** and not for requesting changes to the wiki!  
-If you want your placeholders added or updated, use the [New placeholders/plugin] or [Request change] template.
-
-Also make sure, that you use the latest version of PlaceholderAPI from either the [Spigot page] or the [Jenkins page] and that your 
-issue isn't already listed in the [issue] page.
-
-### Issue
-> What is the issue? Describe it like you would tell a friend.
-<!-- Please type below this like -->
-
-
-### Expected behaviour
-> What should PlaceholderAPI do?
-<!-- Please type below this like -->
-
-
-### Actual behaviour
-> What does PlaceholderAPI actually do?
-<!-- Please type below this like -->
-
-
-### How to reproduce
-> What steps did you made, to get this bug?
-<!-- Please type below this like -->
-1. 

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,103 @@
+name: Bug Report
+description: Found a Bug about PlaceholderAPI? Use this template to report it!
+labels:
+- "Type: Issue (Unconfirmed)"
+body:
+- type: markdown
+  attributes:
+    value: |-
+      Thank you for taking your time and opening a Bug Report.
+      In order for us to process this Bug Report as fast and efficient as possible do we ask you to read the form carefully and provide any requested information.
+      Required fields are marked with an asterisk symbol (`*`)
+      
+      Also, always make sure to use the latest Release from [Spigot](https://www.spigotmc.org/resources/6245/) or the latest Development Build from our [Jenkins Server](http://ci.extendedclip.com/job/PlaceholderAPI/) to make sure that your issue isn't already fixed.
+      
+      **DO NOT REPORT ISSUES WITH EXPANSIONS AND/OR PLACEHOLDERS. USE THE APPROPRIATE ISSUE TRACKER FOR THOSE!**
+- type: checkboxes
+  attributes:
+    label: Confirmation
+    description: Please make sure to have followed the following checks.
+    options:
+      - label: My issue isn't already found on the Issue tracker.
+        required: true
+      - label: My issue is about **PlaceholderAPI** and not any expansion or external plugin
+        required: true
+      - label: The issue isn't already fixed in a Spigot Release or Development Build.
+        required: true
+      - label: The [Common Issues](https://github.com/PlaceholderAPI/PlaceholderAPI/wiki/Common-Issues) page doesn't mention this issue.
+        required: true
+- type: dropdown
+  attributes:
+    label: "Type"
+    description: |-
+      What kind of Bug do you encounter?
+      
+      - `Plugin Bug`: PlaceholderAPI doesn't startup properly.
+      - `API Bug`: A method you use didn't work or has an unexpected result.
+      - `Plugin/Server Incompatability`: PlaceholderAPI either doesn't support a specific Server Type/Version or has conflicts with another plugin.
+    multiple: false
+    options:
+      - "Plugin Bug"
+      - "API Bug"
+      - "Plugin/Server Incompatability"
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: "What happens?"
+    description: "What bug are you encountering? Try to explain it as detailed as possible."
+    placeholder: "PlaceholderAPI does this when I do that..."
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: "Expected Behaviour"
+    description: "What behaviour did you expect from PlaceholderAPI?"
+    placeholder: "PlaceholderAPI should actually do..."
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: "How to Reproduce"
+    description: |-
+      List the steps on how to reproduce this Bug.
+      Post any Code-examples in the `Additional Information` field below when you selected `API Bug`.
+    placeholder: |-
+      1. Do this
+      2. ...
+      3. Profit!
+  validations:
+    required: true
+- type: input
+  id: "dump"
+  attributes:
+    label: "`/papi dump` Output"
+    description: |-
+      Please execute the `/papi dump` command and provide the generated URL from it.
+      If you can't execute the command (i.e. PlaceholderAPI doesn't start up) can you put N/A here and mention the issue in the `Additional Information` field.
+    placeholder: "https://paste.helpch.at/dump.log"
+  validations:
+    required: true
+- type: input
+  id: "console"
+  attributes:
+    label: "Console Log"
+    description: |-
+      Get the latest content of your `latest.log` file an upload it to https://paste.helpch.at
+      Take the generated URL and paste it into this field.
+    placeholder: "https://paste.helpch.at/latest.log"
+- type: input
+  id: "error"
+  attributes:
+    label: "Errors"
+    description: |-
+      Upload any errors you find to https://paste.helpch.at and post the link in the field below.
+    placeholder: "https://paste.helpch.at/error.log"
+- type: textarea
+  attributes:
+    label: "Additional Info"
+    description: |-
+      Add any extra info you think is nessesary for this Bug report.
+      - If you selected `API Bug` will you need to include code-examples here to reproduce the issue.
+      - If you selected `Plugin/Server Incompatability` should you include extra Server info such as a Timings or Spark-Report or info about the plugin in question.
+    placeholder: "Put any extra info you like into this field..."

.github/ISSUE_TEMPLATE/change_request.md

@@ -1,36 +0,0 @@
----
-name: Request change  
-about: Request a update/change of a wiki-page
-
----
-
-[New placeholders/plugin]: https://github.com/PlaceholderAPI/PlaceholderAPI/issues/new?template=feature_request.md
-[Bug report]: https://github.com/PlaceholderAPI/PlaceholderAPI/issues/new?template=bug_report.md
-[issues]: https://github.com/PlaceholderAPI/PlaceholderAPI/issues
-[wiki]: https://github.com/PlaceholderAPI/PlaceholderAPI/wiki
-
-### Notes
-This template is for **requesting changes to the wiki** and not for reporting bugs or requesting additions for the wiki!  
-If you want your placeholders added, use the [New placeholders/plugin] template.  
-For bug reports, use the [Bug report] template.
-
-Also make sure, that your requested change isn't already made in the [wiki] or listed in the [issues] page.
-
-### Type
-> What kind of change is it? (Multiple selections possible)
-<!-- Please select the right one, by changing the [ ] to [x] -->
-
-- [ ] Placeholder(s) changed.
-- [ ] New placeholder(s).
-- [ ] Plugin no longer supports PlaceholderAPI and/or was deleted.
-
-### Plugin
-> What is the name of the plugin?
-<!-- Please type below this line -->
-
-
-### What is the new value?
-> **Placeholder(s) changed**: Type what the old and the new placeholder(s) is/are.  
-> **New Placeholder(s)**: Type the new placeholder(s).  
-> **Plugin no longer supports PlaceholderAPI**: Leave this blank.
-<!-- Please type below this line -->

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,17 @@
+blank_issues_enabled: false
+contact_links:
+  - name: HelpChat Discord
+    url: https://discordapp.com/invite/0utOOIYX82aImw7h
+    about: Please join our Discord for faster support.
+  - name: Wiki
+    url: https://github.com/PlaceholderAPI/PlaceholderAPI/wiki
+    about: The Wiki of PlaceholderAPI.
+  - name: Hastebin
+    url: https://paste.helpch.at
+    about: Use our Hastebin-site for sharing errors and configuration files.
+  - name: Update Wiki
+    url: https://github.com/PlaceholderAPI/PlaceholderAPI/pulls
+    about: Please make a Pull request towards the "wiki" folder to update the wiki.
+  - name: Questions
+    url: https://github.com/PlaceholderAPI/PlaceholderAPI/discussions
+    about: If you have any questions, ask them in our Discussions Page.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,35 +0,0 @@
----
-name: New placeholders/plugin
-about: Do you have a plugin that supports and/or adds placeholders from/to PlaceholderAPI and that isn't on the wiki? Use this template!
-
----
-
-[Request change]: https://github.com/PlaceholderAPI/PlaceholderAPI/issues/new?template=change_request.md
-[Bug report]: https://github.com/PlaceholderAPI/PlaceholderAPI/issues/new?template=bug_report.md
-[issues]: https://github.com/PlaceholderAPI/PlaceholderAPI/issues
-[wiki]: https://github.com/PlaceholderAPI/PlaceholderAPI/wiki
-
-### Notes
-This template is for **requesting additions for the wiki** and not for reporting bugs or requesting changes for the wiki!  
-If you want changes to be made to the wiki, use the [Request change] template.  
-For bug reports, use the [Bug report] template.
-
-Also make sure, that your requested placeholders/plugin isn't already added in the [wiki] or listed in the [issues] page.
-
-### Type
-> What kind of request is this? (Multiple selections possible)
-<!-- Select the right option by replacing [ ] with [x] -->
-<!-- For an update of an already listed plugin, use the "Request change" template -->
-
-- [ ] New expansion providing placeholders.
-- [ ] New plugin providing placeholders.
-- [ ] New plugin supporting PlaceholderAPI.
-
-### Plugin
-> What is the name of the plugin/expansion?
-> Provide also a link to it.
-<!-- Please type below this line -->
-
-### Placeholders/others
-> What are the new placeholders/Any additional info?
-<!-- Please type below this line -->

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,62 @@
+name: Feature Request
+description: Suggest a new Feature for PlaceholderAPI
+labels:
+- "Type: Enhancement"
+body:
+- type: markdown
+  attributes:
+    value: |-
+      Thank you for taking the time in creating this Feature Request.
+      In order to process your feature request as fast and efficiently as possible do we ask you to fill out any required fields (Indicated with a red asterisk (`*`)) with the requested information.
+      
+      If you have any further questions should you either [join our Discord Server](https://helpch.at/discord) or [ask in our Discussions](https://github.com/PlaceholderAPI/PlaceholderAPI/discussions).
+- type: checkboxes
+  attributes:
+    label: Confirmation
+    description: Please make sure to have followed the following checks.
+    options:
+      - label: I checked the Issues and Pull request tab for any existing issues or PRs.
+        required: true
+      - label: My Feature Request is for **PlaceholderAPI** and not any expansion or other plugin.
+        required: true
+- type: dropdown
+  attributes:
+    label: "Type"
+    description: "What type is your Suggestion? Select all that match."
+    multiple: true
+    options:
+      - "New API feature"
+      - "New config option"
+      - "Minor Code improvement (Won't affect Servers)"
+      - "Major Code improvement (Will affect Servers)"
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: "Description"
+    description: |-
+      Give a detailed explanation about your Feature request and why it would be beneficial for PlaceholderAPI.
+      Just saying "It's cool!" or "I need it" don't count as valid reasons. It needs to have a clear benefit for **other** players too.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: "Code Example"
+    description: |-
+      Do you have any Code Snippets that you want to share with us? Paste it here!
+      Note that the input will automatically be rendered as Java code, so you won't need to put it into a code block yourself.
+    render: java
+- type: input
+  attributes:
+    label: "Jar file"
+    description: |-
+      If you already have a PlaceholderAPI Jar with the requested changes would we love to get a download link for it.
+      If you don't have a download link can you leave this field empty or provide "N/A" as a response.
+    placeholder: "https://cdn.discordapp.com/..."
+- type: textarea
+  attributes:
+    label: "Additional Information"
+    description: |-
+      Add any extra info you think is nessesary for this Feature request.
+      - When you selected `Major Code improvement (Will affect Servers)` should you mention what will break when people update.
+    placeholder: "Put any extra info you like into this field..."

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,28 @@
+<!--
+  ### Please read ###
+  Please make sure you checked the following:
+
+  - You checked the Pull requests page for any upcoming changes.
+  - You documented any public code that the end-user might use.
+  - You followed the contributing file (https://github.com/PlaceholderAPI/PlaceholderAPI/tree/master/.github/CONTRIBUTING.md).
+-->
+
+## Pull Request
+
+### Type
+<!--
+      Please select the right one, by changing the [ ] to [x]
+-->
+- [ ] Internal change (Doesn't affect end-user).
+- [ ] External change (Does affect end-user).
+- [ ] Wiki (Changes towards the [Wiki]).
+- [ ] Other: __________ <!-- Use this if none of the above matches your request -->
+
+### Description
+<!-- What does your Pull request change? -->
+
+Closes N/A <!-- If your PR is based on an issue, change "N/A" the the issue ID (#id) -->
+
+
+<!-- DO NOT ALTER ANYTHING BELOW THIS LINE! -->
+[Wiki]: https://wiki.placeholderapi.com

.github/label-commenter-config.yml

@@ -0,0 +1,145 @@
+comment:
+  footer: "\
+    ----\n\n
+    > [!NOTE]\n
+    > *This is an automated response created by a **GitHub Action***<br>
+    > *Mentioning the bot won't have any effect!*
+    "
+
+labels:
+  - name: 'Type: Issue (Expansion)'
+    labeled:
+      issue:
+        body: |-
+          Hello @{{ issue.user.login }},
+          
+          The issue you encountered is caused by an Expansion and not PlaceholderAPI itself.
+          This issue-tracker is reserved for Bug reports and feature requests towards PlaceholderAPI.
+          
+          Please report this issue to the Expansion's main issue-tracker.
+          A list of known Expansion repositories and their issue trackers can be found [here](https://github.com/PlaceholderAPI/PlaceholderAPI/discussions/510#discussion-63812).
+        action: close
+  - name: 'Type: Duplicate'
+    labeled:
+      issue:
+        body: |-
+          Your issue is already known and a separate issue with the exact same report/feature request already exist.
+          
+          Please comment on the already existing issue with your information instead of opening your own.
+        action: close
+  - name: 'Problem: More info required'
+    labeled:
+      issue:
+        body: |-
+          Hello @{{ issue.user.login }},
+          
+          Your issue unfortunately lacks certain information that we require in order to help you with your issue.
+          Please make sure you provide the following information:
+          
+          - Currently used Versions of your server (`/version`) and PlaceholderAPI (`/version PlaceholderAPI`)
+          - Currently installed Expansions (`/papi list`)
+          - Currently installed Plugins (`/pl`)
+          - Any additional information requested by users in this issue.
+          
+          The easiest way to provide those information is through the `/papi dump` command which posts the required information to https://paste.helpch.at and gives a URL to share.
+    unlabeled:
+      issue:
+        body: |-
+          Thank you for providing additional information.
+          We will take a look at the issue you encounter and come back to you with a possible solution.
+  - name: 'Type: Invalid'
+    labeled:
+      issue:
+        body: |-
+          Your issue has beeen marked as invalid.
+          This means that it either doesn't follow any provided template, or isn't related to PlaceholderAPI.
+          
+          Please make sure to use one of the issue templates and provide the requested information.
+          Currently available Templates are:
+          
+          - [Bug Report](https://github.com/PlaceholderAPI/PlaceholderAPI/issues/new?labels=Type%3A+Issue+%28Unconfirmed%29&template=bug_report.yml)
+          - [Feature Request](https://github.com/PlaceholderAPI/PlaceholderAPI/issues/new?labels=Type%3A+Enhancement&template=feature_request.yml)
+          
+          If you want changes to be made towards the Wiki, would we encourage you to [Make a Pull request](https://github.com/PlaceholderAPI/PlaceholderAPI/pulls).  
+          You can find more information about this process on the [Wiki's Readme](https://github.com/PlaceholderAPI/PlaceholderAPI/blob/wiki/README.md).
+          
+          It is recommended to [join our Discord Server](https://helpch.at/discord) as you often receive a faster response compared to the issue tracker here.
+          Questions about PlaceholderAPI should be asked in our [Discussions](https://github.com/PlaceholderAPI/PlaceholderAPI/discussions).
+        action: close
+      pr:
+        body: |-
+          Your Pull request has been marked as **invalid**.
+          This means that it doesn't follow our [Contributing Guidelines](https://github.com/PlaceholderAPI/PlaceholderAPI/blob/master/.github/CONTRIBUTING.md).
+          
+          Here is a small summary of what you should know:
+          
+          - Pull requests for PlaceholderAPI should target the `master` branch.
+          - Pull requests for the Wiki should target the `wiki` branch.
+          
+          Don't hesitate to ask us any questions.
+        action: close
+  - name: 'Type: Invalid (Wiki)'
+    labeled:
+      pr:
+        body: |-
+          Your Wiki Pull request has been marked as **invalid**.
+          
+          Pull requests targeting the Wiki need to target the `wiki` branch.
+          More information can be found on the [Wiki README](https://github.com/PlaceholderAPI/PlaceholderAPI/blob/wiki/README.md).
+        action: close
+  - name: 'Target: Wiki'
+    labeled:
+      issue:
+        body: |-
+          Hello @{{ issue.user.login }},
+          
+          Thank you for reaching out to us about the wiki.
+          We would like to inform you, that you are able to directly commit your changes to the wiki through a Pull request.
+          When doing so, make sure you follow these steps:
+          
+          - The Pull request is based on AND targets the [`wiki`](https://github.com/PlaceholderAPI/PlaceholderAPI/tree/wiki) branch of the Repository.
+          - You followed the general Styling Guidelines mentioned in the wiki's [README](https://github.com/PlaceholderAPI/PlaceholderAPI/blob/wiki/README.md) file.
+          
+          If you have any questions about submitting a PR for the wiki or have any other questions don't hesitate to ask us about it.
+  - name: 'Type: Not a bug'
+    labeled:
+      issue:
+        body: |-
+          The issue you encounter is not considered a bug and rather an intentional behaviour of PlaceholderAPI and/or one of its expansions.
+          If you still believe that it is a bug, provide more information and a maintainer of this repository may look at it more closely.
+          
+          Before providing more info, always make sure to use the latest version of PlaceholderAPI, as the issue you encounter might already be fixed in a newer version.
+          Optionally can you also try out [development builds](https://ci.extendedclip.com/job/PlaceholderAPI/) and see if the issue was fixed there.
+        action: close
+    unlabeled:
+      issue:
+        body: After further investigation is the issue you encounter indeed considered a bug and we will try to fix it as soon as possible.
+        action: open
+  - name: 'Status: Inactive'
+    labeled:
+      issue:
+        body: |-
+          The issue has been marked as **inactive** which means it didn't recieve any responses from the Author ({{ issue.user.login }}) for a long period of time.
+          To keep the issue-tracker clean and up to date do we close issues that haven't received any responses for a long time.
+          
+          If you're the Author of this issue and the reported problem is still present, make sure to respond with additional info to this issue, so that we can reopen it.
+          **Do not create a new issue for the same problem!**
+        action: close
+    unlabeled:
+      issue:
+        body: The issue received a response from the Author who confirms this to still be prominent and has therefore been reopened.
+        action: open
+  - name: 'Type: Question'
+    labeled:
+      issue:
+        body: |-
+          Hello @{{ issue.user.login }},
+          
+          Thank you for reaching out to us for getting Support with PlaceholderAPI.
+          We would like to inform you, that we have [Discussions](https://github.com/PlaceholderAPI/PlaceholderAPI/discussions) that you can use for asking questions.
+          Just head over there and click the "New discussion" button to create a new post.
+          
+          Remember to first read the [READ ME](https://github.com/PlaceholderAPI/PlaceholderAPI/discussions/507) post to not face any issues.
+          
+          For questions do we recommend to use the [(2) Support](https://github.com/PlaceholderAPI/PlaceholderAPI/discussions/categories/-2-support) category.
+          You can also use the Discussion to submit Feature requests (Feature requests through issues are still accepted tho).

.github/release.yml

@@ -0,0 +1,24 @@
+#
+# This file is used to automatically draft new release changelogs in GitHub.
+# Read more: https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes
+#
+changelog:
+  exclude:
+    labels:
+    - 'Action: No Changelog'
+  categories:
+  - title: 'Breaking Changes'
+    labels:
+    - 'Type: Breaking'
+  - title: 'Additions'
+    labels:
+    - 'Type: New Feature'
+  - title: 'Changes'
+    labels:
+    - 'Type: Enhancement'
+  - title: 'Fixes'
+    labels:
+    - 'Type: Bugfix'
+  - title: 'Other changes'
+    labels:
+    - '*' # Catch every other PR not labeled with an "exclude" label.

.github/workflows/label_comment.yml

@@ -0,0 +1,25 @@
+name: Comment
+
+on:
+  issues:
+    types:
+    - labeled
+    - unlabeled
+  pull_request_target:
+    types:
+    - labeled
+    - unlabeled
+
+jobs:
+  give_comment:
+    if: github.event.issue.state == 'open' || github.event.pull_request.state == 'open'
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout Code
+      uses: actions/checkout@v2
+      with:
+        ref: master
+    - name: Send Issue/Pull request comment
+      uses: peaceiris/actions-label-commenter@v1.8.2
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pr_build_jars.yml

@@ -0,0 +1,31 @@
+name: "Test compiling against Java 8, 11 and 16"
+
+on:
+  pull_request:
+    branches:
+    - development
+    paths:
+    - "src/**"
+    - "build.gradle"
+
+jobs:
+  testBuilds:
+    strategy:
+      fail-fast: false
+      max-parallel: 4
+      matrix:
+        java-version: [8, 11, 16]
+    name: "Compile jar against ${{ matrix.java-version }}"
+    runs-on: ubuntu-latest
+    steps:
+    - name: "Checkout Code"
+      uses: actions/checkout@v2
+    - name: "Prepare Java ${{ matrix.java-version }}"
+      uses: actions/setup-java@v2
+      with:
+        distribution: "adopt"
+        java-version: "${{ matrix.java-version }}"
+    - name: "Make build.gradle executable"
+      run: "chmod +x gradlew"
+    - name: "Build jar with Java ${{ matrix.java-version }}"
+      run: "./gradlew shadowJar"

.gitignore

@@ -1,146 +1,6 @@
-### Eclipse ###
-
-.metadata
-bin/
-tmp/
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.settings/
-.loadpath
-.recommenders
-
-# External tool builders
-.externalToolBuilders/
-
-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# PyDev specific (Python IDE for Eclipse)
-*.pydevproject
-
-# CDT-specific (C/C++ Development Tooling)
-.cproject
-
-# Java annotation processor (APT)
-.factorypath
-
-# PDT-specific (PHP Development Tools)
-.buildpath
-
-# sbteclipse plugin
-.target
-
-# Tern plugin
-.tern-project
-
-# TeXlipse plugin
-.texlipse
-
-# STS (Spring Tool Suite)
-.springBeans
-
-# Code Recommenders
-.recommenders/
-
-# Scala IDE specific (Scala & Java development for Eclipse)
-.cache-main
-.scala_dependencies
-.worksheet
-
-### Eclipse Patch ###
-# Eclipse Core
-.project
-
-# JDT-specific (Eclipse Java Development Tools)
-.classpath
-
-### Intellij ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-
-# User-specific stuff:
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/dictionaries
-
-# Sensitive or high-churn files:
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.xml
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-
-# Gradle:
-.idea/**/gradle.xml
-.idea/**/libraries
-
-# CMake
-cmake-build-debug/
-
-# Mongo Explorer plugin:
-.idea/**/mongoSettings.xml
-
-## File-based project format:
-*.iws
-
-## Plugin-specific files:
-
-# IntelliJ
-/out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Cursive Clojure plugin
-.idea/replstate.xml
-
-# Ruby plugin and RubyMine
-/.rakeTasks
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
-
-### Intellij Patch ###
-# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
-
-*.iml
-# modules.xml
-# .idea/misc.xml
-# *.ipr
-
-# Sonarlint plugin
-.idea/sonarlint
-
-### Maven ###
-target/
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-pom.xml.next
-release.properties
-dependency-reduced-pom.xml
-buildNumber.properties
-.mvn/timing.properties
-
-# Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
-!/.mvn/wrapper/maven-wrapper.jar
-
-### NetBeans ###
-nbproject/private/
+.idea/
+.gradle/
+server/
 build/
-nbbuild/
-dist/
-nbdist/
-.nb-gradle/
-nbactions.xml
+out/
+*.iml

CODE_OF_CONDUCT.md

@@ -0,0 +1,51 @@
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/
+
+[discord]: https://helpch.at/discord
+
+## Code of Conduct
+
+### Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+### Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+### Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+### Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+### Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team on their [discord server][discord]. All
+complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+### Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]

README.md

@@ -7,6 +7,9 @@
 
 [discord]: https://helpch.at/discord
 [spigot]: https://www.spigotmc.org/resources/6245/
+[hangar]: https://hangar.papermc.io/HelpChat/PlaceholderAPI
+[bbb]: https://builtbybit.com/resources/placeholderapi.24306
+[modrinth]: https://modrinth.com/plugin/placeholderapi
 [Expansions cloud]: https://api.extendedclip.com/home
 [placeholder list]: https://helpch.at/placeholders
 [statistics]: https://bstats.org/plugin/bukkit/PlaceholderAPI
@@ -14,8 +17,11 @@
 [ci]: http://ci.extendedclip.com/job/PlaceholderAPI/
 [ciImg]: http://ci.extendedclip.com/buildStatus/icon?job=PlaceholderAPI
 
-[APIversionImg]: https://img.shields.io/nexus/r/http/repo.extendedclip.com/me.clip/placeholderapi.svg?label=API-Version
-[logo]: https://i.imgur.com/Ea4PURv.png
+[APIversionImg]: https://repo.extendedclip.com/api/badge/latest/releases/me/clip/placeholderapi?name=API%20Version
+[logo]: https://wiki.placeholderapi.com/assets/img/papi-logo.png
+
+[contributing]: https://github.com/PlaceholderAPI/PlaceholderAPI/blob/master/.github/CONTRIBUTING.md
+[placeholderexpansion]: https://wiki.placeholderapi.com/developers/creating-a-placeholderexpansion/
 <!-- The stuff above isn't visible in the readme -->
 
 [![logo]][spigot]
@@ -25,12 +31,15 @@
 # Information 
 [PlaceholderAPI][spigot] is a plugin for Spigot servers that allows server owners to display information from various plugins with a uniform format. 
 
-Support for specific plugins are provided either by the plugin itself or through expansions. The expansions may be downloaded in-game through the PAPI Expansion Cloud. There are currently over 100 expansions that support a wide variety of plugins, such as Essentials, Factions, LuckPerms, and Vault. 
+Support for specific plugins are provided either by the plugin itself or through expansions. The expansions may be downloaded in-game through the PAPI Expansion Cloud. There are currently over 240+ expansions that support a wide variety of plugins, such as Essentials, Factions, LuckPerms, and Vault. 
 
-PlaceholderAPI has been downloaded over 100,000 times and has been used concurrently on over 10,000 servers, which makes it a must-have for a server of any type or scale.
+PlaceholderAPI has been downloaded over 1,700,000 times on Spigot and has been used concurrently on over 45,000 servers, which makes it a must-have for a server of any type or scale.
 
-<!-- TODO: Add contributing section -->
-<!-- TODO: Add expansion creation section (possibly add to a wiki?) -->
+## Contribute
+If you would like to contribute towards PlaceholderAPI should you take a look at our [Contributing file][contributing] for the ins and outs on how you can do that and what you need to keep in mind.
+
+## Create an Expansion
+If you would like to create your own Placeholder Expansion for PlaceholderAPI, take a look at our [Wiki][placeholderexpansion] which contains a detailed tutorial on how you can achieve this.
 
 ## Support
 - [Issue Tracker][issues]
@@ -38,7 +47,10 @@ PlaceholderAPI has been downloaded over 100,000 times and has been used concurre
 
 ## Quick Links
 - [CI Server][ci]
-- [Expansions cloud]
+- [Expansions Cloud]
 - [Placeholder List]
 - [Spigot Page][spigot]
+- [Hangar Page][hangar]
+- [BuiltByBit Page][bbb]
+- [Modrinth Page][modrinth]
 - [Plugin Statistics][statistics]

build.gradle.kts

@@ -0,0 +1,135 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+plugins {
+    `java-library`
+    `maven-publish`
+    id("com.github.hierynomus.license") version "0.16.1"
+    id("io.github.goooler.shadow") version "8.1.7"
+}
+
+group = "me.clip"
+version = "2.11.7-DEV-${System.getProperty("BUILD_NUMBER")}"
+
+description = "An awesome placeholder provider!"
+
+repositories {
+    maven("https://oss.sonatype.org/content/repositories/snapshots/")
+
+    mavenCentral()
+    mavenLocal()
+
+    maven("https://repo.codemc.org/repository/maven-public/")
+    maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
+    maven("https://repo.papermc.io/repository/maven-public/")
+}
+
+dependencies {
+    implementation("org.bstats:bstats-bukkit:3.0.1")
+    implementation("net.kyori:adventure-platform-bukkit:4.3.3")
+
+    //compileOnly("org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT")
+    compileOnly("dev.folia:folia-api:1.20.1-R0.1-SNAPSHOT")
+    compileOnlyApi("org.jetbrains:annotations:23.0.0")
+
+    testImplementation("org.openjdk.jmh:jmh-core:1.32")
+    testImplementation("org.openjdk.jmh:jmh-generator-annprocess:1.32")
+
+    testImplementation("org.junit.jupiter:junit-jupiter-engine:5.8.2")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
+}
+
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+
+    withJavadocJar()
+    withSourcesJar()
+
+    disableAutoTargetJvm()
+}
+
+license {
+    header = rootProject.file("config/headers/main.txt")
+
+    include("**/*.java")
+    mapping("java", "JAVADOC_STYLE")
+
+    encoding = "UTF-8"
+
+    ext {
+        set("year", 2024)
+    }
+}
+
+val javaComponent: SoftwareComponent = components["java"]
+
+tasks {
+    processResources {
+        eachFile { expand("version" to project.version) }
+    }
+
+    build {
+        dependsOn(named("shadowJar"))
+    }
+
+    withType<JavaCompile> {
+        options.encoding = "UTF-8"
+        options.release = 8
+    }
+
+    withType<Javadoc> {
+        isFailOnError = false
+
+        with(options as StandardJavadocDocletOptions) {
+            addStringOption("Xdoclint:none", "-quiet")
+            addStringOption("encoding", "UTF-8")
+            addStringOption("charSet", "UTF-8")
+        }
+    }
+
+    withType<ShadowJar> {
+        archiveClassifier.set("")
+
+        relocate("org.bstats", "me.clip.placeholderapi.metrics")
+        relocate("net.kyori", "me.clip.placeholderapi.libs.kyori")
+
+        exclude("META-INF/versions/**")
+    }
+
+    test {
+        useJUnitPlatform()
+    }
+
+    publishing {
+        publications {
+            create<MavenPublication>("maven") {
+                artifactId = "placeholderapi"
+                from(javaComponent)
+            }
+        }
+
+        repositories {
+            maven {
+                if ("-DEV" in version.toString()) {
+                    url = uri("https://repo.extendedclip.com/snapshots")
+                } else {
+                    url = uri("https://repo.extendedclip.com/releases")
+                }
+
+                credentials {
+                    username = System.getenv("JENKINS_USER")
+                    password = System.getenv("JENKINS_PASS")
+                }
+            }
+        }
+    }
+
+    publish.get().setDependsOn(listOf(build.get()))
+}
+
+configurations {
+    testImplementation {
+        extendsFrom(compileOnly.get())
+    }
+}

config/headers/jsonmessage.txt

@@ -0,0 +1,7 @@
+Copyright (c) 2018-2024 Peter Blood
+
+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.

config/headers/main.txt

@@ -0,0 +1,17 @@
+This file is part of PlaceholderAPI
+
+PlaceholderAPI
+Copyright (c) 2015 - ${year} PlaceholderAPI Team
+
+PlaceholderAPI free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+PlaceholderAPI is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.

config/style/daddystyle.xml

@@ -0,0 +1,569 @@
+<code_scheme name="DaddyStyle" version="173">
+  <option name="OTHER_INDENT_OPTIONS">
+    <value>
+      <option name="INDENT_SIZE" value="2" />
+      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      <option name="TAB_SIZE" value="2" />
+    </value>
+  </option>
+  <option name="RIGHT_MARGIN" value="100" />
+  <AndroidXmlCodeStyleSettings>
+    <option name="USE_CUSTOM_SETTINGS" value="true" />
+    <option name="LAYOUT_SETTINGS">
+      <value>
+        <option name="INSERT_BLANK_LINE_BEFORE_TAG" value="false" />
+      </value>
+    </option>
+  </AndroidXmlCodeStyleSettings>
+  <JSCodeStyleSettings version="0">
+    <option name="INDENT_CHAINED_CALLS" value="false" />
+  </JSCodeStyleSettings>
+  <JavaCodeStyleSettings>
+    <option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
+    <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+    <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+    <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+      <value />
+    </option>
+    <option name="IMPORT_LAYOUT_TABLE">
+      <value>
+        <package name="" withSubpackages="true" static="true" />
+        <emptyLine />
+        <package name="" withSubpackages="true" static="false" />
+      </value>
+    </option>
+    <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
+    <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
+    <option name="JD_P_AT_EMPTY_LINES" value="false" />
+    <option name="JD_KEEP_EMPTY_PARAMETER" value="false" />
+    <option name="JD_KEEP_EMPTY_EXCEPTION" value="false" />
+    <option name="JD_KEEP_EMPTY_RETURN" value="false" />
+  </JavaCodeStyleSettings>
+  <Objective-C>
+    <option name="INDENT_NAMESPACE_MEMBERS" value="0" />
+    <option name="INDENT_C_STRUCT_MEMBERS" value="2" />
+    <option name="INDENT_CLASS_MEMBERS" value="2" />
+    <option name="INDENT_VISIBILITY_KEYWORDS" value="1" />
+    <option name="INDENT_INSIDE_CODE_BLOCK" value="2" />
+    <option name="KEEP_STRUCTURES_IN_ONE_LINE" value="true" />
+    <option name="FUNCTION_PARAMETERS_WRAP" value="5" />
+    <option name="FUNCTION_CALL_ARGUMENTS_WRAP" value="5" />
+    <option name="TEMPLATE_CALL_ARGUMENTS_WRAP" value="5" />
+    <option name="TEMPLATE_CALL_ARGUMENTS_ALIGN_MULTILINE" value="true" />
+    <option name="ALIGN_INIT_LIST_IN_COLUMNS" value="false" />
+    <option name="SPACE_BEFORE_SUPERCLASS_COLON" value="false" />
+  </Objective-C>
+  <Objective-C-extensions>
+    <option name="GENERATE_INSTANCE_VARIABLES_FOR_PROPERTIES" value="ASK" />
+    <option name="RELEASE_STYLE" value="IVAR" />
+    <option name="TYPE_QUALIFIERS_PLACEMENT" value="BEFORE" />
+    <file>
+      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
+      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
+      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
+      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
+      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
+      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
+      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
+      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
+      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
+    </file>
+    <class>
+      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
+      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
+      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
+      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
+      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
+      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
+    </class>
+    <extensions>
+      <pair source="cc" header="h" />
+      <pair source="c" header="h" />
+    </extensions>
+  </Objective-C-extensions>
+  <Python>
+    <option name="USE_CONTINUATION_INDENT_FOR_ARGUMENTS" value="true" />
+  </Python>
+  <TypeScriptCodeStyleSettings version="0">
+    <option name="INDENT_CHAINED_CALLS" value="false" />
+  </TypeScriptCodeStyleSettings>
+  <XML>
+    <option name="XML_ALIGN_ATTRIBUTES" value="false" />
+    <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+  </XML>
+  <codeStyleSettings language="CSS">
+    <indentOptions>
+      <option name="INDENT_SIZE" value="2" />
+      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      <option name="TAB_SIZE" value="2" />
+    </indentOptions>
+  </codeStyleSettings>
+  <codeStyleSettings language="ECMA Script Level 4">
+    <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+    <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+    <option name="ALIGN_MULTILINE_FOR" value="false" />
+    <option name="CALL_PARAMETERS_WRAP" value="1" />
+    <option name="METHOD_PARAMETERS_WRAP" value="1" />
+    <option name="EXTENDS_LIST_WRAP" value="1" />
+    <option name="BINARY_OPERATION_WRAP" value="1" />
+    <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+    <option name="TERNARY_OPERATION_WRAP" value="1" />
+    <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+    <option name="FOR_STATEMENT_WRAP" value="1" />
+    <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+    <option name="IF_BRACE_FORCE" value="3" />
+    <option name="DOWHILE_BRACE_FORCE" value="3" />
+    <option name="WHILE_BRACE_FORCE" value="3" />
+    <option name="FOR_BRACE_FORCE" value="3" />
+  </codeStyleSettings>
+  <codeStyleSettings language="HTML">
+    <indentOptions>
+      <option name="INDENT_SIZE" value="2" />
+      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      <option name="TAB_SIZE" value="2" />
+    </indentOptions>
+  </codeStyleSettings>
+  <codeStyleSettings language="JAVA">
+    <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
+    <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+    <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
+    <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+    <option name="ALIGN_MULTILINE_RESOURCES" value="false" />
+    <option name="ALIGN_MULTILINE_FOR" value="false" />
+    <option name="CALL_PARAMETERS_WRAP" value="1" />
+    <option name="METHOD_PARAMETERS_WRAP" value="1" />
+    <option name="EXTENDS_LIST_WRAP" value="1" />
+    <option name="THROWS_KEYWORD_WRAP" value="1" />
+    <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+    <option name="BINARY_OPERATION_WRAP" value="1" />
+    <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+    <option name="TERNARY_OPERATION_WRAP" value="1" />
+    <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+    <option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" />
+    <option name="KEEP_SIMPLE_LAMBDAS_IN_ONE_LINE" value="true" />
+    <option name="KEEP_SIMPLE_CLASSES_IN_ONE_LINE" value="true" />
+    <option name="FOR_STATEMENT_WRAP" value="1" />
+    <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+    <option name="WRAP_COMMENTS" value="true" />
+    <option name="IF_BRACE_FORCE" value="3" />
+    <option name="DOWHILE_BRACE_FORCE" value="3" />
+    <option name="WHILE_BRACE_FORCE" value="3" />
+    <option name="FOR_BRACE_FORCE" value="3" />
+    <indentOptions>
+      <option name="INDENT_SIZE" value="2" />
+      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      <option name="TAB_SIZE" value="2" />
+    </indentOptions>
+  </codeStyleSettings>
+  <codeStyleSettings language="JSON">
+    <indentOptions>
+      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      <option name="TAB_SIZE" value="2" />
+    </indentOptions>
+  </codeStyleSettings>
+  <codeStyleSettings language="JavaScript">
+    <option name="RIGHT_MARGIN" value="80" />
+    <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+    <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+    <option name="ALIGN_MULTILINE_FOR" value="false" />
+    <option name="CALL_PARAMETERS_WRAP" value="1" />
+    <option name="METHOD_PARAMETERS_WRAP" value="1" />
+    <option name="BINARY_OPERATION_WRAP" value="1" />
+    <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+    <option name="TERNARY_OPERATION_WRAP" value="1" />
+    <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+    <option name="FOR_STATEMENT_WRAP" value="1" />
+    <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+    <option name="IF_BRACE_FORCE" value="3" />
+    <option name="DOWHILE_BRACE_FORCE" value="3" />
+    <option name="WHILE_BRACE_FORCE" value="3" />
+    <option name="FOR_BRACE_FORCE" value="3" />
+    <indentOptions>
+      <option name="INDENT_SIZE" value="2" />
+      <option name="TAB_SIZE" value="2" />
+    </indentOptions>
+  </codeStyleSettings>
+  <codeStyleSettings language="ObjectiveC">
+    <option name="RIGHT_MARGIN" value="80" />
+    <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
+    <option name="BLANK_LINES_BEFORE_IMPORTS" value="0" />
+    <option name="BLANK_LINES_AFTER_IMPORTS" value="0" />
+    <option name="BLANK_LINES_AROUND_CLASS" value="0" />
+    <option name="BLANK_LINES_AROUND_METHOD" value="0" />
+    <option name="BLANK_LINES_AROUND_METHOD_IN_INTERFACE" value="0" />
+    <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="false" />
+    <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+    <option name="FOR_STATEMENT_WRAP" value="1" />
+    <option name="ASSIGNMENT_WRAP" value="1" />
+    <indentOptions>
+      <option name="INDENT_SIZE" value="2" />
+      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+    </indentOptions>
+  </codeStyleSettings>
+  <codeStyleSettings language="PROTO">
+    <option name="RIGHT_MARGIN" value="80" />
+    <indentOptions>
+      <option name="INDENT_SIZE" value="2" />
+      <option name="CONTINUATION_INDENT_SIZE" value="2" />
+      <option name="TAB_SIZE" value="2" />
+    </indentOptions>
+  </codeStyleSettings>
+  <codeStyleSettings language="Python">
+    <option name="RIGHT_MARGIN" value="80" />
+    <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+    <indentOptions>
+      <option name="INDENT_SIZE" value="2" />
+      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      <option name="TAB_SIZE" value="2" />
+    </indentOptions>
+  </codeStyleSettings>
+  <codeStyleSettings language="SASS">
+    <indentOptions>
+      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      <option name="TAB_SIZE" value="2" />
+    </indentOptions>
+  </codeStyleSettings>
+  <codeStyleSettings language="SCSS">
+    <indentOptions>
+      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      <option name="TAB_SIZE" value="2" />
+    </indentOptions>
+  </codeStyleSettings>
+  <codeStyleSettings language="TypeScript">
+    <indentOptions>
+      <option name="INDENT_SIZE" value="2" />
+      <option name="TAB_SIZE" value="2" />
+    </indentOptions>
+  </codeStyleSettings>
+  <codeStyleSettings language="XML">
+    <indentOptions>
+      <option name="INDENT_SIZE" value="2" />
+      <option name="CONTINUATION_INDENT_SIZE" value="2" />
+      <option name="TAB_SIZE" value="2" />
+    </indentOptions>
+    <arrangement>
+      <rules>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>xmlns:android</NAME>
+                <XML_ATTRIBUTE />
+                <XML_NAMESPACE>^$</XML_NAMESPACE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>xmlns:.*</NAME>
+                <XML_ATTRIBUTE />
+                <XML_NAMESPACE>^$</XML_NAMESPACE>
+              </AND>
+            </match>
+            <order>BY_NAME</order>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>.*:id</NAME>
+                <XML_ATTRIBUTE />
+                <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>style</NAME>
+                <XML_ATTRIBUTE />
+                <XML_NAMESPACE>^$</XML_NAMESPACE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>.*</NAME>
+                <XML_ATTRIBUTE />
+                <XML_NAMESPACE>^$</XML_NAMESPACE>
+              </AND>
+            </match>
+            <order>BY_NAME</order>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>.*:.*Style</NAME>
+                <XML_ATTRIBUTE />
+                <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+              </AND>
+            </match>
+            <order>BY_NAME</order>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>.*:layout_width</NAME>
+                <XML_ATTRIBUTE />
+                <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>.*:layout_height</NAME>
+                <XML_ATTRIBUTE />
+                <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>.*:layout_weight</NAME>
+                <XML_ATTRIBUTE />
+                <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>.*:layout_margin</NAME>
+                <XML_ATTRIBUTE />
+                <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>.*:layout_marginTop</NAME>
+                <XML_ATTRIBUTE />
+                <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>.*:layout_marginBottom</NAME>
+                <XML_ATTRIBUTE />
+                <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>.*:layout_marginStart</NAME>
+                <XML_ATTRIBUTE />
+                <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>.*:layout_marginEnd</NAME>
+                <XML_ATTRIBUTE />
+                <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>.*:layout_marginLeft</NAME>
+                <XML_ATTRIBUTE />
+                <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>.*:layout_marginRight</NAME>
+                <XML_ATTRIBUTE />
+                <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>.*:layout_.*</NAME>
+                <XML_ATTRIBUTE />
+                <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+              </AND>
+            </match>
+            <order>BY_NAME</order>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>.*:padding</NAME>
+                <XML_ATTRIBUTE />
+                <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>.*:paddingTop</NAME>
+                <XML_ATTRIBUTE />
+                <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>.*:paddingBottom</NAME>
+                <XML_ATTRIBUTE />
+                <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>.*:paddingStart</NAME>
+                <XML_ATTRIBUTE />
+                <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>.*:paddingEnd</NAME>
+                <XML_ATTRIBUTE />
+                <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>.*:paddingLeft</NAME>
+                <XML_ATTRIBUTE />
+                <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>.*:paddingRight</NAME>
+                <XML_ATTRIBUTE />
+                <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>.*</NAME>
+                <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+              </AND>
+            </match>
+            <order>BY_NAME</order>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>.*</NAME>
+                <XML_NAMESPACE>http://schemas.android.com/apk/res-auto</XML_NAMESPACE>
+              </AND>
+            </match>
+            <order>BY_NAME</order>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>.*</NAME>
+                <XML_NAMESPACE>http://schemas.android.com/tools</XML_NAMESPACE>
+              </AND>
+            </match>
+            <order>BY_NAME</order>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>.*</NAME>
+                <XML_NAMESPACE>.*</XML_NAMESPACE>
+              </AND>
+            </match>
+            <order>BY_NAME</order>
+          </rule>
+        </section>
+      </rules>
+    </arrangement>
+  </codeStyleSettings>
+  <codeStyleSettings language="protobuf">
+    <option name="RIGHT_MARGIN" value="80" />
+    <indentOptions>
+      <option name="INDENT_SIZE" value="2" />
+      <option name="CONTINUATION_INDENT_SIZE" value="2" />
+      <option name="TAB_SIZE" value="2" />
+    </indentOptions>
+  </codeStyleSettings>
+</code_scheme>

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+networkTimeout=10000
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -0,0 +1,244 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -0,0 +1,92 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

pom.xml

@@ -1,119 +0,0 @@
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>me.clip</groupId>
-  <artifactId>placeholderapi</artifactId>
-
-  <version>2.10.2</version>
-  <name>PlaceholderAPI</name>
-  <description>An awesome placeholder provider!</description>
-  <url>http://extendedclip.com</url>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-
-  <repositories>
-    <repository>
-      <id>spigot-repo</id>
-      <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
-    </repository>
-    <repository>
-      <id>bstats-repo</id>
-      <url>http://repo.bstats.org/content/repositories/releases/</url>
-    </repository>
-    <repository>
-      <id>rayzr-repo</id>
-      <url>https://cdn.rawgit.com/Rayzr522/maven-repo/master/</url>
-    </repository>
-  </repositories>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.spigotmc</groupId>
-      <artifactId>spigot-api</artifactId>
-      <version>1.14-R0.1-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-    <groupId>com.google.code.gson</groupId>
-    <artifactId>gson</artifactId>
-    <version>2.8.5</version>
-  </dependency>
-    <dependency>
-      <groupId>org.bstats</groupId>
-      <artifactId>bstats-bukkit</artifactId>
-      <version>1.2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>me.rayzr522</groupId>
-      <artifactId>jsonmessage</artifactId>
-      <version>1.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <defaultGoal>clean package</defaultGoal>
-
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.3.2</version>
-        <configuration>
-          <finalName>${project.name}-${project.version}</finalName>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.7.0</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>3.1.0</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <minimizeJar>false</minimizeJar>
-              <createDependencyReducedPom>false</createDependencyReducedPom>
-              <relocations>
-                <relocation>
-                  <pattern>org.bstats</pattern>
-                  <shadedPattern>me.clip.placeholderapi.metrics</shadedPattern>
-                </relocation>
-                <relocation>
-                  <pattern>me.rayzr522</pattern>
-                  <shadedPattern>me.clip.placeholderapi.util</shadedPattern>
-                </relocation>
-                <relocation>
-                  <pattern>com.google.code.gson</pattern>
-                  <shadedPattern>me.clip.placeholderapi.libs.gson</shadedPattern>
-                </relocation>
-              </relocations>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
-  </build>
-</project>

settings.gradle.kts

@@ -0,0 +1 @@
+rootProject.name = "PlaceholderAPI"

src/main/java/me/clip/placeholderapi/PlaceholderAPI.java

@@ -1,391 +1,624 @@
 /*
+ * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (C) 2018 Ryan McCarthy
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
- * This program is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * PlaceholderAPI is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- *
  */
+
 package me.clip.placeholderapi;
 
-import static me.clip.placeholderapi.util.Msg.color;
-
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-import me.clip.placeholderapi.events.ExpansionRegisterEvent;
-import me.clip.placeholderapi.events.ExpansionUnregisterEvent;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import me.clip.placeholderapi.expansion.Relational;
-import org.apache.commons.lang.Validate;
-import org.bukkit.Bukkit;
+import me.clip.placeholderapi.expansion.manager.LocalExpansionManager;
+import me.clip.placeholderapi.replacer.CharsReplacer;
+import me.clip.placeholderapi.replacer.Replacer;
+import me.clip.placeholderapi.replacer.Replacer.Closure;
+import me.clip.placeholderapi.util.Msg;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
 
-public class PlaceholderAPI {
+public final class PlaceholderAPI {
+
+  private static final Replacer REPLACER_PERCENT = new CharsReplacer(Closure.PERCENT);
+  private static final Replacer REPLACER_BRACKET = new CharsReplacer(Closure.BRACKET);
 
   private static final Pattern PLACEHOLDER_PATTERN = Pattern.compile("[%]([^%]+)[%]");
   private static final Pattern BRACKET_PLACEHOLDER_PATTERN = Pattern.compile("[{]([^{}]+)[}]");
-  private static final Pattern RELATIONAL_PLACEHOLDER_PATTERN = Pattern.compile("[%](rel_)([^%]+)[%]");
-  private static final Map<String, PlaceholderHook> placeholders = new HashMap<>();
+  private static final Pattern RELATIONAL_PLACEHOLDER_PATTERN = Pattern
+      .compile("[%](rel_)([^%]+)[%]");
+
 
   private PlaceholderAPI() {
   }
 
+  // === Current API ===
+
   /**
-   * check if a specific placeholder identifier is currently registered
+   * Translates all placeholders into their corresponding values.
+   * <br>The pattern of a valid placeholder is {@literal %<identifier>_<params>%}.
    *
-   * @param identifier to check
+   * @param player Player to parse the placeholders against
+   * @param text Text to set the placeholder values in
+   * @return String containing all translated placeholders
+   */
+  @NotNull
+  public static String setPlaceholders(final OfflinePlayer player,
+      @NotNull final String text) {
+    return REPLACER_PERCENT.apply(text, player,
+        PlaceholderAPIPlugin.getInstance().getLocalExpansionManager()::getExpansion);
+  }
+
+  /**
+   * Translates all placeholders into their corresponding values.
+   * <br>The pattern of a valid placeholder is {@literal %<identifier>_<params>%}.
+   *
+   * @param player Player to parse the placeholders against
+   * @param text List of Strings to set the placeholder values in
+   * @return String containing all translated placeholders
+   */
+  @NotNull
+  public static List<String> setPlaceholders(final OfflinePlayer player,
+      @NotNull final List<String> text) {
+    return text.stream().map(line -> setPlaceholders(player, line)).collect(Collectors.toList());
+  }
+
+  /**
+   * Translates all placeholders into their corresponding values.
+   * <br>The pattern of a valid placeholder is {@literal %<identifier>_<params>%}.
+   *
+   * @param player Player to parse the placeholders against
+   * @param text Text to set the placeholder values in
+   * @return String containing all translated placeholders
+   */
+  @NotNull
+  public static String setPlaceholders(final Player player, @NotNull String text) {
+    return setPlaceholders(((OfflinePlayer) player), text);
+  }
+
+  /**
+   * Translates all placeholders into their corresponding values.
+   * <br>The pattern of a valid placeholder is {@literal %<identifier>_<params>%}.
+   *
+   * @param player Player to parse the placeholders against
+   * @param text List of Strings to set the placeholder values in
+   * @return String containing all translated placeholders
+   */
+  @NotNull
+  public static List<String> setPlaceholders(final Player player, @NotNull List<@NotNull String> text) {
+    return setPlaceholders(((OfflinePlayer) player), text);
+  }
+
+  /**
+   * Translates all placeholders into their corresponding values.
+   * <br>The pattern of a valid placeholder is {@literal {<identifier>_<params>}}.
+   *
+   * @param player Player to parse the placeholders against
+   * @param text Text to set the placeholder values in
+   * @return String containing all translated placeholders
+   */
+  @NotNull
+  public static String setBracketPlaceholders(final OfflinePlayer player,
+      @NotNull final String text) {
+    return REPLACER_BRACKET.apply(text, player,
+        PlaceholderAPIPlugin.getInstance().getLocalExpansionManager()::getExpansion);
+  }
+
+  /**
+   * Translates all placeholders into their corresponding values.
+   * <br>The pattern of a valid placeholder is {@literal {<identifier>_<params>}}.
+   *
+   * @param player Player to parse the placeholders against
+   * @param text List of Strings to set the placeholder values in
+   * @return String containing all translated placeholders
+   */
+  @NotNull
+  public static List<@NotNull String> setBracketPlaceholders(final OfflinePlayer player,
+      @NotNull final List<@NotNull String> text) {
+    return text.stream().map(line -> setBracketPlaceholders(player, line))
+        .collect(Collectors.toList());
+  }
+  
+  /**
+   * Translates all placeholders into their corresponding values.
+   * <br>The pattern of a valid placeholder is {@literal {<identifier>_<params>}}.
+   *
+   * @param player Player to parse the placeholders against
+   * @param text Text to set the placeholder values in
+   * @return String containing all translated placeholders
+   */
+  @NotNull
+  public static String setBracketPlaceholders(Player player, @NotNull String text) {
+    return setBracketPlaceholders((OfflinePlayer) player, text);
+  }
+  
+  /**
+   * Translates all placeholders into their corresponding values.
+   * <br>The pattern of a valid placeholder is {@literal {<identifier>_<params>}}.
+   *
+   * @param player Player to parse the placeholders against
+   * @param text List of Strings to set the placeholder values in
+   * @return String containing all translated placeholders
+   */
+  @NotNull
+  public static List<String> setBracketPlaceholders(Player player, @NotNull List<String> text) {
+    return setBracketPlaceholders((OfflinePlayer) player, text);
+  }
+
+  /**
+   * set relational placeholders in the text specified placeholders are matched with the pattern
+   * {@literal %<rel_(identifier)_(params)>%} when set with this method
+   *
+   * @param one First player to compare
+   * @param two Second player to compare
+   * @param text Text to parse the placeholders in
+   * @return The text containing the parsed relational placeholders
+   */
+  public static String setRelationalPlaceholders(Player one, Player two, String text) {
+    final Matcher matcher = RELATIONAL_PLACEHOLDER_PATTERN.matcher(text);
+
+    while (matcher.find()) {
+      final String format = matcher.group(2);
+      final int index = format.indexOf("_");
+
+      if (index <= 0 || index >= format.length()) {
+        continue;
+      }
+
+      String identifier = format.substring(0, index).toLowerCase(Locale.ROOT);
+      String params = format.substring(index + 1);
+      final PlaceholderExpansion expansion = PlaceholderAPIPlugin.getInstance()
+          .getLocalExpansionManager().getExpansion(identifier);
+
+      if (!(expansion instanceof Relational)) {
+        continue;
+      }
+
+      final String value = ((Relational) expansion).onPlaceholderRequest(one, two, params);
+
+      if (value != null) {
+        text = text.replaceAll(Pattern.quote(matcher.group()), Matcher.quoteReplacement(value));
+      }
+    }
+
+    return text;
+  }
+
+  /**
+   * Translate placeholders in the provided List based on the relation of the two provided players.
+   * <br>The pattern of a valid placeholder is {@literal %rel_<identifier>_<param>%}.
+   *
+   * @param one Player to compare
+   * @param two Player to compare
+   * @param text text to parse the placeholder values to
+   * @return The text containing the parsed relational placeholders
+   */
+  public static List<String> setRelationalPlaceholders(Player one, Player two, List<String> text) {
+    return text.stream().map(line -> setRelationalPlaceholders(one, two, line))
+        .collect(Collectors.toList());
+  }
+
+  /**
+   * Check if a specific placeholder identifier is currently registered
+   *
+   * @param identifier The identifier to check
    * @return true if identifier is already registered
    */
-  public static boolean isRegistered(String identifier) {
-    return getRegisteredIdentifiers().stream().filter(id -> id.equalsIgnoreCase(identifier))
-        .findFirst().orElse(null) != null;
-  }
-
-  /**
-   * Register a new placeholder hook
-   *
-   * @param identifier Identifier of the placeholder -> "%(identifier)_(args...)%
-   * @param placeholderHook implementing class that contains the onPlaceholderRequest method which
-   * is called when a value is needed for the specific placeholder
-   * @return true if the hook was successfully registered, false if there is already a hook
-   * registered for the specified identifier
-   */
-  public static boolean registerPlaceholderHook(String identifier,
-      PlaceholderHook placeholderHook) {
-    Validate.notNull(identifier, "Identifier can not be null");
-    Validate.notNull(placeholderHook, "Placeholderhook can not be null");
-    if (isRegistered(identifier)) {
-      return false;
-    }
-    placeholders.put(identifier.toLowerCase(), placeholderHook);
-    return true;
-  }
-
-  /**
-   * unregister a placeholder hook by identifier
-   *
-   * @param identifier the identifier for the placeholder hook to unregister
-   * @return true if the placeholder hook was successfully unregistered, false if there was no
-   * placeholder hook registered for the identifier specified
-   */
-  public static boolean unregisterPlaceholderHook(String identifier) {
-    Validate.notNull(identifier, "Identifier can not be null");
-    return placeholders.remove(identifier.toLowerCase()) != null;
+  public static boolean isRegistered(@NotNull final String identifier) {
+    return PlaceholderAPIPlugin.getInstance().getLocalExpansionManager()
+        .findExpansionByIdentifier(identifier).isPresent();
   }
 
   /**
    * Get all registered placeholder identifiers
    *
-   * @return all registered placeholder identifiers
+   * @return A Set of type String containing the identifiers of all registered expansions.
    */
+  @NotNull
   public static Set<String> getRegisteredIdentifiers() {
-    return ImmutableSet.copyOf(placeholders.keySet());
+    return ImmutableSet
+        .copyOf(PlaceholderAPIPlugin.getInstance().getLocalExpansionManager().getIdentifiers());
   }
 
   /**
-   * Get map of registered placeholders
-   *
-   * @return copy of the internal placeholder map
+   * Get the normal placeholder pattern.
+   * 
+   * @return Regex Pattern of {@literal [%]([^%]+)[%]}
    */
-  public static Map<String, PlaceholderHook> getPlaceholders() {
-    return ImmutableMap.copyOf(placeholders);
-  }
-
-  public static Set<PlaceholderExpansion> getExpansions() {
-    Set<PlaceholderExpansion> set = getPlaceholders().values().stream()
-        .filter(PlaceholderExpansion.class::isInstance).map(PlaceholderExpansion.class::cast)
-        .collect(Collectors.toCollection(HashSet::new));
-    return ImmutableSet.copyOf(set);
+  public static Pattern getPlaceholderPattern() {
+    return PLACEHOLDER_PATTERN;
   }
 
   /**
-   * check if a String contains any PlaceholderAPI placeholders
+   * Get the bracket placeholder pattern.
+   * 
+   * @return Regex Pattern of {@literal [{]([^{}]+)[}]}
+   */
+  public static Pattern getBracketPlaceholderPattern() {
+    return BRACKET_PLACEHOLDER_PATTERN;
+  }
+
+  /**
+   * Get the relational placeholder pattern.
+   * 
+   * @return Regex Pattern of {@literal [%](rel_)([^%]+)[%]}
+   */
+  public static Pattern getRelationalPlaceholderPattern() {
+    return RELATIONAL_PLACEHOLDER_PATTERN;
+  }
+
+  /**
+   * Check if a String contains any PlaceholderAPI placeholders ({@literal
+   * %<identifier>_<params>%}).
    *
    * @param text String to check
-   * @return true if String contains any registered placeholder identifiers, false otherwise
+   * @return true if String contains any matches to the normal placeholder pattern, false otherwise
    */
   public static boolean containsPlaceholders(String text) {
     return text != null && PLACEHOLDER_PATTERN.matcher(text).find();
   }
 
   /**
-   * check if a String contains any PlaceholderAPI bracket placeholders
+   * Check if a String contains any PlaceholderAPI bracket placeholders ({@literal
+   * {<identifier>_<params>}}).
    *
    * @param text String to check
-   * @return true if String contains any registered placeholder identifiers, false otherwise
+   * @return true if String contains any matches to the bracket placeholder pattern, false otherwise
    */
   public static boolean containsBracketPlaceholders(String text) {
     return text != null && BRACKET_PLACEHOLDER_PATTERN.matcher(text).find();
   }
 
-  /**
-   * set placeholders in the list<String> text provided placeholders are matched with the pattern
-   * {<placeholder>} when set with this method
-   *
-   * @param p Player to parse the placeholders for
-   * @param text text to set the placeholder values in
-   * @return modified list with all placeholders set to the corresponding values
-   */
-  public static List<String> setBracketPlaceholders(OfflinePlayer p, List<String> text) {
-    return setPlaceholders(p, text, BRACKET_PLACEHOLDER_PATTERN);
-  }
+  // === Deprecated API ===
 
-  /**
-   * set placeholders in the list<String> text provided placeholders are matched with the pattern
-   * %(identifier)_(params)>% when set with this method
-   *
-   * @param p Player to parse the placeholders for
-   * @param text text to parse the placeholder values in
-   * @return modified list with all placeholders set to the corresponding values
-   */
-  public static List<String> setPlaceholders(OfflinePlayer p, List<String> text) {
-    return setPlaceholders(p, text, PLACEHOLDER_PATTERN);
-  }
-
-
-  /**
-   * set placeholders in the list<String> text provided placeholders are matched with the pattern
-   * %(identifier)_(params)>% when set with this method
-   *
-   * @param p Player to parse the placeholders for
-   * @param text text to parse the placeholder values in
-   * @return modified list with all placeholders set to the corresponding values
-   */
-  public static List<String> setPlaceholders(OfflinePlayer p, List<String> text, Pattern pattern) {
-    if (text == null) {
-      return null;
-    }
-    return text.stream().map(line -> setPlaceholders(p, line, pattern))
-        .collect(Collectors.toList());
-  }
-
-  /**
-   * set placeholders in the text specified placeholders are matched with the pattern
-   * {<placeholder>} when set with this method
-   *
-   * @param player Player to parse the placeholders for
-   * @param text text to parse the placeholder values to
-   * @return modified text with all placeholders set to the corresponding values
-   */
-  public static String setBracketPlaceholders(OfflinePlayer player, String text) {
-    return setPlaceholders(player, text, BRACKET_PLACEHOLDER_PATTERN);
-  }
-
-  /**
-   * set placeholders in the text specified placeholders are matched with the pattern
-   * %<(identifier)_(params)>% when set with this method
-   *
-   * @param player Player to parse the placeholders for
-   * @param text text to parse the placeholder values to
-   * @return text with all placeholders set to the corresponding values
-   */
-  public static String setPlaceholders(OfflinePlayer player, String text) {
-    return setPlaceholders(player, text, PLACEHOLDER_PATTERN);
-  }
-
-  /**
-   * set placeholders in the text specified placeholders are matched with the pattern
-   * %<(identifier)_(params)>% when set with this method
-   *
-   * @param player Player to parse the placeholders for
-   * @param text text to parse the placeholder values to
-   * @param placeholderPattern the pattern to match placeholders to. Capture group 1 must contain an
-   * underscore separating the identifier from the params
-   * @return text with all placeholders set to the corresponding values
-   */
-  public static String setPlaceholders(OfflinePlayer player, String text,
-      Pattern placeholderPattern) {
-    if (text == null) {
-      return null;
-    }
-    if (placeholders.isEmpty()) {
-      return color(text);
-    }
-    Matcher m = placeholderPattern.matcher(text);
-    Map<String, PlaceholderHook> hooks = getPlaceholders();
-    while (m.find()) {
-      String format = m.group(1);
-      int index = format.indexOf("_");
-      if (index <= 0 || index >= format.length()) {
-        continue;
-      }
-      String identifier = format.substring(0, index).toLowerCase();
-      String params = format.substring(index + 1);
-      if (hooks.containsKey(identifier)) {
-        String value = hooks.get(identifier).onRequest(player, params);
-        if (value != null) {
-          text = text.replaceAll(Pattern.quote(m.group()), Matcher.quoteReplacement(value));
-        }
-      }
-    }
-    return color(text);
-  }
-
-  /**
-   * set relational placeholders in the text specified placeholders are matched with the pattern
-   * %<rel_(identifier)_(params)>% when set with this method
-   *
-   * @param one Player to compare
-   * @param two Player to compare
-   * @param text text to parse the placeholder values to
-   * @return text with all relational placeholders set to the corresponding values
-   */
-  public static List<String> setRelationalPlaceholders(Player one, Player two, List<String> text) {
-    if (text == null) {
-      return null;
-    }
-    return text.stream().map(line -> setRelationalPlaceholders(one, two, line))
-        .collect(Collectors.toList());
-  }
-
-  /**
-   * set relational placeholders in the text specified placeholders are matched with the pattern
-   * %<rel_(identifier)_(params)>% when set with this method
-   *
-   * @param one Player to compare
-   * @param two Player to compare
-   * @param text text to parse the placeholder values to
-   * @return text with all relational placeholders set to the corresponding values
-   */
-  public static String setRelationalPlaceholders(Player one, Player two, String text) {
-    if (text == null) {
-      return null;
-    }
-    if (placeholders.isEmpty()) {
-      return color(text);
-    }
-    Matcher m = RELATIONAL_PLACEHOLDER_PATTERN.matcher(text);
-    Map<String, PlaceholderHook> hooks = getPlaceholders();
-    while (m.find()) {
-      String format = m.group(2);
-      int index = format.indexOf("_");
-      if (index <= 0 || index >= format.length()) {
-        continue;
-      }
-      String identifier = format.substring(0, index).toLowerCase();
-      String params = format.substring(index + 1);
-      if (hooks.containsKey(identifier)) {
-        if (!(hooks.get(identifier) instanceof Relational)) {
-          continue;
-        }
-        Relational rel = (Relational) hooks.get(identifier);
-        String value = rel.onPlaceholderRequest(one, two, params);
-        if (value != null) {
-          text = text.replaceAll(Pattern.quote(m.group()), Matcher.quoteReplacement(value));
-        }
-      }
-    }
-    return color(text);
-  }
-
-  /**
-   * unregister ALL placeholder hooks that are currently registered
-   */
-  protected static void unregisterAll() {
-    unregisterAllProvidedExpansions();
-    placeholders.clear();
-  }
-
-  /**
-   * unregister all expansions provided by PlaceholderAPI
-   */
-  public static void unregisterAllProvidedExpansions() {
-    if (placeholders.isEmpty()) {
-      return;
-    }
-    getPlaceholders().forEach((key, value) -> {
-      if (value instanceof PlaceholderExpansion) {
-        PlaceholderExpansion ex = (PlaceholderExpansion) value;
-        if (!ex.persist()) {
-          unregisterExpansion(ex);
-        }
-      }
-    });
-  }
-
-  public static boolean registerExpansion(PlaceholderExpansion ex) {
-    if (registerPlaceholderHook(ex.getIdentifier(), ex)) {
-      Bukkit.getPluginManager().callEvent(new ExpansionRegisterEvent(ex));
-      return true;
-    }
-    return false;
-  }
-
-  public static boolean unregisterExpansion(PlaceholderExpansion ex) {
-    if (unregisterPlaceholderHook(ex.getIdentifier())) {
-      Bukkit.getPluginManager().callEvent(new ExpansionUnregisterEvent(ex));
-      return true;
-    }
-    return false;
-  }
-
-  public static Pattern getPlaceholderPattern() {
-    return PLACEHOLDER_PATTERN;
-  }
-
-  public static Pattern getBracketPlaceholderPattern() {
-    return BRACKET_PLACEHOLDER_PATTERN;
-  }
-
-  public static Pattern getRelationalPlaceholderPattern() {
-    return RELATIONAL_PLACEHOLDER_PATTERN;
+  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  public static boolean registerExpansion(PlaceholderExpansion expansion)
+  {
+    return expansion.register();
   }
 
   @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  public static boolean unregisterExpansion(PlaceholderExpansion expansion)
+  {
+    return expansion.unregister();
+  }
+
+  /**
+   * Get map of registered placeholders
+   * 
+   * @deprecated Use {@link LocalExpansionManager#getExpansions()} instead.
+   *
+   * @return Map of registered placeholders
+   */
+  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  public static Map<String, PlaceholderHook> getPlaceholders() {
+    return PlaceholderAPIPlugin.getInstance().getLocalExpansionManager()
+        .getExpansions().stream()
+        .collect(Collectors.toMap(PlaceholderExpansion::getIdentifier, ex -> ex));
+  }
+
+  /**
+   * @deprecated Please use {@link PlaceholderExpansion} to
+   * register placeholders instead
+   * 
+   * @param plugin The Plugin to register with this {@link PlaceholderHook}
+   * @param placeholderHook The {@link PlaceholderHook} to register
+   * @return always false
+   */
+  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  public static boolean registerPlaceholderHook(Plugin plugin, PlaceholderHook placeholderHook) {
+    Msg.warn("Nag author(s) %s of plugin %s about their usage of the deprecated PlaceholderHook" 
+        + " class! This class will be removed in v2.13.0!", plugin.getDescription().getAuthors(),
+        plugin.getName());
+    return false;
+  }
+
+  /**
+   * @deprecated Please use {@link PlaceholderExpansion} to
+   * register placeholders instead
+   * 
+   * @param identifier The identifier to use for the {@link PlaceholderHook}
+   * @param placeholderHook The {@link PlaceholderHook} to register
+   * @return always false
+   */
+  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  public static boolean registerPlaceholderHook(String identifier,
+      PlaceholderHook placeholderHook) {
+    Msg.warn("%s is attempting to register placeholders via deprecated PlaceholderHook class." 
+        + " This class is no longer supported and will be removed in v2.13.0!", identifier);
+    return false;
+  }
+
+  /**
+   * @deprecated Please use {@link PlaceholderExpansion} to
+   * unregister placeholders instead
+   * 
+   * @param plugin The plugin to unregister
+   * @return always false
+   */
+  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  public static boolean unregisterPlaceholderHook(Plugin plugin) {
+    Msg.warn("Nag author(s) %s of plugin %s about their usage of the PlaceholderAPI class."
+            + " This way of unregistering placeholders is no longer supported and will be removed" 
+            + " in v2.13.0!", plugin.getDescription().getAuthors(), plugin.getName());
+    return false;
+  }
+
+  /**
+   * @deprecated Please use {@link PlaceholderExpansion} to
+   * unregister placeholders instead
+   * 
+   * @param identifier The identifier to unregister
+   * @return always false
+   */
+  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  public static boolean unregisterPlaceholderHook(String identifier) {
+    Msg.warn("%s is attempting to unregister placeholders via PlaceholderAPI class."
+        + " This way of unregistering placeholders is no longer supported and will be removed"
+        + " in v2.13.0!", identifier);
+    return false;
+  }
+
+  /**
+   * @deprecated Will be removed in a future release.
+   * 
+   * @return Set of registered identifiers
+   */
+  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static Set<String> getRegisteredPlaceholderPlugins() {
     return getRegisteredIdentifiers();
   }
 
+  /**
+   * @deprecated Will be removed in a future release.
+   * 
+   * @return always null
+   */
   @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static Set<String> getExternalPlaceholderPlugins() {
     return null;
   }
 
+  /**
+   * @deprecated Please use {@link #setPlaceholders(OfflinePlayer, String)} instead
+   * 
+   * @param player The offline player to parse the placeholders against
+   * @param text The text to parse
+   * @param pattern The Pattern to use
+   * @param colorize If PlaceholderAPI should also parse color codes
+   * @return String with the parsed placeholders
+   */
   @Deprecated
-  public static boolean registerPlaceholderHook(Plugin plugin, PlaceholderHook placeholderHook) {
-    return plugin != null && registerPlaceholderHook(plugin.getName(), placeholderHook);
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  public static String setPlaceholders(OfflinePlayer player,
+      String text, Pattern pattern, boolean colorize) {
+    return setPlaceholders(player, text);
   }
 
+  /**
+   * @deprecated Please use {@link #setPlaceholders(OfflinePlayer, List)} instead
+   * 
+   * @param player The offline player to parse the placeholders against
+   * @param text The List of text to parse
+   * @param pattern The Pattern to use
+   * @param colorize If PlaceholderAPI should also parse color codes
+   * @return String with the parsed placeholders
+   */
   @Deprecated
-  public static boolean unregisterPlaceholderHook(Plugin plugin) {
-    return plugin != null && unregisterPlaceholderHook(plugin.getName());
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  public static List<String> setPlaceholders(OfflinePlayer player,
+      List<String> text, Pattern pattern, boolean colorize) {
+    return setPlaceholders(player, text);
   }
 
-  public static String setPlaceholders(Player p, String text) {
-    return setPlaceholders((OfflinePlayer) p, text, PLACEHOLDER_PATTERN);
+  /**
+   * @deprecated Use {@link #setPlaceholders(OfflinePlayer, List)} instead.
+   *
+   * @param player The offline player to parse the placeholders against
+   * @param text The List of text to parse
+   * @param colorize If PlaceholderAPI should also parse color codes
+   * @return String with the parsed placeholders
+   */
+  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  public static List<String> setPlaceholders(OfflinePlayer player, List<String> text,
+      boolean colorize) {
+    return setPlaceholders(player, text);
   }
 
-  public static List<String> setPlaceholders(Player p, List<String> text) {
-    return setPlaceholders((OfflinePlayer) p, text, PLACEHOLDER_PATTERN);
+  /**
+   * @deprecated Use {@link #setPlaceholders(OfflinePlayer, List)} instead.
+   *
+   * @param player The offline player to parse the placeholders against
+   * @param text The List of text to parse
+   * @param pattern The Pattern to use
+   * @return String with the parsed placeholders
+   */
+  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  public static List<String> setPlaceholders(OfflinePlayer player, List<String> text,
+      Pattern pattern) {
+    return setPlaceholders(player, text);
+  }
+  /**
+   * @deprecated Will be removed in a future release.
+   *
+   * @param player The offline player to parse the placeholders against
+   * @param text The text to parse
+   * @param colorize If PlaceholderAPI should also parse color codes
+   * @return String with the parsed placeholders
+   */
+  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  public static String setPlaceholders(Player player, String text, boolean colorize) {
+    return setPlaceholders(player, text);
   }
 
-  public static String setBracketPlaceholders(Player p, String text) {
-    return setPlaceholders((OfflinePlayer) p, text, BRACKET_PLACEHOLDER_PATTERN);
+  /**
+   * @deprecated Will be removed in a future release.
+   *
+   * @param player The offline player to parse the placeholders against
+   * @param text The List of text to parse
+   * @param colorize If PlaceholderAPI should also parse color codes
+   * @return String with the parsed placeholders
+   */
+  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  public static List<String> setPlaceholders(Player player, List<String> text, boolean colorize) {
+    return setPlaceholders(player, text);
   }
 
-  public static List<String> setBracketPlaceholders(Player p, List<String> text) {
-    return setPlaceholders((OfflinePlayer) p, text, BRACKET_PLACEHOLDER_PATTERN);
+  /**
+   * @deprecated Use {@link #setPlaceholders(OfflinePlayer, String)} instead.
+   *
+   * @param player The offline player to parse the placeholders against
+   * @param text The text to parse
+   * @param colorize If PlaceholderAPI should also parse color codes
+   * @return String with the parsed placeholders
+   */
+  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  public static String setPlaceholders(OfflinePlayer player, String text, boolean colorize) {
+    return setPlaceholders(player, text);
+  }
+
+  /**
+   * @deprecated Use {@link #setPlaceholders(OfflinePlayer, String)} instead.
+   *
+   * @param player The offline player to parse the placeholders against
+   * @param text The text to parse
+   * @param pattern The Pattern to use
+   * @return String with the parsed placeholders
+   */
+  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  public static String setPlaceholders(OfflinePlayer player, String text, Pattern pattern) {
+    return setPlaceholders(player, text);
+  }
+
+  /**
+   * @deprecated Use {@link #setPlaceholders(OfflinePlayer, List)} instead.
+   *
+   * @param player The offline player to parse the placeholders against
+   * @param text The List of text to parse
+   * @param colorize If PlaceholderAPI should also parse color codes
+   * @return String with the parsed placeholders
+   */
+  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  public static List<String> setBracketPlaceholders(OfflinePlayer player, List<String> text,
+      boolean colorize) {
+    return setBracketPlaceholders(player, text);
+  }
+
+  /**
+   * @deprecated Use {@link #setPlaceholders(OfflinePlayer, String)} instead.
+   *
+   * @param player The offline player to parse the placeholders against
+   * @param text The text to parse
+   * @param colorize If PlaceholderAPI should also parse color codes
+   * @return String with the parsed placeholders
+   */
+  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  public static String setBracketPlaceholders(OfflinePlayer player, String text, boolean colorize) {
+    return setBracketPlaceholders(player, text);
+  }
+
+  /**
+   * @deprecated Will be removed in a future release.
+   *
+   * @param player The offline player to parse the placeholders against
+   * @param text The text to parse
+   * @param colorize If PlaceholderAPI should also parse color codes
+   * @return String with the parsed placeholders
+   */
+  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  public static String setBracketPlaceholders(Player player, String text, boolean colorize) {
+    return setBracketPlaceholders(player, text);
+  }
+
+  /**
+   * @deprecated Will be removed in a future release.
+   *
+   * @param player The offline player to parse the placeholders against
+   * @param text The List of text to parse
+   * @param colorize If PlaceholderAPI should also parse color codes
+   * @return String with the parsed placeholders
+   */
+  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  public static List<String> setBracketPlaceholders(Player player, List<String> text,
+      boolean colorize) {
+    return setBracketPlaceholders(player, text);
+  }
+
+  /**
+   * set relational placeholders in the text specified placeholders are matched with the pattern
+   * {@literal %<rel_(identifier)_(params)>%} when set with this method
+   *
+   * @param one Player to compare
+   * @param two Player to compare
+   * @param text Text to parse the placeholders in
+   * @param colorize If color codes ({@literal &[0-1a-fk-o]}) should be translated
+   * @return The text containing the parsed relational placeholders
+   * @deprecated Use {@link #setPlaceholders(OfflinePlayer, String)} instead.
+   */
+  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  public static String setRelationalPlaceholders(Player one, Player two, String text,
+      boolean colorize) {
+    return setRelationalPlaceholders(one, two, text);
+  }
+
+  /**
+   * Translate placeholders in the provided list based on the relation of the two provided players.
+   * <br>The pattern of a valid placeholder is {@literal %rel_<identifier>_<params>%}.
+   *
+   * @param one First player to compare
+   * @param two Second player to compare
+   * @param text Text to parse the placeholders in
+   * @param colorize If color codes ({@literal &[0-1a-fk-o]}) should be translated
+   * @return The text containing the parsed relational placeholders
+   * @deprecated Use {@link #setRelationalPlaceholders(Player, Player, List)} instead.
+   */
+  @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  public static List<String> setRelationalPlaceholders(Player one, Player two, List<String> text,
+      boolean colorize) {
+    return setRelationalPlaceholders(one, two, text);
   }
 }

src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java

@@ -1,79 +1,99 @@
 /*
+ * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (C) 2018 Ryan McCarthy
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
- * This program is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * PlaceholderAPI is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- *
  */
+
 package me.clip.placeholderapi;
 
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import me.clip.placeholderapi.commands.PlaceholderAPICommands;
+import me.clip.placeholderapi.commands.PlaceholderCommandRouter;
 import me.clip.placeholderapi.configuration.PlaceholderAPIConfig;
-import me.clip.placeholderapi.expansion.ExpansionManager;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import me.clip.placeholderapi.expansion.Version;
-import me.clip.placeholderapi.expansion.cloud.ExpansionCloudManager;
-import me.clip.placeholderapi.external.EZPlaceholderHook;
+import me.clip.placeholderapi.expansion.manager.CloudExpansionManager;
+import me.clip.placeholderapi.expansion.manager.LocalExpansionManager;
+import me.clip.placeholderapi.listeners.ServerLoadEventListener;
+import me.clip.placeholderapi.scheduler.UniversalScheduler;
+import me.clip.placeholderapi.scheduler.scheduling.schedulers.TaskScheduler;
 import me.clip.placeholderapi.updatechecker.UpdateChecker;
-import me.clip.placeholderapi.util.TimeUtil;
+import me.clip.placeholderapi.util.Msg;
+import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import org.bstats.bukkit.Metrics;
+import org.bstats.charts.AdvancedPie;
+import org.bstats.charts.SimplePie;
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.command.PluginCommand;
+import org.bukkit.event.HandlerList;
 import org.bukkit.plugin.java.JavaPlugin;
-
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Yes I have a shit load of work to do...
  *
  * @author Ryan McCarthy
  */
-public class PlaceholderAPIPlugin extends JavaPlugin {
+public final class PlaceholderAPIPlugin extends JavaPlugin {
 
+  @NotNull
+  private static final Version VERSION;
   private static PlaceholderAPIPlugin instance;
-  private static SimpleDateFormat dateFormat;
-  private static String booleanTrue;
-  private static String booleanFalse;
-  private static Version serverVersion;
-  private PlaceholderAPIConfig config;
-  private ExpansionManager expansionManager;
-  private ExpansionCloudManager expansionCloud;
-  private long startTime;
 
-  private static Version getVersion() {
-    String v = "unknown";
-    boolean spigot = false;
-    try {
-      v = Bukkit.getServer().getClass().getPackage().getName()
-          .split("\\.")[3];
-    } catch (ArrayIndexOutOfBoundsException ex) {
+  static {
+    String version = Bukkit.getServer().getBukkitVersion().split("-")[0];
+    String suffix;
+    if (version.chars()
+            .filter(c -> c == '.')
+            .count() == 1) {
+      suffix = "R1";
+      version = 'v' + version.replace('.', '_') + '_' + suffix;
+    } else {
+      int minor = Integer.parseInt(version.split("\\.")[2].charAt(0) + "");
+      version = 'v' + version.replace('.', '_').replace("_" + minor, "") + '_' + "R" + (minor - 1);
     }
+
+    boolean isSpigot;
     try {
       Class.forName("org.spigotmc.SpigotConfig");
-      Class.forName("net.md_5.bungee.api.chat.BaseComponent");
-      spigot = true;
-    } catch (ExceptionInInitializerError | ClassNotFoundException exception) {
+      isSpigot = true;
+    } catch (final ExceptionInInitializerError | ClassNotFoundException ignored) {
+      isSpigot = false;
     }
-    return new Version(v, spigot);
+
+    VERSION = new Version(version, isSpigot);
   }
 
+  @NotNull
+  private final PlaceholderAPIConfig config = new PlaceholderAPIConfig(this);
+
+  @NotNull
+  private final LocalExpansionManager localExpansionManager = new LocalExpansionManager(this);
+  @NotNull
+  private final CloudExpansionManager cloudExpansionManager = new CloudExpansionManager(this);
+  @NotNull
+  private final TaskScheduler scheduler = UniversalScheduler.getScheduler(this);
+
+  private BukkitAudiences adventure;
+
+
   /**
    * Gets the static instance of the main class for PlaceholderAPI. This class is not the actual API
    * class, this is the main class that extends JavaPlugin. For most API methods, use static methods
@@ -81,185 +101,128 @@ public class PlaceholderAPIPlugin extends JavaPlugin {
    *
    * @return PlaceholderAPIPlugin instance
    */
+  @NotNull
   public static PlaceholderAPIPlugin getInstance() {
     return instance;
   }
 
+  /**
+   * Get the configurable {@linkplain String} value that should be returned when a boolean is true
+   *
+   * @return string value of true
+   */
+  @NotNull
+  public static String booleanTrue() {
+    return getInstance().getPlaceholderAPIConfig().booleanTrue();
+  }
+
+  /**
+   * Get the configurable {@linkplain String} value that should be returned when a boolean is false
+   *
+   * @return string value of false
+   */
+  @NotNull
+  public static String booleanFalse() {
+    return getInstance().getPlaceholderAPIConfig().booleanFalse();
+  }
+
   /**
    * Get the configurable {@linkplain SimpleDateFormat} object that is used to parse time for
    * generic time based placeholders
    *
    * @return date format
    */
+  @NotNull
   public static SimpleDateFormat getDateFormat() {
-    return dateFormat != null ? dateFormat : new SimpleDateFormat(
-        "MM/dd/yy HH:mm:ss");
-  }
-
-  /**
-   * Get the configurable {@linkplain String} value that should be returned when a boolean is true
-   *
-   * @return string value of true
-   */
-  public static String booleanTrue() {
-    return booleanTrue != null ? booleanTrue : "true";
-  }
-
-  /**
-   * Get the configurable {@linkplain String} value that should be returned when a boolean is false
-   *
-   * @return string value of false
-   */
-  public static String booleanFalse() {
-    return booleanFalse != null ? booleanFalse : "false";
+    try {
+      return new SimpleDateFormat(getInstance().getPlaceholderAPIConfig().dateFormat());
+    } catch (final IllegalArgumentException ex) {
+      Msg.warn("Configured date format ('%s') is invalid! Defaulting to 'MM/dd/yy HH:mm:ss'",
+          ex, getInstance().getPlaceholderAPIConfig().dateFormat());
+      return new SimpleDateFormat("MM/dd/yy HH:mm:ss");
+    }
   }
 
+  @Deprecated
   public static Version getServerVersion() {
-    return serverVersion != null ? serverVersion : getVersion();
+    return VERSION;
   }
 
   @Override
   public void onLoad() {
-    startTime = System.currentTimeMillis();
     instance = this;
-    serverVersion = getVersion();
-    config = new PlaceholderAPIConfig(this);
-    expansionManager = new ExpansionManager(this);
+
+    saveDefaultConfig();
   }
 
   @Override
   public void onEnable() {
-    config.loadDefConfig();
-    setupOptions();
-    getCommand("placeholderapi").setExecutor(new PlaceholderAPICommands(this));
-    new PlaceholderListener(this);
-    try {
-      Class.forName("org.bukkit.event.server.ServerLoadEvent");
-      new ServerLoadEventListener(this);
-    } catch (ExceptionInInitializerError | ClassNotFoundException exception) {
-      Bukkit.getScheduler().runTaskLater(this, () -> {
-        getLogger().info("Placeholder expansion registration initializing...");
-        //fetch any hooks that may have registered externally onEnable first otherwise they will be lost
-        final Map<String, PlaceholderHook> alreadyRegistered = PlaceholderAPI.getPlaceholders();
-        getExpansionManager().registerAllExpansions();
-        if (alreadyRegistered != null && !alreadyRegistered.isEmpty()) {
-          alreadyRegistered.forEach(PlaceholderAPI::registerPlaceholderHook);
-        }
-      }, 1);
+    setupCommand();
+    setupMetrics();
+    setupExpansions();
+
+    adventure = BukkitAudiences.create(this);
+
+    if (config.isCloudEnabled()) {
+      getCloudExpansionManager().load();
     }
+
     if (config.checkUpdates()) {
       new UpdateChecker(this).fetch();
     }
-    if (config.isCloudEnabled()) {
-      enableCloud();
-    }
-    setupMetrics();
-    getServer().getScheduler().runTaskLater(this, this::checkHook, 40);
   }
 
   @Override
   public void onDisable() {
-    disableCloud();
-    PlaceholderAPI.unregisterAll();
-    expansionManager = null;
-    Bukkit.getScheduler().cancelTasks(this);
-    serverVersion = null;
+    getCloudExpansionManager().kill();
+    getLocalExpansionManager().kill();
+
+    HandlerList.unregisterAll(this);
+
+    scheduler.cancelTasks(this);
+
+    adventure.close();
+    adventure = null;
+
     instance = null;
   }
 
-  public void reloadConf(CommandSender s) {
-    boolean cloudEnabled = this.expansionCloud != null;
-    PlaceholderAPI.unregisterAllProvidedExpansions();
+  public void reloadConf(@NotNull final CommandSender sender) {
+    getLocalExpansionManager().kill();
+
     reloadConfig();
-    setupOptions();
-    expansionManager.registerAllExpansions();
-    if (!config.isCloudEnabled()) {
-      disableCloud();
-    } else if (!cloudEnabled) {
-      enableCloud();
-    }
-    s.sendMessage(ChatColor.translateAlternateColorCodes('&',
-        PlaceholderAPI.getRegisteredIdentifiers().size()
-            + " &aplaceholder hooks successfully registered!"));
-  }
 
-  private void checkHook() {
-    Map<String, PlaceholderHook> loaded = PlaceholderAPI.getPlaceholders();
-    loaded.values().forEach(h -> {
-    if (h instanceof EZPlaceholderHook) {
-      String author;
-      try {
-        author = Bukkit.getPluginManager().getPlugin(((EZPlaceholderHook) h).getPluginName()).getDescription().getAuthors().toString();
-      } catch (Exception ex) {
-        author = "the author of the hook's plugin";
-      }
-      getLogger().severe(((EZPlaceholderHook) h).getPluginName() + " is currently using a deprecated method to hook into PlaceholderAPI. Placeholders for that plugin no longer work. " +
-              "Please consult {author} and urge them to update it ASAP.".replace("{author}", author));
-      // disable the hook on startup
-      PlaceholderAPI.unregisterPlaceholderHook(((EZPlaceholderHook) h).getPlaceholderName());
-    }
-    });
-  }
+    getLocalExpansionManager().load(sender);
 
-  private void setupOptions() {
-    booleanTrue = config.booleanTrue();
-    if (booleanTrue == null) {
-      booleanTrue = "true";
-    }
-    booleanFalse = config.booleanFalse();
-    if (booleanFalse == null) {
-      booleanFalse = "false";
-    }
-    try {
-      dateFormat = new SimpleDateFormat(config.dateFormat());
-    } catch (Exception e) {
-      dateFormat = new SimpleDateFormat("MM/dd/yy HH:mm:ss");
-    }
-  }
-
-  private void setupMetrics() {
-    Metrics m = new Metrics(this);
-    m.addCustomChart(new Metrics.SimplePie("using_expansion_cloud",
-        () -> getExpansionCloud() != null ? "yes" : "no"));
-
-    m.addCustomChart(
-        new Metrics.SimplePie("using_spigot", () -> getServerVersion().isSpigot() ? "yes" : "no"));
-
-    m.addCustomChart(new Metrics.AdvancedPie("expansions_used", () -> {
-      Map<String, Integer> map = new HashMap<>();
-      Map<String, PlaceholderHook> p = PlaceholderAPI.getPlaceholders();
-
-      if (!p.isEmpty()) {
-
-        for (PlaceholderHook hook : p.values()) {
-          if (hook instanceof PlaceholderExpansion) {
-            PlaceholderExpansion ex = (PlaceholderExpansion) hook;
-            map.put(ex.getRequiredPlugin() == null ? ex.getIdentifier()
-                : ex.getRequiredPlugin(), 1);
-          }
-        }
-      }
-      return map;
-
-    }));
-
-  }
-
-  public void enableCloud() {
-    if (expansionCloud == null) {
-      expansionCloud = new ExpansionCloudManager(this);
-      expansionCloud.fetch(config.cloudAllowUnverifiedExpansions());
+    if (config.isCloudEnabled()) {
+      getCloudExpansionManager().load();
     } else {
-      expansionCloud.clean();
-      expansionCloud.fetch(config.cloudAllowUnverifiedExpansions());
+      getCloudExpansionManager().kill();
     }
   }
 
-  public void disableCloud() {
-    if (expansionCloud != null) {
-      expansionCloud.clean();
-      expansionCloud = null;
+  @NotNull
+  public LocalExpansionManager getLocalExpansionManager() {
+    return localExpansionManager;
+  }
+
+  @NotNull
+  public CloudExpansionManager getCloudExpansionManager() {
+    return cloudExpansionManager;
+  }
+
+  @NotNull
+  public BukkitAudiences getAdventure() {
+    if(adventure == null) {
+      throw new IllegalStateException("Tried to access Adventure when the plugin was disabled!");
     }
+
+    return adventure;
+  }
+
+  @NotNull
+  public TaskScheduler getScheduler() {
+    return scheduler;
   }
 
   /**
@@ -267,24 +230,51 @@ public class PlaceholderAPIPlugin extends JavaPlugin {
    *
    * @return PlaceholderAPIConfig instance
    */
+  @NotNull
   public PlaceholderAPIConfig getPlaceholderAPIConfig() {
     return config;
   }
 
-  public ExpansionManager getExpansionManager() {
-    return expansionManager;
+  private void setupCommand() {
+    final PluginCommand pluginCommand = getCommand("placeholderapi");
+    if (pluginCommand == null) {
+      return;
+    }
+
+    final PlaceholderCommandRouter router = new PlaceholderCommandRouter(this);
+    pluginCommand.setExecutor(router);
+    pluginCommand.setTabCompleter(router);
   }
 
-  public ExpansionCloudManager getExpansionCloud() {
-    return expansionCloud;
+  private void setupMetrics() {
+    final Metrics metrics = new Metrics(this, 438);
+    metrics.addCustomChart(new SimplePie("using_expansion_cloud",
+        () -> getPlaceholderAPIConfig().isCloudEnabled() ? "yes" : "no"));
+
+    metrics.addCustomChart(new SimplePie("using_spigot", () -> getServerVersion().isSpigot() ? "yes" : "no"));
+
+    metrics.addCustomChart(new AdvancedPie("expansions_used", () -> {
+      final Map<String, Integer> values = new HashMap<>();
+
+      for (final PlaceholderExpansion expansion : getLocalExpansionManager().getExpansions()) {
+        values.put(expansion.getRequiredPlugin() == null ? expansion.getIdentifier()
+            : expansion.getRequiredPlugin(), 1);
+      }
+
+      return values;
+    }));
   }
 
-  public String getUptime() {
-    return TimeUtil
-        .getTime((int) TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis() - startTime));
+  private void setupExpansions() {
+    Bukkit.getPluginManager().registerEvents(getLocalExpansionManager(), this);
+
+    try {
+      Class.forName("org.bukkit.event.server.ServerLoadEvent");
+      new ServerLoadEventListener(this);
+    } catch (final ClassNotFoundException ignored) {
+      scheduler
+          .runTaskLater(() -> getLocalExpansionManager().load(Bukkit.getConsoleSender()), 1);
+    }
   }
 
-  public long getUptimeMillis() {
-    return (System.currentTimeMillis() - startTime);
-  }
 }

src/main/java/me/clip/placeholderapi/PlaceholderHook.java

@@ -1,53 +1,42 @@
 /*
+ * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (C) 2018 Ryan McCarthy
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
- * This program is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * PlaceholderAPI is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- *
  */
+
 package me.clip.placeholderapi;
 
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 public abstract class PlaceholderHook {
-
-  /**
-   * called when a placeholder value is requested from this hook
-   *
-   * @param p {@link OfflinePlayer} to request the placeholder value for, null if not needed for a
-   * player
-   * @param params String passed to the hook to determine what value to return
-   * @return value for the requested player and params
-   */
-  public String onRequest(OfflinePlayer p, String params) {
-    if (p != null && p.isOnline()) {
-      return onPlaceholderRequest((Player) p, params);
+  @Nullable
+  public String onRequest(final OfflinePlayer player, @NotNull final String params) {
+    if (player != null && player.isOnline()) {
+      return onPlaceholderRequest(player.getPlayer(), params);
     }
+
     return onPlaceholderRequest(null, params);
   }
 
-  /**
-   * called when a placeholder is requested from this hook
-   *
-   * @param p {@link Player} to request the placeholder value for, null if not needed for a player
-   * @param params String passed to the hook to determine what value to return
-   * @return value for the requested player and params
-   */
-  public String onPlaceholderRequest(Player p, String params) {
+  @Nullable
+  public String onPlaceholderRequest(final Player player, @NotNull final String params) {
     return null;
   }
 }

src/main/java/me/clip/placeholderapi/PlaceholderListener.java

@@ -1,128 +0,0 @@
-/*
- *
- * PlaceholderAPI
- * Copyright (C) 2018 Ryan McCarthy
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- *
- */
-package me.clip.placeholderapi;
-
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import me.clip.placeholderapi.events.ExpansionUnregisterEvent;
-import me.clip.placeholderapi.expansion.Cacheable;
-import me.clip.placeholderapi.expansion.Cleanable;
-import me.clip.placeholderapi.expansion.PlaceholderExpansion;
-import me.clip.placeholderapi.expansion.Taskable;
-import me.clip.placeholderapi.expansion.cloud.CloudExpansion;
-import org.bukkit.Bukkit;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.event.server.PluginDisableEvent;
-
-
-public class PlaceholderListener implements Listener {
-
-  private PlaceholderAPIPlugin plugin;
-
-  public PlaceholderListener(PlaceholderAPIPlugin instance) {
-    plugin = instance;
-    Bukkit.getPluginManager().registerEvents(this, instance);
-  }
-
-  @EventHandler
-  public void onExpansionUnregister(ExpansionUnregisterEvent event) {
-
-    if (event.getExpansion() instanceof Listener) {
-      HandlerList.unregisterAll((Listener) event.getExpansion());
-    }
-
-    if (event.getExpansion() instanceof Taskable) {
-      ((Taskable) event.getExpansion()).stop();
-    }
-
-    if (event.getExpansion() instanceof Cacheable) {
-      ((Cacheable) event.getExpansion()).clear();
-    }
-
-    if (plugin.getExpansionCloud() != null) {
-
-      CloudExpansion ex = plugin.getExpansionCloud()
-          .getCloudExpansion(event.getExpansion().getName());
-
-      if (ex != null) {
-        ex.setHasExpansion(false);
-        ex.setShouldUpdate(false);
-      }
-    }
-  }
-
-  @EventHandler(priority = EventPriority.HIGH)
-  public void onPluginUnload(PluginDisableEvent e) {
-
-    String n = e.getPlugin().getName();
-
-    if (n == null) {
-      return;
-    }
-
-    if (n.equals(plugin.getName())) {
-      return;
-    }
-
-    Map<String, PlaceholderHook> hooks = PlaceholderAPI.getPlaceholders();
-
-    for (Entry<String, PlaceholderHook> hook : hooks.entrySet()) {
-
-      PlaceholderHook i = hook.getValue();
-
-      if (i instanceof PlaceholderExpansion) {
-
-        PlaceholderExpansion ex = (PlaceholderExpansion) i;
-
-        if (ex.getRequiredPlugin() == null) {
-          continue;
-        }
-
-        if (ex.getRequiredPlugin().equalsIgnoreCase(n)) {
-          if (PlaceholderAPI.unregisterExpansion(ex)) {
-            plugin.getLogger().info("Unregistered placeholder expansion: " + ex.getIdentifier());
-          }
-        }
-      }
-    }
-  }
-
-  @EventHandler
-  public void onQuit(PlayerQuitEvent e) {
-
-    Set<PlaceholderExpansion> expansions = PlaceholderAPI.getExpansions();
-
-    if (expansions.isEmpty()) {
-      return;
-    }
-
-    for (PlaceholderExpansion ex : expansions) {
-      if (ex instanceof Cleanable) {
-        ((Cleanable) ex).cleanup(e.getPlayer());
-      }
-    }
-  }
-}

src/main/java/me/clip/placeholderapi/ServerLoadEventListener.java

@@ -1,37 +0,0 @@
-package me.clip.placeholderapi;
-
-import java.util.Map;
-
-import org.bukkit.Bukkit;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.server.ServerLoadEvent;
-
-public class ServerLoadEventListener implements Listener {
-
-    private PlaceholderAPIPlugin plugin;
-
-    public ServerLoadEventListener(PlaceholderAPIPlugin instance) {
-        plugin = instance;
-        Bukkit.getPluginManager().registerEvents(this, instance);
-    }
-
-    /**
-     * This method will be called when the server is first loaded
-     *
-     * The goal of the method is to register all the expansions as soon as possible
-     * especially before players can join
-     *
-     * This will ensure no issues with expanions and hooks.
-     * @param e the server load event
-     */
-    @EventHandler
-    public void onServerLoad(ServerLoadEvent e) {
-        plugin.getLogger().info("Placeholder expansion registration initializing...");
-        final Map<String, PlaceholderHook> alreadyRegistered = PlaceholderAPI.getPlaceholders();
-        plugin.getExpansionManager().registerAllExpansions();
-        if (alreadyRegistered != null && !alreadyRegistered.isEmpty()) {
-            alreadyRegistered.forEach(PlaceholderAPI::registerPlaceholderHook);
-        }
-    }
-}

src/main/java/me/clip/placeholderapi/commands/ExpansionCloudCommands.java

@@ -1,444 +0,0 @@
-/*
- *
- * PlaceholderAPI
- * Copyright (C) 2018 Ryan McCarthy
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- *
- */
-package me.clip.placeholderapi.commands;
-
-import me.clip.placeholderapi.PlaceholderAPI;
-import me.clip.placeholderapi.PlaceholderAPIPlugin;
-import me.clip.placeholderapi.expansion.PlaceholderExpansion;
-import me.clip.placeholderapi.expansion.cloud.CloudExpansion;
-import me.rayzr522.jsonmessage.JSONMessage;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import static me.clip.placeholderapi.util.Msg.color;
-import static me.clip.placeholderapi.util.Msg.msg;
-
-public class ExpansionCloudCommands implements CommandExecutor {
-
-  private PlaceholderAPIPlugin plugin;
-
-  public ExpansionCloudCommands(PlaceholderAPIPlugin instance) {
-    plugin = instance;
-  }
-
-  @Override
-  public boolean onCommand(CommandSender s, Command c, String label, String[] args) {
-
-    if (args.length == 1) {
-      msg(s, "&bExpansion cloud commands",
-          " ",
-          "&b/papi ecloud status",
-          "&fView status of the ecloud",
-          "&b/papi ecloud list <all/author> (page)",
-          "&fList all/author specific available expansions",
-          "&b/papi ecloud info <expansion name>",
-          "&fView information about a specific expansion available on the cloud",
-          "&b/papi ecloud versioninfo <expansion name> <version>",
-          "&fView information about a specific version of an expansion",
-          "&b/papi ecloud placeholders <expansion name>",
-          "&fView placeholders for an expansion",
-          "&b/papi ecloud download <expansion name> (version)",
-          "&fDownload an expansion from the ecloud",
-          "&b/papi ecloud refresh",
-          "&fFetch the most up to date list of expansions available.",
-          "&b/papi ecloud clear",
-          "&fClear the expansion cloud cache.");
-      return true;
-    }
-
-    if (args[1].equalsIgnoreCase("refresh") || args[1].equalsIgnoreCase("update") || args[1]
-        .equalsIgnoreCase("fetch")) {
-      msg(s, "&aRefresh task started. Use &f/papi ecloud list all &ain a few!!");
-      plugin.getExpansionCloud().clean();
-      plugin.getExpansionCloud().fetch(plugin.getPlaceholderAPIConfig().cloudAllowUnverifiedExpansions());
-      return true;
-    }
-
-    if (plugin.getExpansionCloud().getCloudExpansions().isEmpty()) {
-      msg(s, "&7No cloud expansions are available at this time.");
-      return true;
-    }
-
-    if (args[1].equalsIgnoreCase("clear")) {
-      plugin.getExpansionCloud().clean();
-      msg(s, "&aThe cache has been cleared!!");
-      return true;
-    }
-
-    if (args[1].equalsIgnoreCase("status")) {
-
-      msg(s, "&bThere are &f" + plugin.getExpansionCloud().getCloudExpansions().size()
-              + " &bexpansions available on the cloud.",
-          "&7A total of &f" + plugin.getExpansionCloud().getCloudAuthorCount()
-              + " &7authors have contributed to the expansion cloud.");
-      if (plugin.getExpansionCloud().getToUpdateCount() > 0) {
-        msg(s, "&eYou have &f" + plugin.getExpansionCloud().getToUpdateCount()
-            + " &eexpansions installed that have updates available.");
-      }
-
-      return true;
-    }
-
-    if (args[1].equalsIgnoreCase("info")) {
-
-      if (args.length < 3) {
-        msg(s, "&cAn expansion name must be specified!");
-        return true;
-      }
-
-      CloudExpansion expansion = plugin.getExpansionCloud().getCloudExpansion(args[2]);
-
-      if (expansion == null) {
-        msg(s, "&cNo expansion found by the name: &f" + args[2]);
-        return true;
-      }
-
-      if (!(s instanceof Player)) {
-        msg(s,
-            (expansion.shouldUpdate() ? "&e" : "") + expansion.getName() + " &8&m-- &r" + expansion
-                .getVersion().getUrl());
-        return true;
-      }
-
-      Player p = (Player) s;
-
-      msg(s, "&bExpansion&7: &f" + expansion.getName(),
-          "&bAuthor: &f" + expansion.getAuthor(),
-          "&bVerified: &f" + expansion.isVerified()
-      );
-
-      // latest version
-      JSONMessage latestVersion = JSONMessage
-          .create(color("&bLatest version: &f" + expansion.getLatestVersion()));
-      latestVersion.tooltip(color("&bReleased: &f" + expansion.getTimeSinceLastUpdate()
-          + "\n&bUpdate information: &f" + expansion.getVersion().getReleaseNotes()
-      ));
-      latestVersion.send(p);
-
-      // versions
-      JSONMessage versions = JSONMessage
-          .create(color("&bVersions available: &f" + expansion.getVersions().size()));
-      versions.tooltip(color(String.join("&b, &f", expansion.getAvailableVersions())));
-      versions.suggestCommand(
-          "/papi ecloud versioninfo " + expansion.getName() + " " + expansion.getLatestVersion());
-      versions.send(p);
-
-      // placeholders
-      if (expansion.getPlaceholders() != null) {
-        JSONMessage placeholders = JSONMessage
-            .create(color("&bPlaceholders: &f" + expansion.getPlaceholders().size()));
-        placeholders.tooltip(color(String.join("&b, &f", expansion.getPlaceholders())));
-        placeholders.suggestCommand("/papi ecloud placeholders " + expansion.getName());
-        placeholders.send(p);
-      }
-      return true;
-    }
-
-    if (args[1].equalsIgnoreCase("versioninfo")) {
-
-      if (args.length < 4) {
-        msg(s, "&cAn expansion name and version must be specified!");
-        return true;
-      }
-
-      CloudExpansion expansion = plugin.getExpansionCloud().getCloudExpansion(args[2]);
-
-      if (expansion == null) {
-        msg(s, "&cNo expansion found by the name: &f" + args[2]);
-        return true;
-      }
-
-      CloudExpansion.Version version = expansion.getVersion(args[3]);
-
-      if (version == null) {
-        msg(s, "&cThe version specified does not exist for expansion: &f" + expansion.getName());
-        return true;
-      }
-
-      msg(s, "&bExpansion: " + (expansion.shouldUpdate() ? "&e" : "&f") + expansion.getName(),
-          "&bVersion: &f" + version.getVersion(),
-          "&bVersion info: &f" + version.getReleaseNotes());
-
-      if (!(s instanceof Player)) {
-        msg(s, "&bDownload url: " + version.getUrl());
-        return true;
-      }
-
-      Player p = (Player) s;
-
-      JSONMessage download = JSONMessage.create(color("&7Click to download this version"));
-      download.suggestCommand(
-          "/papi ecloud download " + expansion.getName() + " " + version.getVersion());
-      download.send(p);
-      return true;
-    }
-
-    if (args[1].equalsIgnoreCase("placeholders")) {
-
-      if (args.length < 3) {
-        msg(s, "&cAn expansion name must be specified!");
-        return true;
-      }
-
-      CloudExpansion expansion = plugin.getExpansionCloud().getCloudExpansion(args[2]);
-
-      if (expansion == null) {
-        msg(s, "&cNo expansion found by the name: &f" + args[2]);
-        return true;
-      }
-
-      List<String> placeholders = expansion.getPlaceholders();
-
-      if (placeholders == null) {
-        msg(s, "&cThe expansion: &f" + expansion.getName()
-                + " &cdoes not have any placeholders listed.",
-            "&7You should contact &f" + expansion.getAuthor() + " &7and ask for them to be added.");
-        return true;
-      }
-
-      if (!(s instanceof Player)
-          || plugin.getExpansionManager().getRegisteredExpansion(expansion.getName()) == null) {
-        msg(s, "&bPlaceholders: &f" + placeholders.size(),
-            String.join("&a, &f", placeholders));
-        return true;
-      }
-
-      Player p = (Player) s;
-      JSONMessage message = JSONMessage.create(color("&bPlaceholders: &f" + placeholders.size()));
-      message.then("\n");
-
-      for (int i = 0; i < placeholders.size(); i++) {
-        if (i == placeholders.size() - 1) {
-          message.then(placeholders.get(i));
-        } else {
-          message.then(color(placeholders.get(i) + "&b, &f"));
-        }
-        message.tooltip(PlaceholderAPI.setPlaceholders(p, placeholders.get(i)));
-      }
-
-      message.send(p);
-      return true;
-    }
-
-    if (args[1].equalsIgnoreCase("list")) {
-
-      int page = 1;
-
-      String author;
-      boolean installed = false;
-
-      if (args.length < 3) {
-        msg(s, "&cIncorrect usage! &7/papi ecloud list <all/author/installed> (page)");
-        return true;
-      }
-
-      author = args[2];
-
-      if (author.equalsIgnoreCase("all")) {
-        author = null;
-      } else if (author.equalsIgnoreCase("installed")) {
-        author = null;
-        installed = true;
-      }
-
-      if (args.length >= 4) {
-        try {
-          page = Integer.parseInt(args[3]);
-        } catch (NumberFormatException ex) {
-          msg(s, "&cPage number must be an integer!");
-          return true;
-        }
-      }
-
-      if (page < 1) {
-        msg(s, "&cPage must be greater than or equal to 1!");
-        return true;
-      }
-
-      int avail;
-
-      Map<Integer, CloudExpansion> ex;
-
-      if (installed) {
-        ex = plugin.getExpansionCloud().getAllInstalled();
-      } else if (author == null) {
-        ex = plugin.getExpansionCloud().getCloudExpansions();
-      } else {
-        ex = plugin.getExpansionCloud().getAllByAuthor(author);
-      }
-
-      if (ex == null || ex.isEmpty()) {
-        msg(s, "&cNo expansions available" + (author != null ? " for author &f" + author : ""));
-        return true;
-      }
-
-      avail = plugin.getExpansionCloud().getPagesAvailable(ex, 10);
-
-      if (page > avail) {
-        msg(s, "&cThere " + ((avail == 1) ? " is only &f" + avail + " &cpage available!"
-            : "are only &f" + avail + " &cpages available!"));
-        return true;
-      }
-
-      msg(s, "&bShowing expansions for&7: &f" + (author != null ? author
-          : (installed ? "all installed" : "all available")) + " &8&m--&r &bamount&7: &f" + ex
-          .size() + " &bpage&7: &f" + page + "&7/&f" + avail);
-
-      ex = plugin.getExpansionCloud().getPage(ex, page, 10);
-
-      if (ex == null) {
-        msg(s, "&cThere was a problem getting the requested page...");
-        return true;
-      }
-
-      msg(s, "&aGreen = Expansions you have");
-      msg(s, "&6Gold = Expansions which need updated");
-
-      if (!(s instanceof Player)) {
-        Map<String, CloudExpansion> expansions = new HashMap<>();
-        for (CloudExpansion exp : ex.values()) {
-          if (exp == null || exp.getName() == null) {
-            continue;
-          }
-          expansions.put(exp.getName(), exp);
-        }
-        List<String> ce = expansions.keySet().stream().sorted().collect(Collectors.toList());
-        int i = (int) ex.keySet().toArray()[0]+1;
-        for (String name : ce) {
-          if (expansions.get(name) == null) {
-            continue;
-          }
-          CloudExpansion expansion = expansions.get(name);
-          msg(s,
-              "&b" + i + "&7: " + (expansion.shouldUpdate() ? "&6"
-                  : (expansion.hasExpansion() ? "&a" : "&7")) + expansion
-                  .getName() + " &8&m-- &r" + expansion.getVersion().getUrl());
-          i++;
-        }
-
-        return true;
-      }
-
-      Player p = (Player) s;
-
-      Map<String, CloudExpansion> expansions = new HashMap<>();
-      for (CloudExpansion exp : ex.values()) {
-        if (exp == null || exp.getName() == null) {
-          continue;
-        }
-        expansions.put(exp.getName(), exp);
-      }
-      List<String> ce = expansions.keySet().stream().sorted().collect(Collectors.toList());
-      int i = 1;
-      for (String name : ce) {
-        if (expansions.get(name) == null) {
-          continue;
-        }
-        CloudExpansion expansion = expansions.get(name);
-        StringBuilder sb = new StringBuilder();
-        if (expansion.shouldUpdate()) {
-          sb.append("&6Click to update to the latest version of this expansion\n\n");
-        } else if (!expansion.hasExpansion()) {
-          sb.append("&bClick to download this expansion\n\n");
-        } else {
-          sb.append("&aYou have the latest version of this expansion\n\n");
-        }
-        sb.append("&bAuthor&7: &f" + expansion.getAuthor() + "\n");
-        sb.append("&bVerified&7: &f" + expansion.isVerified() + "\n");
-        sb.append("&bLatest version&7: &f" + expansion.getVersion().getVersion() + "\n");
-        sb.append(
-            "&bLast updated&7: &f" + expansion.getTimeSinceLastUpdate() + " ago\n");
-        sb.append("\n" + expansion.getDescription());
-
-        String msg = color(
-            "&b" + (i + 1) + "&7: " + (expansion.shouldUpdate() ? "&6"
-                : (expansion.hasExpansion() ? "&a" : "")) + expansion.getName());
-
-        String hover = color(sb.toString());
-
-        JSONMessage line = JSONMessage.create(msg);
-        line.tooltip(hover);
-        if (expansion.shouldUpdate()) {
-          line.suggestCommand("/papi ecloud download " + expansion.getName());
-        }
-        else {
-          line.suggestCommand("/papi ecloud info " + expansion.getName());
-        }
-        line.send(p);
-        i++;
-      }
-      return true;
-    }
-
-    if (args[1].equalsIgnoreCase("download")) {
-
-      if (args.length < 3) {
-        msg(s, "&cAn expansion name must be specified!");
-        return true;
-      }
-
-      CloudExpansion expansion = plugin.getExpansionCloud().getCloudExpansion(args[2]);
-
-      if (expansion == null) {
-        msg(s, "&cNo expansion found with the name: &f" + args[2]);
-        return true;
-      }
-
-      PlaceholderExpansion loaded = plugin.getExpansionManager().getRegisteredExpansion(args[2]);
-
-      if (loaded != null && loaded.isRegistered()) {
-        PlaceholderAPI.unregisterPlaceholderHook(loaded.getIdentifier());
-      }
-
-      String version = expansion.getLatestVersion();
-
-      if (args.length == 4) {
-        version = args[3];
-        if (expansion.getVersion(version) == null) {
-          msg(s, "&cThe version you specified does not exist for &f" + expansion.getName());
-          msg(s, "&7Available versions: &f" + expansion.getVersions().size());
-          msg(s, String.join("&a, &f", expansion.getAvailableVersions()));
-          return true;
-        }
-      }
-
-      msg(s, "&aDownload starting for expansion: &f" + expansion.getName() + " &aversion: &f"
-          + version);
-      String player = ((s instanceof Player) ? s.getName() : null);
-      plugin.getExpansionCloud().downloadExpansion(player, expansion, version);
-      plugin.getExpansionCloud().clean();
-      plugin.getExpansionCloud().fetch(plugin.getPlaceholderAPIConfig().cloudAllowUnverifiedExpansions());
-      return true;
-    }
-
-    msg(s, "&cIncorrect usage! &b/papi ecloud");
-    return true;
-  }
-
-
-}

src/main/java/me/clip/placeholderapi/commands/PlaceholderAPICommands.java

@@ -1,289 +0,0 @@
-/*
- *
- * PlaceholderAPI
- * Copyright (C) 2018 Ryan McCarthy
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- *
- */
-package me.clip.placeholderapi.commands;
-
-import java.util.Set;
-import java.util.stream.Collectors;
-import me.clip.placeholderapi.PlaceholderAPI;
-import me.clip.placeholderapi.PlaceholderAPIPlugin;
-import me.clip.placeholderapi.expansion.PlaceholderExpansion;
-import me.clip.placeholderapi.util.Msg;
-import org.apache.commons.lang.StringUtils;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-public class PlaceholderAPICommands implements CommandExecutor {
-
-  private PlaceholderAPIPlugin plugin;
-  private CommandExecutor eCloud;
-
-  public PlaceholderAPICommands(PlaceholderAPIPlugin i) {
-    plugin = i;
-    eCloud = new ExpansionCloudCommands(i);
-  }
-
-  @Override
-  public boolean onCommand(CommandSender s, Command c, String label, String[] args) {
-    if (args.length == 0) {
-
-      Msg.msg(s, "PlaceholderAPI &7version &b&o" + plugin.getDescription().getVersion(),
-          "&fCreated by&7: &b" + plugin.getDescription().getAuthors(),
-              "&fPapi commands: &b/papi help",
-              "&fEcloud commands: &b/papi ecloud");
-      return true;
-    } else {
-
-      if (args[0].equalsIgnoreCase("help")) {
-
-        Msg.msg(s, "PlaceholderAPI &aHelp &e(&f" + plugin.getDescription().getVersion() + "&e)",
-            "&b/papi",
-            "&fView plugin info/version info",
-            "&b/papi list",
-            "&fList all placeholder expansions that are currently active",
-            "&b/papi info <placeholder name>",
-            "&fView information for a specific expansion",
-            "&b/papi parse <(playername)/me> <...args>",
-            "&fParse a String with placeholders",
-            "&b/papi bcparse <(playername)/me> <...args>",
-            "&fParse a String with placeholders and broadcast the message",
-            "&b/papi parserel <player one> <player two> <...args>",
-            "&fParse a String with relational placeholders",
-            "&b/papi register <fileName>",
-            "&fRegister an expansion by the name of the file",
-            "&b/papi unregister <Expansion name>",
-            "&fUnregister an expansion by name",
-            "&b/papi reload",
-            "&fReload the config settings");
-        if (s.hasPermission("placeholderapi.ecloud")) {
-          if (plugin.getExpansionCloud() == null) {
-            Msg.msg(s, "&b/papi enablecloud",
-                "&fEnable the expansion cloud");
-          } else {
-            Msg.msg(s, "&b/papi disablecloud",
-                "&fDisable the expansion cloud",
-                "&b/papi ecloud",
-                "&fView ecloud command usage");
-          }
-        }
-        return true;
-      } else if (args[0].equalsIgnoreCase("ecloud")) {
-
-        if (!s.hasPermission("placeholderapi.ecloud")) {
-          Msg.msg(s, "&cYou don't have permission to do that!");
-          return true;
-        }
-        if (plugin.getExpansionCloud() == null) {
-          Msg.msg(s, "&7The expansion cloud is not enabled!");
-          return true;
-        }
-        return eCloud.onCommand(s, c, label, args);
-      } else if (args[0].equalsIgnoreCase("enablecloud")) {
-
-        if (!s.hasPermission("placeholderapi.ecloud")) {
-          Msg.msg(s, "&cYou don't have permission to do that!");
-          return true;
-        }
-        if (plugin.getExpansionCloud() != null) {
-          Msg.msg(s, "&7The cloud is already enabled!");
-          return true;
-        }
-        plugin.enableCloud();
-        plugin.getPlaceholderAPIConfig().setCloudEnabled(true);
-        Msg.msg(s, "&aThe cloud has been enabled!");
-        return true;
-      } else if (args[0].equalsIgnoreCase("disablecloud")) {
-
-        if (!s.hasPermission("placeholderapi.ecloud")) {
-          Msg.msg(s, "&cYou don't have permission to do that!");
-          return true;
-        }
-        if (plugin.getExpansionCloud() == null) {
-          Msg.msg(s, "&7The cloud is already disabled!");
-          return true;
-        }
-        plugin.disableCloud();
-        plugin.getPlaceholderAPIConfig().setCloudEnabled(false);
-        Msg.msg(s, "&aThe cloud has been disabled!");
-        return true;
-      } else if (args.length > 1 && args[0].equalsIgnoreCase("info")) {
-
-        if (!s.hasPermission("placeholderapi.info")) {
-          Msg.msg(s, "&cYou don't have permission to do that!");
-          return true;
-        }
-        PlaceholderExpansion ex = plugin.getExpansionManager().getRegisteredExpansion(args[1]);
-        if (ex == null) {
-          Msg.msg(s, "&cThere is no expansion loaded with the identifier: &f" + args[1]);
-          return true;
-        }
-        Msg.msg(s, "&7Placeholder expansion info for: &f" + ex.getName());
-        Msg.msg(s, "&7Status: " + (ex.isRegistered() ? "&aRegistered" : "&cNot registered"));
-        if (ex.getAuthor() != null) {
-          Msg.msg(s, "&7Created by: &f" + ex.getAuthor());
-        }
-        if (ex.getVersion() != null) {
-          Msg.msg(s, "&7Version: &f" + ex.getVersion());
-        }
-        if (ex.getRequiredPlugin() != null) {
-          Msg.msg(s, "&7Requires plugin: &f" + ex.getRequiredPlugin());
-        }
-        if (ex.getPlaceholders() != null) {
-          Msg.msg(s, "&8&m-- &r&7Placeholders &8&m--");
-          for (String placeholder : ex.getPlaceholders()) {
-            Msg.msg(s, placeholder);
-          }
-        }
-        return true;
-      } else if (args.length > 2 && args[0].equalsIgnoreCase("parse")
-          || args.length > 2 && args[0].equalsIgnoreCase("bcparse")) {
-
-        if (!s.hasPermission("placeholderapi.parse")) {
-          Msg.msg(s, "&cYou don't have permission to do that!");
-          return true;
-        }
-        OfflinePlayer pl = null;
-        if (args[1].equalsIgnoreCase("me")) {
-          if (s instanceof Player) {
-            pl = (Player) s;
-          } else {
-            Msg.msg(s, "&cThis command must target a player when used by console");
-            return true;
-          }
-        } else {
-          if (Bukkit.getPlayer(args[1]) != null) {
-            pl = Bukkit.getPlayer(args[1]);
-          } else {
-            pl = Bukkit.getOfflinePlayer(args[1]);
-          }
-        }
-        if (pl == null || !pl.hasPlayedBefore()) {
-          Msg.msg(s, "&cFailed to find player: &f" + args[1]);
-          return true;
-        }
-        String parse = StringUtils.join(args, " ", 2, args.length);
-        if (args[0].equalsIgnoreCase("bcparse")) {
-          Msg.broadcast("&r" + PlaceholderAPI.setPlaceholders(pl, parse));
-        } else {
-          Msg.msg(s, "&r" + PlaceholderAPI.setPlaceholders(pl, parse));
-        }
-        return true;
-      } else if (args.length > 3 && args[0].equalsIgnoreCase("parserel")) {
-
-        if (!(s instanceof Player)) {
-          Msg.msg(s, "&cThis command can only be used in game!");
-          return true;
-        } else {
-          if (!s.hasPermission("placeholderapi.parse")) {
-            Msg.msg(s, "&cYou don't have permission to do that!");
-            return true;
-          }
-        }
-        Player one = Bukkit.getPlayer(args[1]);
-        if (one == null) {
-          Msg.msg(s, args[1] + " &cis not online!");
-          return true;
-        }
-        Player two = Bukkit.getPlayer(args[2]);
-        if (two == null) {
-          Msg.msg(s, args[2] + " &cis not online!");
-          return true;
-        }
-        String parse = StringUtils.join(args, " ", 3, args.length);
-        Msg.msg(s, "&r" + PlaceholderAPI.setRelationalPlaceholders(one, two, parse));
-        return true;
-      } else if (args[0].equalsIgnoreCase("reload")) {
-
-        if (s instanceof Player) {
-          if (!s.hasPermission("placeholderapi.reload")) {
-            Msg.msg(s, "&cYou don't have permission to do that!");
-            return true;
-          }
-        }
-        Msg.msg(s, "&fPlaceholder&7API &bconfiguration reloaded!");
-        plugin.reloadConf(s);
-      } else if (args[0].equalsIgnoreCase("list")) {
-
-        if (s instanceof Player) {
-          if (!s.hasPermission("placeholderapi.list")) {
-            Msg.msg(s, "&cYou don't have permission to do that!");
-            return true;
-          }
-        }
-
-        Set<String> registered = PlaceholderAPI.getRegisteredIdentifiers();
-        if (registered.isEmpty()) {
-          Msg.msg(s, "&7There are no placeholder hooks currently registered!");
-          return true;
-        }
-        Msg.msg(s, registered.size() + " &7Placeholder hooks registered:");
-        Msg.msg(s, registered.stream().sorted().collect(Collectors.joining(", ")));
-      } else if (args.length > 1 && args[0].equalsIgnoreCase("register")) {
-
-        if (s instanceof Player) {
-          if (!s.hasPermission("placeholderapi.register")) {
-            Msg.msg(s, "&cYou don't have permission to do that!");
-            return true;
-          }
-        }
-
-        String fileName = args[1].replace(".jar", "");
-        PlaceholderExpansion ex = plugin.getExpansionManager().registerExpansion(fileName);
-
-        if (ex == null) {
-          Msg.msg(s, "&cFailed to register expansion from " + fileName);
-          return true;
-        }
-
-        Msg.msg(s, "&aSuccessfully registered expansion: &f" + ex.getName());
-      } else if (args.length > 1 && args[0].equalsIgnoreCase("unregister")) {
-
-        if (s instanceof Player) {
-          if (!s.hasPermission("placeholderapi.register")) {
-            Msg.msg(s, "&cYou don't have permission to do that!");
-            return true;
-          }
-        }
-
-        PlaceholderExpansion ex = plugin.getExpansionManager().getRegisteredExpansion(args[1]);
-
-        if (ex == null) {
-          Msg.msg(s, "&cFailed to find expansion: &f" + args[1]);
-          return true;
-        }
-
-        if (PlaceholderAPI.unregisterExpansion(ex)) {
-          Msg.msg(s, "&aSuccessfully unregistered expansion: &f" + ex.getName());
-        } else {
-          Msg.msg(s, "&cFailed to unregister expansion: &f" + ex.getName());
-        }
-
-      } else {
-        Msg.msg(s, "&cIncorrect usage! &7/papi help");
-      }
-    }
-    return true;
-  }
-
-}

src/main/java/me/clip/placeholderapi/commands/PlaceholderCommand.java

@@ -0,0 +1,108 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.commands;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+import java.util.stream.Stream;
+import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.Unmodifiable;
+
+public abstract class PlaceholderCommand {
+
+  @NotNull
+  private final String label;
+  @NotNull
+  private final Set<String> alias;
+
+  @Nullable
+  private String permission;
+
+
+  protected PlaceholderCommand(@NotNull final String label, @NotNull final String... alias) {
+    this.label = label;
+    this.alias = Sets.newHashSet(alias);
+
+    setPermission("placeholderapi." + label);
+  }
+
+  @NotNull
+  public static Stream<PlaceholderCommand> filterByPermission(@NotNull final CommandSender sender,
+      @NotNull final Stream<PlaceholderCommand> commands) {
+    return commands.filter(
+        target -> target.getPermission() == null || sender.hasPermission(target.getPermission()));
+  }
+
+  public static void suggestByParameter(@NotNull final Stream<String> possible,
+      @NotNull final List<String> suggestions, @Nullable final String parameter) {
+    if (parameter == null) {
+      possible.forEach(suggestions::add);
+    } else {
+      possible.filter(suggestion -> suggestion.toLowerCase(Locale.ROOT).startsWith(parameter.toLowerCase(Locale.ROOT)))
+          .forEach(suggestions::add);
+    }
+  }
+
+  @NotNull
+  public final String getLabel() {
+    return label;
+  }
+
+  @NotNull
+  @Unmodifiable
+  public final Set<String> getAlias() {
+    return ImmutableSet.copyOf(alias);
+  }
+
+  @NotNull
+  @Unmodifiable
+  public final Set<String> getLabels() {
+    return ImmutableSet.<String>builder().add(label).addAll(alias).build();
+  }
+
+  @Nullable
+  public final String getPermission() {
+    return permission;
+  }
+
+  public void setPermission(@NotNull final String permission) {
+    this.permission = permission;
+  }
+
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params) {
+
+  }
+
+  public void complete(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
+
+  }
+
+}

src/main/java/me/clip/placeholderapi/commands/PlaceholderCommandRouter.java

@@ -0,0 +1,143 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.commands;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.stream.Stream;
+import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import me.clip.placeholderapi.commands.impl.cloud.CommandECloud;
+import me.clip.placeholderapi.commands.impl.local.CommandDump;
+import me.clip.placeholderapi.commands.impl.local.CommandExpansionRegister;
+import me.clip.placeholderapi.commands.impl.local.CommandExpansionUnregister;
+import me.clip.placeholderapi.commands.impl.local.CommandHelp;
+import me.clip.placeholderapi.commands.impl.local.CommandInfo;
+import me.clip.placeholderapi.commands.impl.local.CommandList;
+import me.clip.placeholderapi.commands.impl.local.CommandParse;
+import me.clip.placeholderapi.commands.impl.local.CommandReload;
+import me.clip.placeholderapi.commands.impl.local.CommandVersion;
+import me.clip.placeholderapi.util.Msg;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabCompleter;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Unmodifiable;
+
+public final class PlaceholderCommandRouter implements CommandExecutor, TabCompleter {
+
+  @Unmodifiable
+  private static final List<PlaceholderCommand> COMMANDS = ImmutableList.of(new CommandHelp(),
+      new CommandInfo(),
+      new CommandList(),
+      new CommandDump(),
+      new CommandECloud(),
+      new CommandParse(),
+      new CommandReload(),
+      new CommandVersion(),
+      new CommandExpansionRegister(),
+      new CommandExpansionUnregister());
+
+
+  @NotNull
+  private final PlaceholderAPIPlugin plugin;
+  @NotNull
+  @Unmodifiable
+  private final Map<String, PlaceholderCommand> commands;
+
+
+  public PlaceholderCommandRouter(@NotNull final PlaceholderAPIPlugin plugin) {
+    this.plugin = plugin;
+
+    final ImmutableMap.Builder<String, PlaceholderCommand> commands = ImmutableMap.builder();
+
+    for (final PlaceholderCommand command : COMMANDS) {
+      command.getLabels().forEach(label -> commands.put(label, command));
+    }
+
+    this.commands = commands.build();
+  }
+
+
+  @Override
+  public boolean onCommand(@NotNull final CommandSender sender, @NotNull final Command command,
+      @NotNull final String alias, @NotNull final String[] args) {
+    if (args.length == 0) {
+      final PlaceholderCommand fallback = commands.get("version");
+      if (fallback != null) {
+        fallback.evaluate(plugin, sender, "", Collections.emptyList());
+      }
+
+      return true;
+    }
+
+    final String search = args[0].toLowerCase(Locale.ROOT);
+    final PlaceholderCommand target = commands.get(search);
+
+    if (target == null) {
+      Msg.msg(sender, "&cUnknown command &7" + search);
+      return true;
+    }
+
+    final String permission = target.getPermission();
+    if (permission != null && !permission.isEmpty() && !sender.hasPermission(permission)) {
+      Msg.msg(sender, "&cYou do not have permission to do this!");
+      return true;
+    }
+
+    target
+        .evaluate(plugin, sender, search, Arrays.asList(Arrays.copyOfRange(args, 1, args.length)));
+
+    return true;
+  }
+
+  @Override
+  public List<String> onTabComplete(@NotNull final CommandSender sender,
+      @NotNull final Command command, @NotNull final String alias, @NotNull final String[] args) {
+    final List<String> suggestions = new ArrayList<>();
+
+    if (args.length > 1) {
+      final PlaceholderCommand target = this.commands.get(args[0].toLowerCase(Locale.ROOT));
+
+      if (target != null) {
+        target.complete(plugin, sender, args[0].toLowerCase(Locale.ROOT),
+            Arrays.asList(Arrays.copyOfRange(args, 1, args.length)), suggestions);
+      }
+
+      return suggestions;
+    }
+
+    final Stream<String> targets = PlaceholderCommand
+        .filterByPermission(sender, commands.values().stream()).map(PlaceholderCommand::getLabels)
+        .flatMap(Collection::stream);
+    PlaceholderCommand.suggestByParameter(targets, suggestions, args.length == 0 ? null : args[0]);
+
+    return suggestions;
+  }
+
+}

src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloud.java

@@ -0,0 +1,146 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.commands.impl.cloud;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import me.clip.placeholderapi.commands.PlaceholderCommand;
+import me.clip.placeholderapi.util.Msg;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Unmodifiable;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.stream.Stream;
+
+public final class CommandECloud extends PlaceholderCommand {
+
+  @Unmodifiable
+  private static final List<PlaceholderCommand> COMMANDS = ImmutableList
+      .of(new CommandECloudClear(),
+          new CommandECloudStatus(),
+          new CommandECloudUpdate(),
+          new CommandECloudRefresh(),
+          new CommandECloudDownload(),
+          new CommandECloudExpansionInfo(),
+          new CommandECloudExpansionList(),
+          new CommandECloudExpansionPlaceholders());
+
+  static {
+    COMMANDS
+        .forEach(command -> command.setPermission("placeholderapi.ecloud." + command.getLabel()));
+  }
+
+  @NotNull
+  @Unmodifiable
+  private final Map<String, PlaceholderCommand> commands;
+
+
+  public CommandECloud() {
+    super("ecloud");
+
+    final ImmutableMap.Builder<String, PlaceholderCommand> commands = ImmutableMap.builder();
+
+    for (final PlaceholderCommand command : COMMANDS) {
+      command.getLabels().forEach(label -> commands.put(label, command));
+    }
+
+    this.commands = commands.build();
+  }
+
+
+  @Override
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params) {
+    if (params.isEmpty()) {
+      Msg.msg(sender,
+          "&b&lPlaceholderAPI &8- &7eCloud Help Menu &8- ",
+          " ",
+          "&b/papi &fecloud status",
+          "  &7&oView status of the eCloud",
+          "&b/papi &fecloud list <all/{author}/installed> {page}",
+          "  &7&oList all/author specific available expansions",
+          "&b/papi &fecloud info <expansion name> {version}",
+          "  &7&oView information about a specific expansion available on the eCloud",
+          "&b/papi &fecloud placeholders <expansion name>",
+          "  &7&oView placeholders for an expansion",
+          "&b/papi &fecloud download <expansion name> {version}",
+          "  &7&oDownload an expansion from the eCloud",
+          "&b/papi &fecloud update <expansion name/all>",
+          "  &7&oUpdate a specific/all installed expansions",
+          "&b/papi &fecloud refresh",
+          "  &7&oFetch the most up to date list of expansions available.",
+          "&b/papi &fecloud clear",
+          "  &7&oClear the expansion cloud cache.");
+
+      return;
+    }
+
+    final String search = params.get(0).toLowerCase(Locale.ROOT);
+    final PlaceholderCommand target = commands.get(search);
+
+    if (target == null) {
+      Msg.msg(sender, "&cUnknown command &7ecloud " + search);
+      return;
+    }
+
+    final String permission = target.getPermission();
+    if (permission != null && !permission.isEmpty() && !sender.hasPermission(permission)) {
+      Msg.msg(sender, "&cYou do not have permission to do this!");
+      return;
+    }
+
+    if (!plugin.getPlaceholderAPIConfig().isCloudEnabled()) {
+      Msg.msg(sender, "&cThe eCloud Manager is not enabled! To enable it, set 'cloud_enabled' to true and reload the plugin.");
+      return;
+    }
+
+    target.evaluate(plugin, sender, search, params.subList(1, params.size()));
+  }
+
+  @Override
+  public void complete(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
+    if (params.size() <= 1) {
+      final Stream<String> targets = filterByPermission(sender, commands.values().stream())
+          .map(PlaceholderCommand::getLabels).flatMap(Collection::stream);
+      suggestByParameter(targets, suggestions, params.isEmpty() ? null : params.get(0));
+
+      return; // send sub commands
+    }
+
+    final String search = params.get(0).toLowerCase(Locale.ROOT);
+    final PlaceholderCommand target = commands.get(search);
+
+    if (target == null) {
+      return;
+    }
+
+    target.complete(plugin, sender, search, params.subList(1, params.size()), suggestions);
+  }
+
+}

src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudClear.java

@@ -0,0 +1,46 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.commands.impl.cloud;
+
+import java.util.List;
+import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import me.clip.placeholderapi.commands.PlaceholderCommand;
+import me.clip.placeholderapi.util.Msg;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Unmodifiable;
+
+public final class CommandECloudClear extends PlaceholderCommand {
+
+  public CommandECloudClear() {
+    super("clear");
+  }
+
+  @Override
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params) {
+    plugin.getCloudExpansionManager().clean();
+    Msg.msg(sender,
+        "&aThe eCloud cache has been cleared!");
+  }
+
+}

src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudDownload.java

@@ -0,0 +1,139 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.commands.impl.cloud;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
+import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import me.clip.placeholderapi.commands.PlaceholderCommand;
+import me.clip.placeholderapi.expansion.cloud.CloudExpansion;
+import me.clip.placeholderapi.util.Msg;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Unmodifiable;
+
+public final class CommandECloudDownload extends PlaceholderCommand {
+
+  public CommandECloudDownload() {
+    super("download");
+  }
+
+  private boolean isBlockedExpansion(String name) {
+    String env = System.getenv("PAPI_BLOCKED_EXPANSIONS");
+    if (env == null) {
+      return false;
+    }
+
+    return Arrays.stream(env.split(","))
+            .anyMatch(s -> s.equalsIgnoreCase(name));
+  }
+
+  @Override
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params) {
+    if (params.isEmpty()) {
+      Msg.msg(sender,
+          "&cYou must supply the name of an expansion.");
+      return;
+    }
+
+    if (isBlockedExpansion(params.get(0))) {
+      Msg.msg(sender,
+          "&cThis expansion can't be downloaded.");
+      return;
+    }
+
+    final CloudExpansion expansion = plugin.getCloudExpansionManager()
+        .findCloudExpansionByName(params.get(0)).orElse(null);
+    if (expansion == null) {
+      Msg.msg(sender,
+          "&cFailed to find an expansion named: &f" + params.get(0));
+      return;
+    }
+
+    if (!expansion.isVerified()) {
+      Msg.msg(sender, "&cThe expansion '&f" + params.get(0) + "&c' is not verified and can only be downloaded manually from &fhttps://placeholderapi.com/ecloud");
+      return;
+    }
+
+    final CloudExpansion.Version version;
+    if (params.size() < 2) {
+      version = expansion.getVersion(expansion.getLatestVersion());
+      if (version == null) {
+        Msg.msg(sender,
+            "&cCould not find latest version for expansion.");
+        return;
+      }
+    } else {
+      version = expansion.getVersion(params.get(1));
+      if (version == null) {
+        Msg.msg(sender,
+            "&cCould not find specified version: &f" + params.get(1),
+            "&7Available versions: &f" + expansion.getAvailableVersions());
+        return;
+      }
+    }
+
+    plugin.getCloudExpansionManager().downloadExpansion(expansion, version)
+        .whenComplete((file, exception) -> {
+          if (exception != null) {
+            Msg.msg(sender,
+                "&cFailed to download expansion: &f" + exception.getMessage());
+            return;
+          }
+
+          Msg.msg(sender,
+              "&aSuccessfully downloaded expansion &f" + expansion.getName() + " [" + version
+                  .getVersion() + "] &ato file: &f" + file.getName(),
+              "&aMake sure to type &f/papi reload &ato enable your new expansion!");
+
+          plugin.getCloudExpansionManager().load();
+        });
+  }
+
+  @Override
+  public void complete(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
+    if (params.size() > 2) {
+      return;
+    }
+
+    if (params.size() <= 1) {
+      final Stream<String> names = plugin.getCloudExpansionManager().getCloudExpansions().values()
+          .stream().map(CloudExpansion::getName).map(name -> name.replace(' ', '_'));
+      suggestByParameter(names, suggestions, params.isEmpty() ? null : params.get(0));
+      return;
+    }
+
+    final Optional<CloudExpansion> expansion = plugin.getCloudExpansionManager()
+        .findCloudExpansionByName(params.get(0));
+    if (!expansion.isPresent()) {
+      return;
+    }
+
+    suggestByParameter(expansion.get().getAvailableVersions().stream(), suggestions, params.get(1));
+  }
+
+}

src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudExpansionInfo.java

@@ -0,0 +1,129 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.commands.impl.cloud;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
+import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import me.clip.placeholderapi.commands.PlaceholderCommand;
+import me.clip.placeholderapi.expansion.cloud.CloudExpansion;
+import me.clip.placeholderapi.util.Msg;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Unmodifiable;
+
+public final class CommandECloudExpansionInfo extends PlaceholderCommand {
+
+  public CommandECloudExpansionInfo() {
+    super("info");
+  }
+
+  @Override
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params) {
+    if (params.isEmpty()) {
+      Msg.msg(sender,
+          "&cYou must specify the name of the expansion.");
+      return;
+    }
+
+    final CloudExpansion expansion = plugin.getCloudExpansionManager()
+        .findCloudExpansionByName(params.get(0)).orElse(null);
+    if (expansion == null) {
+      Msg.msg(sender,
+          "&cThere is no expansion with the name: &f" + params.get(0));
+      return;
+    }
+
+    final StringBuilder builder = new StringBuilder();
+
+    builder.append("&bExpansion: &f")
+        .append(expansion.shouldUpdate() ? "&e" : "&a")
+        .append(expansion.getName())
+        .append('\n')
+        .append("&bAuthor: &f")
+        .append(expansion.getAuthor())
+        .append('\n')
+        .append("&bVerified: ")
+        .append(expansion.isVerified() ? "&a&l✔" : "&c&l❌")
+        .append('\n');
+
+    if (params.size() < 2) {
+      builder.append("&bLatest Version: &f")
+          .append(expansion.getLatestVersion())
+          .append('\n')
+          .append("&bReleased: &f")
+          .append(expansion.getTimeSinceLastUpdate())
+          .append(" ago")
+          .append('\n')
+          .append("&bRelease Notes: &f")
+          .append(expansion.getVersion().getReleaseNotes())
+          .append('\n');
+    } else {
+      final CloudExpansion.Version version = expansion.getVersion(params.get(1));
+      if (version == null) {
+        Msg.msg(sender,
+            "&cCould not find specified version: &f" + params.get(1),
+            "&aVersions: &f" + expansion.getAvailableVersions());
+        return;
+      }
+
+      builder.append("&bVersion: &f")
+          .append(version.getVersion())
+          .append('\n')
+          .append("&bRelease Notes: &f")
+          .append(version.getReleaseNotes())
+          .append('\n')
+          .append("&bDownload URL: &f")
+          .append(version.getUrl())
+          .append('\n');
+    }
+
+    Msg.msg(sender, builder.toString());
+  }
+
+  @Override
+  public void complete(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
+    if (params.size() > 2) {
+      return;
+    }
+
+    if (params.size() <= 1) {
+      final Stream<String> names = plugin.getCloudExpansionManager().getCloudExpansions().values()
+          .stream().map(CloudExpansion::getName).map(name -> name.replace(' ', '_'));
+      suggestByParameter(names, suggestions, params.isEmpty() ? null : params.get(0));
+      return;
+    }
+
+    final Optional<CloudExpansion> expansion = plugin.getCloudExpansionManager()
+        .findCloudExpansionByName(params.get(0));
+    if (!expansion.isPresent()) {
+      return;
+    }
+
+    suggestByParameter(expansion.get().getAvailableVersions().stream(), suggestions, params.get(1));
+  }
+
+}

src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudExpansionList.java

@@ -0,0 +1,352 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.commands.impl.cloud;
+
+import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import com.google.common.primitives.Ints;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import me.clip.placeholderapi.commands.PlaceholderCommand;
+import me.clip.placeholderapi.configuration.ExpansionSort;
+import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import me.clip.placeholderapi.expansion.cloud.CloudExpansion;
+import me.clip.placeholderapi.util.Format;
+import me.clip.placeholderapi.util.Msg;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.TextComponent;
+import net.kyori.adventure.text.event.ClickEvent;
+import net.kyori.adventure.text.event.HoverEvent;
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.format.TextDecoration;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Unmodifiable;
+
+import static net.kyori.adventure.text.Component.*;
+import static net.kyori.adventure.text.format.NamedTextColor.*;
+
+public final class CommandECloudExpansionList extends PlaceholderCommand {
+
+  private static final int PAGE_SIZE = 10;
+
+  @NotNull
+  private static final Function<CloudExpansion, Object> EXPANSION_NAME =
+      expansion -> (expansion.shouldUpdate() ? "&6" : expansion.hasExpansion() ? "&a" : "&7")
+          + expansion.getName();
+  @NotNull
+  private static final Function<CloudExpansion, Object> EXPANSION_AUTHOR =
+      expansion -> "&f" + expansion.getAuthor();
+  @NotNull
+  private static final Function<CloudExpansion, Object> EXPANSION_VERIFIED =
+      expansion -> expansion.isVerified() ? "&aY" : "&cN";
+  @NotNull
+  private static final Function<CloudExpansion, Object> EXPANSION_LATEST_VERSION =
+      expansion -> "&f" + expansion.getLatestVersion();
+  @NotNull
+  private static final Function<CloudExpansion, Object> EXPANSION_CURRENT_VERSION =
+      expansion -> "&f" + PlaceholderAPIPlugin.getInstance().getLocalExpansionManager()
+          .findExpansionByName(expansion.getName()).map(PlaceholderExpansion::getVersion)
+          .orElse("Unknown");
+
+
+  @Unmodifiable
+  private static final Set<String> OPTIONS = ImmutableSet.of("all", "installed");
+
+
+  public CommandECloudExpansionList() {
+    super("list");
+  }
+
+  @NotNull
+  private static Collection<CloudExpansion> getExpansions(@NotNull final String target,
+      @NotNull final PlaceholderAPIPlugin plugin) {
+    switch (target.toLowerCase(Locale.ROOT)) {
+      case "all":
+        return plugin.getCloudExpansionManager().getCloudExpansions().values();
+      case "installed":
+        return plugin.getCloudExpansionManager().getCloudExpansionsInstalled().values();
+      default:
+        return plugin.getCloudExpansionManager().getCloudExpansionsByAuthor(target).values();
+    }
+  }
+
+  @NotNull
+  private static List<CloudExpansion> getPage(@NotNull final List<CloudExpansion> expansions,
+      final int page) {
+    final int head = (page * PAGE_SIZE);
+    final int tail = Math.min(expansions.size(), head + PAGE_SIZE);
+
+    if (expansions.size() < head) {
+      return Collections.emptyList();
+    }
+
+    return expansions.subList(head, tail);
+  }
+
+  public static void addExpansionTitle(@NotNull final StringBuilder builder,
+      @NotNull final String target, final int page) {
+    switch (target.toLowerCase(Locale.ROOT)) {
+      case "all":
+        builder.append("&bAll Expansions");
+        break;
+      case "installed":
+        builder.append("&bInstalled Expansions");
+        break;
+      default:
+        builder.append("&bExpansions by &f")
+            .append(target);
+        break;
+    }
+
+    if (page == -1) {
+      builder.append('\n');
+      return;
+    }
+
+    builder.append(" &bPage&7: &a")
+        .append(page)
+        .append("&r");
+  }
+
+  private static Component getMessage(@NotNull final List<CloudExpansion> expansions,
+      final int page, final int limit, @NotNull final String target) {
+    final SimpleDateFormat format = PlaceholderAPIPlugin.getDateFormat();
+
+    final TextComponent.Builder message = text();
+
+    for (int index = 0; index < expansions.size(); index++) {
+      final CloudExpansion expansion = expansions.get(index);
+      final TextComponent.Builder line = text();
+
+      final int expansionNumber = index + ((page - 1) * PAGE_SIZE) + 1;
+      line.append(text(expansionNumber + ". ", DARK_GRAY));
+
+      final NamedTextColor expansionColour;
+
+      if (expansion.shouldUpdate()) {
+        expansionColour = GOLD;
+      } else {
+        if (expansion.hasExpansion()) {
+          expansionColour = GREEN;
+        } else {
+          expansionColour = GRAY;
+        }
+      }
+
+      line.append(text(expansion.getName(), expansionColour));
+
+      line.clickEvent(ClickEvent.suggestCommand("/papi ecloud download " + expansion.getName()));
+
+      final TextComponent.Builder hoverText = text("Click to download this expansion!", AQUA)
+              .append(newline()).append(newline())
+              .append(text("Author: ", AQUA)).append(text(expansion.getAuthor(), WHITE))
+              .append(newline())
+              .append(text("Verified: ", AQUA)).append(text(expansion.isVerified() ? "✔" : "❌", expansion.isVerified() ? GREEN : RED, TextDecoration.BOLD))
+              .append(newline())
+              .append(text("Released: ", AQUA)).append(text(format.format(expansion.getLastUpdate()), WHITE))
+              .toBuilder();
+
+      Optional.ofNullable(expansion.getDescription())
+              .filter(description -> !description.isEmpty())
+              .ifPresent(description -> hoverText.append(newline()).append(newline())
+                      .append(text(description.replace("\r", "").trim(), WHITE))
+              );
+
+      line.hoverEvent(HoverEvent.showText(hoverText.build()));
+
+      if (index != expansions.size() - 1) {
+        line.append(newline());
+      }
+
+      message.append(line.build());
+    }
+
+    if (limit > 1) {
+      message.append(newline());
+
+      final TextComponent.Builder left = text("◀", page > 1 ? GRAY : DARK_GRAY).toBuilder();
+
+      if (page > 1) {
+        left.clickEvent(ClickEvent.runCommand("/papi ecloud list " + target + " " + (page - 1)));
+      }
+
+      final TextComponent.Builder right = text("▶", page < limit ? GRAY : DARK_GRAY).toBuilder();
+
+      if (page < limit) {
+        right.clickEvent(ClickEvent.runCommand("/papi ecloud list " + target + " " + (page + 1)));
+      }
+
+      message.append(left, text(" " + page + " ", GREEN), right);
+    }
+
+    return message.build();
+  }
+
+  private static void addExpansionTable(@NotNull final List<CloudExpansion> expansions,
+      @NotNull final StringBuilder message, final int startIndex,
+      @NotNull final String versionTitle,
+      @NotNull final Function<CloudExpansion, Object> versionFunction) {
+    final Map<String, Function<CloudExpansion, Object>> functions = new LinkedHashMap<>();
+
+    final AtomicInteger counter = new AtomicInteger(startIndex);
+    functions.put("&f", expansion -> "&8" + counter.getAndIncrement() + ".");
+
+    functions.put("&9Name", EXPANSION_NAME);
+    functions.put("&9Author", EXPANSION_AUTHOR);
+    functions.put("&9Verified", EXPANSION_VERIFIED);
+    functions.put(versionTitle, versionFunction);
+
+    final List<List<String>> rows = new ArrayList<>();
+
+    rows.add(0, new ArrayList<>(functions.keySet()));
+
+    for (final CloudExpansion expansion : expansions) {
+      rows.add(functions.values().stream().map(function -> function.apply(expansion))
+          .map(Objects::toString).collect(Collectors.toList()));
+    }
+
+    final List<String> table = Format.tablify(Format.Align.LEFT, rows)
+        .orElse(Collections.emptyList());
+    if (table.isEmpty()) {
+      return;
+    }
+
+    table.add(1, "&8" + Strings.repeat("-", table.get(0).length() - (rows.get(0).size() * 2)));
+
+    message.append(String.join("\n", table));
+  }
+
+  @Override
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params) {
+    if (params.isEmpty()) {
+      Msg.msg(sender,
+          "&cYou must specify an option. [all, {author}, installed]");
+      return;
+    }
+
+    final boolean installed = params.get(0).equalsIgnoreCase("installed");
+    final List<CloudExpansion> expansions = Lists
+        .newArrayList(getExpansions(params.get(0), plugin));
+
+    if (expansions.isEmpty()) {
+      Msg.msg(sender,
+          "&cNo expansions available to list.");
+      return;
+    }
+
+    expansions
+        .sort(plugin.getPlaceholderAPIConfig().getExpansionSort().orElse(ExpansionSort.LATEST));
+
+    if (!(sender instanceof Player) && params.size() < 2) {
+      final StringBuilder builder = new StringBuilder();
+
+      addExpansionTitle(builder, params.get(0), -1);
+      addExpansionTable(expansions,
+          builder,
+          1,
+          installed ? "&9Version" : "&9Latest Version",
+          installed ? EXPANSION_CURRENT_VERSION : EXPANSION_LATEST_VERSION);
+
+      Msg.msg(sender, builder.toString());
+      return;
+    }
+
+    final int page;
+
+    if (params.size() < 2) {
+      page = 1;
+    } else {
+      //noinspection UnstableApiUsage
+      final Integer parsed = Ints.tryParse(params.get(1));
+      if (parsed == null) {
+        Msg.msg(sender,
+            "&cPage number must be an integer.");
+        return;
+      }
+
+      final int limit = (int) Math.ceil((double) expansions.size() / PAGE_SIZE);
+
+      if (parsed < 1 || parsed > limit) {
+        Msg.msg(sender,
+            "&cPage number must be in the range &8[&a1&7..&a" + limit + "&8]");
+        return;
+      }
+
+      page = parsed;
+    }
+
+    final StringBuilder builder = new StringBuilder();
+    final List<CloudExpansion> values = getPage(expansions, page - 1);
+
+    addExpansionTitle(builder, params.get(0), page);
+
+    if (!(sender instanceof Player)) {
+      addExpansionTable(values,
+          builder,
+          ((page - 1) * PAGE_SIZE) + 1,
+          installed ? "&9Version" : "&9Latest Version",
+          installed ? EXPANSION_CURRENT_VERSION : EXPANSION_LATEST_VERSION);
+
+      Msg.msg(sender, builder.toString());
+
+      return;
+    }
+
+    Msg.msg(sender, builder.toString());
+
+    final int limit = (int) Math.ceil((double) expansions.size() / PAGE_SIZE);
+
+    final Component message = getMessage(values, page, limit, params.get(0));
+    plugin.getAdventure().player((Player) sender).sendMessage(message);
+  }
+
+  @Override
+  public void complete(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
+    if (params.size() > 2) {
+      return;
+    }
+
+    if (params.size() <= 1) {
+      suggestByParameter(
+          Sets.union(OPTIONS, plugin.getCloudExpansionManager().getCloudExpansionAuthors())
+              .stream(), suggestions, params.isEmpty() ? null : params.get(0));
+      return;
+    }
+
+    suggestByParameter(IntStream.rangeClosed(1,
+        (int) Math.ceil((double) getExpansions(params.get(0), plugin).size() / PAGE_SIZE))
+        .mapToObj(Objects::toString), suggestions, params.get(1));
+  }
+
+}

src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudExpansionPlaceholders.java

@@ -0,0 +1,94 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.commands.impl.cloud;
+
+import com.google.common.collect.Lists;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import me.clip.placeholderapi.commands.PlaceholderCommand;
+import me.clip.placeholderapi.expansion.cloud.CloudExpansion;
+import me.clip.placeholderapi.util.Msg;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Unmodifiable;
+
+public final class CommandECloudExpansionPlaceholders extends PlaceholderCommand {
+
+  public CommandECloudExpansionPlaceholders() {
+    super("placeholders");
+  }
+
+  @Override
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params) {
+    if (params.isEmpty()) {
+      Msg.msg(sender,
+          "&cYou must specify the name of the expansion.");
+      return;
+    }
+
+    final CloudExpansion expansion = plugin.getCloudExpansionManager()
+        .findCloudExpansionByName(params.get(0)).orElse(null);
+    if (expansion == null) {
+      Msg.msg(sender,
+          "&cThere is no expansion with the name: &f" + params.get(0));
+      return;
+    }
+
+    final List<String> placeholders = expansion.getPlaceholders();
+    if (placeholders == null || placeholders.isEmpty()) {
+      Msg.msg(sender,
+          "&cThe expansion specified does not have placeholders listed.");
+      return;
+    }
+
+    final List<List<String>> partitions = Lists
+        .partition(placeholders.stream().sorted().collect(Collectors.toList()), 10);
+
+    Msg.msg(sender,
+        "&6" + placeholders.size() + "&7 placeholders: &a",
+        partitions.stream().map(partition -> String.join(", ", partition))
+            .collect(Collectors.joining("\n")));
+
+  }
+
+  @Override
+  public void complete(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
+    if (params.size() > 1) {
+      return;
+    }
+
+    final Stream<String> names = plugin.getCloudExpansionManager()
+        .getCloudExpansions()
+        .values()
+        .stream()
+        .map(CloudExpansion::getName)
+        .map(name -> name.replace(' ', '_'));
+
+    suggestByParameter(names, suggestions, params.isEmpty() ? null : params.get(0));
+  }
+
+}

src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudRefresh.java

@@ -0,0 +1,47 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.commands.impl.cloud;
+
+import java.util.List;
+import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import me.clip.placeholderapi.commands.PlaceholderCommand;
+import me.clip.placeholderapi.util.Msg;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Unmodifiable;
+
+public final class CommandECloudRefresh extends PlaceholderCommand {
+
+  public CommandECloudRefresh() {
+    super("refresh");
+  }
+
+  @Override
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params) {
+    plugin.getCloudExpansionManager().load();
+
+    Msg.msg(sender,
+        "&aThe eCloud manager has been refreshed!");
+  }
+
+}

src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudStatus.java

@@ -0,0 +1,64 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.commands.impl.cloud;
+
+import java.util.List;
+import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import me.clip.placeholderapi.commands.PlaceholderCommand;
+import me.clip.placeholderapi.expansion.manager.CloudExpansionManager;
+import me.clip.placeholderapi.util.Msg;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Unmodifiable;
+
+public final class CommandECloudStatus extends PlaceholderCommand {
+
+  public CommandECloudStatus() {
+    super("status");
+  }
+
+  @Override
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params) {
+    final CloudExpansionManager manager = plugin.getCloudExpansionManager();
+
+    final int updateCount = manager.getCloudUpdateCount();
+    final int authorCount = manager.getCloudExpansionAuthorCount();
+    final int expansionCount = manager.getCloudExpansions().size();
+
+    final StringBuilder builder = new StringBuilder();
+
+    builder.append("&bThere are &a").append(expansionCount)
+        .append("&b expansions available on the eCloud.").append('\n');
+    builder.append("&7A total of &f").append(authorCount)
+        .append("&7 authors have contributed to the eCloud.").append('\n');
+
+    if (updateCount > 0) {
+      builder.append("&eYou have &f").append(updateCount)
+          .append(updateCount > 1 ? "&e expansions" : "&e expansion").append(" installed that ")
+          .append(updateCount > 1 ? "have an" : "has an").append(" update available.");
+    }
+
+    Msg.msg(sender, builder.toString());
+  }
+
+}

src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudUpdate.java

@@ -0,0 +1,141 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.commands.impl.cloud;
+
+import com.google.common.collect.Lists;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
+import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import me.clip.placeholderapi.commands.PlaceholderCommand;
+import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import me.clip.placeholderapi.expansion.cloud.CloudExpansion;
+import me.clip.placeholderapi.util.Futures;
+import me.clip.placeholderapi.util.Msg;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.Unmodifiable;
+
+/**
+ * please don't flame me for this code, I will fix this shit later.
+ */
+public final class CommandECloudUpdate extends PlaceholderCommand {
+
+  public CommandECloudUpdate() {
+    super("update");
+  }
+
+  private static CompletableFuture<List<@Nullable Class<? extends PlaceholderExpansion>>> downloadAndDiscover(
+      @NotNull final List<CloudExpansion> expansions, @NotNull final PlaceholderAPIPlugin plugin) {
+    return expansions.stream()
+        .map(expansion -> plugin.getCloudExpansionManager()
+            .downloadExpansion(expansion, expansion.getVersion()))
+        .map(future -> future.thenCompose(plugin.getLocalExpansionManager()::findExpansionInFile))
+        .collect(Futures.collector());
+  }
+
+  @Override
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params) {
+    if (params.isEmpty()) {
+      Msg.msg(sender,
+          "&cYou must define 'all' or the name of an expansion to update.");
+      return;
+    }
+
+    final boolean multiple = params.get(0).equalsIgnoreCase("all");
+    final List<CloudExpansion> expansions = new ArrayList<>();
+
+    // gather target expansions
+    if (multiple) {
+      expansions.addAll(plugin.getCloudExpansionManager().getCloudExpansionsInstalled().values());
+    } else {
+      plugin.getCloudExpansionManager().findCloudExpansionByName(params.get(0))
+          .ifPresent(expansions::add);
+    }
+
+    // remove the ones that are the latest version
+    expansions.removeIf(expansion -> !expansion.shouldUpdate());
+
+    if (expansions.isEmpty()) {
+      Msg.msg(sender,
+          "&cNo updates available for " + (!multiple ? "this expansion."
+              : "your active expansions."));
+      return;
+    }
+
+    Msg.msg(sender,
+        "&aUpdating expansions: " + expansions.stream().map(CloudExpansion::getName)
+            .collect(Collectors.joining("&7, &6", "&8[&6", "&8]&r")));
+
+    Futures.onMainThread(plugin, downloadAndDiscover(expansions, plugin), (classes, exception) -> {
+      if (exception != null) {
+        Msg.msg(sender,
+            "&cFailed to update expansions: &e" + exception.getMessage());
+        return;
+      }
+
+      Msg.msg(sender,
+          "&aSuccessfully downloaded updates, registering new versions.");
+
+      final String message = classes.stream()
+          .filter(Objects::nonNull)
+          .map(plugin.getLocalExpansionManager()::register)
+          .filter(Optional::isPresent)
+          .map(Optional::get)
+          .map(expansion -> "  &a" + expansion.getName() + " &f" + expansion.getVersion())
+          .collect(Collectors.joining("\n"));
+
+      Msg.msg(sender,
+          "&7Registered expansions:", message);
+
+    });
+  }
+
+  @Override
+  public void complete(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
+    if (params.size() > 1) {
+      return;
+    }
+
+    final List<CloudExpansion> installed = Lists
+        .newArrayList(plugin.getCloudExpansionManager().getCloudExpansionsInstalled().values());
+    installed.removeIf(expansion -> !expansion.shouldUpdate());
+
+    if (!installed.isEmpty() && (params.isEmpty() || "all"
+        .startsWith(params.get(0).toLowerCase(Locale.ROOT)))) {
+      suggestions.add("all");
+    }
+
+    suggestByParameter(
+        installed.stream().map(CloudExpansion::getName).map(name -> name.replace(" ", "_")),
+        suggestions, params.isEmpty() ? null : params.get(0));
+  }
+
+}

src/main/java/me/clip/placeholderapi/commands/impl/local/CommandDump.java

@@ -0,0 +1,213 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.commands.impl.local;
+
+import com.google.common.io.CharStreams;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import me.clip.placeholderapi.commands.PlaceholderCommand;
+import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import me.clip.placeholderapi.util.Msg;
+import org.bukkit.command.CommandSender;
+import org.bukkit.plugin.Plugin;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Unmodifiable;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.format.FormatStyle;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Locale;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.logging.Level;
+import java.util.stream.Collectors;
+
+public final class CommandDump extends PlaceholderCommand {
+
+  @NotNull
+  private static final String URL = "https://paste.helpch.at/";
+
+  @NotNull
+  private static final Gson gson = new Gson();
+
+  @NotNull
+  private static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter
+      .ofLocalizedDateTime(FormatStyle.LONG)
+      .withLocale(Locale.US)
+      .withZone(ZoneId.of("UTC"));
+
+
+  public CommandDump() {
+    super("dump");
+  }
+
+  @Override
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params) {
+    postDump(makeDump(plugin)).whenComplete((key, exception) -> {
+      if (exception != null) {
+        plugin.getLogger().log(Level.WARNING, "failed to post dump details", exception);
+
+        Msg.msg(sender,
+            "&cFailed to post dump details, check console.");
+        return;
+      }
+
+      Msg.msg(sender,
+          "&aSuccessfully posted dump: " + URL + key);
+    });
+  }
+
+  @NotNull
+  private CompletableFuture<String> postDump(@NotNull final String dump) {
+    return CompletableFuture.supplyAsync(() -> {
+      try {
+        final HttpURLConnection connection = ((HttpURLConnection) new URL(URL + "documents")
+            .openConnection());
+        connection.setRequestMethod("POST");
+        connection.setRequestProperty("Content-Type", "text/plain; charset=utf-8");
+        connection.setDoOutput(true);
+
+        connection.connect();
+
+        try (final OutputStream stream = connection.getOutputStream()) {
+          stream.write(dump.getBytes(StandardCharsets.UTF_8));
+        }
+
+        try (final InputStream stream = connection.getInputStream()) {
+          final String json = CharStreams.toString(new InputStreamReader(stream, StandardCharsets.UTF_8));
+          return gson.fromJson(json, JsonObject.class).get("key").getAsString();
+        }
+      } catch (final IOException ex) {
+        throw new CompletionException(ex);
+      }
+    });
+  }
+
+  @NotNull
+  private String makeDump(@NotNull final PlaceholderAPIPlugin plugin) {
+    final StringBuilder builder = new StringBuilder();
+
+    builder.append("Generated: ")
+        .append(DATE_FORMAT.format(Instant.now()))
+        .append("\n\n");
+
+    builder.append("PlaceholderAPI: ")
+        .append(plugin.getDescription().getVersion())
+        .append("\n\n");
+
+    builder.append("Expansions Registered:")
+        .append('\n');
+
+    final List<PlaceholderExpansion> expansions = plugin.getLocalExpansionManager()
+        .getExpansions()
+        .stream()
+        .sorted(
+            Comparator.comparing(PlaceholderExpansion::getIdentifier)
+                      .thenComparing(PlaceholderExpansion::getAuthor)
+        )
+        .collect(Collectors.toList());
+
+    int size = expansions.stream().map(e -> e.getIdentifier().length())
+        .max(Integer::compareTo)
+        .orElse(0);
+
+    for (final PlaceholderExpansion expansion : expansions) {
+      builder.append("  ")
+          .append(String.format("%-" + size + "s", expansion.getIdentifier()))
+          .append(" [Author: ")
+          .append(expansion.getAuthor())
+          .append(", Version: ")
+          .append(expansion.getVersion())
+          .append("]\n");
+
+    }
+
+    builder.append('\n');
+
+    builder.append("Expansions Directory:")
+        .append('\n');
+
+    final String[] jars = plugin.getLocalExpansionManager()
+        .getExpansionsFolder()
+        .list((dir, name) -> name.toLowerCase(Locale.ROOT).endsWith(".jar"));
+
+
+    if (jars == null) {
+      builder.append("  ¨[Warning]: Could not load jar files from expansions folder.");
+    } else {
+      for (final String jar : jars) {
+        builder.append("  ")
+            .append(jar)
+            .append('\n');
+      }
+    }
+
+    builder.append('\n');
+
+    builder.append("Server Info: ")
+        .append(plugin.getServer().getBukkitVersion())
+        .append('/')
+        .append(plugin.getServer().getVersion())
+        .append("\n");
+
+    builder.append("Java Version: ")
+        .append(System.getProperty("java.version"))
+        .append("\n\n");
+
+    builder.append("Plugin Info:")
+        .append('\n');
+
+    List<Plugin> plugins = Arrays.stream(plugin.getServer().getPluginManager().getPlugins())
+        .sorted(Comparator.comparing(Plugin::getName))
+        .collect(Collectors.toList());
+    
+    size = plugins.stream().map(pl -> pl.getName().length())
+        .max(Integer::compareTo)
+        .orElse(0);
+
+    for (final Plugin other : plugins) {
+      builder.append("  ")
+          .append(String.format("%-" + size + "s", other.getName()))
+          .append(" [Authors: [")
+          .append(String.join(", ", other.getDescription().getAuthors()))
+          .append("], Version: ")
+          .append(other.getDescription().getVersion())
+          .append("]")
+          .append("\n");
+    }
+
+    return builder.toString();
+  }
+}

src/main/java/me/clip/placeholderapi/commands/impl/local/CommandExpansionRegister.java

@@ -0,0 +1,110 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.commands.impl.local;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.logging.Level;
+import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import me.clip.placeholderapi.commands.PlaceholderCommand;
+import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import me.clip.placeholderapi.expansion.manager.LocalExpansionManager;
+import me.clip.placeholderapi.util.Futures;
+import me.clip.placeholderapi.util.Msg;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Unmodifiable;
+
+public final class CommandExpansionRegister extends PlaceholderCommand {
+
+  public CommandExpansionRegister() {
+    super("register");
+  }
+
+  @Override
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params) {
+    if (params.size() < 1) {
+      Msg.msg(sender,
+          "&cYou must specify the name of an expansion file.");
+      return;
+    }
+
+    final LocalExpansionManager manager = plugin.getLocalExpansionManager();
+
+    final File file = new File(manager.getExpansionsFolder(), params.get(0));
+    if (!file.exists() || !file.getParentFile().equals(manager.getExpansionsFolder())) {
+      Msg.msg(sender,
+          "&cThe file &f" + file.getName() + "&c doesn't exist!");
+      return;
+    }
+
+    Futures.onMainThread(plugin, manager.findExpansionInFile(file), (clazz, exception) -> {
+      if (exception != null) {
+        Msg.msg(sender,
+            "&cFailed to find expansion in file: &f" + file);
+
+        plugin.getLogger()
+            .log(Level.WARNING, "failed to find expansion in file: " + file, exception);
+        return;
+      }
+
+      if (clazz == null) {
+        Msg.msg(sender,
+            "&cNo expansion class found in file: &f" + file);
+        return;
+      }
+
+      final Optional<PlaceholderExpansion> expansion = manager.register(clazz);
+      if (!expansion.isPresent()) {
+        Msg.msg(sender,
+            "&cFailed to register expansion from &f" + params.get(0));
+        return;
+      }
+
+      Msg.msg(sender,
+          "&aSuccessfully registered expansion: &f" + expansion.get().getName());
+
+    });
+  }
+
+  @Override
+  public void complete(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
+    if (params.size() > 1) {
+      return;
+    }
+
+    final String[] fileNames = plugin.getLocalExpansionManager().getExpansionsFolder()
+        .list((dir, name) -> name.endsWith(".jar"));
+    if (fileNames == null || fileNames.length == 0) {
+      return;
+    }
+
+    suggestByParameter(Arrays.stream(fileNames), suggestions,
+        params.isEmpty() ? null : params.get(0));
+  }
+
+}

src/main/java/me/clip/placeholderapi/commands/impl/local/CommandExpansionUnregister.java

@@ -0,0 +1,77 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.commands.impl.local;
+
+import java.util.List;
+import java.util.Optional;
+import me.clip.placeholderapi.PlaceholderAPI;
+import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import me.clip.placeholderapi.commands.PlaceholderCommand;
+import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import me.clip.placeholderapi.util.Msg;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Unmodifiable;
+
+public final class CommandExpansionUnregister extends PlaceholderCommand {
+
+  public CommandExpansionUnregister() {
+    super("unregister");
+  }
+
+  @Override
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params) {
+    if (params.isEmpty()) {
+      Msg.msg(sender,
+          "&cYou must specify the name of the expansion.");
+      return;
+    }
+
+    final Optional<PlaceholderExpansion> expansion = plugin.getLocalExpansionManager()
+        .findExpansionByName(params.get(0));
+    if (!expansion.isPresent()) {
+      Msg.msg(sender,
+          "&cThere is no expansion loaded with the identifier: &f" + params.get(0));
+      return;
+    }
+
+    final String message = !expansion.get().unregister() ?
+        "&cFailed to unregister expansion: &f" :
+        "&aSuccessfully unregistered expansion: &f";
+
+    Msg.msg(sender, message + expansion.get().getName());
+  }
+
+  @Override
+  public void complete(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
+    if (params.size() > 1) {
+      return;
+    }
+
+    suggestByParameter(PlaceholderAPI.getRegisteredIdentifiers().stream(), suggestions,
+        params.isEmpty() ? null : params.get(0));
+  }
+
+}

src/main/java/me/clip/placeholderapi/commands/impl/local/CommandHelp.java

@@ -0,0 +1,72 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.commands.impl.local;
+
+import java.util.List;
+import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import me.clip.placeholderapi.commands.PlaceholderCommand;
+import me.clip.placeholderapi.util.Msg;
+import org.bukkit.command.CommandSender;
+import org.bukkit.plugin.PluginDescriptionFile;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Unmodifiable;
+
+public final class CommandHelp extends PlaceholderCommand {
+
+  public CommandHelp() {
+    super("help");
+  }
+
+
+  @Override
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params) {
+    final PluginDescriptionFile description = plugin.getDescription();
+
+    Msg.msg(sender,
+        "&b&lPlaceholderAPI &8- &7Help Menu &8- &7(&f" + description.getVersion() + "&7)",
+        " ",
+        "&b/papi &fbcparse &9<me|--null|player name> <message>",
+        "  &7&oParse a message with placeholders and broadcast it",
+        "&b/papi &fcmdparse &9<me|player> <command with placeholders>",
+        "  &7&oParse a message with relational placeholders",
+        "&b/papi &fdump",
+        "  &7&oDump all relevant information needed to help debug issues into a paste link.",
+        "&b/papi &finfo &9<placeholder name>",
+        "  &7&oView information for a specific expansion",
+        "&b/papi &flist",
+        "  &7&oList active expansions",
+        "&b/papi &fparse &9<me|--null|player name> <message>",
+        "  &7&oParse a message with placeholders",
+        "&b/papi &fparserel &9<player one> <player two> <message>",
+        "  &7&oParse a message with relational placeholders",
+        "&b/papi &fregister &9<file name>",
+        "  &7&oRegister an expansion by the name of the file",
+        "&b/papi &freload",
+        "  &7&oReload the config of PAPI",
+        "&b/papi &funregister &9<expansion name>",
+        "  &7&oUnregister an expansion by name",
+        "&b/papi &fversion",
+        "  &7&oView plugin info/version");
+  }
+
+}

src/main/java/me/clip/placeholderapi/commands/impl/local/CommandInfo.java

@@ -0,0 +1,113 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.commands.impl.local;
+
+import java.util.List;
+import me.clip.placeholderapi.PlaceholderAPI;
+import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import me.clip.placeholderapi.commands.PlaceholderCommand;
+import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import me.clip.placeholderapi.util.Msg;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Unmodifiable;
+
+public final class CommandInfo extends PlaceholderCommand {
+
+  public CommandInfo() {
+    super("info");
+  }
+
+  @Override
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params) {
+    if (params.isEmpty()) {
+      Msg.msg(sender,
+          "&cYou must specify the name of the expansion.");
+      return;
+    }
+
+    final PlaceholderExpansion expansion = plugin.getLocalExpansionManager()
+        .findExpansionByIdentifier(params.get(0)).orElse(null);
+    if (expansion == null) {
+      Msg.msg(sender,
+          "&cThere is no expansion loaded with the identifier: &f" + params.get(0));
+      return;
+    }
+
+    final StringBuilder builder = new StringBuilder();
+
+    builder.append("&7Placeholder expansion info for: &r")
+        .append(expansion.getName())
+        .append('\n')
+        .append("&7Status: &r")
+        .append(expansion.isRegistered() ? "&aRegistered" : "7cNotRegistered")
+        .append('\n');
+
+    final String author = expansion.getAuthor();
+    if (author != null) {
+      builder.append("&7Author: &r")
+          .append(author)
+          .append('\n');
+    }
+
+    final String version = expansion.getVersion();
+    if (version != null) {
+      builder.append("&7Version: &r")
+          .append(version)
+          .append('\n');
+    }
+
+    final String requiredPlugin = expansion.getRequiredPlugin();
+    if (requiredPlugin != null) {
+      builder.append("&7Requires plugin: &r")
+          .append(requiredPlugin)
+          .append('\n');
+    }
+
+    final List<String> placeholders = expansion.getPlaceholders();
+    if (placeholders != null && !placeholders.isEmpty()) {
+      builder.append("&8&m-- &7Placeholders &8&m--&r")
+          .append('\n');
+
+      for (final String placeholder : placeholders) {
+        builder.append(placeholder)
+            .append('\n');
+      }
+    }
+
+    Msg.msg(sender, builder.toString());
+  }
+
+  @Override
+  public void complete(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
+    if (params.size() > 1) {
+      return;
+    }
+
+    suggestByParameter(PlaceholderAPI.getRegisteredIdentifiers().stream(), suggestions,
+        params.isEmpty() ? null : params.get(0));
+  }
+
+}

src/main/java/me/clip/placeholderapi/commands/impl/local/CommandList.java

@@ -0,0 +1,61 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.commands.impl.local;
+
+import com.google.common.collect.Lists;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import me.clip.placeholderapi.PlaceholderAPI;
+import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import me.clip.placeholderapi.commands.PlaceholderCommand;
+import me.clip.placeholderapi.util.Msg;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Unmodifiable;
+
+public final class CommandList extends PlaceholderCommand {
+
+  public CommandList() {
+    super("list");
+  }
+
+
+  @Override
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params) {
+    final Set<String> identifiers = PlaceholderAPI.getRegisteredIdentifiers();
+    if (identifiers.isEmpty()) {
+      Msg.msg(sender, "&cThere are no placeholder hooks active!");
+      return;
+    }
+
+    final List<List<String>> partitions = Lists
+        .partition(identifiers.stream().sorted().collect(Collectors.toList()), 10);
+
+    Msg.msg(sender,
+        "&7A total of &f" + identifiers.size() + "&7 placeholder hook(s) are active: &a",
+        partitions.stream().map(partition -> String.join("&7, &a", partition))
+            .collect(Collectors.joining("\n")));
+  }
+
+}

src/main/java/me/clip/placeholderapi/commands/impl/local/CommandParse.java

@@ -0,0 +1,256 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.commands.impl.local;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+import java.util.stream.Stream;
+import me.clip.placeholderapi.PlaceholderAPI;
+import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import me.clip.placeholderapi.commands.PlaceholderCommand;
+import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import me.clip.placeholderapi.util.Msg;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.Unmodifiable;
+
+public final class CommandParse extends PlaceholderCommand {
+
+  public CommandParse() {
+    super("parse", "bcparse", "parserel", "cmdparse");
+  }
+
+
+  @Override
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params) {
+    switch (alias.toLowerCase(Locale.ROOT)) {
+      case "parserel":
+        evaluateParseRelation(sender, params);
+        break;
+      case "parse":
+        evaluateParseSingular(sender, params, false, false);
+        break;
+      case "bcparse":
+        evaluateParseSingular(sender, params, true, false);
+        break;
+      case "cmdparse":
+        evaluateParseSingular(sender, params, false, true);
+        break;
+    }
+  }
+
+  @Override
+  public void complete(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
+    switch (alias.toLowerCase(Locale.ROOT)) {
+      case "parserel":
+        completeParseRelation(params, suggestions);
+        break;
+      case "parse":
+      case "bcparse":
+      case "cmdparse":
+        completeParseSingular(sender, params, suggestions);
+        break;
+    }
+  }
+
+
+  private void evaluateParseSingular(@NotNull final CommandSender sender,
+      @NotNull @Unmodifiable final List<String> params, final boolean broadcast,
+      final boolean command) {
+    if (params.size() < 2) {
+      Msg.msg(sender,
+          "&cYou must provide a target and message: &b/papi "
+              + (command ? "cmdparse" : (broadcast ? "bcparse" : "parse")) 
+              + " &7{target} &a{message}");
+      return;
+    }
+
+    OfflinePlayer player;
+
+    if ("me".equalsIgnoreCase(params.get(0))) {
+      if (!(sender instanceof Player)) {
+        Msg.msg(sender, "&cYou must be a player to use &7me&c as a target!");
+        return;
+      }
+
+      player = ((Player) sender);
+    } else if ("--null".equalsIgnoreCase(params.get(0))) {
+      player = null;
+    } else {
+      final OfflinePlayer target = resolvePlayer(params.get(0));
+      if (target == null) {
+        Msg.msg(sender, "&cFailed to find player: &7" + params.get(0));
+        return;
+      }
+
+      player = target;
+    }
+
+    final String message = PlaceholderAPI
+        .setPlaceholders(player, String.join(" ", params.subList(1, params.size())));
+
+    if (command) {
+      Bukkit.dispatchCommand(sender, message);
+      return;
+    }
+
+    if (broadcast) {
+      Bukkit.broadcastMessage(message);
+    } else {
+      sender.sendMessage(message);
+    }
+  }
+
+  private void evaluateParseRelation(@NotNull final CommandSender sender,
+      @NotNull @Unmodifiable final List<String> params) {
+    if (params.size() < 3) {
+      Msg.msg(sender,
+          "&cYou must supply two targets, and a message: &b/papi parserel &7{target one} " 
+              + "{target two} &a{message}");
+      return;
+    }
+    
+    OfflinePlayer playerOne;
+    
+    if ("me".equalsIgnoreCase(params.get(0))) {
+      if (!(sender instanceof Player)) {
+        Msg.msg(sender, "&cYou must be a player to use &7me&c as a target!");
+        return;
+      }
+      
+      playerOne = ((Player) sender);
+    } else {
+      playerOne = resolvePlayer(params.get(0));
+    }
+    
+    if (playerOne == null || !playerOne.isOnline()) {
+      Msg.msg(sender, "&cFailed to find player: &f" + params.get(0));
+      return;
+    }
+    
+    OfflinePlayer playerTwo;
+    
+    if ("me".equalsIgnoreCase(params.get(1))) {
+      if (!(sender instanceof Player)) {
+        Msg.msg(sender, "&cYou must be a player to use &7me&c as a target!");
+        return;
+      }
+      
+      playerTwo = ((Player) sender);
+    } else {
+      playerTwo = resolvePlayer(params.get(1));
+    }
+    
+    if (playerTwo == null || !playerTwo.isOnline()) {
+      Msg.msg(sender, "&cFailed to find player: &f" + params.get(1));
+      return;
+    }
+
+    final String message = PlaceholderAPI
+        .setRelationalPlaceholders((Player) playerOne, (Player) playerTwo,
+            String.join(" ", params.subList(2, params.size())));
+    
+    sender.sendMessage(message);
+  }
+
+
+  private void completeParseSingular(@NotNull final CommandSender sender,
+      @NotNull @Unmodifiable final List<String> params, @NotNull final List<String> suggestions) {
+    if (params.size() <= 1) {
+      if (sender instanceof Player && (params.isEmpty() || "me"
+          .startsWith(params.get(0).toLowerCase(Locale.ROOT)))) {
+        suggestions.add("me");
+      }
+      
+      if ("--null".startsWith(params.get(0).toLowerCase(Locale.ROOT))) {
+        suggestions.add("--null");
+      }
+      
+      final Stream<String> names = Bukkit.getOnlinePlayers().stream().map(Player::getName);
+      suggestByParameter(names, suggestions, params.isEmpty() ? null : params.get(0));
+
+      return;
+    }
+
+    final String name = params.get(params.size() - 1);
+    if (!name.startsWith("%") || name.endsWith("%")) {
+      return;
+    }
+
+    final int index = name.indexOf('_');
+    if (index == -1) {
+      return; // no arguments supplied yet
+    }
+
+    final PlaceholderExpansion expansion = PlaceholderAPIPlugin.getInstance()
+        .getLocalExpansionManager().findExpansionByIdentifier(name.substring(1, index))
+        .orElse(null);
+    if (expansion == null) {
+      return;
+    }
+
+    final Set<String> possible = new HashSet<>(expansion.getPlaceholders());
+
+    PlaceholderAPIPlugin.getInstance()
+        .getCloudExpansionManager()
+        .findCloudExpansionByName(expansion.getName())
+        .ifPresent(cloud -> possible.addAll(cloud.getPlaceholders()));
+
+    suggestByParameter(possible.stream(), suggestions, params.get(params.size() - 1));
+  }
+
+  private void completeParseRelation(@NotNull @Unmodifiable final List<String> params,
+      @NotNull final List<String> suggestions) {
+    if (params.size() > 2) {
+      return;
+    }
+
+    final Stream<String> names = Bukkit.getOnlinePlayers().stream().map(Player::getName);
+    suggestByParameter(names, suggestions, params.isEmpty() ? null : params.get(params.size() - 1));
+  }
+
+
+  @Nullable
+  private OfflinePlayer resolvePlayer(@NotNull final String name) {
+    OfflinePlayer target = Bukkit.getPlayerExact(name);
+    
+    if (target == null) {
+      // Not the best option, but Spigot doesn't offer a good replacement (as usual)
+      target = Bukkit.getOfflinePlayer(name);
+      
+      return target.hasPlayedBefore() ? target : null;
+    }
+
+    return target;
+
+  }
+
+}

src/main/java/me/clip/placeholderapi/commands/impl/local/CommandReload.java

@@ -0,0 +1,43 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.commands.impl.local;
+
+import java.util.List;
+import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import me.clip.placeholderapi.commands.PlaceholderCommand;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Unmodifiable;
+
+public final class CommandReload extends PlaceholderCommand {
+
+  public CommandReload() {
+    super("reload");
+  }
+
+  @Override
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params) {
+    plugin.reloadConf(sender);
+  }
+
+}

src/main/java/me/clip/placeholderapi/commands/impl/local/CommandVersion.java

@@ -0,0 +1,52 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.commands.impl.local;
+
+import java.util.List;
+import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import me.clip.placeholderapi.commands.PlaceholderCommand;
+import me.clip.placeholderapi.util.Msg;
+import org.bukkit.command.CommandSender;
+import org.bukkit.plugin.PluginDescriptionFile;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Unmodifiable;
+
+public final class CommandVersion extends PlaceholderCommand {
+
+  public CommandVersion() {
+    super("version");
+  }
+
+
+  @Override
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params) {
+    final PluginDescriptionFile description = plugin.getDescription();
+
+    Msg.msg(sender,
+        "&b&lPlaceholderAPI &7(&f" + description.getVersion() + "&7)",
+        "&7Author: &f" + description.getAuthors(),
+        "&7PAPI Commands: &b/papi &fhelp",
+        "&7eCloud Commands&8: &b/papi &fecloud");
+  }
+
+}

src/main/java/me/clip/placeholderapi/configuration/ExpansionSort.java

@@ -0,0 +1,47 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.configuration;
+
+import java.util.Comparator;
+import me.clip.placeholderapi.expansion.cloud.CloudExpansion;
+import org.jetbrains.annotations.NotNull;
+
+public enum ExpansionSort implements Comparator<CloudExpansion> {
+
+  NAME(Comparator.comparing(CloudExpansion::getName)),
+  AUTHOR(Comparator.comparing(CloudExpansion::getAuthor)),
+  LATEST(Comparator.comparing(CloudExpansion::getLastUpdate).reversed());
+
+
+  @NotNull
+  private final Comparator<CloudExpansion> comparator;
+
+  ExpansionSort(@NotNull final Comparator<CloudExpansion> comparator) {
+    this.comparator = comparator;
+  }
+
+
+  @Override
+  public final int compare(final CloudExpansion expansion1, final CloudExpansion expansion2) {
+    return comparator.compare(expansion1, expansion2);
+  }
+
+}

src/main/java/me/clip/placeholderapi/configuration/PlaceholderAPIConfig.java

@@ -1,66 +1,89 @@
 /*
+ * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (C) 2018 Ryan McCarthy
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
- * This program is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * PlaceholderAPI is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- *
  */
+
 package me.clip.placeholderapi.configuration;
 
+import java.util.Optional;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import org.jetbrains.annotations.NotNull;
 
-public class PlaceholderAPIConfig {
+public final class PlaceholderAPIConfig {
 
-  private PlaceholderAPIPlugin plugin;
+  @NotNull
+  private final PlaceholderAPIPlugin plugin;
 
-  public PlaceholderAPIConfig(PlaceholderAPIPlugin i) {
-    plugin = i;
+  public PlaceholderAPIConfig(@NotNull final PlaceholderAPIPlugin plugin) {
+    this.plugin = plugin;
   }
 
-  public void loadDefConfig() {
-    plugin.saveDefaultConfig();
-    plugin.reloadConfig();
-  }
 
   public boolean checkUpdates() {
     return plugin.getConfig().getBoolean("check_updates");
   }
 
-  public boolean cloudAllowUnverifiedExpansions() {
-    return plugin.getConfig().getBoolean("cloud_allow_unverified_expansions");
-  }
 
   public boolean isCloudEnabled() {
     return plugin.getConfig().getBoolean("cloud_enabled");
   }
 
-  public void setCloudEnabled(boolean b) {
-    plugin.getConfig().set("cloud_enabled", b);
-    plugin.reloadConfig();
+  public void setCloudEnabled(boolean state) {
+    plugin.getConfig().set("cloud_enabled", state);
+    plugin.saveConfig();
   }
 
-  public String booleanTrue() {
-    return plugin.getConfig().getString("boolean.true");
+
+  public boolean isDebugMode() {
+    return plugin.getConfig().getBoolean("debug", false);
   }
 
-  public String booleanFalse() {
-    return plugin.getConfig().getString("boolean.false");
+
+  public Optional<ExpansionSort> getExpansionSort() {
+    final String option = plugin.getConfig()
+        .getString("cloud_sorting", ExpansionSort.LATEST.name());
+
+    try {
+      //noinspection ConstantConditions (bad spigot annotation)
+      return Optional.of(ExpansionSort.valueOf(option.toUpperCase()));
+    } catch (final IllegalArgumentException ignored) {
+      return Optional.empty();
+    }
   }
 
+
+  @NotNull
   public String dateFormat() {
-    return plugin.getConfig().getString("date_format");
+    //noinspection ConstantConditions (bad spigot annotation)
+    return plugin.getConfig().getString("date_format", "MM/dd/yy HH:mm:ss");
   }
+
+
+  @NotNull
+  public String booleanTrue() {
+    //noinspection ConstantConditions (bad spigot annotation)
+    return plugin.getConfig().getString("boolean.true", "true");
+  }
+
+  @NotNull
+  public String booleanFalse() {
+    //noinspection ConstantConditions (bad spigot annotation)
+    return plugin.getConfig().getString("boolean.false", "false");
+  }
+
 }

src/main/java/me/clip/placeholderapi/events/ExpansionRegisterEvent.java

@@ -1,48 +1,89 @@
 /*
+ * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (C) 2018 Ryan McCarthy
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
- * This program is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * PlaceholderAPI is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- *
  */
+
 package me.clip.placeholderapi.events;
 
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
 
-public class ExpansionRegisterEvent extends Event {
+/**
+ * This event indicates that a <b>single</b> {@link PlaceholderExpansion PlaceholderExpansion} has
+ * been registered in PlaceholderAPI.
+ * 
+ * <p>To know when <b>all</b> Expansions have been registered, use the
+ * {@link me.clip.placeholderapi.events.ExpansionsLoadedEvent ExpansionsLoadedEvent} instead.
+ */
+public final class ExpansionRegisterEvent extends Event implements Cancellable {
 
+  @NotNull
   private static final HandlerList HANDLERS = new HandlerList();
-  private PlaceholderExpansion expansion;
+  @NotNull
+  private final PlaceholderExpansion expansion;
+  private boolean cancelled;
 
-  public ExpansionRegisterEvent(PlaceholderExpansion expansion) {
+  public ExpansionRegisterEvent(@NotNull final PlaceholderExpansion expansion) {
     this.expansion = expansion;
   }
 
+  @NotNull
   public static HandlerList getHandlerList() {
     return HANDLERS;
   }
+  
+  /**
+   * The {@link PlaceholderExpansion PlaceholderExpansion} that was registered in PlaceholderAPI.
+   * <br>The PlaceholderExpansion will be available for use when the event
+   * {@link #isCancelled() was not cancelled}!
+   * 
+   * @return Current instance of the registered {@link PlaceholderExpansion PlaceholderExpansion}
+   */
+  @NotNull
+  public PlaceholderExpansion getExpansion() {
+    return expansion;
+  }
 
+  /**
+   * Indicates if this event was cancelled or not.
+   * <br>A cancelled Event will result in the {@link #getExpansion() PlaceholderExpansion} NOT
+   * being added to PlaceholderAPI's internal list and will therefore be considered not registered
+   * anymore.
+   * 
+   * @return Whether the event has been cancelled or not.
+   */
+  @Override
+  public boolean isCancelled() {
+    return cancelled;
+  }
+
+  @Override
+  public void setCancelled(boolean cancelled) {
+    this.cancelled = cancelled;
+  }
+
+  @NotNull
   @Override
   public HandlerList getHandlers() {
     return HANDLERS;
   }
 
-  public PlaceholderExpansion getExpansion() {
-    return expansion;
-  }
 }

src/main/java/me/clip/placeholderapi/events/ExpansionUnregisterEvent.java

@@ -1,48 +1,70 @@
 /*
+ * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (C) 2018 Ryan McCarthy
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
- * This program is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * PlaceholderAPI is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- *
  */
+
 package me.clip.placeholderapi.events;
 
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
 
-public class ExpansionUnregisterEvent extends Event {
+/**
+ * This event indicates that a {@link PlaceholderExpansion PlaceholderExpansion} has been
+ * unregistered by PlaceholderAPI.
+ * 
+ * <p>Note that this event is triggered <b>before</b> the PlaceholderExpansion is completely
+ * removed.
+ * <br>This includes removing any Listeners, stopping active tasks and clearing the cache of
+ * the PlaceholderExpansion.
+ */
+public final class ExpansionUnregisterEvent extends Event {
 
+  @NotNull
   private static final HandlerList HANDLERS = new HandlerList();
-  private PlaceholderExpansion expansion;
+  
+  @NotNull
+  private final PlaceholderExpansion expansion;
 
-  public ExpansionUnregisterEvent(PlaceholderExpansion expansion) {
+  public ExpansionUnregisterEvent(@NotNull final PlaceholderExpansion expansion) {
     this.expansion = expansion;
   }
 
+  @NotNull
   public static HandlerList getHandlerList() {
     return HANDLERS;
   }
+  
+  /**
+   * The {@link PlaceholderExpansion PlaceholderExpansion} that was unregistered.
+   * 
+   * @return The {@link PlaceholderExpansion PlaceholderExpansion} instance.
+   */
+  @NotNull
+  public PlaceholderExpansion getExpansion() {
+    return expansion;
+  }
 
+  @NotNull
   @Override
   public HandlerList getHandlers() {
     return HANDLERS;
   }
 
-  public PlaceholderExpansion getExpansion() {
-    return expansion;
-  }
 }

src/main/java/me/clip/placeholderapi/events/ExpansionsLoadedEvent.java

@@ -0,0 +1,73 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.events;
+
+
+import java.util.Collections;
+import java.util.List;
+import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * This event indicated that <b>all</b> {@link PlaceholderExpansion PlaceholderExpansions} have
+ * been registered in PlaceholderAPI and can now be used.
+ * <br>This even will also be triggered whenever PlaceholderAPI gets reloaded.
+ * 
+ * <p>All PlaceholderExpansions, except for those loaded by plugins, are loaded
+ * after Spigot triggered its ServerLoadEvent (1.13+), or after PlaceholderAPI has been enabled.
+ */
+public class ExpansionsLoadedEvent extends Event {
+    
+    private final List<PlaceholderExpansion> expansions;
+    
+    public ExpansionsLoadedEvent(List<PlaceholderExpansion> expansions) {
+        this.expansions = Collections.unmodifiableList(expansions);
+    }
+
+    /**
+     * Returns a unmodifiable list of {@link PlaceholderExpansion PlaceholderExpansions} that
+     * have been registered by PlaceholderAPI.
+     * 
+     * <p><b>This list does not include manually registered PlaceholderExpansions.</b>
+     * 
+     * @return List of {@link PlaceholderExpansion registered PlaceholderExpansions}.
+     */
+    @NotNull
+    public final List<PlaceholderExpansion> getExpansions(){
+        return expansions;
+    }
+    
+    @NotNull
+    private static final HandlerList HANDLERS = new HandlerList();
+
+    @NotNull
+    @Override
+    public HandlerList getHandlers() {
+        return HANDLERS;
+    }
+
+    @NotNull
+    public static HandlerList getHandlerList() {
+        return HANDLERS;
+    }
+}

src/main/java/me/clip/placeholderapi/events/PlaceholderHookUnloadEvent.java

@@ -1,55 +1,70 @@
 /*
+ * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (C) 2018 Ryan McCarthy
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
- * This program is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * PlaceholderAPI is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- *
  */
+
 package me.clip.placeholderapi.events;
 
 import me.clip.placeholderapi.PlaceholderHook;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
 
+/**
+ * @deprecated This event is no longer used.
+ */
 @Deprecated
-public class PlaceholderHookUnloadEvent extends Event {
+public final class PlaceholderHookUnloadEvent extends Event {
 
+  @NotNull
   private static final HandlerList HANDLERS = new HandlerList();
-  private String plugin;
-  private PlaceholderHook hook;
 
-  public PlaceholderHookUnloadEvent(String plugin, PlaceholderHook placeholderHook) {
+
+  @NotNull
+  private final String plugin;
+  @NotNull
+  private final PlaceholderHook placeholderHook;
+
+  public PlaceholderHookUnloadEvent(@NotNull final String plugin,
+      @NotNull final PlaceholderHook placeholderHook) {
     this.plugin = plugin;
-    this.hook = placeholderHook;
+    this.placeholderHook = placeholderHook;
   }
 
+  @NotNull
   public static HandlerList getHandlerList() {
     return HANDLERS;
   }
 
+  @NotNull
+  public String getHookName() {
+    return plugin;
+  }
+
+  @NotNull
+  public PlaceholderHook getHook() {
+    return placeholderHook;
+  }
+
+  @NotNull
   @Override
   public HandlerList getHandlers() {
     return HANDLERS;
   }
 
-  public String getHookName() {
-    return plugin;
-  }
-
-  public PlaceholderHook getHook() {
-    return hook;
-  }
 }

src/main/java/me/clip/placeholderapi/exceptions/NoDefaultCommandException.java

@@ -0,0 +1,29 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.exceptions;
+
+public final class NoDefaultCommandException extends RuntimeException {
+
+  public NoDefaultCommandException(final String message) {
+    super(message);
+  }
+}
+

src/main/java/me/clip/placeholderapi/expansion/Cacheable.java

@@ -1,29 +1,31 @@
 /*
+ * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (C) 2018 Ryan McCarthy
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
- * This program is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * PlaceholderAPI is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- *
  */
+
 package me.clip.placeholderapi.expansion;
 
 /**
- * This interface allows a class which extends a {@link PlaceholderExpansion} to have the clear
- * method called when the implementing expansion is unregistered from PlaceholderAPI. This is useful
- * if we want to do things when the implementing hook is unregistered
+ * Classes implementing this interface will have a {@link #clear() clear void} that is called
+ * by PlaceholderAPI whenever the {@link me.clip.placeholderapi.expansion.PlaceholderExpansion PlaceholderExpansion}
+ * is unregistered.
+ * 
+ * <p>This allows you to execute things such as clearing internal caches, saving data to files, etc.
  *
  * @author Ryan McCarthy
  */

src/main/java/me/clip/placeholderapi/expansion/Cleanable.java

@@ -1,31 +1,33 @@
 /*
+ * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (C) 2018 Ryan McCarthy
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
- * This program is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * PlaceholderAPI is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- *
  */
+
 package me.clip.placeholderapi.expansion;
 
 import org.bukkit.entity.Player;
 
 /**
- * This interface allows a class which extends a {@link PlaceholderExpansion} to have the cleanup
- * method called every time a player leaves the server. This is useful if we want to clean up after
- * the player
+ * Classes implementing this interface will have a {@link #cleanup(Player) cleanup void} that is
+ * called by PlaceholderAPI whenever a Player leaves the server.
+ * 
+ * <p>This can be useful for cases where you keep data of the player in a cache or similar
+ * and want to free up space whenever they leave.
  *
  * @author Ryan McCarthy
  */

src/main/java/me/clip/placeholderapi/expansion/Configurable.java

@@ -1,40 +1,54 @@
 /*
+ * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (C) 2018 Ryan McCarthy
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
- * This program is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * PlaceholderAPI is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- *
  */
+
 package me.clip.placeholderapi.expansion;
 
 import java.util.Map;
 
 /**
- * Any {@link PlaceholderExpansion} class which implements configurable will have any options listed
- * in the getDefaults map automatically added to the PlaceholderAPI config.yml file
+ * Implementing this interface allows {@link me.clip.placeholderapi.expansion.PlaceholderExpansion PlaceholderExpansions}
+ * to set a list of default configuration values through the {@link #getDefaults() getDefaults method}
+ * that should be added to the config.yml of PlaceholderAPI.
+ * 
+ * <p>The entries will be added under {@code expansions} as their own section.
+ * <h2>Example:</h2>
+ * returning a Map with key {@code foo} and value {@code bar} will result in the following config entry:
+ * 
+ * <pre><code>
+ * expansions:
+ *   myexpansion:
+ *     foo: "bar"
+ * </code></pre>
+ * 
+ * <p><b>The configuration is set before the PlaceholderExpansion is registered!</b>
  *
  * @author Ryan McCarthy
  */
 public interface Configurable {
 
   /**
-   * This method will be called before the implementing class is registered to obtain a map of
-   * configuration options that the implementing class needs These paths and values will be added to
-   * the PlaceholderAPI config.yml in the configuration section expansions.(placeholder
-   * identifier).(your key): (your value)
+   * The map returned by this method will be used to set config options in PlaceholderAPI's config.yml.
+   * 
+   * <p>The key and value pairs are set under a section named after your
+   * {@link me.clip.placeholderapi.expansion.PlaceholderExpansion PlaceholderExpansion} in the
+   * {@code expansions} section of the config.
    *
    * @return Map of config path / values which need to be added / removed from the PlaceholderAPI
    * config.yml file

src/main/java/me/clip/placeholderapi/expansion/ExpansionManager.java

@@ -1,183 +0,0 @@
-/*
- *
- * PlaceholderAPI
- * Copyright (C) 2018 Ryan McCarthy
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- *
- */
-package me.clip.placeholderapi.expansion;
-
-import java.io.File;
-import java.lang.reflect.Constructor;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import me.clip.placeholderapi.PlaceholderAPI;
-import me.clip.placeholderapi.PlaceholderAPIPlugin;
-import me.clip.placeholderapi.PlaceholderHook;
-import me.clip.placeholderapi.expansion.cloud.CloudExpansion;
-import me.clip.placeholderapi.util.FileUtil;
-import org.bukkit.Bukkit;
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.event.Listener;
-
-public final class ExpansionManager {
-  private PlaceholderAPIPlugin plugin;
-
-  public ExpansionManager(PlaceholderAPIPlugin instance) {
-    plugin = instance;
-    File f = new File(PlaceholderAPIPlugin.getInstance().getDataFolder(), "expansions");
-    if (!f.exists()) {
-      f.mkdirs();
-    }
-  }
-
-  public PlaceholderExpansion getRegisteredExpansion(String name) {
-    for (Entry<String, PlaceholderHook> hook : PlaceholderAPI.getPlaceholders().entrySet()) {
-      if (hook.getValue() instanceof PlaceholderExpansion) {
-        if (name.equalsIgnoreCase(hook.getKey())) {
-          return (PlaceholderExpansion) hook.getValue();
-        }
-      }
-    }
-    return null;
-  }
-
-  public boolean registerExpansion(PlaceholderExpansion expansion) {
-    if (expansion == null || expansion.getIdentifier() == null) {
-      return false;
-    }
-    if (expansion instanceof Configurable) {
-      Map<String, Object> defaults = ((Configurable) expansion).getDefaults();
-      String pre = "expansions." + expansion.getIdentifier() + ".";
-      FileConfiguration cfg = plugin.getConfig();
-      boolean save = false;
-      for (Entry<String, Object> entries : defaults.entrySet()) {
-        if (entries.getKey() == null || entries.getKey().isEmpty()) {
-          continue;
-        }
-        if (entries.getValue() == null) {
-          if (cfg.contains(pre + entries.getKey())) {
-            save = true;
-            cfg.set(pre + entries.getKey(), null);
-          }
-        } else {
-          if (!cfg.contains(pre + entries.getKey())) {
-            save = true;
-            cfg.set(pre + entries.getKey(), entries.getValue());
-          }
-        }
-      }
-      if (save) {
-        plugin.saveConfig();
-        plugin.reloadConfig();
-      }
-    }
-    if (expansion instanceof VersionSpecific) {
-      VersionSpecific nms = (VersionSpecific) expansion;
-      if (!nms.isCompatibleWith(PlaceholderAPIPlugin.getServerVersion())) {
-        plugin.getLogger()
-            .info(
-                "Your server version is not compatible with expansion: " + expansion.getIdentifier()
-                    + " version: " + expansion.getVersion());
-        return false;
-      }
-    }
-    if (!expansion.canRegister()) {
-      return false;
-    }
-    if (!expansion.register()) {
-      return false;
-    }
-    if (expansion instanceof Listener) {
-      Listener l = (Listener) expansion;
-      Bukkit.getPluginManager().registerEvents(l, plugin);
-    }
-    plugin.getLogger().info("Successfully registered expansion: " + expansion.getIdentifier());
-    if (expansion instanceof Taskable) {
-      ((Taskable) expansion).start();
-    }
-    if (plugin.getExpansionCloud() != null) {
-      CloudExpansion ce = plugin.getExpansionCloud().getCloudExpansion(expansion.getIdentifier());
-      if (ce != null) {
-        ce.setHasExpansion(true);
-        if (!ce.getLatestVersion().equals(expansion.getVersion())) {
-          ce.setShouldUpdate(true);
-        }
-      }
-    }
-    return true;
-  }
-
-
-  public PlaceholderExpansion registerExpansion(String fileName) {
-    List<Class<?>> subs = FileUtil.getClasses("expansions", fileName, PlaceholderExpansion.class);
-    if (subs == null || subs.isEmpty()) {
-      return null;
-    }
-    // only register the first instance found as an expansion jar should only have 1 class
-    // extending PlaceholderExpansion
-    PlaceholderExpansion ex = createInstance(subs.get(0));
-    if (registerExpansion(ex)) {
-      return ex;
-    }
-    return null;
-  }
-
-  public void registerAllExpansions() {
-    if (plugin == null) {
-      return;
-    }
-    List<Class<?>> subs = FileUtil.getClasses("expansions", null, PlaceholderExpansion.class);
-    if (subs == null || subs.isEmpty()) {
-      return;
-    }
-    for (Class<?> klass : subs) {
-      PlaceholderExpansion ex = createInstance(klass);
-      if (ex != null) {
-        registerExpansion(ex);
-      }
-    }
-  }
-
-  private PlaceholderExpansion createInstance(Class<?> klass) {
-    if (klass == null) {
-      return null;
-    }
-    PlaceholderExpansion ex = null;
-    if (!PlaceholderExpansion.class.isAssignableFrom(klass)) {
-      return null;
-    }
-    try {
-      Constructor<?>[] c = klass.getConstructors();
-      if (c.length == 0) {
-        ex = (PlaceholderExpansion) klass.newInstance();
-      } else {
-        for (Constructor<?> con : c) {
-          if (con.getParameterTypes().length == 0) {
-            ex = (PlaceholderExpansion) klass.newInstance();
-            break;
-          }
-        }
-      }
-    } catch (Throwable t) {
-      plugin.getLogger()
-          .severe("Failed to init placeholder expansion from class: " + klass.getName());
-      plugin.getLogger().severe(t.getMessage());
-    }
-    return ex;
-  }
-}

src/main/java/me/clip/placeholderapi/expansion/NMSVersion.java

@@ -1,23 +1,23 @@
 /*
+ * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (C) 2018 Ryan McCarthy
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
- * This program is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * PlaceholderAPI is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- *
  */
+
 package me.clip.placeholderapi.expansion;
 
 public enum NMSVersion {
@@ -37,9 +37,26 @@ public enum NMSVersion {
   SPIGOT_1_12_R1("v1_12_R1"),
   SPIGOT_1_13_R1("v1_13_R1"),
   SPIGOT_1_13_R2("v1_13_R2"),
-  SPIGOT_1_14_R1("v1_14_R1");
+  SPIGOT_1_14_R1("v1_14_R1"),
+  SPIGOT_1_15_R1("v1_15_R1"),
+  SPIGOT_1_16_R1("v1_16_R1"),
+  SPIGOT_1_16_R2("v1_16_R2"),
+  SPIGOT_1_16_R3("v1_16_R3"),
+  SPIGOT_1_17_R1("v1_17_R1"),
+  SPIGOT_1_18_R1("v1_18_R1"),
+  SPIGOT_1_19_R1("v1_19_R1"),
+  SPIGOT_1_19_R2("v1_19_R2"),
+  SPIGOT_1_19_R3("v1_19_R3"),
+  SPIGOT_1_20_R1("v1_20_R1"),
+  SPIGOT_1_20_R2("v1_20_R2"),
+  SPIGOT_1_20_R3("v1_20_R3"),
+  SPIGOT_1_20_R4("v1_20_R4"),
+  SPIGOT_1_21_R1("v1_21_R1"),
+  SPIGOT_1_21_R2("V1_21_R2"),
+  SPIGOT_1_21_R3("V1_21_R3"),
+  SPIGOT_1_21_R4("V1_21_R4");
 
-  private String version;
+  private final String version;
 
   NMSVersion(String version) {
     this.version = version;
@@ -51,6 +68,7 @@ public enum NMSVersion {
         return v;
       }
     }
+
     return NMSVersion.UNKNOWN;
   }
 

src/main/java/me/clip/placeholderapi/expansion/PlaceholderExpansion.java

@@ -1,49 +1,60 @@
 /*
+ * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (C) 2018 Ryan McCarthy
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
- * This program is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * PlaceholderAPI is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- *
  */
+
 package me.clip.placeholderapi.expansion;
 
+import java.util.Collections;
 import java.util.List;
-import me.clip.placeholderapi.PlaceholderAPI;
+import java.util.logging.Level;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.PlaceholderHook;
-import org.apache.commons.lang.Validate;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.ConfigurationSection;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
+/**
+ * Any class extending this will be able to get registered as a PlaceholderExpansion.
+ * <br>The registration either happens automatically when the jar file containing a
+ * class extending this one is located under the {@code PlaceholderAPI/expansions}
+ * directory or when the {@link #register()} method is called by said class.
+ */
 public abstract class PlaceholderExpansion extends PlaceholderHook {
 
   /**
-   * The name of this expansion
-   *
-   * @return {@link #getIdentifier()} by default, name of this expansion if specified
+   * The type is {@link Type#INTERNAL} by default.
+   * For external expansions, the type is updated on {@link me.clip.placeholderapi.expansion.manager.LocalExpansionManager#register(Class) register}.
+   * @since 2.11.4
    */
-  public String getName() {
-    return getIdentifier();
-  }
+  @ApiStatus.Internal
+  protected Type expansionType = Type.INTERNAL;
 
   /**
-   * The placeholder identifier of this expanion
+   * The placeholder identifier of this expansion. May not contain {@literal %},
+   * {@literal {}} or _
    *
    * @return placeholder identifier that is associated with this expansion
    */
+  @NotNull
   public abstract String getIdentifier();
 
   /**
@@ -51,6 +62,7 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
    *
    * @return name of the author for this expansion
    */
+  @NotNull
   public abstract String getAuthor();
 
   /**
@@ -58,14 +70,25 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
    *
    * @return current version of this expansion
    */
+  @NotNull
   public abstract String getVersion();
 
   /**
-   * The name of the plugin that this expansion hooks into. by default will return the deprecated
-   * {@link #getPlugin()} method
+   * The name of this expansion
+   *
+   * @return {@link #getIdentifier()} by default, name of this expansion if specified
+   */
+  @NotNull
+  public String getName() {
+    return getIdentifier();
+  }
+
+  /**
+   * The name of the plugin that this expansion hooks into. by default will null
    *
    * @return plugin name that this expansion requires to function
    */
+  @Nullable
   public String getRequiredPlugin() {
     return getPlugin();
   }
@@ -75,10 +98,12 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
    *
    * @return placeholder list that this expansion provides
    */
+  @NotNull
   public List<String> getPlaceholders() {
-    return null;
+    return Collections.emptyList();
   }
 
+
   /**
    * Expansions that do not use the ecloud and instead register from the dependency should set this
    * to true to ensure that your placeholder expansion is not unregistered when the papi reload
@@ -90,16 +115,18 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
     return false;
   }
 
+
   /**
-   * Check if this placeholder identfier has already been registered
+   * Check if this placeholder identifier has already been registered
    *
    * @return true if the identifier for this expansion is already registered
    */
-  public boolean isRegistered() {
-    Validate.notNull(getIdentifier(), "Placeholder identifier can not be null!");
-    return PlaceholderAPI.getRegisteredIdentifiers().contains(getIdentifier());
+  public final boolean isRegistered() {
+    return getPlaceholderAPI().getLocalExpansionManager().findExpansionByIdentifier(getIdentifier())
+        .map(it -> it.equals(this)).orElse(false);
   }
 
+
   /**
    * If any requirements need to be checked before this expansion should register, you can check
    * them here
@@ -117,83 +144,336 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
    * @return true if this expansion is now registered with PlaceholderAPI
    */
   public boolean register() {
-    Validate.notNull(getIdentifier(), "Placeholder identifier can not be null!");
-    return PlaceholderAPI.registerExpansion(this);
+    return getPlaceholderAPI().getLocalExpansionManager().register(this);
   }
 
+  /**
+   * Attempt to unregister this PlaceholderExpansion
+   *
+   * @return true if this expansion is now unregistered with PlaceholderAPI
+   */
+  public final boolean unregister() {
+    return getPlaceholderAPI().getLocalExpansionManager().unregister(this);
+  }
+
+
   /**
    * Quick getter for the {@link PlaceholderAPIPlugin} instance
    *
    * @return {@link PlaceholderAPIPlugin} instance
    */
-  public PlaceholderAPIPlugin getPlaceholderAPI() {
+  @NotNull
+  public final PlaceholderAPIPlugin getPlaceholderAPI() {
     return PlaceholderAPIPlugin.getInstance();
   }
 
-  public String getString(String path, String def) {
-    return getPlaceholderAPI().getConfig()
-        .getString("expansions." + getIdentifier() + "." + path, def);
+  /**
+   * Get the type of the expansion
+   *
+   * @return the type of the expansion
+   * @since 2.11.4
+   */
+  @ApiStatus.Internal
+  public Type getExpansionType() {
+    return expansionType;
   }
 
-  public int getInt(String path, int def) {
-    return getPlaceholderAPI().getConfig()
-        .getInt("expansions." + getIdentifier() + "." + path, def);
+  /**
+   * Set the type of the expansion
+   * @param expansionType the new type
+   * @since 2.11.4
+   */
+  @ApiStatus.Internal
+  public void setExpansionType(Type expansionType) {
+    this.expansionType = expansionType;
   }
 
-  public long getLong(String path, long def) {
-    return getPlaceholderAPI().getConfig()
-        .getLong("expansions." + getIdentifier() + "." + path, def);
-  }
-
-  public double getDouble(String path, double def) {
-    return getPlaceholderAPI().getConfig()
-        .getDouble("expansions." + getIdentifier() + "." + path, def);
-  }
-
-  public List<String> getStringList(String path) {
-    return getPlaceholderAPI().getConfig()
-        .getStringList("expansions." + getIdentifier() + "." + path);
-  }
-
-  public Object get(String path, Object def) {
-    return getPlaceholderAPI().getConfig().get("expansions." + getIdentifier() + "." + path, def);
-  }
-
-  public ConfigurationSection getConfigSection(String path) {
-    return getPlaceholderAPI().getConfig()
-        .getConfigurationSection("expansions." + getIdentifier() + "." + path);
-  }
-
-  public ConfigurationSection getConfigSection() {
+  // === Configuration ===
+  
+  /**
+   * Gets the ConfigurationSection of the expansion located in the config.yml of PlaceholderAPI or
+   * null when not specified.
+   * <br>You may use the {@link Configurable} interface to define default values set
+   * 
+   * @return ConfigurationSection that this expansion has.
+   */
+  @Nullable
+  public final ConfigurationSection getConfigSection() {
     return getPlaceholderAPI().getConfig().getConfigurationSection("expansions." + getIdentifier());
   }
-
-  public boolean configurationContains(String path) {
-    return getPlaceholderAPI().getConfig().contains("expansions." + getIdentifier() + "." + path);
+  
+  /**
+   * Gets the ConfigurationSection relative to the {@link #getConfigSection() default one} set
+   * by the expansion or null when the default ConfigurationSection is null
+   * 
+   * @param path The path to get the ConfigurationSection from. This is relative to the default section
+   * @return ConfigurationSection relative to the default section
+   */
+  @Nullable
+  public final ConfigurationSection getConfigSection(@NotNull final String path) {
+    final ConfigurationSection section = getConfigSection();
+    return section == null ? null : section.getConfigurationSection(path);
+  }
+  
+  /**
+   * Gets the Object relative to the {@link #getConfigSection() default ConfigurationSection} set
+   * by the expansion or the provided Default Object, when the default ConfigurationSection is null
+   * 
+   * @param path The path to get the Object from. This is relative to the default section
+   * @param def The default Object to return when the ConfigurationSection returns null
+   * @return Object from the provided path or the default one provided
+   */
+  @Nullable
+  @Contract("_, !null -> !null")
+  public final Object get(@NotNull final String path, final Object def) {
+    final ConfigurationSection section = getConfigSection();
+    return section == null ? def : section.get(path, def);
+  }
+  
+  /**
+   * Gets the int relative to the {@link #getConfigSection() default ConfigurationSection} set
+   * by the expansion or the provided Default int, when the default ConfigurationSection is null
+   *
+   * @param path The path to get the int from. This is relative to the default section
+   * @param def The default int to return when the ConfigurationSection returns null
+   * @return int from the provided path or the default one provided
+   */
+  public final int getInt(@NotNull final String path, final int def) {
+    final ConfigurationSection section = getConfigSection();
+    return section == null ? def : section.getInt(path, def);
+  }
+  
+  /**
+   * Gets the long relative to the {@link #getConfigSection() default ConfigurationSection} set
+   * by the expansion or the provided Default long, when the default ConfigurationSection is null
+   *
+   * @param path The path to get the long from. This is relative to the default section
+   * @param def The default long to return when the ConfigurationSection returns null
+   * @return long from the provided path or the default one provided
+   */
+  public final long getLong(@NotNull final String path, final long def) {
+    final ConfigurationSection section = getConfigSection();
+    return section == null ? def : section.getLong(path, def);
+  }
+  
+  /**
+   * Gets the double relative to the {@link #getConfigSection() default ConfigurationSection} set
+   * by the expansion or the provided Default double, when the default ConfigurationSection is null
+   *
+   * @param path The path to get the double from. This is relative to the default section
+   * @param def The default double to return when the ConfigurationSection returns null
+   * @return double from the provided path or the default one provided
+   */
+  public final double getDouble(@NotNull final String path, final double def) {
+    final ConfigurationSection section = getConfigSection();
+    return section == null ? def : section.getDouble(path, def);
+  }
+  
+  /**
+   * Gets the String relative to the {@link #getConfigSection() default ConfigurationSection} set
+   * by the expansion or the provided Default String, when the default ConfigurationSection is null
+   *
+   * @param path The path to get the String from. This is relative to the default section
+   * @param def The default String to return when the ConfigurationSection returns null. Can be null
+   * @return String from the provided path or the default one provided
+   */
+  @Nullable
+  @Contract("_, !null -> !null")
+  public final String getString(@NotNull final String path, @Nullable final String def) {
+    final ConfigurationSection section = getConfigSection();
+    return section == null ? def : section.getString(path, def);
+  }
+  
+  /**
+   * Gets a String List relative to the {@link #getConfigSection() default ConfigurationSection} set
+   * by the expansion or an empty List, when the default ConfigurationSection is null
+   *
+   * @param path The path to get the String list from. This is relative to the default section
+   * @return String list from the provided path or an empty list
+   */
+  @NotNull
+  public final List<String> getStringList(@NotNull final String path) {
+    final ConfigurationSection section = getConfigSection();
+    return section == null ? Collections.emptyList() : section.getStringList(path);
+  }
+  
+  /**
+   * Gets the boolean relative to the {@link #getConfigSection() default ConfigurationSection} set
+   * by the expansion or the default boolean, when the default ConfigurationSection is null
+   *
+   * @param path The path to get the boolean from. This is relative to the default section
+   * @param def The default boolean to return when the ConfigurationSection is null
+   * @return boolean from the provided path or the default one provided
+   */
+  public final boolean getBoolean(@NotNull final String path, final boolean def) {
+    final ConfigurationSection section = getConfigSection();
+    return section == null ? def : section.getBoolean(path, def);
   }
 
+  /**
+   * Whether the {@link #getConfigSection() default ConfigurationSection} contains the provided path
+   * or not. This will return {@code false} when either the default section is null, or doesn't
+   * contain the provided path
+   *
+   * @param path The path to check
+   * @return true when the default ConfigurationSection is not null and contains the path, false otherwise
+   */
+  public final boolean configurationContains(@NotNull final String path) {
+    final ConfigurationSection section = getConfigSection();
+    return section != null && section.contains(path);
+  }
+
+  /**
+   * Logs the provided message with the provided Level in the console.
+   * <br>The message will be prefixed with {@link #getName() <code>[&lt;expansion name&gt;]</code>}
+   * 
+   * @param level The Level at which the message should be logged with
+   * @param msg The message to log
+   */
+  public void log(Level level, String msg) {
+    getPlaceholderAPI().getLogger().log(level, "[" + getName() + "] " + msg);
+  }
+
+  /**
+   * Logs the provided message and Throwable with the provided Level in the console.
+   * <br>The message will be prefixed with {@link #getName() <code>[&lt;expansion name&gt;]</code>}
+   *
+   * @param level The Level at which the message should be logged with
+   * @param msg The message to log
+   * @param throwable The Throwable to log
+   */
+  public void log(Level level, String msg, Throwable throwable) {
+    getPlaceholderAPI().getLogger().log(level, "[" + getName() + "] " + msg, throwable);
+  }
+
+  /**
+   * Logs the provided message with Level "info".
+   * <br>The message will be prefixed with {@link #getName() <code>[&lt;expansion name&gt;]</code>}
+   *
+   * @param msg The message to log
+   */
+  public void info(String msg) {
+    log(Level.INFO, msg);
+  }
+
+  /**
+   * Logs the provided message with Level "warning".
+   * <br>The message will be prefixed with {@link #getName() <code>[&lt;expansion name&gt;]</code>}
+   *
+   * @param msg The message to log
+   */
+  public void warning(String msg) {
+    log(Level.WARNING, msg);
+  }
+
+  /**
+   * Logs the provided message with Level "severe" (error).
+   * <br>The message will be prefixed with {@link #getName() <code>[&lt;expansion name&gt;]</code>}
+   *
+   * @param msg The message to log
+   */
+  public void severe(String msg) {
+    log(Level.SEVERE, msg);
+  }
+
+  /**
+   * Logs the provided message and Throwable with Level "severe" (error).
+   * <br>The message will be prefixed with {@link #getName() <code>[&lt;expansion name&gt;]</code>}
+   *
+   * @param msg The message to log
+   * @param throwable The Throwable to log
+   */
+  public void severe(String msg, Throwable throwable) {
+    log(Level.SEVERE, msg, throwable);
+  }
+  
+  
+  /**
+   * Whether the provided Object is an instance of this PlaceholderExpansion.
+   * <br>This method will perform the following checks in order:
+   * <br><ul>
+   *     <li>Checks if Object equals the class. Returns true when equal and continues otherwise</li>
+   *     <li>Checks if the Object is an instance of a PlaceholderExpansion. Returns false if not</li>
+   *     <li>Checks if the Object's Identifier, Author and version equal the one of this class</li>
+   * </ul>
+   * 
+   * @param o The Object to check
+   * @return true or false depending on the above mentioned checks
+   */
+  @Override
+  public final boolean equals(final Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (!(o instanceof PlaceholderExpansion)) {
+      return false;
+    }
+
+    final PlaceholderExpansion expansion = (PlaceholderExpansion) o;
+
+    return getIdentifier().equals(expansion.getIdentifier()) &&
+        getAuthor().equals(expansion.getAuthor()) &&
+        getVersion().equals(expansion.getVersion());
+  }
+  
+  /**
+   * Returns a String containing the Expansion's name, author and version
+   * 
+   * @return String containing name, author and version of the expansion
+   */
+  @Override
+  public final String toString() {
+    return String.format("PlaceholderExpansion[name: '%s', author: '%s', version: '%s', type: '%s']", getName(),
+        getAuthor(), getVersion(), getExpansionType());
+  }
+
+  // === Deprecated API ===
 
   /**
    * @deprecated As of versions greater than 2.8.7, use {@link #getRequiredPlugin()}
+   *
+   * @return The plugin name.
    */
   @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public String getPlugin() {
     return null;
   }
 
   /**
    * @deprecated As of versions greater than 2.8.7, use the expansion cloud to show a description
+   *
+   * @return The description of the expansion.
    */
   @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public String getDescription() {
     return null;
   }
 
   /**
    * @deprecated As of versions greater than 2.8.7, use the expansion cloud to display a link
+   *
+   * @return The link for the expansion.
    */
   @Deprecated
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public String getLink() {
     return null;
   }
-}
+
+  public enum Type {
+
+    /**
+     * An expansion provided by a plugin is considered internal
+     */
+    INTERNAL,
+
+    /**
+     * An expansion loaded from the expansions folder is considered external
+     */
+    EXTERNAL
+
+  }
+
+}

src/main/java/me/clip/placeholderapi/expansion/Relational.java

@@ -1,28 +1,43 @@
 /*
+ * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (C) 2018 Ryan McCarthy
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
- * This program is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * PlaceholderAPI is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- *
  */
+
 package me.clip.placeholderapi.expansion;
 
 import org.bukkit.entity.Player;
 
+/**
+ * Implementing this interface allows your {@link me.clip.placeholderapi.expansion.PlaceholderExpansion PlaceholderExpansion}
+ * to be used as a relational placeholder expansion.
+ * 
+ * <p>Relational placeholders take two Players as input and are always prefixed with {@code rel_},
+ * so {@code %foo_bar%} becomes {@code %rel_foo_bar%}
+ */
 public interface Relational {
 
+  /**
+   * This method is called whenever a placeholder starting with {@code rel_} is called.
+   * 
+   * @param one The first player used for the placeholder.
+   * @param two The second player used for the placeholder.
+   * @param identifier The text right after the expansion's name (%expansion_<b>identifier</b>%)
+   * @return Parsed String from the expansion.
+   */
   String onPlaceholderRequest(Player one, Player two, String identifier);
 }

src/main/java/me/clip/placeholderapi/expansion/Taskable.java

@@ -1,37 +1,43 @@
 /*
+ * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (C) 2018 Ryan McCarthy
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
- * This program is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * PlaceholderAPI is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- *
  */
+
 package me.clip.placeholderapi.expansion;
 
-
+/**
+ * Implementing this interface adds the {@link #start() start} and {@link #stop() stop} void
+ * methods to your {@link me.clip.placeholderapi.expansion.PlaceholderExpansion PlaceholderExpansion}.
+ * 
+ * <p>This can be used to execute methods and tasks whenever the PlaceholderExpansion has been
+ * successfully (un)registered.
+ */
 public interface Taskable {
 
   /**
-   * Called when the implementing class has successfully been registered to the placeholder map
-   * Tasks that need to be performed when this expansion is registered should go here
+   * Called when the implementing class has successfully been registered to the placeholder map.
+   * <br>Tasks that need to be performed when this expansion is registered should go here
    */
   void start();
 
   /**
-   * Called when the implementing class has been unregistered from PlaceholderAPI Tasks that need to
-   * be performed when this expansion has unregistered should go here
+   * Called when the implementing class has been unregistered from PlaceholderAPI.
+   * <br>Tasks that need to be performed when this expansion has unregistered should go here
    */
   void stop();
 }

src/main/java/me/clip/placeholderapi/expansion/Version.java

@@ -1,30 +1,30 @@
 /*
+ * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (C) 2018 Ryan McCarthy
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
- * This program is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * PlaceholderAPI is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- *
  */
+
 package me.clip.placeholderapi.expansion;
 
+@Deprecated
 public final class Version {
 
-  private boolean isSpigot;
-
-  private String version;
+  private final boolean isSpigot;
+  private final String version;
 
   public Version(String version, boolean isSpigot) {
     this.version = version;

src/main/java/me/clip/placeholderapi/expansion/VersionSpecific.java

@@ -1,23 +1,23 @@
 /*
+ * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (C) 2018 Ryan McCarthy
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
- * This program is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * PlaceholderAPI is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- *
  */
+
 package me.clip.placeholderapi.expansion;
 
 /**
@@ -27,13 +27,18 @@ package me.clip.placeholderapi.expansion;
  * with that version.
  *
  * @author Ryan McCarthy
+ *
+ * @deprecated Will be removed in a future release.
  */
+@Deprecated
 public interface VersionSpecific {
 
   /**
    * This method is called before the expansion is attempted to be registered The server version
    * will be passed to this method so you know what version the server is currently running.
    *
+   * @param v The {@link Version} to check against
+   *
    * @return true if your expansion is compatible with the version the server is running.
    */
   boolean isCompatibleWith(Version v);

src/main/java/me/clip/placeholderapi/expansion/cloud/CloudExpansion.java

@@ -1,23 +1,23 @@
 /*
+ * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (C) 2018 Ryan McCarthy
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
- * This program is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * PlaceholderAPI is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- *
  */
+
 package me.clip.placeholderapi.expansion.cloud;
 
 import java.util.List;
@@ -171,7 +171,7 @@ public class CloudExpansion {
     this.versions = versions;
   }
 
-  public class Version {
+  public static class Version {
 
     private String url, version, release_notes;
 

src/main/java/me/clip/placeholderapi/expansion/cloud/ExpansionCloudManager.java

@@ -1,345 +0,0 @@
-/*
- *
- * PlaceholderAPI
- * Copyright (C) 2018 Ryan McCarthy
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- *
- */
-package me.clip.placeholderapi.expansion.cloud;
-
-import com.google.gson.Gson;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.*;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import com.google.gson.reflect.TypeToken;
-import me.clip.placeholderapi.PlaceholderAPI;
-import me.clip.placeholderapi.PlaceholderAPIPlugin;
-import me.clip.placeholderapi.expansion.PlaceholderExpansion;
-import me.clip.placeholderapi.util.Msg;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-public class ExpansionCloudManager {
-
-    private static final String API_URL = "http://api.extendedclip.com/v2/";
-    private static final Gson GSON = new Gson();
-
-
-    private final PlaceholderAPIPlugin plugin;
-    private final File expansionsDir;
-
-    private final List<String> downloading = new ArrayList<>();
-    private final Map<Integer, CloudExpansion> remote = new TreeMap<>();
-
-
-    public ExpansionCloudManager(PlaceholderAPIPlugin plugin) {
-        this.plugin = plugin;
-
-        expansionsDir = new File(plugin.getDataFolder(), "expansions");
-
-        final boolean result = expansionsDir.mkdirs();
-        if (result) {
-            plugin.getLogger().info("Created Expansions Directory");
-        }
-
-    }
-
-
-    public void clean() {
-        remote.clear();
-        downloading.clear();
-    }
-
-
-    public Map<Integer, CloudExpansion> getCloudExpansions() {
-        return remote;
-    }
-
-    public CloudExpansion getCloudExpansion(String name) {
-        return remote.values()
-                     .stream()
-                     .filter(ex -> ex.getName().equalsIgnoreCase(name))
-                     .findFirst()
-                     .orElse(null);
-    }
-
-
-    public int getCloudAuthorCount() {
-        return remote.values()
-                     .stream()
-                     .collect(Collectors.groupingBy(CloudExpansion::getAuthor, Collectors.counting()))
-                     .size();
-    }
-
-    public int getToUpdateCount() {
-        return ((int) PlaceholderAPI.getExpansions()
-                                    .stream()
-                                    .filter(ex -> getCloudExpansion(ex.getName()) != null && getCloudExpansion(ex.getName()).shouldUpdate())
-                                    .count());
-    }
-
-
-    public Map<Integer, CloudExpansion> getAllByAuthor(String author) {
-        if (remote.isEmpty()) return new HashMap<>();
-
-        Map<Integer, CloudExpansion> byAuthor = new TreeMap<>();
-
-        for (CloudExpansion ex : remote.values()) {
-            if (!ex.getAuthor().equalsIgnoreCase(author)) continue;
-
-            byAuthor.put(byAuthor.size(), ex);
-        }
-
-        return byAuthor;
-    }
-
-    public Map<Integer, CloudExpansion> getAllInstalled() {
-        if (remote.isEmpty()) return new HashMap<>();
-
-        Map<Integer, CloudExpansion> has = new TreeMap<>();
-
-        for (CloudExpansion ex : remote.values()) {
-            if (!ex.hasExpansion()) continue;
-
-            has.put(has.size(), ex);
-        }
-
-        return has;
-    }
-
-
-    public int getPagesAvailable(Map<Integer, CloudExpansion> map, int amount) {
-        if (map == null) {
-            return 0;
-        }
-        int pages = map.size() > 0 ? 1 : 0;
-        if (pages == 0) {
-            return pages;
-        }
-        if (map.size() > amount) {
-            pages = map.size() / amount;
-            if (map.size() % amount > 0) {
-                pages++;
-            }
-        }
-        return pages;
-    }
-
-    public Map<Integer, CloudExpansion> getPage(Map<Integer, CloudExpansion> map, int page, int size) {
-        if (map == null || map.size() == 0 || page > getPagesAvailable(map, size)) {
-            return new HashMap<>();
-        }
-
-        int end = size * page;
-        int start = end - size;
-
-        Map<Integer, CloudExpansion> ex = new TreeMap<>();
-        IntStream.range(start, end).forEach(n -> ex.put(n, map.get(n)));
-
-        return ex;
-    }
-
-
-    public void fetch(boolean allowUnverified) {
-
-        plugin.getLogger().info("Fetching available expansion information...");
-
-        plugin.getServer().getScheduler().runTaskAsynchronously(plugin, () -> {
-
-            final String readJson = URLReader.read(API_URL);
-            final Map<String, CloudExpansion> data = GSON.fromJson(readJson, new TypeToken<Map<String, CloudExpansion>>() {
-            }.getType());
-
-            final List<CloudExpansion> unsorted = new ArrayList<>();
-
-            data.forEach((name, cexp) -> {
-
-                if ((allowUnverified || cexp.isVerified()) && cexp.getLatestVersion() != null && cexp.getVersion(cexp.getLatestVersion()) != null) {
-                    cexp.setName(name);
-
-                    PlaceholderExpansion ex = plugin.getExpansionManager().getRegisteredExpansion(cexp.getName());
-
-                    if (ex != null && ex.isRegistered()) {
-                        cexp.setHasExpansion(true);
-                        if (!ex.getVersion().equals(cexp.getLatestVersion())) {
-                            cexp.setShouldUpdate(true);
-                        }
-                    }
-
-                    unsorted.add(cexp);
-                }
-            });
-
-            unsorted.sort(Comparator.comparing(CloudExpansion::getLastUpdate).reversed());
-
-            int count = 0;
-            for (CloudExpansion e : unsorted) {
-                remote.put(count++, e);
-            }
-
-            plugin.getLogger().info(count + " placeholder expansions are available on the cloud.");
-
-            long updates = getToUpdateCount();
-
-            if (updates > 0) {
-                plugin.getLogger().info(updates + " installed expansions have updates available.");
-            }
-
-        });
-    }
-
-
-    public boolean isDownloading(String expansion) {
-        return downloading.contains(expansion);
-    }
-
-    private void download(URL url, String name) throws IOException {
-
-        InputStream is = null;
-
-        FileOutputStream fos = null;
-
-        try {
-
-            URLConnection urlConn = url.openConnection();
-
-            is = urlConn.getInputStream();
-
-            fos = new FileOutputStream(
-                    expansionsDir.getAbsolutePath() + File.separator + "Expansion-" + name + ".jar");
-
-            byte[] buffer = new byte[is.available()];
-
-            int l;
-
-            while ((l = is.read(buffer)) > 0) {
-                fos.write(buffer, 0, l);
-            }
-        } finally {
-            try {
-                if (is != null) {
-                    is.close();
-                }
-            } finally {
-                if (fos != null) {
-                    fos.close();
-                }
-            }
-        }
-    }
-
-
-    public void downloadExpansion(final String player, final CloudExpansion ex) {
-        downloadExpansion(player, ex, ex.getLatestVersion());
-    }
-
-    public void downloadExpansion(final String player, final CloudExpansion ex, final String version) {
-
-        if (downloading.contains(ex.getName())) {
-            return;
-        }
-
-        final CloudExpansion.Version ver = ex.getVersions()
-                                             .stream()
-                                             .filter(v -> v.getVersion().equals(version))
-                                             .findFirst()
-                                             .orElse(null);
-
-        if (ver == null) {
-            return;
-        }
-
-        downloading.add(ex.getName());
-
-        plugin.getLogger().info("Attempting download of expansion: " + ex.getName() + (player != null ? " by user: " + player : "") + " from url: " + ver.getUrl());
-
-        Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
-
-            try {
-
-                download(new URL(ver.getUrl()), ex.getName());
-
-                plugin.getLogger().info("Download of expansion: " + ex.getName() + " complete!");
-
-            } catch (Exception e) {
-
-                plugin.getLogger()
-                      .warning("Failed to download expansion: " + ex.getName() + " from: " + ver.getUrl());
-
-                Bukkit.getScheduler().runTask(plugin, () -> {
-
-                    downloading.remove(ex.getName());
-
-                    if (player != null) {
-                        Player p = Bukkit.getPlayer(player);
-
-                        if (p != null) {
-                            Msg.msg(p, "&cThere was a problem downloading expansion: &f" + ex.getName());
-                        }
-                    }
-                });
-
-                return;
-            }
-
-            Bukkit.getScheduler().runTask(plugin, () -> {
-
-                downloading.remove(ex.getName());
-
-                if (player != null) {
-
-                    Player p = Bukkit.getPlayer(player);
-
-                    if (p != null) {
-                        Msg.msg(p, "&aExpansion &f" + ex.getName() + " &adownload complete!");
-                    }
-                }
-            });
-
-        });
-    }
-
-
-    private static class URLReader {
-
-        static String read(String url) {
-            StringBuilder builder = new StringBuilder();
-
-            try (BufferedReader reader = new BufferedReader(new InputStreamReader(new URL(url).openStream()))) {
-
-                String inputLine;
-                while ((inputLine = reader.readLine()) != null) {
-                    builder.append(inputLine);
-                }
-            } catch (Exception ex) {
-                builder.setLength(0);
-            }
-
-            return builder.toString();
-        }
-    }
-
-}

src/main/java/me/clip/placeholderapi/expansion/manager/CloudExpansionManager.java

@@ -0,0 +1,276 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.expansion.manager;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.io.Resources;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.net.URL;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.function.Function;
+import java.util.logging.Level;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import me.clip.placeholderapi.expansion.cloud.CloudExpansion;
+import me.clip.placeholderapi.util.Msg;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Unmodifiable;
+
+public final class CloudExpansionManager {
+
+  @NotNull
+  private static final String API_URL = "http://api.extendedclip.com/v2/";
+
+  @NotNull
+  private static final Gson GSON = new Gson();
+  @NotNull
+  private static final Type TYPE = new TypeToken<Map<String, CloudExpansion>>() {}.getType();
+
+  @NotNull
+  private final Collector<CloudExpansion, ?, Map<String, CloudExpansion>> INDEXED_NAME_COLLECTOR = Collectors
+      .toMap(CloudExpansionManager::toIndexName, Function.identity());
+
+
+  @NotNull
+  private final PlaceholderAPIPlugin plugin;
+
+  @NotNull
+  private final Map<String, CloudExpansion> cache = new HashMap<>();
+  @NotNull
+  private final Map<String, CompletableFuture<File>> await = new ConcurrentHashMap<>();
+
+  private final ExecutorService ASYNC_EXECUTOR =
+      Executors.newCachedThreadPool(
+          new ThreadFactoryBuilder().setNameFormat("placeholderapi-io-#%1$d").build());
+
+  public CloudExpansionManager(@NotNull final PlaceholderAPIPlugin plugin) {
+    this.plugin = plugin;
+  }
+
+  @NotNull
+  private static String toIndexName(@NotNull final String name) {
+    return name.toLowerCase(Locale.ROOT).replace(' ', '_');
+  }
+
+  @NotNull
+  private static String toIndexName(@NotNull final CloudExpansion expansion) {
+    return toIndexName(expansion.getName());
+  }
+
+  public void load() {
+    clean();
+    fetch();
+  }
+
+  public void kill() {
+    clean();
+  }
+
+  @NotNull
+  @Unmodifiable
+  public Map<String, CloudExpansion> getCloudExpansions() {
+    return ImmutableMap.copyOf(cache);
+  }
+
+  @NotNull
+  @Unmodifiable
+  public Map<String, CloudExpansion> getCloudExpansionsInstalled() {
+    if (cache.isEmpty()) {
+      return Collections.emptyMap();
+    }
+
+    return cache.values()
+        .stream()
+        .filter(CloudExpansion::hasExpansion)
+        .collect(INDEXED_NAME_COLLECTOR);
+  }
+
+  @NotNull
+  @Unmodifiable
+  public Map<String, CloudExpansion> getCloudExpansionsByAuthor(@NotNull final String author) {
+    if (cache.isEmpty()) {
+      return Collections.emptyMap();
+    }
+
+    return cache.values()
+        .stream()
+        .filter(expansion -> author.equalsIgnoreCase(expansion.getAuthor()))
+        .collect(INDEXED_NAME_COLLECTOR);
+  }
+
+  @NotNull
+  @Unmodifiable
+  public Set<String> getCloudExpansionAuthors() {
+    return cache.values().stream().map(CloudExpansion::getAuthor).collect(Collectors.toSet());
+  }
+
+  public int getCloudExpansionAuthorCount() {
+    return getCloudExpansionAuthors().size();
+  }
+
+  public int getCloudUpdateCount() {
+    return ((int) plugin.getLocalExpansionManager()
+        .getExpansions()
+        .stream()
+        .filter(expansion -> findCloudExpansionByName(expansion.getName())
+            .map(CloudExpansion::shouldUpdate).orElse(false))
+        .count());
+  }
+
+  @NotNull
+  public Optional<CloudExpansion> findCloudExpansionByName(@NotNull final String name) {
+    return Optional.ofNullable(cache.get(toIndexName(name)));
+  }
+
+  public void clean() {
+    cache.clear();
+
+    await.values().forEach(future -> future.cancel(true));
+    await.clear();
+  }
+
+  public void fetch() {
+    plugin.getLogger().info("Fetching available expansion information...");
+
+    ASYNC_EXECUTOR.submit(
+        () -> {
+          // a defence tactic! use ConcurrentHashMap instead of normal HashMap
+          Map<String, CloudExpansion> values = new ConcurrentHashMap<>();
+          try {
+            //noinspection UnstableApiUsage
+            String json = Resources.toString(new URL(API_URL), StandardCharsets.UTF_8);
+            values.putAll(GSON.fromJson(json, TYPE));
+
+            List<String> toRemove = new ArrayList<>();
+
+            for (Map.Entry<String, CloudExpansion> entry : values.entrySet()) {
+              CloudExpansion expansion = entry.getValue();
+              if (expansion.getLatestVersion() == null
+                  || expansion.getVersion(expansion.getLatestVersion()) == null) {
+                toRemove.add(entry.getKey());
+              }
+            }
+
+            for (String name : toRemove) {
+              values.remove(name);
+            }
+          } catch (Throwable e) {
+            // ugly swallowing of every throwable, but we have to be defensive
+            plugin.getLogger().log(Level.WARNING, "Failed to download expansion information", e);
+          }
+
+          // loop through what's left on the main thread
+          plugin
+              .getScheduler()
+              .runTask(
+                  () -> {
+                    try {
+                      for (Map.Entry<String, CloudExpansion> entry : values.entrySet()) {
+                        String name = entry.getKey();
+                        CloudExpansion expansion = entry.getValue();
+
+                        expansion.setName(name);
+
+                        Optional<PlaceholderExpansion> localOpt =
+                            plugin.getLocalExpansionManager().findExpansionByName(name);
+                        if (localOpt.isPresent()) {
+                          PlaceholderExpansion local = localOpt.get();
+                          if (local.isRegistered()) {
+                            expansion.setHasExpansion(true);
+                            expansion.setShouldUpdate(
+                                !local.getVersion().equalsIgnoreCase(expansion.getLatestVersion()));
+                          }
+                        }
+
+                        cache.put(toIndexName(expansion), expansion);
+                      }
+                    } catch (Throwable e) {
+                      // ugly swallowing of every throwable, but we have to be defensive
+                      plugin
+                          .getLogger()
+                          .log(Level.WARNING, "Failed to download expansion information", e);
+                    }
+                  });
+        });
+  }
+
+  public boolean isDownloading(@NotNull final CloudExpansion expansion) {
+    return await.containsKey(toIndexName(expansion));
+  }
+
+  @NotNull
+  public CompletableFuture<File> downloadExpansion(@NotNull final CloudExpansion expansion,
+      @NotNull final CloudExpansion.Version version) {
+    final CompletableFuture<File> previous = await.get(toIndexName(expansion));
+    if (previous != null) {
+      return previous;
+    }
+
+    final File file = new File(plugin.getLocalExpansionManager().getExpansionsFolder(),
+        "Expansion-" + toIndexName(expansion) + ".jar");
+
+    final CompletableFuture<File> download = CompletableFuture.supplyAsync(() -> {
+      try (final ReadableByteChannel source = Channels.newChannel(new URL(version.getUrl())
+          .openStream()); final FileOutputStream target = new FileOutputStream(file)) {
+        target.getChannel().transferFrom(source, 0, Long.MAX_VALUE);
+      } catch (final IOException ex) {
+        throw new CompletionException(ex);
+      }
+      return file;
+    }, ASYNC_EXECUTOR);
+
+    download.whenCompleteAsync((value, exception) -> {
+      await.remove(toIndexName(expansion));
+
+      if (exception != null) {
+        Msg.severe("Failed to download %s:%s", exception, expansion.getName(), expansion.getVersion());
+      }
+    }, ASYNC_EXECUTOR);
+
+    await.put(toIndexName(expansion), download);
+
+    return download;
+  }
+
+}

src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java

@@ -0,0 +1,495 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.expansion.manager;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
+import java.io.File;
+import java.lang.reflect.Modifier;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.logging.Level;
+import java.util.stream.Collectors;
+import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import me.clip.placeholderapi.events.ExpansionRegisterEvent;
+import me.clip.placeholderapi.events.ExpansionUnregisterEvent;
+import me.clip.placeholderapi.events.ExpansionsLoadedEvent;
+import me.clip.placeholderapi.expansion.Cacheable;
+import me.clip.placeholderapi.expansion.Cleanable;
+import me.clip.placeholderapi.expansion.Configurable;
+import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import me.clip.placeholderapi.expansion.Taskable;
+import me.clip.placeholderapi.expansion.VersionSpecific;
+import me.clip.placeholderapi.expansion.cloud.CloudExpansion;
+import me.clip.placeholderapi.util.FileUtil;
+import me.clip.placeholderapi.util.Futures;
+import me.clip.placeholderapi.util.Msg;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.event.server.PluginDisableEvent;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.Unmodifiable;
+
+public final class LocalExpansionManager implements Listener {
+
+  @NotNull
+  private static final String EXPANSIONS_FOLDER_NAME = "expansions";
+
+  @NotNull
+  private static final Set<MethodSignature> ABSTRACT_EXPANSION_METHODS = Arrays.stream(PlaceholderExpansion.class.getDeclaredMethods())
+          .filter(method -> Modifier.isAbstract(method.getModifiers()))
+          .map(method -> new MethodSignature(method.getName(), method.getParameterTypes()))
+          .collect(Collectors.toSet());
+
+  @NotNull
+  private final File folder;
+  @NotNull
+  private final PlaceholderAPIPlugin plugin;
+
+  @NotNull
+  private final Map<String, PlaceholderExpansion> expansions = new ConcurrentHashMap<>();
+  private final ReentrantLock expansionsLock = new ReentrantLock();
+
+
+  public LocalExpansionManager(@NotNull final PlaceholderAPIPlugin plugin) {
+    this.plugin = plugin;
+    this.folder = new File(plugin.getDataFolder(), EXPANSIONS_FOLDER_NAME);
+
+    if (!this.folder.exists() && !folder.mkdirs()) {
+      Msg.warn("Failed to create expansions folder!");
+    }
+  }
+
+  public void load(@NotNull final CommandSender sender) {
+    registerAll(sender);
+  }
+
+  public void kill() {
+    unregisterAll();
+  }
+
+
+  @NotNull
+  public File getExpansionsFolder() {
+    return folder;
+  }
+
+  @NotNull
+  @Unmodifiable
+  public Collection<String> getIdentifiers() {
+    expansionsLock.lock();
+    try {
+      return ImmutableSet.copyOf(expansions.keySet());
+    } finally {
+      expansionsLock.unlock();
+    }
+  }
+
+  @NotNull
+  @Unmodifiable
+  public Collection<PlaceholderExpansion> getExpansions() {
+    expansionsLock.lock();
+    try {
+      return ImmutableSet.copyOf(expansions.values());
+    } finally {
+      expansionsLock.unlock();
+    }
+  }
+
+  @Nullable
+  public PlaceholderExpansion getExpansion(@NotNull final String identifier) {
+    expansionsLock.lock();
+    try {
+      return expansions.get(identifier.toLowerCase(Locale.ROOT));
+    } finally {
+      expansionsLock.unlock();
+    }
+  }
+
+  @NotNull
+  public Optional<PlaceholderExpansion> findExpansionByName(@NotNull final String name) {
+    expansionsLock.lock();
+    try {
+      PlaceholderExpansion bestMatch = null;
+      for (Map.Entry<String, PlaceholderExpansion> entry : expansions.entrySet()) {
+        PlaceholderExpansion expansion = entry.getValue();
+        if (expansion.getName().equalsIgnoreCase(name)) {
+          bestMatch = expansion;
+          break;
+        }
+      }
+      return Optional.ofNullable(bestMatch);
+    } finally {
+      expansionsLock.unlock();
+    }
+  }
+
+  @NotNull
+  public Optional<PlaceholderExpansion> findExpansionByIdentifier(
+      @NotNull final String identifier) {
+    return Optional.ofNullable(getExpansion(identifier));
+  }
+
+
+  public Optional<PlaceholderExpansion> register(
+      @NotNull final Class<? extends PlaceholderExpansion> clazz) {
+    try {
+      final PlaceholderExpansion expansion = createExpansionInstance(clazz);
+      
+      if(expansion == null){
+        return Optional.empty();
+      }
+      
+      Objects.requireNonNull(expansion.getAuthor(), "The expansion author is null!");
+      Objects.requireNonNull(expansion.getIdentifier(), "The expansion identifier is null!");
+      Objects.requireNonNull(expansion.getVersion(), "The expansion version is null!");
+      
+      if (expansion.getRequiredPlugin() != null && !expansion.getRequiredPlugin().isEmpty()) {
+        if (!Bukkit.getPluginManager().isPluginEnabled(expansion.getRequiredPlugin())) {
+          Msg.warn("Cannot load expansion %s due to a missing plugin: %s", expansion.getIdentifier(),
+              expansion.getRequiredPlugin());
+          return Optional.empty();
+        }
+      }
+
+      expansion.setExpansionType(PlaceholderExpansion.Type.EXTERNAL);
+      
+      if (!expansion.register()) {
+        Msg.warn("Cannot load expansion %s due to an unknown issue.", expansion.getIdentifier());
+        return Optional.empty();
+      }
+
+      return Optional.of(expansion);
+    } catch (LinkageError | NullPointerException ex) {
+      final String reason;
+
+      if (ex instanceof LinkageError) {
+        reason = " (Is a dependency missing?)";
+      } else {
+        reason = " - One of its properties is null which is not allowed!";
+      }
+      
+      Msg.severe("Failed to load expansion class %s%s", ex, clazz.getSimpleName(), reason);
+    }
+
+    return Optional.empty();
+  }
+
+  /**
+   * Attempt to register a {@link PlaceholderExpansion}
+   * @param expansion the expansion to register
+   * @return if the expansion was registered
+   */
+  @ApiStatus.Internal
+  public boolean register(@NotNull final PlaceholderExpansion expansion) {
+    final String identifier = expansion.getIdentifier().toLowerCase(Locale.ROOT);
+
+    if (!expansion.canRegister()) {
+      return false;
+    }
+
+    // Avoid loading two external expansions with the same identifier
+    if (expansion.getExpansionType() == PlaceholderExpansion.Type.EXTERNAL && expansions.containsKey(identifier)) {
+      Msg.warn("Failed to load external expansion %s. Identifier is already in use.", expansion.getIdentifier());
+      return false;
+    }
+
+    if (expansion instanceof Configurable) {
+      Map<String, Object> defaults = ((Configurable) expansion).getDefaults();
+      String pre = "expansions." + identifier + ".";
+      FileConfiguration cfg = plugin.getConfig();
+      boolean save = false;
+
+      if (defaults != null) {
+        for (Map.Entry<String, Object> entries : defaults.entrySet()) {
+          if (entries.getKey() == null || entries.getKey().isEmpty()) {
+            continue;
+          }
+
+          if (entries.getValue() == null) {
+            if (cfg.contains(pre + entries.getKey())) {
+              save = true;
+              cfg.set(pre + entries.getKey(), null);
+            }
+          } else {
+            if (!cfg.contains(pre + entries.getKey())) {
+              save = true;
+              cfg.set(pre + entries.getKey(), entries.getValue());
+            }
+          }
+        }
+      }
+
+      if (save) {
+        plugin.saveConfig();
+        plugin.reloadConfig();
+      }
+    }
+
+    if (expansion instanceof VersionSpecific) {
+      VersionSpecific nms = (VersionSpecific) expansion;
+      if (!nms.isCompatibleWith(PlaceholderAPIPlugin.getServerVersion())) {
+        Msg.warn("Your server version is incompatible with expansion %s %s",
+            expansion.getIdentifier(), expansion.getVersion());
+        return false;
+      }
+    }
+
+    final PlaceholderExpansion removed = getExpansion(identifier);
+    if (removed != null && !removed.unregister()) {
+      return false;
+    }
+
+    final ExpansionRegisterEvent event = new ExpansionRegisterEvent(expansion);
+    Bukkit.getPluginManager().callEvent(event);
+
+    if (event.isCancelled()) {
+      return false;
+    }
+
+    expansionsLock.lock();
+    try {
+      expansions.put(identifier, expansion);
+    } finally {
+      expansionsLock.unlock();
+    }
+
+    if (expansion instanceof Listener) {
+      Bukkit.getPluginManager().registerEvents(((Listener) expansion), plugin);
+    }
+    
+    Msg.info(
+            "Successfully registered %s expansion: %s [%s]",
+            expansion.getExpansionType().name().toLowerCase(),
+            expansion.getIdentifier(),
+            expansion.getVersion()
+    );
+
+    if (expansion instanceof Taskable) {
+      ((Taskable) expansion).start();
+    }
+
+    // Check eCloud for updates only if the expansion is external
+    if (plugin.getPlaceholderAPIConfig().isCloudEnabled() && expansion.getExpansionType() == PlaceholderExpansion.Type.EXTERNAL) {
+      final Optional<CloudExpansion> cloudExpansionOptional = plugin.getCloudExpansionManager().findCloudExpansionByName(identifier);
+      if (cloudExpansionOptional.isPresent()) {
+        CloudExpansion cloudExpansion = cloudExpansionOptional.get();
+        cloudExpansion.setHasExpansion(true);
+        cloudExpansion.setShouldUpdate(!cloudExpansion.getLatestVersion().equals(expansion.getVersion()));
+      }
+    }
+
+    return true;
+  }
+
+  @ApiStatus.Internal
+  public boolean unregister(@NotNull final PlaceholderExpansion expansion) {
+    if (expansions.remove(expansion.getIdentifier().toLowerCase(Locale.ROOT)) == null) {
+      return false;
+    }
+
+    Bukkit.getPluginManager().callEvent(new ExpansionUnregisterEvent(expansion));
+
+    if (expansion instanceof Listener) {
+      HandlerList.unregisterAll((Listener) expansion);
+    }
+
+    if (expansion instanceof Taskable) {
+      ((Taskable) expansion).stop();
+    }
+
+    if (expansion instanceof Cacheable) {
+      ((Cacheable) expansion).clear();
+    }
+
+    if (plugin.getPlaceholderAPIConfig().isCloudEnabled()) {
+      plugin.getCloudExpansionManager().findCloudExpansionByName(expansion.getName())
+          .ifPresent(cloud -> {
+            cloud.setHasExpansion(false);
+            cloud.setShouldUpdate(false);
+          });
+    }
+
+    return true;
+  }
+
+  private void registerAll(@NotNull final CommandSender sender) {
+    Msg.info("Placeholder expansion registration initializing...");
+
+    Futures.onMainThread(plugin, findExpansionsOnDisk(), (classes, exception) -> {
+      if (exception != null) {
+        Msg.severe("Failed to load class files of expansion.", exception);
+        return;
+      }
+      
+      final List<PlaceholderExpansion> registered = classes.stream()
+          .filter(Objects::nonNull)
+          .map(this::register)
+          .filter(Optional::isPresent)
+          .map(Optional::get)
+          .collect(Collectors.toList());
+
+      final long needsUpdate = registered.stream()
+          .map(expansion -> plugin.getCloudExpansionManager().findCloudExpansionByName(expansion.getName()).orElse(null))
+          .filter(Objects::nonNull)
+          .filter(CloudExpansion::shouldUpdate)
+          .count();
+
+      StringBuilder message = new StringBuilder(registered.size() == 0 ? "&6" : "&a")
+          .append(registered.size())
+          .append(' ')
+          .append("placeholder hook(s) registered!");
+      
+      if (needsUpdate > 0) {
+        message.append(' ')
+            .append("&6")
+            .append(needsUpdate)
+            .append(' ')
+            .append("placeholder hook(s) have an update available.");
+      }
+      
+      
+      Msg.msg(sender, message.toString());
+
+      Bukkit.getPluginManager().callEvent(new ExpansionsLoadedEvent(registered));
+    });
+  }
+
+  private void unregisterAll() {
+    for (final PlaceholderExpansion expansion : Sets.newHashSet(expansions.values())) {
+      if (expansion.persist()) {
+        continue;
+      }
+
+      expansion.unregister();
+    }
+  }
+
+  @NotNull
+  public CompletableFuture<@NotNull List<@Nullable Class<? extends PlaceholderExpansion>>> findExpansionsOnDisk() {
+    File[] files = folder.listFiles((dir, name) -> name.endsWith(".jar"));
+    if (files == null) {
+      return CompletableFuture.completedFuture(Collections.emptyList());
+    }
+    
+    return Arrays.stream(files)
+        .map(this::findExpansionInFile)
+        .collect(Futures.collector());
+  }
+
+  @NotNull
+  public CompletableFuture<@Nullable Class<? extends PlaceholderExpansion>> findExpansionInFile(
+      @NotNull final File file) {
+    return CompletableFuture.supplyAsync(() -> {
+      try {
+        final Class<? extends PlaceholderExpansion> expansionClass = FileUtil.findClass(file, PlaceholderExpansion.class);
+
+        if (expansionClass == null) {
+          Msg.severe("Failed to load expansion %s, as it does not have a class which"
+              + " extends PlaceholderExpansion", file.getName());
+          return null;
+        }
+
+        Set<MethodSignature> expansionMethods = Arrays.stream(expansionClass.getDeclaredMethods())
+                .map(method -> new MethodSignature(method.getName(), method.getParameterTypes()))
+                .collect(Collectors.toSet());
+        if (!expansionMethods.containsAll(ABSTRACT_EXPANSION_METHODS)) {
+          Msg.severe("Failed to load expansion %s, as it does not have the required"
+              + " methods declared for a PlaceholderExpansion.", file.getName());
+          return null;
+        }
+
+        return expansionClass;
+      } catch (VerifyError | NoClassDefFoundError e) {
+        Msg.severe("Failed to load expansion %s (is a dependency missing?)", e, file.getName());
+        return null;
+      } catch (Exception e) {
+        plugin.getLogger().log(Level.SEVERE, "Failed to load expansion file: " + file.getAbsolutePath(), e);
+        return null;
+      }
+    });
+  }
+
+
+  @Nullable
+  public PlaceholderExpansion createExpansionInstance(
+      @NotNull final Class<? extends PlaceholderExpansion> clazz) throws LinkageError {
+    try {
+      return clazz.getDeclaredConstructor().newInstance();
+    } catch (final Exception ex) {
+      if (ex.getCause() instanceof LinkageError) {
+        throw ((LinkageError) ex.getCause());
+      }
+      
+      Msg.warn("There was an issue with loading an expansion.");
+      return null;
+    }
+  }
+
+
+  @EventHandler
+  public void onQuit(@NotNull final PlayerQuitEvent event) {
+    for (final PlaceholderExpansion expansion : getExpansions()) {
+      if (!(expansion instanceof Cleanable)) {
+        continue;
+      }
+
+      ((Cleanable) expansion).cleanup(event.getPlayer());
+    }
+  }
+
+  @EventHandler(priority = EventPriority.HIGH)
+  public void onPluginDisable(@NotNull final PluginDisableEvent event) {
+    final String name = event.getPlugin().getName();
+    if (name.equals(plugin.getName())) {
+      return;
+    }
+
+    for (final PlaceholderExpansion expansion : getExpansions()) {
+      if (!name.equalsIgnoreCase(expansion.getRequiredPlugin())) {
+        continue;
+      }
+
+      expansion.unregister();
+      Msg.info("Unregistered placeholder expansion %s", expansion.getIdentifier());
+      Msg.info("Reason: required plugin %s was disabled.", name);
+    }
+  }
+
+}

src/main/java/me/clip/placeholderapi/expansion/manager/MethodSignature.java

@@ -0,0 +1,57 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.expansion.manager;
+
+import java.util.Arrays;
+import java.util.Objects;
+
+public final class MethodSignature {
+    private final String name;
+    private final Class<?>[] params;
+
+    protected MethodSignature(String name, Class<?>[] params) {
+        this.name = name;
+        this.params = params;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Class<?>[] getParams() {
+        return params;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        MethodSignature that = (MethodSignature) o;
+        return Objects.equals(name, that.name) && Arrays.equals(params, that.params);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = Objects.hash(name);
+        result = 31 * result + Arrays.hashCode(params);
+        return result;
+    }
+}

src/main/java/me/clip/placeholderapi/external/EZPlaceholderHook.java

@@ -1,57 +0,0 @@
-/*
- *
- * PlaceholderAPI
- * Copyright (C) 2018 Ryan McCarthy
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- *
- */
-package me.clip.placeholderapi.external;
-
-import me.clip.placeholderapi.PlaceholderAPI;
-import me.clip.placeholderapi.PlaceholderHook;
-import org.apache.commons.lang.Validate;
-import org.bukkit.plugin.Plugin;
-
-@Deprecated
-public abstract class EZPlaceholderHook extends PlaceholderHook {
-
-  private String identifier;
-
-  private String plugin;
-
-  public EZPlaceholderHook(Plugin plugin, String identifier) {
-    Validate.notNull(plugin, "Plugin can not be null!");
-    Validate.notNull(identifier, "Placeholder name can not be null!");
-    this.identifier = identifier;
-    this.plugin = plugin.getName();
-  }
-
-  public boolean isHooked() {
-    return PlaceholderAPI.getRegisteredPlaceholderPlugins().contains(identifier);
-  }
-
-  public boolean hook() {
-    return PlaceholderAPI.registerPlaceholderHook(identifier, this);
-  }
-
-  public String getPlaceholderName() {
-    return identifier;
-  }
-
-  public String getPluginName() {
-    return plugin;
-  }
-}

src/main/java/me/clip/placeholderapi/listeners/ServerLoadEventListener.java

@@ -0,0 +1,48 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.listeners;
+
+import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import org.bukkit.Bukkit;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.Listener;
+import org.bukkit.event.server.ServerLoadEvent;
+import org.jetbrains.annotations.NotNull;
+
+public final class ServerLoadEventListener implements Listener {
+
+  @NotNull
+  private final PlaceholderAPIPlugin plugin;
+
+  public ServerLoadEventListener(@NotNull final PlaceholderAPIPlugin plugin) {
+    this.plugin = plugin;
+
+    Bukkit.getPluginManager().registerEvents(this, plugin);
+  }
+
+  @EventHandler
+  public void onServerLoad(@NotNull final ServerLoadEvent event) {
+    HandlerList.unregisterAll(this);
+    plugin.getLocalExpansionManager().load(Bukkit.getConsoleSender());
+  }
+
+}

src/main/java/me/clip/placeholderapi/replacer/CharsReplacer.java

@@ -0,0 +1,137 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.replacer;
+
+import java.util.Locale;
+import java.util.function.Function;
+import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import org.bukkit.ChatColor;
+import org.bukkit.OfflinePlayer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public final class CharsReplacer implements Replacer {
+
+  @NotNull
+  private final Closure closure;
+
+  public CharsReplacer(@NotNull final Closure closure) {
+    this.closure = closure;
+  }
+
+
+  @NotNull
+  @Override
+  public String apply(@NotNull final String text, @Nullable final OfflinePlayer player,
+      @NotNull final Function<String, @Nullable PlaceholderExpansion> lookup) {
+    final char[] chars = text.toCharArray();
+    final StringBuilder builder = new StringBuilder(text.length());
+
+    final StringBuilder identifier = new StringBuilder();
+    final StringBuilder parameters = new StringBuilder();
+
+    for (int i = 0; i < chars.length; i++) {
+      final char l = chars[i];
+
+      if (l != closure.head || i + 1 >= chars.length) {
+        builder.append(l);
+        continue;
+      }
+
+      boolean identified = false;
+      boolean invalid = true;
+      boolean hadSpace = false;
+
+      while (++i < chars.length) {
+        final char p = chars[i];
+
+        if (p == ' ' && !identified) {
+          hadSpace = true;
+          break;
+        }
+        if (p == closure.tail) {
+          invalid = false;
+          break;
+        }
+
+        if (p == '_' && !identified) {
+          identified = true;
+          continue;
+        }
+
+        if (identified) {
+          parameters.append(p);
+        } else {
+          identifier.append(p);
+        }
+      }
+
+      final String identifierString = identifier.toString();
+      final String lowercaseIdentifierString = identifierString.toLowerCase(Locale.ROOT);
+      final String parametersString = parameters.toString();
+
+      identifier.setLength(0);
+      parameters.setLength(0);
+
+      if (invalid) {
+        builder.append(closure.head).append(identifierString);
+
+        if (identified) {
+          builder.append('_').append(parametersString);
+        }
+
+        if (hadSpace) {
+          builder.append(' ');
+        }
+        continue;
+      }
+
+      final PlaceholderExpansion placeholder = lookup.apply(lowercaseIdentifierString);
+      if (placeholder == null) {
+        builder.append(closure.head).append(identifierString);
+
+        if (identified) {
+          builder.append('_');
+        }
+
+        builder.append(parametersString).append(closure.tail);
+        continue;
+      }
+
+      final String replacement = placeholder.onRequest(player, parametersString);
+      if (replacement == null) {
+        builder.append(closure.head).append(identifierString);
+
+        if (identified) {
+          builder.append('_');
+        }
+
+        builder.append(parametersString).append(closure.tail);
+        continue;
+      }
+
+      builder.append(replacement);
+    }
+
+    return builder.toString();
+  }
+
+}

src/main/java/me/clip/placeholderapi/replacer/Replacer.java

@@ -0,0 +1,49 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.replacer;
+
+import java.util.function.Function;
+import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import org.bukkit.OfflinePlayer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public interface Replacer {
+
+  @NotNull
+  String apply(@NotNull final String text, @Nullable final OfflinePlayer player,
+      @NotNull final Function<String, @Nullable PlaceholderExpansion> lookup);
+
+
+  enum Closure {
+    BRACKET('{', '}'),
+    PERCENT('%', '%');
+
+
+    public final char head, tail;
+
+    Closure(final char head, final char tail) {
+      this.head = head;
+      this.tail = tail;
+    }
+  }
+
+}

src/main/java/me/clip/placeholderapi/scheduler/UniversalRunnable.java

@@ -0,0 +1,178 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2023 Sevastjan
+ *
+ * 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.clip.placeholderapi.scheduler;
+
+import me.clip.placeholderapi.scheduler.scheduling.schedulers.TaskScheduler;
+import me.clip.placeholderapi.scheduler.scheduling.tasks.MyScheduledTask;
+import org.bukkit.plugin.Plugin;
+
+/** Just modified BukkitRunnable */
+public abstract class UniversalRunnable implements Runnable {
+    MyScheduledTask task;
+
+    public synchronized void cancel() throws IllegalStateException {
+        checkScheduled();
+        task.cancel();
+    }
+
+    /**
+     * Returns true if this task has been cancelled.
+     *
+     * @return true if the task has been cancelled
+     * @throws IllegalStateException if task was not scheduled yet
+     */
+    public synchronized boolean isCancelled() throws IllegalStateException {
+        checkScheduled();
+        return task.isCancelled();
+    }
+
+    /**
+     * Schedules this in the Bukkit scheduler to run on next tick.
+     *
+     * @param plugin the reference to the plugin scheduling task
+     * @return {@link MyScheduledTask}
+     * @throws IllegalArgumentException if plugin is null
+     * @throws IllegalStateException    if this was already scheduled
+     * @see TaskScheduler#runTask(Runnable)
+     */
+
+    public synchronized MyScheduledTask runTask(Plugin plugin) throws IllegalArgumentException, IllegalStateException {
+        checkNotYetScheduled();
+        return setupTask(UniversalScheduler.getScheduler(plugin).runTask(this));
+    }
+
+    /**
+     * <b>Asynchronous tasks should never access any API in Bukkit. Great care
+     * should be taken to assure the thread-safety of asynchronous tasks.</b>
+     * <p>
+     * Schedules this in the Bukkit scheduler to run asynchronously.
+     *
+     * @param plugin the reference to the plugin scheduling task
+     * @return {@link MyScheduledTask}
+     * @throws IllegalArgumentException if plugin is null
+     * @throws IllegalStateException    if this was already scheduled
+     * @see TaskScheduler#runTaskAsynchronously(Runnable)
+     */
+
+    public synchronized MyScheduledTask runTaskAsynchronously(Plugin plugin) throws IllegalArgumentException, IllegalStateException {
+        checkNotYetScheduled();
+        return setupTask(UniversalScheduler.getScheduler(plugin).runTaskAsynchronously(this));
+    }
+
+    /**
+     * Schedules this to run after the specified number of server ticks.
+     *
+     * @param plugin the reference to the plugin scheduling task
+     * @param delay  the ticks to wait before running the task
+     * @return {@link MyScheduledTask}
+     * @throws IllegalArgumentException if plugin is null
+     * @throws IllegalStateException    if this was already scheduled
+     * @see TaskScheduler#runTaskLater(Runnable, long)
+     */
+
+    public synchronized MyScheduledTask runTaskLater(Plugin plugin, long delay) throws IllegalArgumentException, IllegalStateException {
+        checkNotYetScheduled();
+        return setupTask(UniversalScheduler.getScheduler(plugin).runTaskLater(this, delay));
+    }
+
+    /**
+     * <b>Asynchronous tasks should never access any API in Bukkit. Great care
+     * should be taken to assure the thread-safety of asynchronous tasks.</b>
+     * <p>
+     * Schedules this to run asynchronously after the specified number of
+     * server ticks.
+     *
+     * @param plugin the reference to the plugin scheduling task
+     * @param delay  the ticks to wait before running the task
+     * @return {@link MyScheduledTask}
+     * @throws IllegalArgumentException if plugin is null
+     * @throws IllegalStateException    if this was already scheduled
+     * @see TaskScheduler#runTaskLaterAsynchronously(Runnable, long)
+     */
+
+    public synchronized MyScheduledTask runTaskLaterAsynchronously(Plugin plugin, long delay) throws IllegalArgumentException, IllegalStateException {
+        checkNotYetScheduled();
+        return setupTask(UniversalScheduler.getScheduler(plugin).runTaskLaterAsynchronously(this, delay));
+    }
+
+    /**
+     * Schedules this to repeatedly run until cancelled, starting after the
+     * specified number of server ticks.
+     *
+     * @param plugin the reference to the plugin scheduling task
+     * @param delay  the ticks to wait before running the task
+     * @param period the ticks to wait between runs
+     * @return {@link MyScheduledTask}
+     * @throws IllegalArgumentException if plugin is null
+     * @throws IllegalStateException    if this was already scheduled
+     * @see TaskScheduler#runTaskTimer(Runnable, long, long)
+     */
+
+    public synchronized MyScheduledTask runTaskTimer(Plugin plugin, long delay, long period) throws IllegalArgumentException, IllegalStateException {
+        checkNotYetScheduled();
+        return setupTask(UniversalScheduler.getScheduler(plugin).runTaskTimer(this, delay, period));
+    }
+
+    /**
+     * <b>Asynchronous tasks should never access any API in Bukkit. Great care
+     * should be taken to assure the thread-safety of asynchronous tasks.</b>
+     * <p>
+     * Schedules this to repeatedly run asynchronously until cancelled,
+     * starting after the specified number of server ticks.
+     *
+     * @param plugin the reference to the plugin scheduling task
+     * @param delay  the ticks to wait before running the task for the first
+     *               time
+     * @param period the ticks to wait between runs
+     * @return {@link MyScheduledTask}
+     * @throws IllegalArgumentException if plugin is null
+     * @throws IllegalStateException    if this was already scheduled
+     * @see TaskScheduler#runTaskTimerAsynchronously(Runnable, long, long)
+     */
+
+    public synchronized MyScheduledTask runTaskTimerAsynchronously(Plugin plugin, long delay, long period) throws IllegalArgumentException, IllegalStateException {
+        checkNotYetScheduled();
+        return setupTask(UniversalScheduler.getScheduler(plugin).runTaskTimerAsynchronously(this, delay, period));
+    }
+
+    private void checkScheduled() {
+        if (task == null) {
+            throw new IllegalStateException("Not scheduled yet");
+        }
+    }
+
+    private void checkNotYetScheduled() {
+        if (task != null) {
+            throw new IllegalStateException("Already scheduled");
+        }
+    }
+
+
+    private MyScheduledTask setupTask(final MyScheduledTask task) {
+        this.task = task;
+        return task;
+    }
+
+
+}

src/main/java/me/clip/placeholderapi/scheduler/UniversalScheduler.java

@@ -0,0 +1,42 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2023 Sevastjan
+ *
+ * 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.clip.placeholderapi.scheduler;
+
+import me.clip.placeholderapi.scheduler.bukkit.BukkitScheduler;
+import me.clip.placeholderapi.scheduler.folia.FoliaScheduler;
+import me.clip.placeholderapi.scheduler.paper.PaperScheduler;
+import me.clip.placeholderapi.scheduler.scheduling.schedulers.TaskScheduler;
+import me.clip.placeholderapi.scheduler.utils.JavaUtil;
+import org.bukkit.plugin.Plugin;
+
+public class UniversalScheduler {
+    private static final boolean IS_FOLIA = JavaUtil.classExists("io.papermc.paper.threadedregions.RegionizedServer");
+    private static final boolean IS_CANVAS = JavaUtil.classExists("io.canvasmc.canvas.server.ThreadedServer");
+    private static final boolean IS_EXPANDED_SCHEDULING_AVAILABLE = JavaUtil.classExists("io.papermc.paper.threadedregions.scheduler.ScheduledTask");
+
+    public static TaskScheduler getScheduler(Plugin plugin) {
+        return IS_FOLIA || IS_CANVAS ? new FoliaScheduler(plugin) : (IS_EXPANDED_SCHEDULING_AVAILABLE ? new PaperScheduler(plugin) : new BukkitScheduler(plugin));
+    }
+
+}

src/main/java/me/clip/placeholderapi/scheduler/bukkit/BukkitScheduledTask.java

@@ -0,0 +1,71 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2023 Sevastjan
+ *
+ * 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.clip.placeholderapi.scheduler.bukkit;
+
+import me.clip.placeholderapi.scheduler.scheduling.tasks.MyScheduledTask;
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.scheduler.BukkitTask;
+
+public class BukkitScheduledTask implements MyScheduledTask {
+
+    BukkitTask task;
+
+    boolean isRepeating;
+
+    public BukkitScheduledTask(final BukkitTask task) {
+        this.task = task;
+        this.isRepeating = false;
+    }
+
+    public BukkitScheduledTask(final BukkitTask task, boolean isRepeating) {
+        this.task = task;
+        this.isRepeating = isRepeating;
+    }
+
+    @Override
+    public void cancel() {
+        task.cancel();
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return task.isCancelled();
+    }
+
+    @Override
+    public Plugin getOwningPlugin() {
+        return task.getOwner();
+    }
+
+    @Override
+    public boolean isCurrentlyRunning() {
+        return Bukkit.getServer().getScheduler().isCurrentlyRunning(this.task.getTaskId()); //There's no other way. Fuck bukkit
+    }
+
+    @Override
+    public boolean isRepeatingTask() {
+        return isRepeating;
+    }
+}

src/main/java/me/clip/placeholderapi/scheduler/bukkit/BukkitScheduler.java

@@ -0,0 +1,129 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2023 Sevastjan
+ *
+ * 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.clip.placeholderapi.scheduler.bukkit;
+
+import me.clip.placeholderapi.scheduler.scheduling.schedulers.TaskScheduler;
+import me.clip.placeholderapi.scheduler.scheduling.tasks.MyScheduledTask;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.plugin.Plugin;
+
+public class BukkitScheduler implements TaskScheduler {
+    final Plugin plugin;
+
+    public BukkitScheduler(Plugin plugin) {
+        this.plugin = plugin;
+    }
+
+    @Override
+    public boolean isGlobalThread() {
+        return Bukkit.getServer().isPrimaryThread();
+    }
+
+    @Override
+    public boolean isEntityThread(Entity entity) {
+        return Bukkit.getServer().isPrimaryThread();
+    }
+
+    @Override
+    public boolean isRegionThread(Location location) {
+        return Bukkit.getServer().isPrimaryThread();
+    }
+
+    @Override
+    public MyScheduledTask runTask(Runnable runnable) {
+        return new BukkitScheduledTask(Bukkit.getScheduler().runTask(plugin, runnable));
+    }
+
+    @Override
+    public MyScheduledTask runTaskLater(Runnable runnable, long delay) {
+        return new BukkitScheduledTask(Bukkit.getScheduler().runTaskLater(plugin, runnable, delay));
+    }
+
+    @Override
+    public MyScheduledTask runTaskTimer(Runnable runnable, long delay, long period) {
+        return new BukkitScheduledTask(Bukkit.getScheduler().runTaskTimer(plugin, runnable, delay, period));
+    }
+
+    @Override
+    public MyScheduledTask runTaskAsynchronously(Runnable runnable) {
+        return new BukkitScheduledTask(Bukkit.getScheduler().runTaskAsynchronously(plugin, runnable));
+    }
+
+    @Override
+    public MyScheduledTask runTaskLaterAsynchronously(Runnable runnable, long delay) {
+        return new BukkitScheduledTask(Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, runnable, delay));
+    }
+
+    @Override
+    public MyScheduledTask runTaskTimerAsynchronously(Runnable runnable, long delay, long period) {
+        return new BukkitScheduledTask(Bukkit.getScheduler().runTaskTimerAsynchronously(plugin, runnable, delay, period));
+    }
+
+    //Useless? Or...
+    public MyScheduledTask runTask(Plugin plugin, Runnable runnable) {
+        return new BukkitScheduledTask(Bukkit.getScheduler().runTask(plugin, runnable));
+    }
+
+    @Override
+    public MyScheduledTask runTaskLater(Plugin plugin, Runnable runnable, long delay) {
+        return new BukkitScheduledTask(Bukkit.getScheduler().runTaskLater(plugin, runnable, delay));
+    }
+
+    @Override
+    public MyScheduledTask runTaskTimer(Plugin plugin, Runnable runnable, long delay, long period) {
+        return new BukkitScheduledTask(Bukkit.getScheduler().runTaskTimer(plugin, runnable, delay, period));
+    }
+
+    @Override
+    public MyScheduledTask runTaskAsynchronously(Plugin plugin, Runnable runnable) {
+        return new BukkitScheduledTask(Bukkit.getScheduler().runTaskAsynchronously(plugin, runnable));
+    }
+
+    @Override
+    public MyScheduledTask runTaskLaterAsynchronously(Plugin plugin, Runnable runnable, long delay) {
+        return new BukkitScheduledTask(Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, runnable, delay));
+    }
+
+    @Override
+    public MyScheduledTask runTaskTimerAsynchronously(Plugin plugin, Runnable runnable, long delay, long period) {
+        return new BukkitScheduledTask(Bukkit.getScheduler().runTaskTimerAsynchronously(plugin, runnable, delay, period));
+    }
+
+    @Override
+    public void execute(Runnable runnable) {
+        Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, runnable);
+    }
+
+    @Override
+    public void cancelTasks() {
+        Bukkit.getScheduler().cancelTasks(plugin);
+    }
+
+    @Override
+    public void cancelTasks(Plugin plugin) {
+        Bukkit.getScheduler().cancelTasks(plugin);
+    }
+}

src/main/java/me/clip/placeholderapi/scheduler/folia/FoliaScheduledTask.java

@@ -0,0 +1,57 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2023 Sevastjan
+ *
+ * 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.clip.placeholderapi.scheduler.folia;
+
+import me.clip.placeholderapi.scheduler.scheduling.tasks.MyScheduledTask;
+import io.papermc.paper.threadedregions.scheduler.ScheduledTask;
+import org.bukkit.plugin.Plugin;
+
+public class FoliaScheduledTask implements MyScheduledTask {
+    private final ScheduledTask task;
+
+    public FoliaScheduledTask(final ScheduledTask task) {
+        this.task = task;
+    }
+
+    public void cancel() {
+        this.task.cancel();
+    }
+
+    public boolean isCancelled() {
+        return this.task.isCancelled();
+    }
+
+    public Plugin getOwningPlugin() {
+        return this.task.getOwningPlugin();
+    }
+
+    public boolean isCurrentlyRunning() {
+        final ScheduledTask.ExecutionState state = this.task.getExecutionState();
+        return state == ScheduledTask.ExecutionState.RUNNING || state == ScheduledTask.ExecutionState.CANCELLED_RUNNING;
+    }
+
+    public boolean isRepeatingTask() {
+        return this.task.isRepeatingTask();
+    }
+}

src/main/java/me/clip/placeholderapi/scheduler/folia/FoliaScheduler.java

@@ -0,0 +1,220 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2023 Sevastjan
+ *
+ * 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.clip.placeholderapi.scheduler.folia;
+
+import me.clip.placeholderapi.scheduler.scheduling.schedulers.TaskScheduler;
+import me.clip.placeholderapi.scheduler.scheduling.tasks.MyScheduledTask;
+import io.papermc.paper.threadedregions.scheduler.AsyncScheduler;
+import io.papermc.paper.threadedregions.scheduler.GlobalRegionScheduler;
+import io.papermc.paper.threadedregions.scheduler.RegionScheduler;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.plugin.Plugin;
+
+import java.util.concurrent.TimeUnit;
+
+public class FoliaScheduler implements TaskScheduler {
+
+    final Plugin plugin;
+
+    public FoliaScheduler(Plugin plugin) {
+        this.plugin = plugin;
+    }
+
+    private final RegionScheduler regionScheduler = Bukkit.getServer().getRegionScheduler();
+    private final GlobalRegionScheduler globalRegionScheduler = Bukkit.getServer().getGlobalRegionScheduler();
+    private final AsyncScheduler asyncScheduler = Bukkit.getServer().getAsyncScheduler();
+
+    @Override
+    public boolean isGlobalThread() {
+        return Bukkit.getServer().isGlobalTickThread();
+    }
+
+    @Override
+    public boolean isTickThread() {
+        return Bukkit.getServer().isPrimaryThread(); // The Paper implementation checks whether this is a tick thread, this method exists to avoid confusion.
+    }
+
+    @Override
+    public boolean isEntityThread(Entity entity) {
+        return Bukkit.getServer().isOwnedByCurrentRegion(entity);
+    }
+
+    @Override
+    public boolean isRegionThread(Location location) {
+        return Bukkit.getServer().isOwnedByCurrentRegion(location);
+    }
+
+    @Override
+    public MyScheduledTask runTask(Runnable runnable) {
+        return new FoliaScheduledTask(globalRegionScheduler.run(plugin, task -> runnable.run()));
+    }
+
+    @Override
+    public MyScheduledTask runTaskLater(Runnable runnable, long delay) {
+        //Folia exception: Delay ticks may not be <= 0
+        if (delay <= 0) {
+            return runTask(runnable);
+        }
+        return new FoliaScheduledTask(globalRegionScheduler.runDelayed(plugin, task -> runnable.run(), delay));
+    }
+
+    @Override
+    public MyScheduledTask runTaskTimer(Runnable runnable, long delay, long period) {
+        //Folia exception: Delay ticks may not be <= 0
+        delay = getOneIfNotPositive(delay);
+        return new FoliaScheduledTask(globalRegionScheduler.runAtFixedRate(plugin, task -> runnable.run(), delay, period));
+    }
+
+    @Override
+    public MyScheduledTask runTask(Plugin plugin, Runnable runnable) {
+        return new FoliaScheduledTask(globalRegionScheduler.run(plugin, task -> runnable.run()));
+    }
+
+    @Override
+    public MyScheduledTask runTaskLater(Plugin plugin, Runnable runnable, long delay) {
+        //Folia exception: Delay ticks may not be <= 0
+        if (delay <= 0) {
+            return runTask(plugin, runnable);
+        }
+        return new FoliaScheduledTask(globalRegionScheduler.runDelayed(plugin, task -> runnable.run(), delay));
+    }
+
+    @Override
+    public MyScheduledTask runTaskTimer(Plugin plugin, Runnable runnable, long delay, long period) {
+        //Folia exception: Delay ticks may not be <= 0
+        delay = getOneIfNotPositive(delay);
+        return new FoliaScheduledTask(globalRegionScheduler.runAtFixedRate(plugin, task -> runnable.run(), delay, period));
+    }
+
+    @Override
+    public MyScheduledTask runTask(Location location, Runnable runnable) {
+        return new FoliaScheduledTask(regionScheduler.run(plugin, location, task -> runnable.run()));
+    }
+
+    @Override
+    public MyScheduledTask runTaskLater(Location location, Runnable runnable, long delay) {
+        //Folia exception: Delay ticks may not be <= 0
+        if (delay <= 0) {
+            return runTask(runnable);
+        }
+        return new FoliaScheduledTask(regionScheduler.runDelayed(plugin, location, task -> runnable.run(), delay));
+    }
+
+    @Override
+    public MyScheduledTask runTaskTimer(Location location, Runnable runnable, long delay, long period) {
+        //Folia exception: Delay ticks may not be <= 0
+        delay = getOneIfNotPositive(delay);
+        return new FoliaScheduledTask(regionScheduler.runAtFixedRate(plugin, location, task -> runnable.run(), delay, period));
+    }
+
+    @Override
+    public MyScheduledTask runTask(Entity entity, Runnable runnable) {
+        return new FoliaScheduledTask(entity.getScheduler().run(plugin, task -> runnable.run(), null));
+    }
+
+    @Override
+    public MyScheduledTask runTaskLater(Entity entity, Runnable runnable, long delay) {
+        //Folia exception: Delay ticks may not be <= 0
+        if (delay <= 0) {
+            return runTask(entity, runnable);
+        }
+        return new FoliaScheduledTask(entity.getScheduler().runDelayed(plugin, task -> runnable.run(), null, delay));
+    }
+
+    @Override
+    public MyScheduledTask runTaskTimer(Entity entity, Runnable runnable, long delay, long period) {
+        //Folia exception: Delay ticks may not be <= 0
+        delay = getOneIfNotPositive(delay);
+        return new FoliaScheduledTask(entity.getScheduler().runAtFixedRate(plugin, task -> runnable.run(), null, delay, period));
+    }
+
+    @Override
+    public MyScheduledTask runTaskAsynchronously(Runnable runnable) {
+        return new FoliaScheduledTask(asyncScheduler.runNow(plugin, task -> runnable.run()));
+    }
+
+    @Override
+    public MyScheduledTask runTaskLaterAsynchronously(Runnable runnable, long delay) {
+        //Folia exception: Delay ticks may not be <= 0
+        delay = getOneIfNotPositive(delay);
+        return new FoliaScheduledTask(asyncScheduler.runDelayed(plugin, task -> runnable.run(), delay * 50L, TimeUnit.MILLISECONDS));
+    }
+
+    @Override
+    public MyScheduledTask runTaskTimerAsynchronously(Runnable runnable, long delay, long period) {
+        return new FoliaScheduledTask(asyncScheduler.runAtFixedRate(plugin, task -> runnable.run(), delay * 50, period * 50, TimeUnit.MILLISECONDS));
+    }
+
+    @Override
+    public MyScheduledTask runTaskAsynchronously(Plugin plugin, Runnable runnable) {
+        return new FoliaScheduledTask(asyncScheduler.runNow(plugin, task -> runnable.run()));
+    }
+
+    @Override
+    public MyScheduledTask runTaskLaterAsynchronously(Plugin plugin, Runnable runnable, long delay) {
+        //Folia exception: Delay ticks may not be <= 0
+        delay = getOneIfNotPositive(delay);
+        return new FoliaScheduledTask(asyncScheduler.runDelayed(plugin, task -> runnable.run(), delay * 50L, TimeUnit.MILLISECONDS));
+    }
+
+    @Override
+    public MyScheduledTask runTaskTimerAsynchronously(Plugin plugin, Runnable runnable, long delay, long period) {
+        //Folia exception: Delay ticks may not be <= 0
+        delay = getOneIfNotPositive(delay);
+        return new FoliaScheduledTask(asyncScheduler.runAtFixedRate(plugin, task -> runnable.run(), delay * 50, period * 50, TimeUnit.MILLISECONDS));
+    }
+
+    @Override
+    public void execute(Runnable runnable) {
+        globalRegionScheduler.execute(plugin, runnable);
+    }
+
+    @Override
+    public void execute(Location location, Runnable runnable) {
+        regionScheduler.execute(plugin, location, runnable);
+    }
+
+    @Override
+    public void execute(Entity entity, Runnable runnable) {
+        entity.getScheduler().execute(plugin, runnable, null, 1L);
+    }
+
+    @Override
+    public void cancelTasks() {
+        globalRegionScheduler.cancelTasks(plugin);
+        asyncScheduler.cancelTasks(plugin);
+    }
+
+    @Override
+    public void cancelTasks(Plugin plugin) {
+        globalRegionScheduler.cancelTasks(plugin);
+        asyncScheduler.cancelTasks(plugin);
+    }
+
+    private long getOneIfNotPositive(long x) {
+        return x <= 0 ? 1L : x;
+    }
+}

src/main/java/me/clip/placeholderapi/scheduler/paper/PaperScheduler.java

@@ -0,0 +1,41 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2023 Sevastjan
+ *
+ * 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.clip.placeholderapi.scheduler.paper;
+
+import me.clip.placeholderapi.scheduler.folia.FoliaScheduler;
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.Plugin;
+
+//Thanks to Towny
+public class PaperScheduler extends FoliaScheduler {
+    public PaperScheduler(Plugin plugin) {
+        super(plugin);
+    }
+
+    @Override
+    public boolean isGlobalThread() {
+        // isGlobalThread does not exist on paper, match the bukkit task scheduler's behaviour.
+        return Bukkit.getServer().isPrimaryThread();
+    }
+}

src/main/java/me/clip/placeholderapi/scheduler/scheduling/schedulers/TaskScheduler.java

@@ -0,0 +1,346 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2023 Sevastjan
+ *
+ * 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.clip.placeholderapi.scheduler.scheduling.schedulers;
+
+import me.clip.placeholderapi.scheduler.scheduling.tasks.MyScheduledTask;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.plugin.Plugin;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Future;
+
+public interface TaskScheduler {
+
+    /**
+     * <b>Folia</b>: Returns whether the current thread is ticking the global region <br>
+     * <b>Paper & Bukkit</b>: Returns {@link org.bukkit.Server#isPrimaryThread}
+     */
+    boolean isGlobalThread();
+
+    /**
+     * @return {@link org.bukkit.Server#isPrimaryThread}
+     */
+    default boolean isTickThread() {
+        return Bukkit.getServer().isPrimaryThread();
+    }
+
+    /**
+     * <b>Folia & Paper</b>: Returns whether the current thread is ticking a region and that the region
+     * being ticked owns the specified entity. Note that this function is the only appropriate method of
+     * checking for ownership of an entity, as retrieving the entity's location is undefined unless the
+     * entity is owned by the current region
+     * <p>
+     * <b>Bukkit</b>: returns {@link org.bukkit.Server#isPrimaryThread}
+     *
+     * @param entity Specified entity
+     */
+    boolean isEntityThread(Entity entity);
+
+    /**
+     * <b>Folia & Paper</b>: Returns whether the current thread is ticking a region and that the region
+     * being ticked owns the chunk at the specified world and block position as included in the specified location
+     * <p>
+     * <b>Bukkit</b>: returns {@link org.bukkit.Server#isPrimaryThread}
+     *
+     * @param location Specified location, must have a non-null world.
+     */
+    boolean isRegionThread(Location location);
+
+    /**
+     * Schedules a task to be executed on the next tick <br>
+     * <b>Folia & Paper</b>: ...on the global region <br>
+     * <b>Bukkit</b>: ...on the main thread
+     *
+     * @param runnable The task to execute
+     */
+    MyScheduledTask runTask(Runnable runnable);
+
+    /**
+     * Schedules a task to be executed after the specified delay in ticks <br>
+     * <b>Folia & Paper</b>: ...on the global region <br>
+     * <b>Bukkit</b>: ...on the main thread
+     *
+     * @param runnable The task to execute
+     * @param delay    The delay, in ticks
+     */
+    MyScheduledTask runTaskLater(Runnable runnable, long delay);
+
+    /**
+     * Schedules a repeating task to be executed after the initial delay with the specified period <br>
+     * <b>Folia & Paper</b>: ...on the global region <br>
+     * <b>Bukkit</b>: ...on the main thread
+     *
+     * @param runnable The task to execute
+     * @param delay    The initial delay, in ticks.
+     * @param period   The period, in ticks.
+     */
+    MyScheduledTask runTaskTimer(Runnable runnable, long delay, long period);
+
+    /**
+     * Deprecated: use {@link #runTask(Runnable)}
+     */
+    @Deprecated
+    default MyScheduledTask runTask(Plugin plugin, Runnable runnable) {
+        return runTask(runnable);
+    }
+
+    /**
+     * Deprecated: use {@link #runTaskLater(Runnable, long)}
+     */
+    @Deprecated
+    default MyScheduledTask runTaskLater(Plugin plugin, Runnable runnable, long delay) {
+        return runTaskLater(runnable, delay);
+    }
+
+    /**
+     * Deprecated: use {@link #runTaskTimer(Runnable, long, long)}
+     */
+    @Deprecated
+    default MyScheduledTask runTaskTimer(Plugin plugin, Runnable runnable, long delay, long period) {
+        return runTaskTimer(runnable, delay, period);
+    }
+
+    /**
+     * <b>Folia & Paper</b>: Schedules a task to be executed on the region which owns the location on the next tick
+     * <p>
+     * <b>Bukkit</b>: same as {@link #runTask(Runnable)}
+     *
+     * @param location The location which the region executing should own
+     * @param runnable The task to execute
+     */
+    default MyScheduledTask runTask(Location location, Runnable runnable) {
+        return runTask(runnable);
+    }
+
+    /**
+     * <b>Folia & Paper</b>: Schedules a task to be executed on the region which owns the location after the
+     * specified delay in ticks
+     * <p>
+     * <b>Bukkit</b>: same as {@link #runTaskLater(Runnable, long)}
+     *
+     * @param location The location which the region executing should own
+     * @param runnable The task to execute
+     * @param delay    The delay, in ticks.
+     */
+    default MyScheduledTask runTaskLater(Location location, Runnable runnable, long delay) {
+        return runTaskLater(runnable, delay);
+    }
+
+    /**
+     * <b>Folia & Paper</b>: Schedules a repeating task to be executed on the region which owns the location
+     * after the initial delay with the specified period
+     * <p>
+     * <b>Bukkit</b>: same as {@link #runTaskTimer(Runnable, long, long)}
+     *
+     * @param location The location which the region executing should own
+     * @param runnable The task to execute
+     * @param delay    The initial delay, in ticks.
+     * @param period   The period, in ticks.
+     */
+    default MyScheduledTask runTaskTimer(Location location, Runnable runnable, long delay, long period) {
+        return runTaskTimer(runnable, delay, period);
+    }
+
+    /**
+     * Deprecated: use {@link #runTaskLater(Runnable, long)}
+     */
+    @Deprecated
+    default MyScheduledTask scheduleSyncDelayedTask(Runnable runnable, long delay) {
+        return runTaskLater(runnable, delay);
+    }
+
+    /**
+     * Deprecated: use {@link #execute(Runnable)} or {@link #runTask(Runnable)}
+     */
+    @Deprecated
+    default MyScheduledTask scheduleSyncDelayedTask(Runnable runnable) {
+        return runTask(runnable);
+    }
+
+    /**
+     * Deprecated: use {@link #runTaskTimer(Runnable, long, long)}
+     */
+    @Deprecated
+    default MyScheduledTask scheduleSyncRepeatingTask(Runnable runnable, long delay, long period) {
+        return runTaskTimer(runnable, delay, period);
+    }
+
+    /**
+     * <b>Folia & Paper</b>: Schedules a task to be executed on the region which owns the location
+     * of given entity on the next tick
+     * <p>
+     * <b>Bukkit</b>: same as {@link #runTask(Runnable)}
+     *
+     * @param entity   The entity whose location the region executing should own
+     * @param runnable The task to execute
+     */
+    default MyScheduledTask runTask(Entity entity, Runnable runnable) {
+        return runTask(runnable);
+    }
+
+    /**
+     * <b>Folia & Paper</b>: Schedules a task to be executed on the region which owns the location
+     * of given entity after the specified delay in ticks
+     * <p>
+     * <b>Bukkit</b>: same as {@link #runTaskLater(Runnable, long)}
+     *
+     * @param entity   The entity whose location the region executing should own
+     * @param runnable The task to execute
+     * @param delay    The delay, in ticks.
+     */
+    default MyScheduledTask runTaskLater(Entity entity, Runnable runnable, long delay) {
+        return runTaskLater(runnable, delay);
+    }
+
+    /**
+     * <b>Folia & Paper</b>: Schedules a repeating task to be executed on the region which owns the
+     * location of given entity after the initial delay with the specified period
+     * <p>
+     * <b>Bukkit</b>: same as {@link #runTaskTimer(Runnable, long, long)}
+     *
+     * @param entity   The entity whose location the region executing should own
+     * @param runnable The task to execute
+     * @param delay    The initial delay, in ticks.
+     * @param period   The period, in ticks.
+     */
+    default MyScheduledTask runTaskTimer(Entity entity, Runnable runnable, long delay, long period) {
+        return runTaskTimer(runnable, delay, period);
+    }
+
+    /**
+     * Schedules the specified task to be executed asynchronously immediately
+     *
+     * @param runnable The task to execute
+     * @return The {@link MyScheduledTask} that represents the scheduled task
+     */
+    MyScheduledTask runTaskAsynchronously(Runnable runnable);
+
+    /**
+     * Schedules the specified task to be executed asynchronously after the time delay has passed
+     *
+     * @param runnable The task to execute
+     * @param delay    The time delay to pass before the task should be executed
+     * @return The {@link MyScheduledTask} that represents the scheduled task
+     */
+    MyScheduledTask runTaskLaterAsynchronously(Runnable runnable, long delay);
+
+    /**
+     * Schedules the specified task to be executed asynchronously after the initial delay has passed,
+     * and then periodically executed with the specified period
+     *
+     * @param runnable The task to execute
+     * @param delay    The time delay to pass before the first execution of the task, in ticks
+     * @param period   The time between task executions after the first execution of the task, in ticks
+     * @return The {@link MyScheduledTask} that represents the scheduled task
+     */
+    MyScheduledTask runTaskTimerAsynchronously(Runnable runnable, long delay, long period);
+
+    /**
+     * Deprecated: use {@link #runTaskAsynchronously(Runnable)}
+     */
+    @Deprecated
+    default MyScheduledTask runTaskAsynchronously(Plugin plugin, Runnable runnable) {
+        return runTaskAsynchronously(runnable);
+    }
+
+    /**
+     * Deprecated: use {@link #runTaskLaterAsynchronously(Runnable, long)}
+     */
+    @Deprecated
+    default MyScheduledTask runTaskLaterAsynchronously(Plugin plugin, Runnable runnable, long delay) {
+        return runTaskLaterAsynchronously(runnable, delay);
+    }
+
+    /**
+     * Deprecated: use {@link #runTaskTimerAsynchronously(Runnable, long, long)}
+     */
+    @Deprecated
+    default MyScheduledTask runTaskTimerAsynchronously(Plugin plugin, Runnable runnable, long delay, long period) {
+        return runTaskTimerAsynchronously(runnable, delay, period);
+    }
+
+    /**
+     * Calls a method on the main thread and returns a Future object. This task will be executed
+     * by the main(Bukkit)/global(Folia&Paper) server thread.
+     * <p>
+     * Note: The Future.get() methods must NOT be called from the main thread.
+     * <p>
+     * Note2: There is at least an average of 10ms latency until the isDone() method returns true.
+     *
+     * @param task Task to be executed
+     */
+    default <T> Future<T> callSyncMethod(final Callable<T> task) {
+        CompletableFuture<T> completableFuture = new CompletableFuture<>();
+        execute(() -> {
+            try {
+                completableFuture.complete(task.call());
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        });
+        return completableFuture;
+    }
+
+    /**
+     * Schedules a task to be executed on the global region
+     *
+     * @param runnable The task to execute
+     */
+    void execute(Runnable runnable);
+
+    /**
+     * Schedules a task to be executed on the region which owns the location
+     *
+     * @param location The location which the region executing should own
+     * @param runnable The task to execute
+     */
+    default void execute(Location location, Runnable runnable) {
+        execute(runnable);
+    }
+
+    /**
+     * Schedules a task to be executed on the region which owns the location of given entity
+     *
+     * @param entity   The entity which location the region executing should own
+     * @param runnable The task to execute
+     */
+    default void execute(Entity entity, Runnable runnable) {
+        execute(runnable);
+    }
+
+    /**
+     * Attempts to cancel all tasks scheduled by this plugin
+     */
+    void cancelTasks();
+
+    /**
+     * Attempts to cancel all tasks scheduled by the specified plugin
+     *
+     * @param plugin specified plugin
+     */
+    void cancelTasks(Plugin plugin);
+}

src/main/java/me/clip/placeholderapi/scheduler/scheduling/tasks/MyScheduledTask.java

@@ -0,0 +1,53 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2023 Sevastjan
+ *
+ * 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.clip.placeholderapi.scheduler.scheduling.tasks;
+
+import org.bukkit.plugin.Plugin;
+
+public interface MyScheduledTask {
+    /**
+     * Cancels executing task
+     */
+    void cancel();
+
+    /**
+     * @return true if task is cancelled, false otherwise
+     */
+    boolean isCancelled();
+
+    /**
+     * @return The plugin under which the task was scheduled.
+     */
+    Plugin getOwningPlugin();
+
+    /**
+     * @return true if task is currently executing, false otherwise
+     */
+    boolean isCurrentlyRunning();
+
+    /**
+     * @return true if task is repeating, false otherwise
+     */
+    boolean isRepeatingTask();
+}

src/main/java/me/clip/placeholderapi/scheduler/utils/JavaUtil.java

@@ -0,0 +1,12 @@
+package me.clip.placeholderapi.scheduler.utils;
+
+public class JavaUtil {
+    public static boolean classExists(String className) {
+        try {
+            Class.forName(className);
+            return true;
+        } catch (ClassNotFoundException e) {
+            return false;
+        }
+    }
+}

src/main/java/me/clip/placeholderapi/updatechecker/UpdateChecker.java

@@ -1,10 +1,32 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package me.clip.placeholderapi.updatechecker;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.net.URL;
+import java.util.Arrays;
 import javax.net.ssl.HttpsURLConnection;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import me.clip.placeholderapi.scheduler.scheduling.schedulers.TaskScheduler;
 import me.clip.placeholderapi.util.Msg;
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
@@ -14,14 +36,17 @@ import org.bukkit.event.player.PlayerJoinEvent;
 
 public class UpdateChecker implements Listener {
 
-  private final int RESOURCE_ID = 6245;
-  private PlaceholderAPIPlugin plugin;
-  private String spigotVersion, pluginVersion;
+  private static final int RESOURCE_ID = 6245;
+  private final PlaceholderAPIPlugin plugin;
+  private final TaskScheduler scheduler;
+  private final String pluginVersion;
+  private String spigotVersion;
   private boolean updateAvailable;
 
-  public UpdateChecker(PlaceholderAPIPlugin i) {
-    plugin = i;
-    pluginVersion = i.getDescription().getVersion();
+  public UpdateChecker(PlaceholderAPIPlugin plugin) {
+    this.plugin = plugin;
+    scheduler = plugin.getScheduler();
+    pluginVersion = plugin.getDescription().getVersion();
   }
 
   public boolean hasUpdateAvailable() {
@@ -33,7 +58,7 @@ public class UpdateChecker implements Listener {
   }
 
   public void fetch() {
-    Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
+    scheduler.runTaskAsynchronously(() -> {
       try {
         HttpsURLConnection con = (HttpsURLConnection) new URL(
             "https://api.spigotmc.org/legacy/update.php?resource=" + RESOURCE_ID).openConnection();
@@ -54,7 +79,7 @@ public class UpdateChecker implements Listener {
         return;
       }
 
-      Bukkit.getScheduler().runTask(plugin, () -> {
+      scheduler.runTask(() -> {
         plugin.getLogger()
             .info("An update for PlaceholderAPI (v" + getSpigotVersion() + ") is available at:");
         plugin.getLogger()
@@ -65,19 +90,28 @@ public class UpdateChecker implements Listener {
   }
 
   private boolean spigotIsNewer() {
-      if (spigotVersion == null || spigotVersion.isEmpty()) {
-          return false;
-      }
-    String plV = toReadable(pluginVersion);
-    String spV = toReadable(spigotVersion);
-    return plV.compareTo(spV) < 0;
+    if (spigotVersion == null || spigotVersion.isEmpty()) {
+      return false;
+    }
+
+    int[] plV = toReadable(pluginVersion);
+    int[] spV = toReadable(spigotVersion);
+
+    if (plV[0] < spV[0]) {
+      return true;
+    } else if ((plV[1] < spV[1])) {
+      return true;
+    } else {
+      return plV[2] < spV[2];
+    }
   }
 
-  private String toReadable(String version) {
-    if (version.contains("-DEV-")) {
-      version = version.split("-DEV-")[0];
+  private int[] toReadable(String version) {
+    if (version.contains("-DEV")) {
+      version = version.split("-DEV")[0];
     }
-    return version.replaceAll("\\.", "");
+
+    return Arrays.stream(version.split("\\.")).mapToInt(Integer::parseInt).toArray();
   }
 
   @EventHandler(priority = EventPriority.MONITOR)

src/main/java/me/clip/placeholderapi/util/FileUtil.java

@@ -1,93 +1,77 @@
 /*
+ * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (C) 2018 Ryan McCarthy
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
- * This program is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * PlaceholderAPI is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- *
  */
+
 package me.clip.placeholderapi.util;
 
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
 import java.io.File;
-import java.io.FilenameFilter;
+import java.io.IOException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.jar.JarEntry;
 import java.util.jar.JarInputStream;
-import me.clip.placeholderapi.PlaceholderAPIPlugin;
 
 public class FileUtil {
 
-  public static List<Class<?>> getClasses(String folder, Class<?> type) {
-    return getClasses(folder, null, type);
-  }
-
-  public static List<Class<?>> getClasses(String folder, String fileName, Class<?> type) {
-    List<Class<?>> list = new ArrayList<>();
-    try {
-      File f = new File(PlaceholderAPIPlugin.getInstance().getDataFolder(), folder);
-      if (!f.exists()) {
-        return list;
-      }
-      FilenameFilter fileNameFilter = (dir, name) -> {
-        if (fileName != null) {
-          return name.endsWith(".jar") && name.replace(".jar", "")
-              .equalsIgnoreCase(fileName.replace(".jar", ""));
-        }
-        return name.endsWith(".jar");
-      };
-      File[] jars = f.listFiles(fileNameFilter);
-      if (jars == null) {
-        return list;
-      }
-      for (File file : jars) {
-        list = gather(file.toURI().toURL(), list, type);
-      }
-      return list;
-    } catch (Throwable t) {
+  @Nullable
+  public static <T> Class<? extends T> findClass(@NotNull final File file,
+      @NotNull final Class<T> clazz) throws IOException, ClassNotFoundException {
+    if (!file.exists()) {
+      return null;
     }
-    return null;
-  }
 
-  private static List<Class<?>> gather(URL jar, List<Class<?>> list, Class<?> clazz) {
-    if (list == null) {
-      list = new ArrayList<>();
-    }
-    try (URLClassLoader cl = new URLClassLoader(new URL[]{jar}, clazz.getClassLoader()); JarInputStream jis = new JarInputStream(jar.openStream())) {
-      while (true) {
-        JarEntry j = jis.getNextJarEntry();
-        if (j == null) {
-          break;
-        }
-        String name = j.getName();
-        if (name == null || name.isEmpty()) {
+    final URL jar = file.toURI().toURL();
+    final URLClassLoader loader = new URLClassLoader(new URL[]{jar}, clazz.getClassLoader());
+    final List<String> matches = new ArrayList<>();
+    final List<Class<? extends T>> classes = new ArrayList<>();
+
+    try (final JarInputStream stream = new JarInputStream(jar.openStream())) {
+      JarEntry entry;
+      while ((entry = stream.getNextJarEntry()) != null) {
+        final String name = entry.getName();
+        if (name.isEmpty() || !name.endsWith(".class")) {
           continue;
         }
-        if (name.endsWith(".class")) {
-          name = name.replace("/", ".");
-          String cname = name.substring(0, name.lastIndexOf(".class"));
-          Class<?> c = cl.loadClass(cname);
-          if (clazz.isAssignableFrom(c)) {
-            list.add(c);
+
+        matches.add(name.substring(0, name.lastIndexOf('.')).replace('/', '.'));
+      }
+
+      for (final String match : matches) {
+        try {
+          final Class<?> loaded = loader.loadClass(match);
+          if (clazz.isAssignableFrom(loaded)) {
+            classes.add(loaded.asSubclass(clazz));
           }
+        } catch (final NoClassDefFoundError ignored) {
         }
       }
-    } catch (Throwable t) {
     }
-    return list;
+    if (classes.isEmpty()) {
+        loader.close();
+        return null;
+    }
+    return classes.get(0);
   }
+
 }

src/main/java/me/clip/placeholderapi/util/Format.java

@@ -0,0 +1,70 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.util;
+
+import static java.lang.Math.max;
+import static java.lang.Math.min;
+import static java.util.Arrays.stream;
+import static java.util.stream.Collectors.joining;
+import static java.util.stream.Collectors.toList;
+import static java.util.stream.IntStream.range;
+
+import java.util.List;
+import java.util.Optional;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * For the record, I am not sorry.
+ */
+public final class Format {
+
+  private Format() {}
+
+  @NotNull
+  public static Optional<List<String>> tablify(@NotNull final Align align,
+      @NotNull final List<List<String>> rows) {
+    return findSpacing(rows)
+        .map(spacing -> buildFormat(align, spacing))
+        .map(format -> rows.stream()
+            .map(
+                row -> String.format(format, row.toArray()).substring(align == Align.RIGHT ? 2 : 0))
+            .collect(toList()));
+  }
+
+  @NotNull
+  private static String buildFormat(@NotNull final Align align, final int[] spacing) {
+    return stream(spacing)
+        .mapToObj(space -> "%" + (align == Align.LEFT ? "-" : "") + (space + 2) + "s")
+        .collect(joining());
+  }
+
+  @NotNull
+  private static Optional<int[]> findSpacing(@NotNull final List<List<String>> rows) {
+    return rows.stream()
+        .map(row -> row.stream().mapToInt(String::length).toArray())
+        .reduce((l, r) -> range(0, min(l.length, r.length)).map(i -> max(l[i], r[i])).toArray());
+  }
+
+  public enum Align {
+    LEFT, RIGHT
+  }
+
+}

src/main/java/me/clip/placeholderapi/util/Futures.java

@@ -0,0 +1,79 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.util;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.BiConsumer;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.Plugin;
+import org.jetbrains.annotations.NotNull;
+
+public final class Futures {
+
+  private Futures() {}
+
+
+  public static <T> void onMainThread(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CompletableFuture<T> future,
+      @NotNull final BiConsumer<T, Throwable> consumer) {
+    future.whenComplete((value, exception) -> {
+      if (Bukkit.isPrimaryThread()) {
+        consumer.accept(value, exception);
+      } else {
+        plugin.getScheduler().runTask(() -> consumer.accept(value, exception));
+      }
+    });
+  }
+
+
+  @NotNull
+  public static <T> Collector<CompletableFuture<T>, ?, CompletableFuture<List<T>>> collector() {
+    return Collectors.collectingAndThen(Collectors.toList(), Futures::of);
+  }
+
+
+  @NotNull
+  public static <T> CompletableFuture<List<T>> of(
+      @NotNull final Stream<CompletableFuture<T>> futures) {
+    return of(futures.collect(Collectors.toList()));
+  }
+
+  @NotNull
+  public static <T> CompletableFuture<List<T>> of(
+      @NotNull final Collection<CompletableFuture<T>> futures) {
+    return CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]))
+        .thenApplyAsync($ -> awaitCompletion(futures));
+  }
+
+  @NotNull
+  private static <T> List<T> awaitCompletion(
+      @NotNull final Collection<CompletableFuture<T>> futures) {
+    return futures.stream().map(CompletableFuture::join).collect(Collectors.toList());
+  }
+
+}

src/main/java/me/clip/placeholderapi/util/Msg.java

@@ -1,41 +1,79 @@
 /*
+ * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (C) 2018 Ryan McCarthy
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
- * This program is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * PlaceholderAPI is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- *
  */
+
 package me.clip.placeholderapi.util;
 
 import java.util.Arrays;
+import java.util.logging.Level;
+import java.util.stream.Collectors;
+import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
 
-public class Msg {
+public final class Msg {
+  
+  public static void log(Level level, String msg, Object... args) {
+    PlaceholderAPIPlugin.getInstance().getLogger().log(level, String.format(msg, args));
+  }
+  
+  public static void info(String msg, Object... args) {
+    log(Level.INFO, msg, args);
+  }
+  
+  public static void warn(String msg, Object... args) {
+    log(Level.WARNING, msg, args);
+  }
+  
+  public static void warn(String msg, Throwable throwable, Object... args){
+    PlaceholderAPIPlugin.getInstance().getLogger().log(Level.WARNING, String.format(msg, args), throwable);
+  }
+  
+  public static void severe(String msg, Object... args) {
+    log(Level.SEVERE, msg, args);
+  }
+  
+  public static void severe(String msg, Throwable throwable, Object... args) {
+    PlaceholderAPIPlugin.getInstance().getLogger().log(Level.SEVERE, String.format(msg, args), throwable);
+  }
+  
+  public static void msg(@NotNull final CommandSender sender, @NotNull final String... messages) {
+    if (messages.length == 0) {
+      return;
+    }
 
-  public static void msg(CommandSender s, String... msg) {
-    Arrays.stream(msg).map(Msg::color).forEach(s::sendMessage);
+    sender.sendMessage(Arrays.stream(messages).map(Msg::color).collect(Collectors.joining("\n")));
   }
 
-  public static void broadcast(String... msg) {
-    Arrays.stream(msg).map(Msg::color).forEach(Bukkit::broadcastMessage);
+  public static void broadcast(@NotNull final String... messages) {
+    if (messages.length == 0) {
+      return;
+    }
+
+    Bukkit.broadcastMessage(
+        Arrays.stream(messages).map(Msg::color).collect(Collectors.joining("\n")));
   }
 
-  public static String color(String text) {
+  public static String color(@NotNull final String text) {
     return ChatColor.translateAlternateColorCodes('&', text);
   }
+
 }

src/main/java/me/clip/placeholderapi/util/TimeFormat.java

@@ -1,27 +1,26 @@
 /*
+ * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (C) 2018 Ryan McCarthy
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
- * This program is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * PlaceholderAPI is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- *
  */
+
 package me.clip.placeholderapi.util;
 
 public enum TimeFormat {
-
   DAYS,
   HOURS,
   MINUTES,

src/main/java/me/clip/placeholderapi/util/TimeUtil.java

@@ -1,159 +1,96 @@
 /*
+ * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (C) 2018 Ryan McCarthy
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
  *
- * This program is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * PlaceholderAPI is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- *
  */
+
 package me.clip.placeholderapi.util;
 
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.StringJoiner;
+
 public class TimeUtil {
 
-  public static String getRemaining(int seconds, TimeFormat type) {
+  public static String getRemaining(final int seconds, final TimeFormat type) {
+    return getRemaining((long) seconds, type);
+  }
 
-    if (seconds < 60) {
-      switch (type) {
-        case DAYS:
-        case HOURS:
-        case MINUTES:
-          return "0";
-        case SECONDS:
-          return String.valueOf(seconds);
-      }
-      return String.valueOf(seconds);
-    }
+  public static String getRemaining(final long seconds, final TimeFormat type) {
+    switch (type) {
+      default:
+        return String.valueOf(seconds);
 
-    int minutes = seconds / 60;
-    int s = 60 * minutes;
-    int secondsLeft = seconds - s;
-    if (minutes < 60) {
-      switch (type) {
-        case DAYS:
-        case HOURS:
-          return "0";
-        case MINUTES:
-          return String.valueOf(minutes);
-        case SECONDS:
-          return String.valueOf(secondsLeft);
-      }
-      return String.valueOf(seconds);
-    }
+      case SECONDS:
+        return String.valueOf(seconds % 60);
 
-    if (minutes < 1440) {
-      int hours = minutes / 60;
-      int inMins = 60 * hours;
-      int leftOver = minutes - inMins;
-      switch (type) {
-        case DAYS:
-          return "0";
-        case HOURS:
-          return String.valueOf(hours);
-        case MINUTES:
-          return String.valueOf(leftOver);
-        case SECONDS:
-          return String.valueOf(secondsLeft);
-      }
-      return String.valueOf(seconds);
-    }
+      case MINUTES:
+        return String.valueOf((seconds / 60) % 60);
 
-    int days = minutes / 1440;
-    int inMins = 1440 * days;
-    int leftOver = minutes - inMins;
+      case HOURS:
+        return String.valueOf((seconds / 3600) % 24);
 
-    if (leftOver < 60) {
-      switch (type) {
-        case DAYS:
-          return String.valueOf(days);
-        case HOURS:
-          return String.valueOf(0);
-        case MINUTES:
-          return String.valueOf(leftOver);
-        case SECONDS:
-          return String.valueOf(secondsLeft);
-      }
-      return String.valueOf(seconds);
-
-    } else {
-      int hours = leftOver / 60;
-      int hoursInMins = 60 * hours;
-      int minsLeft = leftOver - hoursInMins;
-      switch (type) {
-        case DAYS:
-          return String.valueOf(days);
-        case HOURS:
-          return String.valueOf(hours);
-        case MINUTES:
-          return String.valueOf(minsLeft);
-        case SECONDS:
-          return String.valueOf(secondsLeft);
-      }
-      return String.valueOf(seconds);
+      case DAYS:
+        return String.valueOf(seconds / 86400);
     }
   }
 
-  public static String getTime(int seconds) {
+  /**
+   * Format the given value with s, m, h and d (seconds, minutes, hours and days)
+   *
+   * @param duration {@link Duration} (eg, Duration.of(20, {@link ChronoUnit#SECONDS}) for 20
+   *                 seconds)
+   * @return formatted time
+   */
+  public static String getTime(final Duration duration) {
+    return getTime(duration.getSeconds());
+  }
 
-    if (seconds < 60) {
-      return seconds + "s";
+  public static String getTime(final int seconds) {
+    return getTime((long) seconds);
+  }
+
+  public static String getTime(long seconds) {
+    final StringJoiner joiner = new StringJoiner(" ");
+
+    long minutes = seconds / 60;
+    long hours = minutes / 60;
+    final long days = hours / 24;
+
+    seconds %= 60;
+    minutes %= 60;
+    hours %= 24;
+
+    if (days > 0) {
+      joiner.add(days + "d");
     }
 
-    int minutes = seconds / 60;
-    int s = 60 * minutes;
-    int secondsLeft = seconds - s;
-    if (minutes < 60) {
-      if (secondsLeft > 0) {
-        return minutes + "m " + secondsLeft + "s";
-      } else {
-        return minutes + "m";
-      }
-    }
-    if (minutes < 1440) {
-      String time;
-      int hours = minutes / 60;
-      time = hours + "h";
-      int inMins = 60 * hours;
-      int leftOver = minutes - inMins;
-      if (leftOver >= 1) {
-        time = time + " " + leftOver + "m";
-      }
-      if (secondsLeft > 0) {
-        time = time + " " + secondsLeft + "s";
-      }
-      return time;
+    if (hours > 0) {
+      joiner.add(hours + "h");
     }
 
-    String time;
-    int days = minutes / 1440;
-    time = days + "d";
-    int inMins = 1440 * days;
-    int leftOver = minutes - inMins;
-    if (leftOver >= 1) {
-      if (leftOver < 60) {
-        time = time + " " + leftOver + "m";
-      } else {
-        int hours = leftOver / 60;
-        time = time + " " + hours + "h";
-        int hoursInMins = 60 * hours;
-        int minsLeft = leftOver - hoursInMins;
-        time = time + " " + minsLeft + "m";
-      }
+    if (minutes > 0) {
+      joiner.add(minutes + "m");
     }
-    if (secondsLeft > 0) {
-      time = time + " " + secondsLeft + "s";
+
+    if (seconds > 0) {
+      joiner.add(seconds + "s");
     }
-    return time;
+
+    return joiner.toString();
   }
 }

src/main/resources/config.yml

@@ -1,17 +1,18 @@
 # PlaceholderAPI
-# Version: ${project.version}
+# Version: ${version}
 # Created by: extended_clip
 # Contributors: https://github.com/PlaceholderAPI/PlaceholderAPI/graphs/contributors
 # Issues: https://github.com/PlaceholderAPI/PlaceholderAPI/issues
-# Expansions: https://api.extendedclip.com/all/
-# Wiki: https://github.com/PlaceholderAPI/PlaceholderAPI/wiki
+# Expansions: https://placeholderapi.com/ecloud
+# Wiki: https://wiki.placeholderapi.com/
 # Discord: https://helpch.at/discord
 # No placeholders are provided with this plugin by default.
 # Download placeholders: /papi ecloud
 check_updates: true
 cloud_enabled: true
-cloud_allow_unverified_expansions: false
+cloud_sorting: "name"
 boolean:
   'true': 'yes'
   'false': 'no'
 date_format: MM/dd/yy HH:mm:ss
+debug: false

src/main/resources/plugin.yml

@@ -1,41 +1,99 @@
-name: ${project.name}
-main: me.clip.placeholderapi.PlaceholderAPIPlugin
-version: ${project.version}
-authors: [extended_clip, Glare]
-description: ${project.description}
-permissions:
-    placeholderapi.*:
-        description: ability to use all commands
-        children:
-            placeholderapi.admin: true
-    placeholderapi.admin:
-        description: ability to use all commands
-        children:
-            placeholderapi.list: true
-            placeholderapi.reload: true
-            placeholderapi.ecloud: true
-            placeholderapi.parse: true
-            placeholderapi.register: true
-            placeholderapi.updatenotify: true
-    placeholderapi.list:
-        description: ability to use the list command
-        default: op
-    placeholderapi.reload:
-        description: ability to use the reload command
-        default: op
-    placeholderapi.parse:
-        description: ability to use parse command
-        default: op
-    placeholderapi.register:
-        description: ability to register or unregister placeholder expansions
-        default: op
-    placeholderapi.ecloud:
-        description: allows the usage of ecloud commands
-        default: op
-    placeholderapi.updatenotify:
-        description: notifies you when there is a PAPI update
-        default: op
+name: PlaceholderAPI
+main: "me.clip.placeholderapi.PlaceholderAPIPlugin"
+folia-supported: true
+
+version: ${version}
+author: HelpChat
+
+api-version: "1.13"
+description: "An awesome placeholder provider!"
+
 commands:
-   placeholderapi:
-     description: PlaceholderAPI command
-     aliases: [papi]
+  placeholderapi:
+    description: "PlaceholderAPI Command"
+    aliases: ["papi"]
+
+permissions:
+  placeholderapi.*:
+    description: "Ability to use all PAPI commands"
+    children:
+      placeholderapi.admin: true
+      placeholderapi.ecloud.*: true
+  placeholderapi.admin:
+    description: "Ability to use all PAPI commands"
+    children:
+      placeholderapi.help: true
+      placeholderapi.info: true
+      placeholderapi.list: true
+      placeholderapi.parse: true
+      placeholderapi.reload: true
+      placeholderapi.version: true
+      placeholderapi.register: true
+      placeholderapi.unregister: true
+      placeholderapi.updatenotify: true
+  placeholderapi.ecloud.*:
+    description: "Ability to use all PAPI ecloud commands"
+    children:
+      placeholderapi.ecloud: true
+      placeholderapi.ecloud.info: true
+      placeholderapi.ecloud.list: true
+      placeholderapi.ecloud.clear: true
+      placeholderapi.ecloud.status: true
+      placeholderapi.ecloud.update: true
+      placeholderapi.ecloud.refresh: true
+      placeholderapi.ecloud.download: true
+      placeholderapi.ecloud.placeholders: true
+  placeholderapi.help:
+    default: "op"
+    description: "Allows you to view the list of PAPI commands"
+  placeholderapi.info:
+    default: "op"
+    description: "Allows you to view expansion information"
+  placeholderapi.list:
+    default: "op"
+    description: "Allows you to list active expansions"
+  placeholderapi.ecloud:
+    default: "op"
+    description: "Allows you to access PAPI eCloud"
+  placeholderapi.parse:
+    default: "op"
+    description: "Allows you to parse placeholders"
+  placeholderapi.reload:
+    default: "op"
+    description: "Allows you to reload PAPI and its configuration"
+  placeholderapi.version:
+    default: "op"
+    description: "Allows you to view the version of PAPI installed"
+  placeholderapi.register:
+    default: "op"
+    description: "Allows you to register expansions"
+  placeholderapi.unregister:
+    default: "op"
+    description: "Allows you to unregister expansions"
+  placeholderapi.updatenotify:
+    default: "op"
+    description: "Notifies you when there is a PAPI update"
+  placeholderapi.ecloud.info:
+    default: "op"
+    description: "Allows you to view cloud expansion information"
+  placeholderapi.ecloud.list:
+    default: "op"
+    description: "Allows you to list eCloud expansions"
+  placeholderapi.ecloud.clear:
+    default: "op"
+    description: "Allows you to clear the local eCloud expansion cache"
+  placeholderapi.ecloud.status:
+    default: "op"
+    description: "Allows you to view the status of eCloud expansions"
+  placeholderapi.ecloud.update:
+    default: "op"
+    description: "Allows you to update registered eCloud expansions"
+  placeholderapi.ecloud.refresh:
+    default: "op"
+    description: "Allows you to refresh the local eCloud expansion cache"
+  placeholderapi.ecloud.download:
+    default: "op"
+    description: "Allows you to download an expansion from the eCloud"
+  placeholderapi.ecloud.placeholders:
+    default: "op"
+    description: "Allows you to view the placeholders of a eCloud expansion"

src/test/java/me/clip/placeholderapi/Values.java

@@ -0,0 +1,93 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi;
+
+import com.google.common.collect.ImmutableMap;
+import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import me.clip.placeholderapi.replacer.CharsReplacer;
+import me.clip.placeholderapi.replacer.Replacer;
+import org.bukkit.OfflinePlayer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public interface Values {
+
+  String SMALL_TEXT = "My name is %player_name%";
+  String LARGE_TEXT = "My name is %player_name% and my location is (%player_x%, %player_y%, %player_z%), this placeholder is invalid %server_name%";
+
+  ImmutableMap<String, PlaceholderExpansion> PLACEHOLDERS = ImmutableMap.<String, PlaceholderExpansion>builder()
+      .put("player", new MockPlayerPlaceholderExpansion())
+      .build();
+
+
+  Replacer CHARS_REPLACER = new CharsReplacer(Replacer.Closure.PERCENT);
+
+
+  final class MockPlayerPlaceholderExpansion extends PlaceholderExpansion {
+
+    public static final String PLAYER_X = "10";
+    public static final String PLAYER_Y = "20";
+    public static final String PLAYER_Z = "30";
+    public static final String PLAYER_NAME = "Sxtanna";
+
+
+    @NotNull
+    @Override
+    public String getIdentifier() {
+      return "player";
+    }
+
+    @NotNull
+    @Override
+    public String getAuthor() {
+      return "Sxtanna";
+    }
+
+    @NotNull
+    @Override
+    public String getVersion() {
+      return "1.0";
+    }
+
+    @Override
+    public String onRequest(@Nullable final OfflinePlayer player, @NotNull final String params) {
+      final String[] parts = params.split("_");
+      if (parts.length == 0) {
+        return null;
+      }
+
+      switch (parts[0]) {
+        case "name":
+          return PLAYER_NAME;
+        case "x":
+          return PLAYER_X;
+        case "y":
+          return PLAYER_Y;
+        case "z":
+          return PLAYER_Z;
+      }
+
+      return null;
+    }
+
+  }
+
+}

src/test/java/me/clip/placeholderapi/replacer/ReplacerBenchmarks.java

@@ -0,0 +1,38 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ *
+ * PlaceholderAPI free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.replacer;
+
+import me.clip.placeholderapi.Values;
+import org.openjdk.jmh.annotations.Benchmark;
+
+public class ReplacerBenchmarks {
+
+  @Benchmark
+  public void measureCharsReplacerSmallText() {
+    Values.CHARS_REPLACER.apply(Values.SMALL_TEXT, null, Values.PLACEHOLDERS::get);
+  }
+
+  @Benchmark
+  public void measureCharsReplacerLargeText() {
+    Values.CHARS_REPLACER.apply(Values.LARGE_TEXT, null, Values.PLACEHOLDERS::get);
+  }
+
+}