Add missing Javadoc comments

Remove testCharsReplacerHandlesEscapedHex()

.github/CONTRIBUTING.md

@@ -1,64 +1,52 @@
-[issue]: https://github.com/PlaceholderAPI/PlaceholderAPI/issues/new?template=change_request_placeholderapi.md
-[Discord]: https://helpch.at/discord
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
+[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/docs/wiki/wiki
+[dev]: https://github.com/PlaceholderAPI/PlaceholderAPI/tree/development
+[style]: https://github.com/PlaceholderAPI/PlaceholderAPI/tree/master/config/style
 
-# Contributing
+# 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.
 
-When contributing to this repository, please first discuss the change you wish to make via [issue] or through [Discord] with the owners of this repository before making a change. 
+If you have any questions about contributions towards the project, feel free to contact us on our [Discord Server][discord].
 
-Please note we have a code of conduct, please follow it in all your interactions with the project.
+## 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.
 
-## Pull Request Process
+When doing so, make sure you follow rules below:
 
-1. Update the README.md with details of changes if it is affected by those changes.
-2. Try to prevent any breaking changes affecting the end-user (Developers using the API).  
-Mention any breaking changes that could affect the end-user.
-3. Document any public methods that the end-user might use.
+### 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 like bug fixes or new features, or contributions to its documentation such as the [Wiki] or the Javadoc.
+
+### Code contributions
+Any contributions to PlaceholderAPI's code should be done towards the [`development`][dev] branch. Targeting the `master` branch in your Pull request may get it closed without warning.  
+Additionally should you follow the project's codestyle which you can find in the [`config/style`][style] directory.
+
+### Wiki/Javadoc contributions
+If your pull request only targets the [wiki] or only changes the javadoc comments of PlaceholderAPI (And not its actual code), it should be to `docs/wiki` branch.  
+The develop branch should only be targeted when you also change some of PlaceholderAPI's code.
 
 ## 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 at our [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]
+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,43 +0,0 @@
----
-name: Bug Report  
-about: Report bugs of PlaceholderAPI with this template
-
----
-
-<!--
-  ### Please read ###
-  This template is only for reporting bugs of PlaceholderAPI!  
-  If you want to request changes to the code of PlaceholderAPI, use the "Request change (PlaceholderAPI)" template.  
-  For changes to the wiki consider making a Pull request towards the "wiki" folder containing your changes.
-
-  Please also make sure that you use the latest Spigot release or the latest developement build and that your bug isn't already reported on the issues page.
-  You may get Releases from following sources:
-  
-  - Spigot:  https://www.spigotmc.org/resources/6245/
-  - Jenkins: http://ci.extendedclip.com/job/PlaceholderAPI/
-
-  NOTE:
-  PLEASE REPORT ISSUES WITH EXPANSIONS AND/OR PLACEHOLDERS TO THEIR CORRESPONDING REPOSITORY/ISSUE TRACKER.
-  THIS REPOSITORY IS NOT FOR SUCH ISSUES.
--->
-## Bug Report
-
-### Issue
-<!-- What is the issue? Describe it like you would tell a friend. -->
-
-
-### Expected behaviour
-<!-- What should PlaceholderAPI do? -->
-
-
-### Actual behaviour
-<!-- What does PlaceholderAPI actually do? -->
-
-
-### How to reproduce
-<!-- What steps did you made, to get this bug? -->
-
-1. 
-
-### `/papi dump` output
-<!-- Please provide the URL that was generated when using /papi dump -->

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,101 @@
+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
+- 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/config.yml

@@ -12,3 +12,6 @@ contact_links:
   - 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,31 +0,0 @@
----
-name: Feature Request
-about: Request a update/change of the PlaceholderAPI-code
-
----
-
-<!--
-  ### Please read ###
-  Before suggesting any new features, make sure that it wasn't suggested before and that no open issue with it exists already.
-
-  If possible would we suggest to create a Pull request instead.
-  When doing so, make sure to follow our Contributing Guidelines: https://github.com/PlaceholderAPI/PlaceholderAPI/blob/master/.github/CONTRIBUTING.md
--->
-
-## Feature Request
-
-### Type
-<!-- What kind of request is this? (Multiple selections possible) -->
-<!-- To select an option change the [ ] to [x] -->
-
-- [ ] New function for PlaceholderAPI.  
-A new function that developers could use.
-- [ ] Change to code (Internal).  
-Changes to code that won't affect the end-user.
-- [ ] Change to code (External).  
-Changes to code that will affect the end-user (breaks stuff).
-- [ ] Other: __________ <!-- Use this if none of the above matches your request -->
-
-### Description
-<!-- Describe what this suggested change should do and why it would be useful -->
-<!-- When possible, add some code-examples to better illustrate the change -->

.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/label-commenter-config.yml

@@ -0,0 +1,145 @@
+comment:
+  footer: "\
+    ----\n\n
+    > *This is an automated response created by a **GitHub Action***\n
+    > *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 and PlaceholderAPI
+          - Currently installed Expansions
+          - Currently installed Plugins
+          - 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 in any way.
+          
+          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?template=bug_report.md)
+          - [Feature Request](https://github.com/PlaceholderAPI/PlaceholderAPI/issues/new?template=feature_request.md)
+          
+          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/master/wiki/README.md).
+          
+          It is recommended to [join our Discord Server](https://helpch.at/discord) as you often receive 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 `development` branch.
+          - Pull requests for the Wiki should target the `docs/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 be based of and target the `docs/wiki` branch of this repository.
+          More information can be found on the [Wiki README](https://github.com/PlaceholderAPI/PlaceholderAPI/blob/docs/wiki/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 now 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 [`docs/wiki`](https://github.com/PlaceholderAPI/PlaceholderAPI/tree/docs/wiki) branch of the Repository.
+          - You only made changes to the files inside the [`wiki`](https://github.com/PlaceholderAPI/PlaceholderAPI/tree/docs/wiki/wiki) folder.
+          - You followed the general Styling Guidelines mentioned in the wiki's [README](https://github.com/PlaceholderAPI/PlaceholderAPI/blob/docs/wiki/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.
+          **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 now 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"

.github/workflows/wiki.yml

@@ -27,26 +27,10 @@ jobs:
       - name: 'Checkout Code'
         uses: actions/Checkout@v2
       - name: 'Update Wiki'
-        uses: docker://decathlon/wiki-page-creator-action:latest
+        uses: Andrew-Chen-Wang/github-wiki-action@v2
         env:
-          #
-          # We can use the E-Mail and Name of the GitHub Actions account
-          # for our convenience.
-          #
-          ACTION_MAIL: 'actions@github.com'
-          ACTION_NAME: 'github-actions[bot]'
-          #
-          # We (sadly) have to use a PAT (Personal Access Token) for this action.
-          #
-          GH_PAT: '${{ secrets.WORKFLOWPAT }}'
-          OWNER: 'PlaceholderAPI'
-          REPO_NAME: 'PlaceholderAPI'
-          #
-          # We only want to target files in the wiki folder
-          #
-          MD_FOLDER: 'wiki'
-          WIKI_PUSH_MESSAGE: '${{ github.event.commits[0].message }}'
-          #
-          # We skip/ignore the README.md file in the Wiki folder
-          #
-          SKIP_MD: README.md
+          WIKI_DIR: wiki/
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_MAIL: 'actions@github.com'
+          GH_NAME: 'github-actions[bot]'
+          EXCLUDED_FILES: 'README.md'

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

@@ -15,7 +15,10 @@
 [ciImg]: http://ci.extendedclip.com/buildStatus/icon?job=PlaceholderAPI
 
 [APIversionImg]: https://img.shields.io/nexus/placeholderapi/me.clip/placeholderapi?server=https%3A%2F%2Frepo.extendedclip.com&label=API%20Version
-[logo]: https://i.imgur.com/Ea4PURv.png
+[logo]: https://raw.githubusercontent.com/PlaceholderAPI/PlaceholderAPI/master/wiki/img/papi-logo.png
+
+[contributing]: https://github.com/PlaceholderAPI/PlaceholderAPI/blob/master/.github/CONTRIBUTING.md
+[placeholderexpansion]: https://github.com/PlaceholderAPI/PlaceholderAPI/wiki/PlaceholderExpansion
 <!-- The stuff above isn't visible in the readme -->
 
 [![logo]][spigot]
@@ -25,12 +28,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 150+ 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 400,000 times and has been used concurrently on over 20,000 servers, which makes it a must-have for a server of any type or scale.
+PlaceholderAPI has been downloaded over 1,000,000 times and has been used concurrently on over 40,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 +44,7 @@ PlaceholderAPI has been downloaded over 400,000 times and has been used concurre
 
 ## Quick Links
 - [CI Server][ci]
-- [Expansions cloud]
+- [Expansions Cloud]
 - [Placeholder List]
 - [Spigot Page][spigot]
 - [Plugin Statistics][statistics]

build.gradle

@@ -1,54 +1,69 @@
+import org.apache.tools.ant.filters.ReplaceTokens
+
 plugins {
     id "java"
     id "maven-publish"
-    id "net.minecrell.licenser" version "0.4.1"
-    id "com.github.johnrengelman.shadow" version "6.0.0"
+    id "org.cadixdev.licenser" version "0.6.1"
+    id "com.github.johnrengelman.shadow" version "7.1.0"
 }
 
 group "me.clip"
-version "2.10.9"
+version "2.11.2-DEV-${System.getProperty("BUILD_NUMBER")}"
 
 description "An awesome placeholder provider!"
 
 repositories {
-    mavenCentral()
+    maven({ url = "https://oss.sonatype.org/content/repositories/snapshots/" })
 
-    maven({ url = "https://repo.codemc.org/repository/maven-public" })
+    mavenCentral()
+    mavenLocal()
+
+    maven({ url = "https://repo.codemc.org/repository/maven-public/" })
     maven({ url = "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" })
 }
 
 dependencies {
-    implementation "com.google.code.gson:gson:2.8.6"
-    implementation "org.bstats:bstats-bukkit:1.5"
+    implementation "org.bstats:bstats-bukkit:2.2.1"
+    implementation "net.kyori:adventure-platform-bukkit:4.0.1"
 
-    compileOnly "org.spigotmc:spigot-api:1.16.1-R0.1-SNAPSHOT"
-    compileOnly "org.jetbrains:annotations:19.0.0"
+    compileOnly "org.spigotmc:spigot-api:1.18-R0.1-SNAPSHOT"
+    compileOnly "org.jetbrains:annotations:22.0.0"
 
-    testImplementation "org.openjdk.jmh:jmh-core:1.23"
-    testImplementation "org.openjdk.jmh:jmh-generator-annprocess:1.23"
+    testImplementation "org.openjdk.jmh:jmh-core:1.32"
+    testImplementation "org.openjdk.jmh:jmh-generator-annprocess:1.32"
 
-    testCompile "org.junit.jupiter:junit-jupiter-engine:5.6.2"
-    testRuntime "org.junit.jupiter:junit-jupiter-engine:5.6.2"
+    testImplementation "org.junit.jupiter:junit-jupiter-engine:5.8.2"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.8.1"
 }
 
 processResources {
-    from(sourceSets.main.resources.srcDirs) {
-        filter org.apache.tools.ant.filters.ReplaceTokens, tokens: [name: rootProject.name, version: project.version.toString(), description: project.description]
-    }
+    filter ReplaceTokens, tokens: [name: rootProject.name, version: project.version.toString(), description: project.description]
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+
+    withJavadocJar()
+    withSourcesJar()
 }
 
 tasks.withType(JavaCompile) {
     options.encoding = "UTF-8"
+}
 
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+tasks.withType(Javadoc) {
+    failOnError false
+    options.addStringOption('Xdoclint:none', '-quiet')
+    options.addStringOption('encoding', 'UTF-8')
+    options.addStringOption('charSet', 'UTF-8')
 }
 
 shadowJar {
     archiveClassifier.set("")
 
     relocate "org.bstats", "me.clip.placeholderapi.metrics"
-    relocate "com.google.gson", "me.clip.placeholderapi.libs.gson"
+    relocate "net.kyori", "me.clip.placeholderapi.libs.kyori"
 }
 
 license {
@@ -58,12 +73,8 @@ license {
         header = file('config/headers/main.txt')
     }
 
-    matching('**/JSONMessage.java') {
-        header = file('config/headers/jsonmessage.txt')
-    }
-
     ext {
-        year = 2020
+        year = 2021
     }
 }
 
@@ -71,15 +82,16 @@ test {
     useJUnitPlatform()
 }
 
-sourceSets {
-    test.compileClasspath += configurations.compileOnly
-    test.runtimeClasspath += configurations.compileOnly
+configurations {
+    testImplementation {
+        extendsFrom(compileOnly)
+    }
 }
 
 publishing {
     repositories {
         maven {
-            if (version.contains("-DEV-")) {
+            if (version.contains("-DEV")) {
                 url = uri("https://repo.extendedclip.com/content/repositories/dev/")
             } else {
                 url = uri("https://repo.extendedclip.com/content/repositories/placeholderapi/")
@@ -100,6 +112,8 @@ publishing {
 
             pom.withXml {
 
+                // some are having issues with bstats so we might need to add that to the pom as well
+
                 asNode().appendNode("packaging", "jar")
                 asNode().remove(asNode().get("dependencies"))
 
@@ -114,4 +128,4 @@ publishing {
     }
 }
 
-publish.dependsOn clean, test, jar
+publish.dependsOn clean, test, jar

config/headers/jsonmessage.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2018-2020 Peter Blood
+Copyright (c) 2018-2021 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:
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Tue Jul 14 23:27:02 AWST 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright <20> 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.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   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 <20>$var<61>, <20>${var}<7D>, <20>${var:-default}<7D>, <20>${var+SET}<7D>,
+#           <20>${var#prefix}<7D>, <20>${var%suffix}<7D>, and <20>$( cmd )<29>;
+#         * compound commands having a testable exit status, especially <20>case<73>;
+#         * various built-in commands including <20>command<6E>, <20>set<65>, and <20>ulimit<69>.
+#
+#   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/master/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
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+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
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # 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"
+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
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+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
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 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"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    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
@@ -106,80 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# 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.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# 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 \
+        "$@"
+
+# 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

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,21 +64,6 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
@@ -86,7 +71,7 @@ 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 %CMD_LINE_ARGS%
+"%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

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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
@@ -22,6 +22,7 @@ package me.clip.placeholderapi;
 
 import com.google.common.collect.ImmutableSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Matcher;
@@ -29,6 +30,7 @@ import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import me.clip.placeholderapi.expansion.Relational;
+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;
@@ -80,7 +82,7 @@ public final class PlaceholderAPI {
    */
   @NotNull
   public static List<String> setPlaceholders(final OfflinePlayer player,
-      @NotNull final List<@NotNull String> text) {
+      @NotNull final List<String> text) {
     return text.stream().map(line -> setPlaceholders(player, line)).collect(Collectors.toList());
   }
 
@@ -135,22 +137,38 @@ public final class PlaceholderAPI {
    */
   @NotNull
   public static List<String> setBracketPlaceholders(final OfflinePlayer player,
-      @NotNull final List<@NotNull String> text) {
+      @NotNull final List<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
+   */
   public static String setBracketPlaceholders(Player player, 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
+   */
   public static List<String> setBracketPlaceholders(Player player, List<String> text) {
-    return setPlaceholders((OfflinePlayer) player, text);
+    return setBracketPlaceholders((OfflinePlayer) player, text);
   }
 
   /**
    * set relational placeholders in the text specified placeholders are matched with the pattern
-   * %<rel_(identifier)_(params)>% when set with this method
+   * {@literal %<rel_(identifier)_(params)>%} when set with this method
    *
    * @param one First player to compare
    * @param two Second player to compare
@@ -168,7 +186,7 @@ public final class PlaceholderAPI {
         continue;
       }
 
-      String identifier = format.substring(0, index).toLowerCase();
+      String identifier = format.substring(0, index).toLowerCase(Locale.ROOT);
       String params = format.substring(index + 1);
       final PlaceholderExpansion expansion = PlaceholderAPIPlugin.getInstance()
           .getLocalExpansionManager().getExpansion(identifier);
@@ -215,7 +233,7 @@ public final class PlaceholderAPI {
   /**
    * 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() {
@@ -225,6 +243,8 @@ public final class PlaceholderAPI {
 
   /**
    * Get the normal placeholder pattern.
+   * 
+   * @return Regex Pattern of {@literal [%]([^%]+)[%]}
    */
   public static Pattern getPlaceholderPattern() {
     return PLACEHOLDER_PATTERN;
@@ -232,6 +252,8 @@ public final class PlaceholderAPI {
 
   /**
    * Get the bracket placeholder pattern.
+   * 
+   * @return Regex Pattern of {@literal [{]([^{}]+)[}]}
    */
   public static Pattern getBracketPlaceholderPattern() {
     return BRACKET_PLACEHOLDER_PATTERN;
@@ -239,6 +261,8 @@ public final class PlaceholderAPI {
 
   /**
    * Get the relational placeholder pattern.
+   * 
+   * @return Regex Pattern of {@literal [%](rel_)([^%]+)[%]}
    */
   public static Pattern getRelationalPlaceholderPattern() {
     return RELATIONAL_PLACEHOLDER_PATTERN;
@@ -268,15 +292,29 @@ public final class PlaceholderAPI {
 
   // === Deprecated API ===
 
+  @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 Use {@link me.clip.placeholderapi.PlaceholderAPIPlugin().getLocalExpansionManager()
-   * .getExpansions()} instead.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static Map<String, PlaceholderHook> getPlaceholders() {
     return PlaceholderAPIPlugin.getInstance().getLocalExpansionManager()
         .getExpansions().stream()
@@ -284,11 +322,15 @@ public final class PlaceholderAPI {
   }
 
   /**
-   * @deprecated Please use {@link me.clip.placeholderapi.expansion.PlaceholderExpansion} to
+   * @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.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static boolean registerPlaceholderHook(Plugin plugin, PlaceholderHook placeholderHook) {
     PlaceholderAPIPlugin.getInstance().getLogger().warning(plugin.getName()
         + " is attempting to register placeholders via a PlaceholderHook class which is no longer supported!"
@@ -298,11 +340,15 @@ public final class PlaceholderAPI {
   }
 
   /**
-   * @deprecated Please use {@link me.clip.placeholderapi.expansion.PlaceholderExpansion} to
+   * @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.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static boolean registerPlaceholderHook(String identifier,
       PlaceholderHook placeholderHook) {
     PlaceholderAPIPlugin.getInstance().getLogger().warning(identifier
@@ -311,11 +357,14 @@ public final class PlaceholderAPI {
   }
 
   /**
-   * @deprecated Please use {@link me.clip.placeholderapi.expansion.PlaceholderExpansion} to
+   * @deprecated Please use {@link PlaceholderExpansion} to
    * unregister placeholders instead
+   * 
+   * @param plugin The plugin to unregister
+   * @return always false
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static boolean unregisterPlaceholderHook(Plugin plugin) {
     PlaceholderAPIPlugin.getInstance().getLogger().warning(plugin.getName()
         + " is attempting to unregister placeholders via the PlaceholderAPI class which is no longer supported!"
@@ -325,11 +374,14 @@ public final class PlaceholderAPI {
   }
 
   /**
-   * @deprecated Please use {@link me.clip.placeholderapi.expansion.PlaceholderExpansion} to
+   * @deprecated Please use {@link PlaceholderExpansion} to
    * unregister placeholders instead
+   * 
+   * @param identifier The identifier to unregister
+   * @return always false
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static boolean unregisterPlaceholderHook(String identifier) {
     PlaceholderAPIPlugin.getInstance().getLogger().warning(identifier
         + " is attempting to unregister placeholders through the PlaceholderAPI class which is no longer supported!");
@@ -338,27 +390,37 @@ public final class PlaceholderAPI {
 
   /**
    * @deprecated Will be removed in a future release.
+   * 
+   * @return Set of registered identifiers
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @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.11.0")
+  @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
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static String setPlaceholders(OfflinePlayer player,
       String text, Pattern pattern, boolean colorize) {
     return setPlaceholders(player, text);
@@ -366,9 +428,15 @@ public final class PlaceholderAPI {
 
   /**
    * @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
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static List<String> setPlaceholders(OfflinePlayer player,
       List<String> text, Pattern pattern, boolean colorize) {
     return setPlaceholders(player, text);
@@ -376,9 +444,14 @@ public final class PlaceholderAPI {
 
   /**
    * @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.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static List<String> setPlaceholders(OfflinePlayer player, List<String> text,
       boolean colorize) {
     return setPlaceholders(player, text);
@@ -386,54 +459,84 @@ public final class PlaceholderAPI {
 
   /**
    * @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.11.0")
+  @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.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static String setPlaceholders(Player player, String text, boolean colorize) {
     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 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.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static List<String> setPlaceholders(Player player, List<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 colorize If PlaceholderAPI should also parse color codes
+   * @return String with the parsed placeholders
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @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.11.0")
+  @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.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static List<String> setBracketPlaceholders(OfflinePlayer player, List<String> text,
       boolean colorize) {
     return setBracketPlaceholders(player, text);
@@ -441,27 +544,42 @@ public final class PlaceholderAPI {
 
   /**
    * @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.11.0")
+  @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.11.0")
+  @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.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static List<String> setBracketPlaceholders(Player player, List<String> text,
       boolean colorize) {
     return setBracketPlaceholders(player, text);
@@ -469,17 +587,17 @@ public final class PlaceholderAPI {
 
   /**
    * set relational placeholders in the text specified placeholders are matched with the pattern
-   * %<rel_(identifier)_(params)>% when set with this method
+   * {@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 (&[0-1a-fk-o]) should be translated
+   * @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.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static String setRelationalPlaceholders(Player one, Player two, String text,
       boolean colorize) {
     return setRelationalPlaceholders(one, two, text);
@@ -492,12 +610,12 @@ public final class PlaceholderAPI {
    * @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 (&[0-1a-fk-o]) should be translated
+   * @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<String>)} instead.
+   * @deprecated Use {@link #setRelationalPlaceholders(Player, Player, List)} instead.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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
@@ -32,7 +32,10 @@ import me.clip.placeholderapi.expansion.manager.CloudExpansionManager;
 import me.clip.placeholderapi.expansion.manager.LocalExpansionManager;
 import me.clip.placeholderapi.listeners.ServerLoadEventListener;
 import me.clip.placeholderapi.updatechecker.UpdateChecker;
+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.command.CommandSender;
 import org.bukkit.command.PluginCommand;
@@ -73,6 +76,8 @@ public final class PlaceholderAPIPlugin extends JavaPlugin {
   @NotNull
   private final CloudExpansionManager cloudExpansionManager = new CloudExpansionManager(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
@@ -138,6 +143,8 @@ public final class PlaceholderAPIPlugin extends JavaPlugin {
     setupMetrics();
     setupExpansions();
 
+    adventure = BukkitAudiences.create(this);
+
     if (config.isCloudEnabled()) {
       getCloudExpansionManager().load();
     }
@@ -156,6 +163,9 @@ public final class PlaceholderAPIPlugin extends JavaPlugin {
 
     Bukkit.getScheduler().cancelTasks(this);
 
+    adventure.close();
+    adventure = null;
+
     instance = null;
   }
 
@@ -183,6 +193,15 @@ public final class PlaceholderAPIPlugin extends JavaPlugin {
     return cloudExpansionManager;
   }
 
+  @NotNull
+  public BukkitAudiences getAdventure() {
+    if(adventure == null) {
+      throw new IllegalStateException("Tried to access Adventure when the plugin was disabled!");
+    }
+
+    return adventure;
+  }
+
   /**
    * Obtain the configuration class for PlaceholderAPI.
    *
@@ -205,14 +224,13 @@ public final class PlaceholderAPIPlugin extends JavaPlugin {
   }
 
   private void setupMetrics() {
-    final Metrics metrics = new Metrics(this);
-    metrics.addCustomChart(new Metrics.SimplePie("using_expansion_cloud",
+    final Metrics metrics = new Metrics(this, 438);
+    metrics.addCustomChart(new SimplePie("using_expansion_cloud",
         () -> getPlaceholderAPIConfig().isCloudEnabled() ? "yes" : "no"));
 
-    metrics.addCustomChart(
-        new Metrics.SimplePie("using_spigot", () -> getServerVersion().isSpigot() ? "yes" : "no"));
+    metrics.addCustomChart(new SimplePie("using_spigot", () -> getServerVersion().isSpigot() ? "yes" : "no"));
 
-    metrics.addCustomChart(new Metrics.AdvancedPie("expansions_used", () -> {
+    metrics.addCustomChart(new AdvancedPie("expansions_used", () -> {
       final Map<String, Integer> values = new HashMap<>();
 
       for (final PlaceholderExpansion expansion : getLocalExpansionManager().getExpansions()) {
@@ -230,7 +248,7 @@ public final class PlaceholderAPIPlugin extends JavaPlugin {
     try {
       Class.forName("org.bukkit.event.server.ServerLoadEvent");
       new ServerLoadEventListener(this);
-    } catch (final ExceptionInInitializerError | ClassNotFoundException ignored) {
+    } catch (final ClassNotFoundException ignored) {
       Bukkit.getScheduler()
           .runTaskLater(this, () -> getLocalExpansionManager().load(Bukkit.getConsoleSender()), 1);
     }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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
@@ -23,9 +23,24 @@ package me.clip.placeholderapi;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
+@Deprecated
 public abstract class PlaceholderHook {
 
+  /**
+   * Please see {@link me.clip.placeholderapi.expansion.PlaceholderExpansion#parsePlaceholders(OfflinePlayer, String) PlaceholderExpansion#parsePlaceholder(OfflinePlayer, String)}
+   * for a full description of what this method is used for.
+   * 
+   * @param player Possibly-null OfflinePlayer instance to use.
+   * @param params String after {@code %<expansion>_} and before the second percent symbol.
+   * @return Possibly-null String depending on the Expansions returned value.
+   * @deprecated Planned for removal in 2.14.0
+   *             <br>Please use {@link me.clip.placeholderapi.expansion.PlaceholderExpansion#parsePlaceholders(OfflinePlayer, String) parsePlaceholders(OfflinePlayer, String)}
+   *             instead
+   */
+  @Nullable
+  @Deprecated
   public String onRequest(final OfflinePlayer player, @NotNull final String params) {
     if (player != null && player.isOnline()) {
       return onPlaceholderRequest((Player) player, params);
@@ -34,6 +49,20 @@ public abstract class PlaceholderHook {
     return onPlaceholderRequest(null, params);
   }
 
+  /**
+   * Please see {@link me.clip.placeholderapi.expansion.PlaceholderExpansion#parsePlaceholders(Player, String) PlaceholderExpansion#parsePlaceholder(Player, String)}
+   * for a full description of what this method is used for.
+   *
+   * @param player Possibly-null Player instance to use.
+   * @param params String after {@code %<expansion>_} and before the second percent symbol.
+   * @return Possibly-null String depending on the Expansions returned value.
+   * 
+   * @deprecated Planned for removal in 2.14.0
+   *             <br>Please use {@link me.clip.placeholderapi.expansion.PlaceholderExpansion#parsePlaceholders(Player, String) parsePlaceholders(Player, String)}
+   *             instead
+   */
+  @Nullable
+  @Deprecated
   public String onPlaceholderRequest(final Player player, @NotNull final String params) {
     return null;
   }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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
@@ -23,6 +23,7 @@ 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;
@@ -61,7 +62,7 @@ public abstract class PlaceholderCommand {
     if (parameter == null) {
       possible.forEach(suggestions::add);
     } else {
-      possible.filter(suggestion -> suggestion.toLowerCase().startsWith(parameter.toLowerCase()))
+      possible.filter(suggestion -> suggestion.toLowerCase(Locale.ROOT).startsWith(parameter.toLowerCase(Locale.ROOT)))
           .forEach(suggestions::add);
     }
   }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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
@@ -27,6 +27,7 @@ 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;
@@ -95,7 +96,7 @@ public final class PlaceholderCommandRouter implements CommandExecutor, TabCompl
       return true;
     }
 
-    final String search = args[0].toLowerCase();
+    final String search = args[0].toLowerCase(Locale.ROOT);
     final PlaceholderCommand target = commands.get(search);
 
     if (target == null) {
@@ -121,10 +122,10 @@ public final class PlaceholderCommandRouter implements CommandExecutor, TabCompl
     final List<String> suggestions = new ArrayList<>();
 
     if (args.length > 1) {
-      final PlaceholderCommand target = this.commands.get(args[0].toLowerCase());
+      final PlaceholderCommand target = this.commands.get(args[0].toLowerCase(Locale.ROOT));
 
       if (target != null) {
-        target.complete(plugin, sender, args[0].toLowerCase(),
+        target.complete(plugin, sender, args[0].toLowerCase(Locale.ROOT),
             Arrays.asList(Arrays.copyOfRange(args, 1, args.length)), suggestions);
       }
 

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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
@@ -24,6 +24,7 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import java.util.Collection;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.stream.Stream;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
@@ -100,7 +101,7 @@ public final class CommandECloud extends PlaceholderCommand {
       return;
     }
 
-    final String search = params.get(0).toLowerCase();
+    final String search = params.get(0).toLowerCase(Locale.ROOT);
     final PlaceholderCommand target = commands.get(search);
 
     if (target == null) {
@@ -136,7 +137,7 @@ public final class CommandECloud extends PlaceholderCommand {
       return; // send sub commands
     }
 
-    final String search = params.get(0).toLowerCase();
+    final String search = params.get(0).toLowerCase(Locale.ROOT);
     final PlaceholderCommand target = commands.get(search);
 
     if (target == null) {

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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
@@ -26,14 +26,7 @@ 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.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -43,15 +36,22 @@ 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.libs.JSONMessage;
 import me.clip.placeholderapi.util.Format;
 import me.clip.placeholderapi.util.Msg;
-import org.bukkit.ChatColor;
+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;
@@ -87,7 +87,7 @@ public final class CommandECloudExpansionList extends PlaceholderCommand {
   @NotNull
   private static Collection<CloudExpansion> getExpansions(@NotNull final String target,
       @NotNull final PlaceholderAPIPlugin plugin) {
-    switch (target.toLowerCase()) {
+    switch (target.toLowerCase(Locale.ROOT)) {
       case "all":
         return plugin.getCloudExpansionManager().getCloudExpansions().values();
       case "installed":
@@ -112,7 +112,7 @@ public final class CommandECloudExpansionList extends PlaceholderCommand {
 
   public static void addExpansionTitle(@NotNull final StringBuilder builder,
       @NotNull final String target, final int page) {
-    switch (target.toLowerCase()) {
+    switch (target.toLowerCase(Locale.ROOT)) {
       case "all":
         builder.append("&bAll Expansions");
         break;
@@ -132,77 +132,81 @@ public final class CommandECloudExpansionList extends PlaceholderCommand {
 
     builder.append(" &bPage&7: &a")
         .append(page)
-        .append("&r")
-        .append('\n');
+        .append("&r");
   }
 
-  @NotNull
-  private static JSONMessage getMessage(@NotNull final List<CloudExpansion> expansions,
+  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 StringBuilder tooltip = new StringBuilder();
-    final JSONMessage message = JSONMessage.create();
+    final TextComponent.Builder message = text();
 
     for (int index = 0; index < expansions.size(); index++) {
       final CloudExpansion expansion = expansions.get(index);
+      final TextComponent.Builder line = text();
 
-      tooltip.append("&bClick to download this expansion!")
-          .append('\n')
-          .append('\n')
-          .append("&bAuthor: &f")
-          .append(expansion.getAuthor())
-          .append('\n')
-          .append("&bVerified: ")
-          .append(expansion.isVerified() ? "&a&l✔&r" : "&c&l❌&r")
-          .append('\n')
-          .append("&bLatest Version: &f")
-          .append(expansion.getLatestVersion())
-          .append('\n')
-          .append("&bReleased: &f")
-          .append(format.format(expansion.getLastUpdate()));
+      final int expansionNumber = index + ((page - 1) * PAGE_SIZE) + 1;
+      line.append(text(expansionNumber + ". ", DARK_GRAY));
 
-      final String description = expansion.getDescription();
-      if (description != null && !description.isEmpty()) {
-        tooltip.append('\n')
-            .append('\n')
-            .append("&f")
-            .append(description.replace("\r", "").trim());
+      final NamedTextColor expansionColour;
+
+      if (expansion.shouldUpdate()) {
+        expansionColour = GOLD;
+      } else {
+        if (expansion.hasExpansion()) {
+          expansionColour = GREEN;
+        } else {
+          expansionColour = GRAY;
+        }
       }
 
-      message.then(Msg.color(
-          "&8" + (index + ((page - 1) * PAGE_SIZE) + 1) + ".&r " + (expansion.shouldUpdate() ? "&6"
-              : expansion.hasExpansion() ? "&a" : "&7") + expansion.getName()));
+      line.append(text(expansion.getName(), expansionColour));
 
-      message.tooltip(Msg.color(tooltip.toString()));
-      message.suggestCommand("/papi ecloud download " + expansion.getName());
+      line.clickEvent(ClickEvent.suggestCommand("/papi ecloud download " + expansion.getName()));
 
-      if (index < expansions.size() - 1) {
-        message.newline();
+      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());
       }
 
-      tooltip.setLength(0);
+      message.append(line.build());
     }
 
     if (limit > 1) {
-      message.newline();
+      message.append(newline());
+
+      final TextComponent.Builder left = text("◀", page > 1 ? GRAY : DARK_GRAY).toBuilder();
 
-      message.then("◀")
-          .color(page > 1 ? ChatColor.GRAY : ChatColor.DARK_GRAY);
       if (page > 1) {
-        message.runCommand("/papi ecloud list " + target + " " + (page - 1));
+        left.clickEvent(ClickEvent.runCommand("/papi ecloud list " + target + " " + (page - 1)));
       }
 
-      message.then(" " + page + " ").color(ChatColor.GREEN);
+      final TextComponent.Builder right = text("▶", page < limit ? GRAY : DARK_GRAY).toBuilder();
 
-      message.then("▶")
-          .color(page < limit ? ChatColor.GRAY : ChatColor.DARK_GRAY);
       if (page < limit) {
-        message.runCommand("/papi ecloud list " + target + " " + (page + 1));
+        right.clickEvent(ClickEvent.runCommand("/papi ecloud list " + target + " " + (page + 1)));
       }
+
+      message.append(left, text(" " + page + " ", GREEN), right);
     }
 
-    return message;
+    return message.build();
   }
 
   private static void addExpansionTable(@NotNull final List<CloudExpansion> expansions,
@@ -321,8 +325,8 @@ public final class CommandECloudExpansionList extends PlaceholderCommand {
 
     final int limit = (int) Math.ceil((double) expansions.size() / PAGE_SIZE);
 
-    final JSONMessage message = getMessage(values, page, limit, params.get(0));
-    message.send(((Player) sender));
+    final Component message = getMessage(values, page, limit, params.get(0));
+    plugin.getAdventure().player((Player) sender).sendMessage(message);
   }
 
   @Override

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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
@@ -21,6 +21,8 @@
 package me.clip.placeholderapi.commands.impl.cloud;
 
 import java.util.List;
+import java.util.Locale;
+
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;
 import me.clip.placeholderapi.util.Msg;
@@ -41,7 +43,7 @@ public final class CommandECloudToggle extends PlaceholderCommand {
     final boolean desiredState;
     final boolean currentState = plugin.getPlaceholderAPIConfig().isCloudEnabled();
 
-    switch (alias.toLowerCase()) {
+    switch (alias.toLowerCase(Locale.ROOT)) {
       case "enable":
         desiredState = true;
         break;

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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
@@ -23,6 +23,7 @@ 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;
@@ -128,7 +129,7 @@ public final class CommandECloudUpdate extends PlaceholderCommand {
     installed.removeIf(expansion -> !expansion.shouldUpdate());
 
     if (!installed.isEmpty() && (params.isEmpty() || "all"
-        .startsWith(params.get(0).toLowerCase()))) {
+        .startsWith(params.get(0).toLowerCase(Locale.ROOT)))) {
       suggestions.add("all");
     }
 

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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
@@ -21,7 +21,17 @@
 package me.clip.placeholderapi.commands.impl.local;
 
 import com.google.common.io.CharStreams;
-import com.google.gson.JsonParser;
+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;
@@ -41,20 +51,15 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.logging.Level;
 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.util.Msg;
-import org.bukkit.command.CommandSender;
-import org.bukkit.plugin.Plugin;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Unmodifiable;
 
 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)
@@ -102,9 +107,8 @@ public final class CommandDump extends PlaceholderCommand {
 
         try (final InputStream stream = connection.getInputStream()) {
           //noinspection UnstableApiUsage
-          final String json = CharStreams
-              .toString(new InputStreamReader(stream, StandardCharsets.UTF_8));
-          return JsonParser.parseString(json).getAsJsonObject().get("key").getAsString();
+          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);
@@ -161,7 +165,7 @@ public final class CommandDump extends PlaceholderCommand {
 
     final String[] jars = plugin.getLocalExpansionManager()
         .getExpansionsFolder()
-        .list((dir, name) -> name.toLowerCase().endsWith(".jar"));
+        .list((dir, name) -> name.toLowerCase(Locale.ROOT).endsWith(".jar"));
 
     for (final String jar : jars) {
       builder.append("  ")
@@ -175,6 +179,10 @@ public final class CommandDump extends PlaceholderCommand {
         .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:")

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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
@@ -45,9 +45,9 @@ public final class CommandHelp extends PlaceholderCommand {
     Msg.msg(sender,
         "&b&lPlaceholderAPI &8- &7Help Menu &8- &7(&f" + description.getVersion() + "&7)",
         " ",
-        "&b/papi &fbcparse &9<me/player name> <message>",
+        "&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>",
+        "&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.",
@@ -55,7 +55,7 @@ public final class CommandHelp extends PlaceholderCommand {
         "  &7&oView information for a specific expansion",
         "&b/papi &flist",
         "  &7&oList active expansions",
-        "&b/papi &fparse &9<me/player name> <message>",
+        "&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",

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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
@@ -47,7 +47,7 @@ public final class CommandInfo extends PlaceholderCommand {
     }
 
     final PlaceholderExpansion expansion = plugin.getLocalExpansionManager()
-        .findExpansionByName(params.get(0)).orElse(null);
+        .findExpansionByIdentifier(params.get(0)).orElse(null);
     if (expansion == null) {
       Msg.msg(sender,
           "&cThere is no expansion loaded with the identifier: &f" + params.get(0));

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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
@@ -22,6 +22,7 @@ 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;
@@ -49,7 +50,7 @@ public final class CommandParse extends PlaceholderCommand {
   public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
       @NotNull final CommandSender sender, @NotNull final String alias,
       @NotNull @Unmodifiable final List<String> params) {
-    switch (alias.toLowerCase()) {
+    switch (alias.toLowerCase(Locale.ROOT)) {
       case "parserel":
         evaluateParseRelation(sender, params);
         break;
@@ -69,7 +70,7 @@ public final class CommandParse extends PlaceholderCommand {
   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()) {
+    switch (alias.toLowerCase(Locale.ROOT)) {
       case "parserel":
         completeParseRelation(params, suggestions);
         break;
@@ -92,7 +93,7 @@ public final class CommandParse extends PlaceholderCommand {
       return;
     }
 
-    @NotNull final OfflinePlayer player;
+    OfflinePlayer player;
 
     if ("me".equalsIgnoreCase(params.get(0))) {
       if (!(sender instanceof Player)) {
@@ -101,6 +102,8 @@ public final class CommandParse extends PlaceholderCommand {
       }
 
       player = ((Player) sender);
+    } else if ("--null".equalsIgnoreCase(params.get(0))) {
+      player = null;
     } else {
       final OfflinePlayer target = resolvePlayer(params.get(0));
       if (target == null) {
@@ -161,10 +164,14 @@ public final class CommandParse extends PlaceholderCommand {
       @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()))) {
+          .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));
 
@@ -211,13 +218,16 @@ public final class CommandParse extends PlaceholderCommand {
 
   @Nullable
   private OfflinePlayer resolvePlayer(@NotNull final String name) {
-    OfflinePlayer target = Bukkit.getPlayer(name);
-
+    OfflinePlayer target = Bukkit.getPlayerExact(name);
+    
     if (target == null) {
-      target = Bukkit.getOfflinePlayer(name); // this is probably not a great idea.
+      // 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.hasPlayedBefore() ? target : null;
+    return target;
 
   }
 

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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
@@ -26,6 +26,13 @@ import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
 
+/**
+ * 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
@@ -42,12 +49,27 @@ public final class ExpansionRegisterEvent extends Event implements Cancellable {
   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;

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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
@@ -25,12 +25,20 @@ import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
 
+/**
+ * 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();
-
-
+  
   @NotNull
   private final PlaceholderExpansion expansion;
 
@@ -42,7 +50,12 @@ public final class ExpansionUnregisterEvent extends Event {
   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;

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

@@ -0,0 +1,73 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2021 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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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
@@ -21,9 +21,11 @@
 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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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
@@ -23,9 +23,11 @@ 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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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
@@ -23,18 +23,32 @@ 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/NMSVersion.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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
@@ -39,7 +39,11 @@ public enum NMSVersion {
   SPIGOT_1_13_R2("v1_13_R2"),
   SPIGOT_1_14_R1("v1_14_R1"),
   SPIGOT_1_15_R1("v1_15_R1"),
-  SPIGOT_1_16_R1("v1_16_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");
 
   private final String version;
 

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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
@@ -22,20 +22,29 @@ package me.clip.placeholderapi.expansion;
 
 import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
+import java.util.logging.Level;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.PlaceholderHook;
 import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.entity.Player;
 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 placeholder identifier of this expansion
+   * The placeholder identifier of this expansion. May not contain {@literal %},
+   * {@literal {}} or _
    *
    * @return placeholder identifier that is associated with this expansion
    */
@@ -153,58 +162,217 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
   }
 
   // === 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 epxpansion has.
+   */
   @Nullable
   public final ConfigurationSection getConfigSection() {
     return getPlaceholderAPI().getConfig().getConfigurationSection("expansions." + getIdentifier());
   }
-
+  
+  /**
+   * 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) {
@@ -220,45 +388,106 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
         getAuthor().equals(expansion.getAuthor()) &&
         getVersion().equals(expansion.getVersion());
   }
-
-  @Override
-  public final int hashCode() {
-    return Objects.hash(getIdentifier(), getAuthor(), 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']", getName(),
         getAuthor(), getVersion());
   }
 
+  /**
+   * This method is called first whenever PlaceholderAPI finds a valid placeholder with a matching expansion.
+   * <br>When called, the provided OfflinePlayer instance can be one of 3 possible states:
+   * 
+   * <ul>
+   *   <li>Not null and online</li>
+   *   <li>Not null and offline</li>
+   *   <li>Null</li>
+   * </ul>
+   * 
+   * When not overridden by the called expansion will the method as of now call
+   * {@link PlaceholderHook#onRequest(OfflinePlayer, String) PlaceholderHook#onRequest(OfflinePlayer, String)}.
+   * <br>This behaviour will change in a future version to call {@link #parsePlaceholders(Player, String) parsePlaceholders(Player, String)}
+   * with the OfflinePlayer either being casted to a Player (When online), or {@link null}.
+   * 
+   * <p>To use this method in your PlaceholderExpansion, override it and return either a String or {@code null}.
+   * <br>When {@code null} is returned will PlaceholderAPI see it as an "invalid placeholder" and return
+   * the content as-is in the final String.
+   * 
+   * @param player The OfflinePlayer to use.
+   * @param params The parameters of the placeholder, right after the first underscore.
+   * @return Parsed placeholder, or null depending on the Expansion's handling of it.
+   */
+  @Nullable
+  public String parsePlaceholders(@Nullable OfflinePlayer player, @NotNull String params) {
+    return this.onRequest(player, params);
+  }
+
+  /**
+   * This method is called whenever PlaceholderAPI finds a valid placeholder with a matching expansion
+   * AND {@link #parsePlaceholders(OfflinePlayer, String) parsePlaceholder(OfflinePlayer, String)} isn't
+   * overridden by the expansion in question.
+   * <br>When called, the provided Player instance can be one of 2 possible states:
+   * 
+   * <ul>
+   *   <li>Not null and online</li>
+   *   <li>Null</li>
+   * </ul>
+   *
+   * When not overridden by the called expansion will the method as of now call
+   * {@link PlaceholderHook#onPlaceholderRequest(Player, String) PlaceholderHook#onPlaceholderRequest(Player, String)}.
+   * <br>This behaviour will change in a future version to instead return {@code null}.
+   * 
+   * <p>To use this method in your PlaceholderExpansion, override it and return either a String or {@code null}.
+   * <br>When {@code null} is returned will PlaceholderAPI see it as an "invalid placeholder" and return
+   * the content as-is in the final String.
+   * 
+   * @param player The Player to use. May be null
+   * @param params The parameters of the placeholder, right after the first underscore.
+   * @return Parsed placeholder, or null depending on the Expansion's handling of it.
+   */
+  @Nullable
+  public String parsePlaceholders(@Nullable Player player, @NotNull String params){
+    return this.onPlaceholderRequest(player, params);
+  }
+  
   // === Deprecated API ===
 
   /**
    * @deprecated As of versions greater than 2.8.7, use {@link #getRequiredPlugin()}
+   *
+   * @return The plugin name.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @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.11.0")
+  @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.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public String getLink() {
     return null;
   }
-
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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
@@ -21,8 +21,29 @@
 package me.clip.placeholderapi.expansion;
 
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
+/**
+ * This interface should be used when your {@link me.clip.placeholderapi.expansion.PlaceholderExpansion PlaceholderExpansion}
+ * should support relational placeholders.
+ * 
+ * <p>The difference between relational placeholders and normal ones is, that relational ones start
+ * with a {@code rel_} prefix and have two Players provided, instead of one.
+ * <br>The main purpose is to return a String based on the "relationship" between the two players
+ * (i.e. if both are within the same world).
+ */
 public interface Relational {
 
-  String onPlaceholderRequest(Player one, Player two, String identifier);
+  /**
+   * This method will be called whenever a valid placeholder in the format {@code %rel_<expansion>_<identifier>%}
+   * is found.
+   * 
+   * @param one The first player to use for comparison.
+   * @param two The second player to use for comparison
+   * @param identifier String right after {@code %rel_<expansion>_} and before the second percent symbol.
+   * @return Possibly-null String, depending on what the expansion returns.
+   */
+  @Nullable
+  String onPlaceholderRequest(Player one, Player two, @NotNull String identifier);
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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
@@ -20,18 +20,24 @@
 
 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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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
@@ -34,6 +34,8 @@ 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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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
@@ -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/manager/CloudExpansionManager.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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
@@ -22,6 +22,7 @@ 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;
@@ -32,14 +33,19 @@ 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;
@@ -73,6 +79,9 @@ public final class CloudExpansionManager {
   @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;
@@ -80,7 +89,7 @@ public final class CloudExpansionManager {
 
   @NotNull
   private static String toIndexName(@NotNull final String name) {
-    return name.toLowerCase().replace(' ', '_');
+    return name.toLowerCase(Locale.ROOT).replace(' ', '_');
   }
 
   @NotNull
@@ -163,58 +172,71 @@ public final class CloudExpansionManager {
   public void fetch(final boolean allowUnverified) {
     plugin.getLogger().info("Fetching available expansion information...");
 
-    CompletableFuture<Map<String, CloudExpansion>> future = CompletableFuture.supplyAsync(() -> {
-      final Map<String, CloudExpansion> values = new HashMap<>();
+    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));
 
-      try {
-        //noinspection UnstableApiUsage
-        final String json = Resources.toString(new URL(API_URL), StandardCharsets.UTF_8);
-        values.putAll(GSON.fromJson(json, TYPE));
-      } catch (final IOException ex) {
-        throw new CompletionException(ex);
-      }
+            List<String> toRemove = new ArrayList<>();
 
-      values.values().removeIf(value -> value.getLatestVersion() == null
-          || value.getVersion(value.getLatestVersion()) == null);
+            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());
+              }
+              if (!allowUnverified && !expansion.isVerified()) {
+                toRemove.add(entry.getKey());
+              }
+            }
 
-      return values;
-    });
+            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);
+          }
 
-    if (!allowUnverified) {
-      future = future.thenApplyAsync((values) -> {
-        values.values().removeIf(expansion -> !expansion.isVerified());
-        return values;
-      });
-    }
+          // loop thru what's left on the main thread
+          plugin
+              .getServer()
+              .getScheduler()
+              .runTask(
+                  plugin,
+                  () -> {
+                    try {
+                      for (Map.Entry<String, CloudExpansion> entry : values.entrySet()) {
+                        String name = entry.getKey();
+                        CloudExpansion expansion = entry.getValue();
 
-    future = future.thenApplyAsync((values) -> {
+                        expansion.setName(name);
 
-      values.forEach((name, expansion) -> {
-        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()));
+                          }
+                        }
 
-        final Optional<PlaceholderExpansion> local = plugin.getLocalExpansionManager()
-            .findExpansionByName(name);
-        if (local.isPresent() && local.get().isRegistered()) {
-          expansion.setHasExpansion(true);
-          expansion.setShouldUpdate(!local.get().getVersion().equals(expansion.getLatestVersion()));
-        }
-      });
-
-      return values;
-    });
-
-    future.whenComplete((expansions, exception) -> {
-
-      if (exception != null) {
-        plugin.getLogger()
-            .log(Level.WARNING, "failed to download expansion information", exception);
-        return;
-      }
-
-      for (final CloudExpansion expansion : expansions.values()) {
-        this.cache.put(toIndexName(expansion), expansion);
-      }
-    });
+                        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) {
@@ -240,7 +262,7 @@ public final class CloudExpansionManager {
         throw new CompletionException(ex);
       }
       return file;
-    });
+    }, ASYNC_EXECUTOR);
 
     download.whenCompleteAsync((value, exception) -> {
       await.remove(toIndexName(expansion));
@@ -249,7 +271,7 @@ public final class CloudExpansionManager {
         plugin.getLogger().log(Level.SEVERE,
             "failed to download " + expansion.getName() + ":" + version.getVersion(), exception);
       }
-    });
+    }, ASYNC_EXECUTOR);
 
     await.put(toIndexName(expansion), download);
 

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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
@@ -20,28 +20,13 @@
 
 package me.clip.placeholderapi.expansion.manager;
 
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
-import java.io.File;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
-import java.util.logging.Level;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.events.ExpansionRegisterEvent;
 import me.clip.placeholderapi.events.ExpansionUnregisterEvent;
-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.events.ExpansionsLoadedEvent;
+import me.clip.placeholderapi.expansion.*;
 import me.clip.placeholderapi.expansion.cloud.CloudExpansion;
 import me.clip.placeholderapi.util.FileUtil;
 import me.clip.placeholderapi.util.Futures;
@@ -60,11 +45,26 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.Unmodifiable;
 
+import java.io.File;
+import java.lang.reflect.Modifier;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.logging.Level;
+import java.util.stream.Collectors;
+
 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;
@@ -72,7 +72,8 @@ public final class LocalExpansionManager implements Listener {
   private final PlaceholderAPIPlugin plugin;
 
   @NotNull
-  private final Map<String, PlaceholderExpansion> expansions = new HashMap<>();
+  private final Map<String, PlaceholderExpansion> expansions = new ConcurrentHashMap<>();
+  private final ReentrantLock expansionsLock = new ReentrantLock();
 
 
   public LocalExpansionManager(@NotNull final PlaceholderAPIPlugin plugin) {
@@ -98,31 +99,54 @@ public final class LocalExpansionManager implements Listener {
     return folder;
   }
 
-  public int getExpansionsCount() {
-    return expansions.size();
-  }
-
-
   @NotNull
   @Unmodifiable
   public Collection<String> getIdentifiers() {
-    return ImmutableSet.copyOf(expansions.keySet());
+    expansionsLock.lock();
+    try {
+      return ImmutableSet.copyOf(expansions.keySet());
+    } finally {
+      expansionsLock.unlock();
+    }
   }
 
   @NotNull
   @Unmodifiable
   public Collection<PlaceholderExpansion> getExpansions() {
-    return ImmutableSet.copyOf(expansions.values());
+    expansionsLock.lock();
+    try {
+      return ImmutableSet.copyOf(expansions.values());
+    } finally {
+      expansionsLock.unlock();
+    }
   }
 
   @Nullable
   public PlaceholderExpansion getExpansion(@NotNull final String identifier) {
-    return ImmutableMap.copyOf(expansions).get(identifier.toLowerCase());
+    expansionsLock.lock();
+    try {
+      return expansions.get(identifier.toLowerCase(Locale.ROOT));
+    } finally {
+      expansionsLock.unlock();
+    }
   }
 
   @NotNull
   public Optional<PlaceholderExpansion> findExpansionByName(@NotNull final String name) {
-    return getExpansions().stream().filter(expansion -> name.equalsIgnoreCase(expansion.getName())).findFirst();
+    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
@@ -136,26 +160,40 @@ public final class LocalExpansionManager implements Listener {
       @NotNull final Class<? extends PlaceholderExpansion> clazz) {
     try {
       final PlaceholderExpansion expansion = createExpansionInstance(clazz);
-      if (expansion == null || !expansion.register()) {
+      
+      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.register()) {
         return Optional.empty();
       }
 
       return Optional.of(expansion);
-    } catch (final LinkageError ex) {
-      plugin.getLogger().severe("expansion class " + clazz.getSimpleName() + " is outdated: \n" +
-          "Failed to load due to a [" + ex.getClass().getSimpleName() + "], attempted to use " + ex
-          .getMessage());
+    } 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!";
+      }
+
+      plugin.getLogger().severe("Failed to load expansion class " + clazz.getSimpleName() +
+              reason);
+      plugin.getLogger().log(Level.SEVERE, "", ex);
     }
 
     return Optional.empty();
   }
 
-  /**
-   * Do not call this method yourself, use {@link PlaceholderExpansion#register()}
-   */
   @ApiStatus.Internal
   public boolean register(@NotNull final PlaceholderExpansion expansion) {
-    final String identifier = expansion.getIdentifier().toLowerCase();
+    final String identifier = expansion.getIdentifier().toLowerCase(Locale.ROOT);
 
     if (!expansion.canRegister()) {
       return false;
@@ -196,14 +234,13 @@ public final class LocalExpansionManager implements Listener {
     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());
+        plugin.getLogger().warning("Your server version is not compatible with expansion " +
+            expansion.getIdentifier() + " " + expansion.getVersion());
         return false;
       }
     }
 
-    final PlaceholderExpansion removed = expansions.get(identifier);
+    final PlaceholderExpansion removed = getExpansion(identifier);
     if (removed != null && !removed.unregister()) {
       return false;
     }
@@ -215,34 +252,38 @@ public final class LocalExpansionManager implements Listener {
       return false;
     }
 
-    expansions.put(identifier, expansion);
+    expansionsLock.lock();
+    try {
+      expansions.put(identifier, expansion);
+    } finally {
+      expansionsLock.unlock();
+    }
 
     if (expansion instanceof Listener) {
       Bukkit.getPluginManager().registerEvents(((Listener) expansion), plugin);
     }
 
-    plugin.getLogger().info("Successfully registered expansion: " + expansion.getIdentifier());
+    plugin.getLogger().info("Successfully registered expansion: " + expansion.getIdentifier() + 
+        " [" + expansion.getVersion() + "]");
 
     if (expansion instanceof Taskable) {
       ((Taskable) expansion).start();
     }
 
     if (plugin.getPlaceholderAPIConfig().isCloudEnabled()) {
-      final Optional<CloudExpansion> cloudExpansion = plugin.getCloudExpansionManager()
-          .findCloudExpansionByName(identifier);
-      if (cloudExpansion.isPresent()) {
-        cloudExpansion.get().setHasExpansion(true);
-        cloudExpansion.get().setShouldUpdate(
-            !cloudExpansion.get().getLatestVersion().equals(expansion.getVersion()));
+      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;
   }
 
-  /**
-   * Do not call this method yourself, use {@link PlaceholderExpansion#unregister()}
-   */
   @ApiStatus.Internal
   public boolean unregister(@NotNull final PlaceholderExpansion expansion) {
     if (expansions.remove(expansion.getIdentifier()) == null) {
@@ -283,13 +324,37 @@ public final class LocalExpansionManager implements Listener {
         plugin.getLogger().log(Level.SEVERE, "failed to load class files of expansions", 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 registered = classes.stream().map(this::register).filter(Optional::isPresent)
+      final long needsUpdate = registered.stream()
+          .map(expansion -> plugin.getCloudExpansionManager().findCloudExpansionByName(expansion.getName()).orElse(null))
+          .filter(Objects::nonNull)
+          .filter(CloudExpansion::shouldUpdate)
           .count();
 
-      Msg.msg(sender,
-          registered == 0 ? "&6No expansions were registered!"
-              : registered + "&a placeholder hooks successfully registered!");
+      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));
     });
   }
 
@@ -303,10 +368,14 @@ public final class LocalExpansionManager implements Listener {
     }
   }
 
-
   @NotNull
-  public CompletableFuture<@NotNull List<@NotNull Class<? extends PlaceholderExpansion>>> findExpansionsOnDisk() {
-    return Arrays.stream(folder.listFiles((dir, name) -> name.endsWith(".jar")))
+  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());
   }
@@ -316,11 +385,28 @@ public final class LocalExpansionManager implements Listener {
       @NotNull final File file) {
     return CompletableFuture.supplyAsync(() -> {
       try {
-        return FileUtil.findClass(file, PlaceholderExpansion.class);
+        final Class<? extends PlaceholderExpansion> expansionClass = FileUtil.findClass(file, PlaceholderExpansion.class);
+
+        if (expansionClass == null) {
+          plugin.getLogger().severe("Failed to load Expansion: " + file.getName() + ", as it does not have" +
+                  " a class which extends PlaceholderExpansion.");
+          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)) {
+          plugin.getLogger().severe("Failed to load Expansion: " + file.getName() + ", as it does not have the" +
+                  " required methods declared for a PlaceholderExpansion.");
+          return null;
+        }
+
+        return expansionClass;
       } catch (final VerifyError ex) {
-        plugin.getLogger().severe("expansion file " + file.getName() + " is outdated: \n" +
-            "Failed to load due to a [" + ex.getClass().getSimpleName() + "], attempted to use" + ex
-            .getMessage().substring(ex.getMessage().lastIndexOf(' ')));
+        plugin.getLogger().severe("Failed to load Expansion class " + file.getName() +
+            " (Is a dependency missing?)");
+        plugin.getLogger().severe("Cause: " + ex.getClass().getSimpleName() + " " + ex.getMessage());
         return null;
       } catch (final Exception ex) {
         throw new CompletionException(ex);
@@ -339,9 +425,8 @@ public final class LocalExpansionManager implements Listener {
         throw ((LinkageError) ex.getCause());
       }
 
-      plugin.getLogger()
-          .log(Level.SEVERE, "Failed to load placeholder expansion from class: " + clazz.getName(),
-              ex);
+      plugin.getLogger().warning("There was an issue with loading an expansion.");
+      
       return null;
     }
   }

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

@@ -0,0 +1,57 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2021 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/listeners/ServerLoadEventListener.java

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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
@@ -39,16 +39,6 @@ public final class ServerLoadEventListener implements Listener {
     Bukkit.getPluginManager().registerEvents(this, plugin);
   }
 
-  /**
-   * This method will be called when the server is first loaded
-   * <p>
-   * The goal of the method is to register all the expansions as soon as possible especially before
-   * players can join
-   * <p>
-   * This will ensure no issues with expansions and hooks.
-   *
-   * @param event the server load event
-   */
   @EventHandler
   public void onServerLoad(@NotNull final ServerLoadEvent event) {
     HandlerList.unregisterAll(this);

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

@@ -1,174 +1,137 @@
-/*
- * This file is part of PlaceholderAPI
- *
- * PlaceholderAPI
- * Copyright (c) 2015 - 2020 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.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 == '&' && ++i < chars.length) {
-        final char c = Character.toLowerCase(chars[i]);
-
-        if (c != '0' && c != '1' && c != '2' && c != '3' && c != '4' && c != '5' && c != '6'
-            && c != '7' && c != '8' && c != '9' && c != 'a' && c != 'b' && c != 'c' && c != 'd'
-            && c != 'e' && c != 'f' && c != 'k' && c != 'l' && c != 'm' && c != 'n' && c != 'o' && c != 'r'
-            && c != 'x') {
-          builder.append(l).append(chars[i]);
-        } else {
-          builder.append(ChatColor.COLOR_CHAR);
-
-          if (c != 'x') {
-            builder.append(chars[i]);
-            continue;
-          }
-
-          if ((i > 1 && chars[i - 2] == '\\') /*allow escaping &x*/) {
-            builder.setLength(builder.length() - 2);
-            builder.append('&').append(chars[i]);
-            continue;
-          }
-
-          builder.append(c);
-
-          int j = 0;
-          while (++j <= 6) {
-            if (i + j >= chars.length) {
-              break;
-            }
-
-            final char x = chars[i + j];
-            builder.append(ChatColor.COLOR_CHAR).append(x);
-          }
-
-          if (j == 7) {
-            i += 6;
-          } else {
-            builder.setLength(builder.length() - (j * 2)); // undo &x parsing
-          }
-        }
-        continue;
-      }
-
-      if (l != closure.head || i + 1 >= chars.length) {
-        builder.append(l);
-        continue;
-      }
-
-      boolean identified = false;
-      boolean oopsitsbad = true;
-
-      while (++i < chars.length) {
-        final char p = chars[i];
-
-        if (p == ' ' && !identified) {
-          break;
-        }
-        if (p == closure.tail) {
-          oopsitsbad = false;
-          break;
-        }
-
-        if (p == '_' && !identified) {
-          identified = true;
-          continue;
-        }
-
-        if (identified) {
-          parameters.append(p);
-        } else {
-          identifier.append(p);
-        }
-      }
-
-      final String identifierString = identifier.toString().toLowerCase();
-      final String parametersString = parameters.toString();
-
-      identifier.setLength(0);
-      parameters.setLength(0);
-
-      if (oopsitsbad) {
-        builder.append(closure.head).append(identifierString);
-
-        if (identified) {
-          builder.append('_').append(parametersString);
-        }
-
-        builder.append(' ');
-        continue;
-      }
-
-      final PlaceholderExpansion placeholder = lookup.apply(identifierString);
-      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(ChatColor.translateAlternateColorCodes('&', replacement));
-    }
-
-    return builder.toString();
-  }
-
-}
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2021 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.parsePlaceholders(player, parametersString);
+      if (replacement == null) {
+        builder.append(closure.head).append(identifierString);
+
+        if (identified) {
+          builder.append('_');
+        }
+
+        builder.append(parametersString).append(closure.tail);
+        continue;
+      }
+
+      builder.append(ChatColor.translateAlternateColorCodes('&', replacement));
+    }
+
+    return builder.toString();
+  }
+
+}

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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
@@ -61,7 +61,7 @@ public final class RegexReplacer implements Replacer {
         continue;
       }
 
-      final String requested = expansion.onRequest(player, parameters);
+      final String requested = expansion.parsePlaceholders(player, parameters);
       matcher.appendReplacement(builder, requested != null ? requested : matcher.group(0));
     }
     while (matcher.find());

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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
@@ -23,6 +23,7 @@ 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.util.Msg;
@@ -90,17 +91,24 @@ public class UpdateChecker implements Listener {
       return false;
     }
 
-    String plV = toReadable(pluginVersion);
-    String spV = toReadable(spigotVersion);
-    return plV.compareTo(spV) < 0;
+    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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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
@@ -20,6 +20,9 @@
 
 package me.clip.placeholderapi.util;
 
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
@@ -28,8 +31,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.jar.JarEntry;
 import java.util.jar.JarInputStream;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 public class FileUtil {
 
@@ -41,17 +42,15 @@ public class FileUtil {
     }
 
     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()); final URLClassLoader loader = new URLClassLoader(new URL[]{jar},
-        clazz.getClassLoader())) {
+    try (final JarInputStream stream = new JarInputStream(jar.openStream())) {
       JarEntry entry;
       while ((entry = stream.getNextJarEntry()) != null) {
         final String name = entry.getName();
-        if (name == null || name.isEmpty() || !name.endsWith(".class")) {
+        if (name.isEmpty() || !name.endsWith(".class")) {
           continue;
         }
 
@@ -68,8 +67,11 @@ public class FileUtil {
         }
       }
     }
-
-    return classes.isEmpty() ? null : classes.get(0);
+    if (classes.isEmpty()) {
+        loader.close();
+        return null;
+    }
+    return classes.get(0);
   }
 
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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
@@ -50,7 +50,7 @@ public final class Format {
   }
 
   @NotNull
-  private static String buildFormat(@NotNull final Align align, @NotNull final int[] spacing) {
+  private static String buildFormat(@NotNull final Align align, final int[] spacing) {
     return stream(spacing)
         .mapToObj(space -> "%" + (align == Align.LEFT ? "-" : "") + (space + 2) + "s")
         .collect(joining());

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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
@@ -22,150 +22,75 @@ 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) {
-    if (seconds < 60) {
-      switch (type) {
-        case DAYS:
-        case HOURS:
-        case MINUTES:
-          return "0";
-        case SECONDS:
-          return String.valueOf(seconds);
-      }
-
-      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);
-    }
-
-    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);
-    }
-
-    int days = minutes / 1440;
-    int inMins = 1440 * days;
-    int leftOver = minutes - inMins;
-
-    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);
-    }
+  public static String getRemaining(final int seconds, final TimeFormat type) {
+    return getRemaining((long) seconds, type);
   }
 
-  public static String getTime(int seconds) {
-    return getTime(Duration.ofSeconds(seconds));
+  public static String getRemaining(final long seconds, final TimeFormat type) {
+    switch (type) {
+      default:
+        return String.valueOf(seconds);
+
+      case SECONDS:
+        return String.valueOf(seconds % 60);
+
+      case MINUTES:
+        return String.valueOf((seconds / 60) % 60);
+
+      case HOURS:
+        return String.valueOf((seconds / 3600) % 24);
+
+      case DAYS:
+        return String.valueOf(seconds / 86400);
+    }
   }
 
   /**
    * 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)
+   *                 seconds)
    * @return formatted time
    */
   public static String getTime(final Duration duration) {
-    final StringBuilder builder = new StringBuilder();
+    return getTime(duration.getSeconds());
+  }
+
+  public static String getTime(final int seconds) {
+    return getTime((long) seconds);
+  }
+
+  public static String getTime(long seconds) {
+    final StringJoiner joiner = new StringJoiner(" ");
 
-    long seconds = duration.getSeconds();
     long minutes = seconds / 60;
     long hours = minutes / 60;
-    long days = hours / 24;
+    final long days = hours / 24;
 
     seconds %= 60;
     minutes %= 60;
-    hours %= 60;
-    days %= 24;
+    hours %= 24;
 
-    if (seconds > 0) {
-      builder.insert(0, seconds + "s");
-    }
-
-    if (minutes > 0) {
-      if (builder.length() > 0) {
-        builder.insert(0, ' ');
-      }
-
-      builder.insert(0, minutes + "m");
+    if (days > 0) {
+      joiner.add(days + "d");
     }
 
     if (hours > 0) {
-      if (builder.length() > 0) {
-        builder.insert(0, ' ');
-      }
-
-      builder.insert(0, hours + "h");
+      joiner.add(hours + "h");
     }
 
-    if (days > 0) {
-      if (builder.length() > 0) {
-        builder.insert(0, ' ');
-      }
-
-      builder.insert(0, days + "d");
+    if (minutes > 0) {
+      joiner.add(minutes + "m");
     }
 
-    return builder.toString();
+    if (seconds > 0) {
+      joiner.add(seconds + "s");
+    }
+
+    return joiner.toString();
   }
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2020 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 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
@@ -88,12 +88,4 @@ public final class ReplacerUnitTester {
     assertEquals(text, Values.CHARS_REPLACER.apply(text, null, Values.PLACEHOLDERS::get));
   }
 
-  @Test
-  void testCharsReplacerHandlesEscapedHex() {
-    final String text = "\\&xffffffThis should not change.";
-
-    assertEquals(text.substring(1),
-        Values.CHARS_REPLACER.apply(text, null, Values.PLACEHOLDERS::get));
-  }
-
 }

wiki/Commands.md

@@ -27,213 +27,213 @@ This page shows all commands, including with a detailed description of what ever
 
 - **[Other Commands](#other-commands)**
   - [`/papi dump`](#papi-dump)
+  - [`/papi help`](#papi-help)
   - [`/papi reload`](#papi-reload)
+  - [`/papi version`](#papi-version)
 
 ----
+
 ### Parse Commands
 These commands are used to parse placeholders into their respective values. Useful for debugging.
 
-#### `/papi bcparse`
-**Description**:  
-Parses placeholders of a String and broadcasts the result to all players.
+- #### `/papi bcparse`
+  **Description**:  
+  Parses placeholders of a String and broadcasts the result to all players.
+  
+  **Arguments**:
+  * `<player|me>` - The Player to parse values of the placeholder (Use `me` for yourself).
+  * `<Text with placeholders>` - The text to parse.
+  
+  **Example**:  
+  ```
+  /papi bcparse funnycube My name is %player_name%!
+  ```
 
-**Arguments**:
-* `<player|me>` - The Player to parse values of the placeholder (Use `me` for yourself).
-* `<Text with placeholders>` - The text to parse.
+- #### `/papi cmdparse`
+  **Description**:  
+  Parses placeholders of a String and executes it as a command.
 
-**Example**:  
-```
-/papi bcparse funnycube My name is %player_name%!
-```
+  **Arguments**:  
+  - `<player|me>` - The player to parse placeholders against. Use `me` for yourself.
+  - `<Command with placeholders>` - The Text to parse and execute as command. Please leave away the `/` of the command.
+  
+  **Example**:  
+  ```
+  /papi cmdparse funnycube say My name is %player_name%!
+  ```
+
+- #### `/papi parse`
+  **Description**:  
+  Parses the placeholders in a given text and shows the result.
+  
+  **Arguments**:
+  * `<player|me>` - The Player to parse values of the placeholder (Use `me` for yourself).
+  * `<Text with placeholders>` - The text to parse.
+  
+  **Example**:  
+  ```
+  /papi parse funnycube My group is %vault_group%
+  ```
+
+- #### `/papi parserel`
+  **Description**:  
+  Parses a relational placeholder.
+  
+  **Arguments**:  
+  * `<player1>` - The first player.
+  * `<player2>` - the second player to compare with.
+  * `<Text with placeholders>` - The actual placeholder to parse.
+  
+  **Example**:  
+  ```
+  /papi parserel funnycube extended_clip %placeholder%
+  ```
 
 ----
-#### `/papi cmdparse`
-**Description**:  
-Parses placeholders of a String and executes it as a command.
 
-**Arguments**:  
-- `<player|me>` - The player to parse placeholders against. Use `me` for yourself.
-- `<Command with placeholders>` - The Text to parse and execute as command. Please leave away the `/` of the command.
-
-**Example**:  
-```
-/papi cmdparse funnycube say My name is %player_name%!
-```
-
-----
-#### `/papi parse`
-**Description**:  
-Parses the placeholders in a given text and shows the result.
-
-**Arguments**:
-* `<player|me>` - The Player to parse values of the placeholder (Use `me` for yourself).
-* `<Text with placeholders>` - The text to parse.
-
-**Example**:  
-```
-/papi parse funnycube My group is %vault_group%
-```
-
-----
-#### `/papi parserel`
-**Description**:  
-Parses a relational placeholder.
-
-**Arguments**:  
-* `<player1>` - The first player.
-* `<player2>` - the second player to compare with.
-* `<Text with placeholders>` - The actual placeholder to parse.
-
-**Example**:  
-```
-/papi parserel funnycube extended_clip %placeholder%
-```
-
-----
 ### eCloud Commands
 These commands all start with `/papi ecloud` and are used for things related about the [[Expansion Cloud]].
 
-#### `/papi ecloud clear`
-**Description**:  
-Clears the cache for the eCloud.
+- #### `/papi ecloud clear`
+  **Description**:  
+  Clears the cache for the eCloud.
+
+- #### `/papi ecloud disable`
+  **Description**:  
+  Disables the connection to the eCloud.
+
+- #### `/papi ecloud download`
+  **Description**:  
+  Allows you to download an expansion from the eCloud
+  
+  **Arguments**:  
+  - `<expansion>` - The expansion to download.
+  - `[version]` - The specific version of the expansion to download (Optional)
+  
+  **Example**:  
+  ```
+  /papi ecloud download Vault
+  /papi ecloud download Vault 1.5.2
+  ```
+
+- #### `/papi ecloud enable`
+  **Description**:  
+  Enables the connection to the eCloud
+ 
+- #### `/papi ecloud info`
+  **Description**:  
+  Gives information about a specific Expansion.
+  
+  **Arguments**:  
+  - `<expansion>` - The Expansion to retrieve information from.
+  - `[version]` - The Expansion's version to get information from.
+  
+  **Example**:  
+  ```
+  /papi ecloud info Vault
+  ```
+
+- #### `/papi ecloud list`
+  **Description**:  
+  Lists either all Expansions on the eCloud, only those by a specific author or only those that you have [installed](#papi-ecloud-download).  
+  Installed Expansions show as green in the list and Expansions that are installed and have an update available show as gold.
+  
+  **Arguments**:  
+  - `<all|<author>|installed>` - List all Expansions, Expansions of a specific author or all Expnansions you have installed.
+  
+  **Example**:  
+  ```
+  /papi ecloud list all
+  /papi ecloud list clip
+  /papi ecloud list installed
+  ```
+
+- #### `/papi ecloud placeholders`
+  **Description**:  
+  List all placeholders of an Expansion.
+  
+  **Arguments**:  
+  - `<expansion>` - The Expansion to list placeholders of.
+  
+  **Example**:  
+  ```
+  /papi ecloud placeholders Vault
+  ```
+
+- #### `/papi ecloud refresh`
+  **Description**:  
+  Refresh the cached data from the eCloud.
+
+- #### `/papi ecloud status`
+  **Description**:  
+  Displays the actual Status of the eCloud.
 
 ----
-#### `/papi ecloud disable`
-**Description**:  
-Disables the connection to the eCloud.
 
-----
-#### `/papi ecloud download`
-**Description**:  
-Allows you to download an expansion from the eCloud
-
-**Arguments**:  
-- `<expansion>` - The expansion to download.
-- `[version]` - The specific version of the expansion to download (Optional)
-
-**Example**:  
-```
-/papi ecloud download Vault
-/papi ecloud download Vault 1.5.2
-```
-
-----
-#### `/papi ecloud enable`
-**Description**:  
-Enables the connection to the eCloud
-
-----
-#### `/papi ecloud info`
-**Description**:  
-Gives information about a specific Expansion.
-
-**Arguments**:  
-- `<expansion>` - The Expansion to retrieve information from.
-- `[version]` - The Expansion's version to get information from.
-
-**Example**:  
-```
-/papi ecloud info Vault
-```
-
-----
-#### `/papi ecloud list`
-**Description**:  
-Lists either all Expansions on the eCloud, only those by a specific author or only those that you have [installed](#papi-ecloud-download).  
-Installed Expansions show as green in the list and Expansions that are installed and have an update available show as gold.
-
-**Arguments**:  
-- `<all|<author>|installed>` - List all Expansions, Expansions of a specific author or all Expnansions you have installed.
-
-**Example**:  
-```
-/papi ecloud list all
-/papi ecloud list clip
-/papi ecloud list installed
-```
-
-----
-#### `/papi ecloud placeholders`
-**Description**:  
-List all placeholders of an Expansion.
-
-**Arguments**:  
-- `<expansion>` - The Expansion to list placeholders of.
-
-**Example**:  
-```
-/papi ecloud placeholders Vault
-```
-
-----
-#### `/papi ecloud refresh`
-**Description**:  
-Refresh the cached data from the eCloud.
-
-----
-#### `/papi ecloud status`
-**Description**:  
-Displays the actual Status of the eCloud.
-
-----
 ### Expansion Commands
 These commands can be used to manage the expansions that you have currently installed.
 
-#### `/papi info`
-**Description**:  
-Gives you information about the specified Expansion.
+- #### `/papi info`
+  **Description**:  
+  Gives you information about the specified Expansion.
 
-**Argument(s)**:  
-- `<expansion>` - The Expansion to get info from (Needs to be registered and active).
+  **Argument(s)**:  
+  - `<expansion>` - The Expansion to get info from (Needs to be registered and active).
+  
+  **Example**:  
+  ```
+  /papi info Vault
+  ```
 
-**Example**:  
-```
-/papi info Vault
-```
+- #### `/papi list`
+  **Description**:  
+  Lists all active/registered expansions.  
+  This is different to [/papi ecloud list installed](#papi-ecloud-list) in the fact, that it also includes expansions that were installed through a plugin (That aren't a separate   jar-file) and it also doesn't show which one have updates available.
+
+- #### `/papi register`
+  **Description**:  
+  Registers an expansion from a specified filename.  
+  This is useful in cases, where you downloaded the expansion manually and don't want to restart the server.  
+  The file needs to be inside `/plugins/PlaceholderAPI/expansions`.
+  
+  **Arguments**:
+  - `<filename>` - The file to register (including the file-extension).
+  
+  **Example**:  
+  ```
+  /papi register MyExpansion.jar
+  ```
+
+- #### `/papi unregister`
+  **Description**:  
+  Unregisters the specified expansion.
+  
+  **Arguments**:
+  - `<filename>` - The expansion to unregister.
+  
+  **Example**:  
+  ```
+  /papi unregister MyExpansion.jar
+  ```
 
 ----
-#### `/papi list`
-**Description**:  
-Lists all active/registered expansions.  
-This is different to [/papi ecloud list installed](#papi-ecloud-list) in the fact, that it also includes expansions that were installed through a plugin (That aren't a separate jar-file) and it also doesn't show which one have updates available.
 
-----
-#### `/papi register`
-**Description**:  
-Registers an expansion from a specified filename.  
-This is useful in cases, where you downloaded the expansion manually and don't want to restart the server.  
-The file needs to be inside `/plugins/PlaceholderAPI/expansions`.
-
-**Arguments**:
-- `<filename>` - The file to register (including the file-extension).
-
-**Example**:  
-```
-/papi register MyExpansion.jar
-```
-
-----
-#### `/papi unregister`
-**Description**:  
-Unregisters the specified expansion.
-
-**Arguments**:
-- `<filename>` - The expansion to unregister.
-
-**Example**:  
-```
-/papi unregister MyExpansion.jar
-```
-
-----
 ### Other Commands
 These are other commands of PlaceholderAPI that don't fit any of the above categories.
 
-#### `/papi dump`
-**Description**:  
-Pastes useful information from PlaceholderAPI such as plugin version, server version and installed expansions to https://paste.helpch.at for simple sharing and support.
+- #### `/papi dump`
+  **Description**:  
+  Pastes useful information from PlaceholderAPI such as plugin version, server version and installed expansions to https://paste.helpch.at for simple sharing and support.
 
-#### `/papi reload`
-**Description**:  
-Reloads the config settings.  
-You need to use this command after [downloading Expansions](#papi-ecloud-download) from the eCloud or they won't be properly registered.
+- #### `/papi help`
+  **Description**:  
+  Displays all the commands PlaceholderAPI currently offers.
+
+- #### `/papi reload`
+  **Description**:  
+  Reloads the config settings.  
+  You need to use this command after [downloading Expansions](#papi-ecloud-download) from the eCloud or they won't be properly registered.
+
+- #### `/papi version`
+  **Description**:  
+  Shows the current version and authors of PlaceholderAPI.

wiki/FAQ.md

@@ -1,16 +1,30 @@
+[readme]: https://github.com/PlaceholderAPI/PlaceholderAPI/blob/docs/wiki/wiki/README.md
+
 Here are frequently asked questions about stuff related to PlaceholderAPI.
 
-## It only shows %placeholder% and not the variable
-Make sure, that you've tried the following steps:
-- PlaceholderAPI is installed and running (Shows green in `/pl` and responds to the `/papi` command)
-- You downloaded the expansion with `/papi ecloud download [expansion]`  
-A list of available expansions and their placeholders can be found [[here|Placeholders]]!  
-Also note that not all placeholders are in a seperate expansion. Some are "hardcoded" into a plugin.
-- You reloaded PlaceholderAPI with `/papi reload` after downloading an expansion.
-- Any possible dependency for the expansion (Plugin) is installed and running.
-- The placeholder doesn't contain any typos.
-- The plugin that should use the placeholder actually supports PlaceholderAPI.
-For a list of plugins supporting PlaceholderAPI go [[here|Plugins-using-PlaceholderAPI]].
+## It only shows `%placeholder%` and not the variable
+When a plugin or `/papi parse me %placeholder%` only returns the placeholder itself and no value should you check for the following things:
+
+### The expansion is actually installed.
+In many cases is the cause that the expansion of the placeholder is missing.  
+Just execute `/papi ecloud download <name of expansion>` followed by `/papi reload` to activate it. You can find a list of Expansions and their Placeholders [[on this page|Placeholders]].
+
+**NOTE!**  
+Not all placeholders come in their own expansion. Some plugins *hardcode* them in and load them on startup, when hooking into PlaceholderAPI.
+
+### Plugin actualls supports PlaceholderAPI
+It can happen that the plugin you use to display the placeholder in doesn't support PlaceholderAPI. In such a case check, if the parse command returns the actual value of a placeholder.  
+If that is the case while the plugin is still displaying the placeholder, can this be an indicator of the plugin not supporting PlaceholderAPI.
+
+You can find a list of plugins supporting PlaceholderAPI [[here|Plugins-using-PlaceholderAPI]].  
+Just make sure that "Supports placeholders" has a check mark in front of it.
+
+### No typo in the placeholder
+Double-check that the placeholder you set doesn't contain a typo. You can use `/papi ecloud placeholders <expansion>` (replace `<expansion>` with the name of the expansion) to get a list of all the placeholders the expansion may have.  
+Keep in mind that this only works for separate expansions on the eCloud and not for those that are loaded by plugins.
+
+### Plugin is enabled
+If an expansion depends on a plugin, make sure you have the plugin installed and that it is enabled (Shows green in `/pl`).
 
 ## I can't download the expansion
 Make sure, that the connection to the cloud (https://api.extendedclip.com) isn't blocked by a firewall or similar.  
@@ -19,4 +33,23 @@ Next step would be to check if the expansion actually exists on the cloud. Not a
 If both checks failed, go to the cloud-page and download the jar manually. Put it then in the `expansions` folder of PlaceholderAPI (`/plugins/PlaceholderAPI/expansions`)
 
 ## How can other plugins use my placeholders with PlaceholderAPI?
-A tutorial can be found [[here|Hook into PlaceholderAPI]]!
+A tutorial can be found [[here|Hook into PlaceholderAPI]]!
+
+## Can I help on this wiki?
+You sure can!  
+We welcome contributions to our wiki by everyone. If you found a typo or want to improve this wiki in another way, head over to the [Wiki's readme file][readme] to find out about how you can contribute towards this wiki.
+
+## PlaceholderAPI is posting an error about an outdated expansion?
+```
+[00:00:01 ERROR]: [PlaceholderAPI] Failed to load Expansion class <expansion> (Is a dependency missing?)
+[00:00:01 ERROR]: [PlaceholderAPI] Cause: NoClassDefFoundError <path>
+```
+
+If you receive the above error, try to do the following steps:
+
+- Make sure any required dependency of the mentioned expansion (e.g. a plugin) is installed.
+- Make sure you use the latest version supported for the server version you use.
+- If you downloaded the jar from the ecloud, make sure it isn't malformed/corrupted.
+
+If the issue persists after you've done those checks, report it to the author of the expansion.  
+In most cases is the issue that either a dependency is missing or that the expansion tries to use outdated methods from PlaceholderAPI.

wiki/Home.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="https://i.imgur.com/puadJ8Z.png" alt="PlaceholderAPI">
+  <img src="https://raw.githubusercontent.com/PlaceholderAPI/PlaceholderAPI/master/wiki/img/wiki-logo.png" alt="PlaceholderAPI">
 </p>  
 This wiki gives you information on how to create placeholders in your plugin that can be used in other plugins, how to use other placeholders inside your plugin, or how to make an expansion.  
 It also has a list with all available placeholders (Work in progress).
@@ -7,10 +7,12 @@ It also has a list with all available placeholders (Work in progress).
 ### Setup
 **[[Hook into PlaceholderAPI]]**
 - [[First steps|Hook-into-PlaceholderAPI#first-steps]]
-- [[Adding placeholders to PlaceholderAPI|Hook-into-PlaceholderAPI#adding-placeholders-to-placeholderapi]]
-  - [[PlaceholderExpansion]]
-    - [[Without an external plugin|PlaceholderExpansion#without-an-external-plugin]]
-    - [[With external plugin|PlaceholderExpansion#with-external-plugin]]
+- [[Adding placeholders to PlaceholderAPI|PlaceholderExpansion]]
+  - [[Common Parts|PlaceholderExpansion#common-parts]]
+  - [[Without an external plugin|PlaceholderExpansion#without-a-plugin]]
+  - [[With an external Plugin (Separate Jar)|PlaceholderExpansion#with-a-plugin-external-jar]]
+  - [[With an external Plugin (Internal class)|PlaceholderExpansion#with-a-plugin-internal-class]]
+  - [[Relational Placeholders|PlaceholderExpansion#relational-placeholders]]
 - [[Setting placeholders in your plugin|Hook-into-PlaceholderAPI#setting-placeholders-in-your-plugin]]
 
 ### Other
@@ -18,40 +20,8 @@ It also has a list with all available placeholders (Work in progress).
 **[[Expansion cloud]]**  
 **[[FAQ]]**  
 **[[Plugins using PlaceholderAPI]]**  
-**[[Placeholders]]**  
-- [[PAPI-placeholders|Placeholders#papi-placeholders-1]]
-  - [[Advancements|Placeholders#advancements]]
-  - [[Animations|Placeholders#animations]]
-  - [[Armor|Placeholders#armor]]
-  - [[ASCII|Placeholders#ASCII]]
-  - [[BungeeCord|Placeholders#bungeecord]]
-  - [[CheckItem|Placeholders#checkitem]]
-  - [[CooldownBar|Placeholders#cooldownbar]]
-  - [[Formatter|Placeholders#formatter]]
-  - [[Javascript|Placeholders#javascript]]
-  - [[ListPlayers|Placeholders#listplayer]]
-  - [[LocalTime|Placeholders#localtime]]
-  - [[Math|Placeholders#math]]
-  - [[MVdW placeholders|Placeholders#mvdw-placeholders]]
-  - [[OtherPlayer|Placeholders#otherplayer]]
-  - [[ParseNear|Placeholders#parsenear]]
-  - [[ParseOther|Placeholders#parseother]]
-  - [[Pinger|Placeholders#pinger]]
-  - [[Player|Placeholders#player]]
-  - [[PlayerList|Placeholders#playerlist]]
-  - [[Plugin|Placeholders#plugin]]
-  - [[Progress|Placeholders#progress]]
-  - [[RainbowColor|Placeholders#rainbowcolor]]
-  - [[RandomColor|Placeholders#randomcolor]]
-  - [[RedisBungee|Placeholders#redisbungee]]
-  - [[RelCon|Placeholders#relcon]]
-  - [[ScoreboardObjectives|Placeholders#scoreboardobjectives]]
-  - [[Server|Placeholders#server]]
-  - [[Sound|Placeholders#sound]]
-  - [[Spectators|Placeholders#spectators]]
-  - [[Statistic|Placeholders#statistic]]
-  
-- [[Plugin-placeholders|Placeholders#plugin-placeholders-1]]
+**[[Placeholders]]**
+- [[Standalone|Placeholders#standalone]]
   - [[A|Placeholders#a]]
   - [[B|Placeholders#b]]
   - [[C|Placeholders#c]]
@@ -75,4 +45,33 @@ It also has a list with all available placeholders (Work in progress).
   - [[U|Placeholders#u]]
   - [[V|Placeholders#v]]
   - [[W|Placeholders#w]]
+  - [[X|Placeholders#x]]
+  - [[Y|Placeholders#y]]
   - [[Z|Placeholders#z]]
+- [[Plugin-placeholders|Placeholders#plugin-placeholders-1]]
+  - [[A|Placeholders#a-1]]
+  - [[B|Placeholders#b-1]]
+  - [[C|Placeholders#c-1]]
+  - [[D|Placeholders#d-1]]
+  - [[E|Placeholders#e-1]]
+  - [[F|Placeholders#f-1]]
+  - [[G|Placeholders#g-1]]
+  - [[H|Placeholders#h-1]]
+  - [[I|Placeholders#i-1]]
+  - [[J|Placeholders#j-1]]
+  - [[K|Placeholders#k-1]]
+  - [[L|Placeholders#l-1]]
+  - [[M|Placeholders#m-1]]
+  - [[N|Placeholders#n-1]]
+  - [[O|Placeholders#o-1]]
+  - [[P|Placeholders#p-1]]
+  - [[Q|Placeholders#q-1]]
+  - [[R|Placeholders#r-1]]
+  - [[S|Placeholders#s-1]]
+  - [[T|Placeholders#t-1]]
+  - [[U|Placeholders#u-1]]
+  - [[V|Placeholders#v-1]]
+  - [[W|Placeholders#w-1]]
+  - [[X|Placeholders#x-1]]
+  - [[Y|Placeholders#y-1]]
+  - [[Z|Placeholders#z-1]]

wiki/Hook-into-PlaceholderAPI.md

@@ -1,4 +1,4 @@
-[APIBadge]: https://img.shields.io/nexus/r/http/repo.extendedclip.com/me.clip/placeholderapi.svg?label=API-Version
+[APIBadge]: https://img.shields.io/nexus/placeholderapi/me.clip/placeholderapi?server=https%3A%2F%2Frepo.extendedclip.com&label=API%20Version
 
 [SpigotBadge]: https://img.shields.io/spiget/version/6245?label=Spigot
 [Spigot]: https://spigotmc.org/resources/6245
@@ -136,7 +136,7 @@ public class JoinExample extends JavaPlugin implements Listener {
          */
         joinText = PlaceholderAPI.setPlaceholders(event.getPlayer(), joinText);
 
-        event.setJoinMessage(withPlaceholdersSet);
+        event.setJoinMessage(joinText);
     }
 }
 ```

wiki/PlaceholderExpansion.md

@@ -1,411 +1,381 @@
+[placeholderexpansion]: https://github.com/PlaceholderAPI/PlaceholderAPI/blob/master/src/main/java/me/clip/placeholderapi/expansion/PlaceholderExpansion.java
+
+[playerexpansion]: https://github.com/PlaceholderAPI/Player-Expansion
+[serverexpansion]: https://github.com/PlaceholderAPI/Server-Expansion
+[mathexpansion]: https://github.com/Andre601/Math-expansion
+
+[relational]: https://github.com/PlaceholderAPI/PlaceholderAPI/blob/master/src/main/java/me/clip/placeholderapi/expansion/Relational.java
+
 ## Overview
-This page covers how you can use the `PlaceholderExpansion` to add own placeholders to PlaceholderAPI, which then can be used by other plugins.
+This page will cover how you can create your own [`PlaceholderExpansion`][placeholderexpansion] which you can either [[Upload to the eCloud|Expansion cloud]] or integrate into your own plugin.
 
-PlaceholderAPI is using Expansions for its placeholders, with PlaceholderAPI providing the core. Users can download Expansions from the cloud server using commands in-game or by going [here](https://api.extendedclip.com/home/) if they want to use the placeholder.
+It's worth noting that PlaceholderAPI relies on expansions being installed. PlaceholderAPI only acts as the core replacing utility while the expansions allow other plugins to use any installed placeholder in their own messages.
+You can download Expansions either directly from the eCloud yourself, or download them through the [[download command of PlaceholderAPI|Commands#papi-ecloud-download]].
 
-## Note
-You can either make a separate jar file, to upload it to the expansion-cloud (recommended) or have it as a local class inside your plugin.
+## Table of Contents
 
-## Examples
-There are multiple methods and ways you can use the PlaceholderExpansion.  
-Those depend on what you want to display through the placeholders in the end.
+- [Getting started](#getting-started)
+  - [Common Parts](#common-parts)
+- [Without a Plugin](#without-a-plugin)
+- [With a Plugin (External Jar)](#with-a-plugin-external-jar)
+- [With a Plugin (Internal Class)](#with-a-plugin-internal-class)
+  - [Register the Expansion](#register-the-expansion)
+- [Relational Placeholders](#relational-placeholders)
+  - [Notes about Relational Placeholders](#notes-about-relational-placeholders)
 
-* [Without external plugin](#without-external-plugin)
-* [With external plugin](#with-external-plugin)
-  * [Separate jar](#separate-jar)
-  * [Internal class](#internal-class)
+## Getting started
+For starters, you need to decide what type of [`PlaceholderExpansion`][placeholderexpansion] you want to create. There are various ways to create an expansion. This page will cover the most common ones.
 
-### Without an external plugin
-This part here covers how you create an expansion that doesn't require any external/additional plugins to function.  
-Examples of such expansions are:
-- [Player expansion](/PlaceholderAPI/Player-Expansion)
-- [Math expansion](https://github.com/Andre601/Math-Expansion)
-- [Statistics expansion](/PlaceholderAPI/Statistics-Expansion)
+### Common Parts
+All shown examples will share the same common parts that belong to the [`PlaceholderExpansion`][placeholderexpansion] class.  
+In order to not repeat the same basic info for each method throughout this page, and to greatly reduce its overall length, we will cover the most basic/necessary ones here.
 
-Since it would be weird (and also make no real sense) to have this inside your plugin, we assume you make a separate jar-file as an expansion.
-
-To begin, first make the class extend the `PlaceholderExpansion` and add the required methods:  
+#### Basic PlaceholderExpansion Structure
 ```java
 package at.helpch.placeholderapi.example.expansions;
 
 import org.bukkit.OfflinePlayer;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 
-/**
- * This class will automatically register as a placeholder expansion 
- * when a jar including this class is added to the directory 
- * {@code /plugins/PlaceholderAPI/expansions} on your server.
- * <br>
- * <br>If you create such a class inside your own plugin, you have to
- * register it manually in your plugins {@code onEnable()} by using 
- * {@code new YourExpansionClass().register();}
- */
 public class SomeExpansion extends PlaceholderExpansion {
 
-    /**
-     * This method should always return true unless we
-     * have a dependency we need to make sure is on the server
-     * for our placeholders to work!
-     *
-     * @return always true since we do not have any dependencies.
-     */
     @Override
-    public boolean canRegister(){
-        return true;
-    }
-
-    /**
-     * The name of the person who created this expansion should go here.
-     * 
-     * @return The name of the author as a String.
-     */
-    @Override
-    public String getAuthor(){
+    public String getAuthor() {
         return "someauthor";
     }
-
-    /**
-     * The placeholder identifier should go here.
-     * <br>This is what tells PlaceholderAPI to call our onRequest 
-     * method to obtain a value if a placeholder starts with our 
-     * identifier.
-     * <br>This must be unique and can not contain % or _
-     *
-     * @return The identifier in {@code %<identifier>_<value>%} as String.
-     */
+    
     @Override
-    public String getIdentifier(){
+    public String getIdentifier() {
         return "example";
     }
 
-    /**
-     * This is the version of this expansion.
-     * <br>You don't have to use numbers, since it is set as a String.
-     *
-     * @return The version as a String.
-     */
     @Override
-    public String getVersion(){
+    public String getVersion() {
         return "1.0.0";
     }
-  
-    /**
-     * This is the method called when a placeholder with our identifier 
-     * is found and needs a value.
-     * <br>We specify the value identifier in this method.
-     * <br>Since version 2.9.1 can you use OfflinePlayers in your requests.
-     *
-     * @param  player
-     *         A {@link org.bukkit.OfflinePlayer OfflinePlayer}.
-     * @param  identifier
-     *         A String containing the identifier/value.
-     *
-     * @return Possibly-null String of the requested identifier.
-     */
-    @Override
-    public String onRequest(OfflinePlayer player, String identifier){
-  
-        // %example_placeholder1%
-        if(identifier.equals("placeholder1")){
-            return "placeholder1 works";
-        }
-
-        // %example_placeholder2%
-        if(identifier.equals("placeholder2")){
-            return "placeholder2 works";
-        }
-
-        // We return null if an invalid placeholder (f.e. %example_placeholder3%) 
-        // was provided
-        return null;
-    }
 }
 ```
+Let's quickly break down the different methods you have to implement.
+
+- #### getAuthor
+  This method allows you to set the name of the expansion's author.
+- #### getIdentifier
+  The identifier is the part in the placeholder that is between the first `%` (Or `{` if bracket placeholders are used) and the first `_`.  
+  Because of that can you not use `%`, `{`, `}` or `_` in youd identifier.
+  
+  If you still want to use those symbols can you override the `getName()` method to display a different name.
+- #### getVersion
+  This is a string, which means it can contain more than just a number. This is used to determine if a new update is available or not when the expansion is shared on the eCloud.
+  For expansions that are part of a plugin, this does not really matter.
+
+Those are all the neccessary parts for your PlaceholderExpansion.  
+Any other methods that are part of the [`PlaceholderExpansion`][placeholderexpansion] class are optional and will usually not be used, or will default to a specific value. Please read the Javadoc comments of those methods for more information.
+
+You must choose between one of these two methods for handling the actual parsing of placeholders:
+
+- #### onRequest(OfflinePlayer, String)
+  If not explicitly set, this will automatically call [`onPlaceholderRequest(Player, String)`](#onplaceholderrequestplayer-string).
+  This method is recommended as it allows the usage of `null` and can therefore be used in placeholders that don't require a valid player to be used.
+- #### onPlaceholderRequest(Player, String)
+  If not set, this method will return `null` which PlaceholderAPI sees as an invalid placeholder.
+
 ----
+## Without a Plugin
+An expansion does not always need a plugin to rely on. If the placeholders it provides can return values from just the server itself or some other source (i.e. Java itself), then it can work independently.
 
-### With external plugin
-Those examples here applies to people who want to provide information from their own plugin through placeholders from PlaceholderAPI.  
-There exists a repository showcasing an [example-expansion](/PlaceholderAPI/Example-Expansion) with what you can/should do.
+Common examples of such Expansions are:
 
-In our examples do we have the plugin `SomePlugin` and want to show certain placeholders with it.
+- [Player Expansion][playerexpansion]
+- [Server Expansion][serverexpansion]
+- [Math Expansion][mathexpansion]
 
-There are two ways to actually get information from your plugin and they only are different in if you have the expansion as a separate jar-file or as an internal class.
+These kinds of expansions don't require any additional plugins to function.  
+When creating such an expansion is it recommended to use [`onRequest(OfflinePlayer, String)`](#onrequestofflineplayer-string).
 
-#### Separate jar
-In our separate jar do we have to make some checks, to be sure, that the required plugin is installed and running.  
-The below code shows how the class can look like in case the plugin doesn't have a public and easy to access API.
+#### Full Example
+Please see the [Common parts](#common-parts) section for info on the other methods.
 
 ```java
 package at.helpch.placeholderapi.example.expansions;
 
 import org.bukkit.OfflinePlayer;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
-import at.helpch.placeholderapi.example.SomePlugin;
 
-/**
- * This class will automatically register as a placeholder expansion 
- * when a jar including this class is added to the directory 
- * {@code /plugins/PlaceholderAPI/expansions} on your server.
- * <br>
- * <br>If you create such a class inside your own plugin, you have to
- * register it manually in your plugins {@code onEbale()} by using 
- * {@code new YourExpansionClass().register();}
- */
 public class SomeExpansion extends PlaceholderExpansion {
 
-    // We get an instance of the plugin later.
-    private SomePlugin plugin;
-
-    /**
-     * Since this expansion requires api access to the plugin "SomePlugin" 
-     * we must check if said plugin is on the server or not.
-     *
-     * @return true or false depending on if the required plugin is installed.
-     */
     @Override
-    public boolean canRegister(){
-        return (plugin = (SomePlugin) Bukkit.getPluginManager().getPlugin(getRequiredPlugin())) != null;
-    }
-
-    /**
-     * The name of the person who created this expansion should go here.
-     * 
-     * @return The name of the author as a String.
-     */
-    @Override
-    public String getAuthor(){
+    public String getAuthor() {
         return "someauthor";
     }
- 
-    /**
-     * The placeholder identifier should go here.
-     * <br>This is what tells PlaceholderAPI to call our onRequest 
-     * method to obtain a value if a placeholder starts with our 
-     * identifier.
-     * <br>This must be unique and can not contain % or _
-     *
-     * @return The identifier in {@code %<identifier>_<value>%} as String.
-     */
+    
     @Override
-    public String getIdentifier(){
-        return "someplugin";
-    }
-  
-    /**
-     * if the expansion requires another plugin as a dependency, the 
-     * proper name of the dependency should go here.
-     * <br>Set this to {@code null} if your placeholders do not require 
-     * another plugin to be installed on the server for them to work.
-     * <br>
-     * <br>This is extremely important to set your plugin here, since if 
-     * you don't do it, your expansion will throw errors.
-     *
-     * @return The name of our dependency.
-     */
-    @Override
-    public String getRequiredPlugin(){
-        return "SomePlugin";
+    public String getIdentifier() {
+        return "example";
     }
 
-    /**
-     * This is the version of this expansion.
-     * <br>You don't have to use numbers, since it is set as a String.
-     *
-     * @return The version as a String.
-     */
     @Override
-    public String getVersion(){
+    public String getVersion() {
         return "1.0.0";
     }
-  
-    /**
-     * This is the method called when a placeholder with our identifier 
-     * is found and needs a value.
-     * <br>We specify the value identifier in this method.
-     * <br>Since version 2.9.1 can you use OfflinePlayers in your requests.
-     *
-     * @param  player
-     *         A {@link org.bukkit.Player Player}.
-     * @param  identifier
-     *         A String containing the identifier/value.
-     *
-     * @return possibly-null String of the requested identifier.
-     */
+    
     @Override
-    public String onPlaceholderRequest(Player player, String identifier){
-
-        if(p == null){
-            return "";
+    public String onRequest(OfflinePlayer player, String params) {
+        if(params.equalsIgnoreCase("name")) {
+            return player == null ? null : player.getName(); // "name" requires the player to be valid
         }
-
-        // %someplugin_placeholder1%
-        if(identifier.equals("placeholder1")){
-            return plugin.getConfig().getString("placeholder1", "value doesnt exist");
+        
+        if(params.equalsIgnoreCase("placeholder1")) {
+            return "Placeholder Text 1";
         }
-
-        // %someplugin_placeholder2%
-        if(identifier.equals("placeholder2")){
-            return plugin.getConfig().getString("placeholder2", "value doesnt exist");
+        
+        if(params.equalsIgnoreCase("placeholder2")) {
+            return "Placeholder Text 2";
         }
- 
-        // We return null if an invalid placeholder (f.e. %someplugin_placeholder3%) 
-        // was provided
-        return null;
+        
+        return null; // Placeholder is unknown by the Expansion
     }
 }
 ```
 
 ----
-#### Internal class
-You can have the class inside your plugin.  
-This has some advantages but can also have some disadvantages.
-If you include a PlaceholderExpansion class in your plugin, you MUST add an override the persist() method to return true
-otherwise, if PlaceholderAPI is reloaded, your expansion will be unregistered and lost forever.
+## With a Plugin (External Jar)
+If your expansion relies on a plugin to provide its placeholder values, you will need to override a few more methods to make sure everything will work correctly.
+
+Your expansion will need to override the `getRequiredPlugin()` method to return the name of the plugin your expansion depends on.  
+PlaceholderAPI automatically checks if this method will either return null, or if the name defined results in a non-null plugin.
+
+It is worth noting that it is a bit more difficult to make a separate jar file that depends on a plugin, as it will require the plugin to have some sort of accessible API in order to get the required values.
+One way to bypass this is to override the `canRegister()` method with the following code:
+
+```java
+private SomePlugin plugin = null; // This would be the plugin your expansion depends on
+
+@Override
+public boolean canregister() {
+    // This sets plugin to the SomePlugin instance you get through the PluginManager
+    return (plugin = (SomePlugin) Bukkit.getPluginManager().getPlugin(getRequiredPlugin())) != null;
+}
+```
+Using this code-snippet, you can get a direct instance of the plugin and access things such as config values.  
+With that said, it is recommended instead to use an API if one is available, as this kind of plugin access is a relatively poor approach.
+
+#### Full Example
+Please see the [Common parts](#common-parts) section for info on the other methods.
+
+```java
+package at.helpch.placeholderapi.example.expansions;
+
+import at.helpch.placeholderapi.example.SomePlugin;
+import org.bukkit.OfflinePlayer;
+import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+
+public class SomeExpansion extends PlaceholderExpansion {
+
+    private SomePlugin plugin; // This instance is assigned in canRegister()
+    
+    @Override
+    public String getAuthor() {
+        return "someauthor";
+    }
+    
+    @Override
+    public String getIdentifier() {
+        return "example";
+    }
+
+    @Override
+    public String getVersion() {
+        return "1.0.0";
+    }
+    
+    @Override
+    public String getRequiredPlugin() {
+        return "SomePlugin";
+    }
+    
+    @Override
+    public boolean canRegister() {
+        return (plugin = (SomePlugin) Bukkit.getPluginManager().getPlugin(getRequiredPlugin())) != null;
+    }
+    
+    @Override
+    public String onRequest(OfflinePlayer player, String params) {
+        if(params.equalsIgnoreCase("placeholder1")){
+            return plugin.getConfig().getString("placeholders.placeholder1", "default1");
+        }
+        
+        if(params.equalsIgnoreCase("placeholder2")){
+            return plugin.getConfig().getString("placeholders.placeholder2", "default2");
+        }
+        
+        return null; // Placeholder is unknown by the expansion
+    }
+}
+```
+
+----
+## With a Plugin (Internal Class)
+The way expansions are handled when they are part of the plugin itself is fairly similar to when you [make an expansion without a plugin dependency](#without-a-plugin).
+
+In fact, you don't even have to override the `getRequiredPlugin()` and `canRegister()` methods as it is always guaranteed that the plugin is available.  
+Something worth noting, however, is that you need to override the `persist()` method and make it return true. This ensures that the expansion won't be unregistered by PlaceholderAPI whenever it is reloaded.
+
+Finally, you can also use dependency injection as an easier way to access a plugin's methods.
+Here is a small code example of how dependency injection may look:
+
+```java
+public class SomeExpansion extends PlaceholderExpansion {
+    private final SomePlugin plugin; // The instance is created in the constructor and won't be modified, so it can be final
+    
+    public SomeExpansion(SomePlugin plugin) {
+        this.plugin = plugin;
+    }
+}
+```
+
+#### Full Example
+Please see the [Common parts](#common-parts) section for info on the other methods.
 
 
 ```java
 package at.helpch.placeholderapi.example.expansions;
 
+import at.helpch.placeholderapi.example.SomePlugin;
 import org.bukkit.OfflinePlayer;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
-import at.helpch.placeholderapi.example.SomePlugin;
 
-/**
- * This class will be registered through the register-method in the 
- * plugins onEnable-method.
- */
 public class SomeExpansion extends PlaceholderExpansion {
 
-    private SomePlugin plugin;
-
-    /**
-     * Since we register the expansion inside our own plugin, we
-     * can simply use this method here to get an instance of our
-     * plugin.
-     *
-     * @param plugin
-     *        The instance of our plugin.
-     */
-    public SomeExpansion(SomePlugin plugin){
+    private final SomePlugin plugin;
+    
+    public SomeExpansion(SomePlugin plugin) {
         this.plugin = plugin;
     }
-
-    /**
-     * Because this is an internal class,
-     * you must override this method to let PlaceholderAPI know to not unregister your expansion class when
-     * PlaceholderAPI is reloaded
-     *
-     * @return true to persist through reloads
-     */
+    
     @Override
-    public boolean persist(){
-        return true;
+    public String getAuthor() {
+        return "someauthor";
+    }
+    
+    @Override
+    public String getIdentifier() {
+        return "example";
     }
 
-    /**
-     * Because this is a internal class, this check is not needed
-     * and we can simply return {@code true}
-     *
-     * @return Always true since it's an internal class.
-     */
     @Override
-    public boolean canRegister(){
-        return true;
+    public String getVersion() {
+        return "1.0.0";
     }
-
-    /**
-     * The name of the person who created this expansion should go here.
-     * <br>For convienience do we return the author from the plugin.yml
-     * 
-     * @return The name of the author as a String.
-     */
+    
     @Override
-    public String getAuthor(){
-        return plugin.getDescription().getAuthors().toString();
+    public boolean persist() {
+        return true; // This is required or else PlaceholderAPI will unregister the Expansion on reload
     }
-
-    /**
-     * The placeholder identifier should go here.
-     * <br>This is what tells PlaceholderAPI to call our onRequest 
-     * method to obtain a value if a placeholder starts with our 
-     * identifier.
-     * <br>This must be unique and can not contain % or _
-     *
-     * @return The identifier in {@code %<identifier>_<value>%} as String.
-     */
+    
     @Override
-    public String getIdentifier(){
-        return "someplugin";
-    }
-
-    /**
-     * This is the version of the expansion.
-     * <br>You don't have to use numbers, since it is set as a String.
-     *
-     * For convienience do we return the version from the plugin.yml
-     *
-     * @return The version as a String.
-     */
-    @Override
-    public String getVersion(){
-        return plugin.getDescription().getVersion();
-    }
-
-    /**
-     * This is the method called when a placeholder with our identifier 
-     * is found and needs a value.
-     * <br>We specify the value identifier in this method.
-     * <br>Since version 2.9.1 can you use OfflinePlayers in your requests.
-     *
-     * @param  player
-     *         A {@link org.bukkit.Player Player}.
-     * @param  identifier
-     *         A String containing the identifier/value.
-     *
-     * @return possibly-null String of the requested identifier.
-     */
-    @Override
-    public String onPlaceholderRequest(Player player, String identifier){
-
-        if(player == null){
-            return "";
+    public String onRequest(OfflinePlayer player, String params) {
+        if(params.equalsIgnoreCase("placeholder1")){
+            return plugin.getConfig().getString("placeholders.placeholder1", "default1");
         }
-
-        // %someplugin_placeholder1%
-        if(identifier.equals("placeholder1")){
-            return plugin.getConfig().getString("placeholder1", "value doesnt exist");
+        
+        if(params.equalsIgnoreCase("placeholder2")) {
+            return plugin.getConfig().getString("placeholders.placeholder2", "default2");
         }
-
-        // %someplugin_placeholder2%
-        if(identifier.equals("placeholder2")){
-            return plugin.getConfig().getString("placeholder2", "value doesnt exist");
-        }
- 
-        // We return null if an invalid placeholder (f.e. %someplugin_placeholder3%) 
-        // was provided
-        return null;
+        
+        return null; // Placeholder is unknown by the Expansion
     }
 }
 ```
 
-As you can see is this method pretty similar to the one without any external plugins, since we can get an instance of our plugin much easier and also have a 100% guarantee that the plugin is installed and running.
+### Register the Expansion
+To register the expansion, you will need to call the `register()` method yourself.
+This should be done in your plugin's `onEnable()` method after you make sure that PlaceholderAPI is installed and enabled.
 
-Our final step now is to register the class and its placeholders. The plugin doesn't do this on its own.  
-To achieve this, add the following to your `onEnable()` section (Use your expansion name of course):  
 ```java
 package at.helpch.placeholderapi.example
 
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;
 
-public class SomePlugin extends JavaPlugin{
+public class SomePlugin extends JavaPlugin {
     
     @Override
-    public void onEnable(){
+    public void onEnable() {
         // Small check to make sure that PlaceholderAPI is installed
-        if(Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null){
+        if(Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) {
               new SomeExpansion(this).register();
         }
     }
 }
-```
+```
+
+----
+## Relational Placeholders
+Relational Placeholders are a bit more specific compared to the previous examples.  
+While they do use the same [common parts](#common-parts) that the other examples do, they have a different method to return placeholders.
+
+In order to use the relational placeholders feature, you will need to implement the [`Relational`][relational] interface, which in return adds the `onPlaceholderRequest(Player, Player, String)` method to use.
+
+#### Full Example
+Please see the [Common parts](#common-parts) section for info on the other methods.
+
+In this example, we use the [Internal class setup](#with-a-plugin-internal-jar) and `SomePlugin` has an `areFriends(Player, Player)` method that returns true or false based on if the given players are friends.
+
+```java
+package at.helpch.placeholderapi.example.expansions;
+
+import at.helpch.placeholderapi.example.SomePlugin;
+import org.bukkit.ChatColor;
+import org.bukkit.Player;
+import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import me.clip.placeholderapi.expansion.Relational;
+
+public class SomeExpansion extends PlaceholderExpansion implements Relational {
+
+    private final SomePlugin plugin;
+    
+    public SomeExpansion(SomePlugin plugin) {
+        this.plugin = plugin;
+    }
+    
+    @Override
+    public String getAuthor() {
+        return "someauthor";
+    }
+    
+    @Override
+    public String getIdentifier() {
+        return "example";
+    }
+
+    @Override
+    public String getVersion() {
+        return "1.0.0";
+    }
+    
+    @Override
+    public boolean persist() {
+        return true; // This is required or else PlaceholderAPI will unregister the Expansion on reload
+    }
+    
+    @Override
+    public String onPlaceholderRequest(Player one, Player two, String identifier) {
+        if(one == null || two == null)
+            return null; // We require both Players to be online
+            
+        if(params.equalsIgnoreCase("friend")) {
+            if(plugin.areFriends(one, two)) {
+                return ChatColor.GREEN + one.getName() + " and " + two.getName() + " are friends!";
+            } else {
+                return ChatColor.GREEN + one.getName() + " and " + two.getName() + " are not friends!";
+            }
+        }
+        
+        return null; // Placeholder is unknown by the Expansion
+    }
+}
+```
+
+### Notes about Relational Placeholders
+Relational placeholders will always start with `%rel_` to properly identify them.  
+So in the above example, the full placeholder will look like `%rel_example_friend%`.

wiki/Plugins-using-PlaceholderAPI.md

@@ -41,9 +41,9 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
 - **[Advanced Abilities](https://www.spigotmc.org/resources/21983/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#advanced-abilities]]**]
-- **[Advanced Achievements](https://www.spigotmc.org/resources/6239/)**
-  - [x] Supports placeholders.
-  - [ ] Provides own placeholders. [Link]
+- **[Advanced Achievements](https://www.spigotmc.org/resources/83466/)**
+  - [ ] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#advanced-achievements]]**]
 - **[AdvancedAFK](https://www.spigotmc.org/resources/60761/)**
   - [x] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#advancedafk]]**]
@@ -62,6 +62,9 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
 - **[ajParkour](https://www.spigotmc.org/resources/60909/)**
   - [x] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#ajparkour]]**]
+- **[AlonsoLevels](https://www.spigotmc.org/resources/83380/)**
+  - [ ] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#alonsolevels]]**]
 - **[AnimatedBoard](https://www.spigotmc.org/resources/13632/)**
   - [x] Supports placeholders.
   - [ ] Provides own placeholders. [Link]
@@ -86,6 +89,9 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
 - **[AsyncKeepAlive](https://www.spigotmc.org/resources/64676/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#asynckeepalive]]**]
+- **[Ath](https://www.spigotmc.org/resources/87124/)**
+  - [ ] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#ath]]**]
 - **[AutoCommandsPlus](https://www.spigotmc.org/resources/11083/)**
   - [x] Supports placeholders.
   - [ ] Provides own placeholders. [Link]
@@ -116,6 +122,9 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
 - **[BentoBox](https://github.com/BentoBoxWorld/BentoBox)**
   - [x] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#bentobox]]**]
+- **[BetonQuest](https://www.spigotmc.org/resources/2117/)
+  - [x] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#betonquest]]**]
 - **[Big Doors Opener](https://www.spigotmc.org/resources/80805/)**
   - [x] Supports placeholders.
   - [ ] Provides own placeholders. [Link]
@@ -134,6 +143,9 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
 - **[BossVote](https://www.spigotmc.org/resources/16497/)**
   - [x] Supports placeholders.
   - [ ] Provides own placeholders. [Link]
+- **[Boxing](https://www.spigotmc.org/resources/83879/)**
+  - [ ] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#boxing]]**]
 - **[Broadcaster Plugin](https://dev.bukkit.org/projects/broadcaster-plugin)**
   - [x] Supports placeholders.
   - [ ] Provides own placeholders. [Link]
@@ -188,9 +200,12 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
 - **[Clans](https://www.spigotmc.org/resources/34696/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#clans]]**]
-- **[Clans](https://www.spigotmc.org/resources/78415/)**
+- **[ClansFree](https://www.spigotmc.org/resources/78415/)**
   - [ ] Supports placeholders.
-  - [x] Provides own placeholders. [**[[Link|Placeholders#clans-1]]**]
+  - [x] Provides own placeholders. [**[[Link|Placeholders#clansfree]]**]
+- **[ClansPro](https://www.spigotmc.org/resources/87515/)**
+  - [x] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#clanspro]]**]
 - **[ClicksPerSecond](https://www.spigotmc.org/resources/57214/)**
   - [x] Supports placeholders.
   - [ ] Provides own placeholders. [Link]
@@ -259,7 +274,7 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
   - [ ] Provides own placeholders. [Link]
 - **[DeluxeMenus](https://www.spigotmc.org/resources/11734/)**
   - [x] Supports placeholders.
-  - [ ] Provides own placeholders. [Link]
+  - [x] Provides own placeholders. [**[[Link|Placeholder#deluxemenus]]**]
 - **[DeluxeTags](https://www.spigotmc.org/resources/4390/)**
   - [x] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#deluxetags]]**]
@@ -389,6 +404,9 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
 - **[HoloBlock](https://www.spigotmc.org/resources/43192/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#holoblock]]**]
+- **[HoloMobHealth](https://www.spigotmc.org/resources/75975/)**
+  - [x] Supports placeholders.
+  - [ ] Provides own placeholders. [Link]
 - **[HPWizard](https://www.spigotmc.org/resources/26821/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#hpwizard]]**]
@@ -401,6 +419,9 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
 - **[InteractionVisualizer](https://www.spigotmc.org/resources/77050/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#interactionvisualizer]]**]
+- **[InteractiveChat](https://www.spigotmc.org/resources/75870/)**
+  - [x] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#interactivechat]]**]
 - **[IslandRate (ASkyBlock Addon)](https://www.spigotmc.org/resources/53519/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#islandrate-askyblock-addon]]**]
@@ -440,6 +461,9 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
 
 ----
 ## L
+- **[Lands](https://www.spigotmc.org/resources/53313/)**
+  - [ ] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#lands]]**]
 - **[LastLoginAPI](https://www.spigotmc.org/resources/66348/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#lastloginapi]]**]
@@ -455,6 +479,9 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
 - **[LemonMobCoins](https://www.spigotmc.org/resources/59402/)**
   - [x] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#lemonmobcoins]]**]
+- **[LevelledMobs](https://www.spigotmc.org/resources/levelledmobs-for-1-14-x-1-17-x.74304/)**
+  - [ ] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#levelledmobs]]**]
 - **[LuckPerms](https://www.spigotmc.org/resources/28140/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#luckperms]]**]
@@ -536,6 +563,9 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
 - **[Nameless Plugin](https://www.spigotmc.org/resources/59032/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#nameless-plugin]]**]
+- **[NameMC-API-ServersMC](https://www.spigotmc.org/resources/88871/)**
+  - [x] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders##namemc-api-serversmc]]**]
 - **[Nicknamer](https://www.spigotmc.org/resources/5341/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#nicknamer]]**]
@@ -557,9 +587,15 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
 - **[OnTime](http://dev.bukkit.org/bukkit-plugins/ontime/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#ontime]]**]
+- **[OpEconomy](https://www.spigotmc.org/resources/95674)**
+  - [x] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#opeconomy]]**]
 - **[OreAnnouncer](https://www.spigotmc.org/resources/33464/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#oreannouncer]]**]
+- **[OreMarket](https://www.spigotmc.org/resources/91015/)**
+  - [ ] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#oremarket]]**]
 - **[Outpost](https://www.spigotmc.org/resources/38657/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#outpost]]**]
@@ -606,11 +642,14 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
   - [x] Supports placeholders.
   - [ ] Provides own placeholders. [Link]
 - **[PowerRanks](https://www.spigotmc.org/resources/64696/)**
-  - [ ] Supports placeholders.
+  - [x] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#powerranks]]**]
 - **[PremiumVanish](https://www.spigotmc.org/resources/14404/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#premiumvanish]]**]
+- **[Prison](https://www.spigotmc.org/resources/1223/)**
+  - [ ] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#prison]]**]
 - **[PrisonMines](https://www.spigotmc.org/resources/4046/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#prisonmines]]**]
@@ -675,12 +714,18 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
 - **[RankedHelp](https://www.spigotmc.org/resources/61919/)**
   - [x] Supports placeholders.
   - [ ] Provides own placeholders. [Link]
+- **[RankJoin](https://www.spigotmc.org/resources/67551/)**
+  - [x] Supports placeholders.
+  - [ ] Provides own placeholders. [Link]
 - **[Rankup](https://www.spigotmc.org/resources/17933/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#rankup]]**]
 - **[RawMSG](https://www.spigotmc.org/resources/35864/)**
   - [x] Supports placeholders.
   - [ ] Provides own placeholders.
+- **[RealisticWorldGenerator](https://www.spigotmc.org/resources/15905/)**
+  - [ ] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#realisticworldgenerator]]**]
 - **[RecentFind (Treasures Add-on)](https://www.spigotmc.org/resources/33366/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#recentfind]]**]
@@ -693,6 +738,12 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
 - **[RestrictedDimensions](http://spigotmc.org/resources/80574/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#restricteddimensions]]**]
+- **[RocketJoin](https://www.spigotmc.org/resources/82520/)**
+  - [x] Supports placeholders.
+  - [ ] Provides own placeholders. [Link]
+- **[RocketPlaceholders](https://www.spigotmc.org/resources/82678/)**
+  - [x] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#rocketplaceholders]]**]
 - **[RogueParkour](https://www.spigotmc.org/resources/26563/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#rogueparkour]]**]
@@ -708,6 +759,9 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
 - **[RPGInventory](https://www.spigotmc.org/resources/12498/)**
   - [x] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#rpginventory]]**]
+- **[RTP](https://www.spigotmc.org/resources/94812/)**
+  - [x] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#rtp]]**]
 
 ----
 ## S
@@ -720,6 +774,9 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
 - **[Skellett (Skript Add-on)](https://forums.skunity.com/resources/24/)**
   - [x] Supports placeholders.
   - [ ] Provides own placeholders. [Link]
+- **[Seasons](https://www.spigotmc.org/resources/39298/)**
+  - [ ] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#seasons]]**]
 - **[SellAll](https://www.spigotmc.org/resources/1221/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#sellall]]**]
@@ -738,6 +795,9 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
 - **[SimpleClans](https://www.spigotmc.org/resources/5269/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#simpleclans]]**]
+- **[SimpleCoins](https://dev.bukkit.org/projects/simplecoins)**
+  - [ ] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#simplecoins]]**]
 - **[SimpleCoinsAPI](https://www.spigotmc.org/resources/1432/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#simplecoinsapi]]**]
@@ -753,6 +813,9 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
 - **[SkillAPI](https://www.spigotmc.org/resources/4824/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#skillapi]]**]
+- **[SkinsRestorer](https://www.spigotmc.org/resources/2124/)**
+  - [ ] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#skinsrestorer]]**]
 - **[Skript](https://github.com/bensku/Skript)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#skript]]**]
@@ -786,9 +849,15 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
 - **[Staff Facilities](https://www.spigotmc.org/resources/13097/)**
   - [x] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#staff-facilities]]**]
+- **[Staff++](https://www.spigotmc.org/resources/staff.83562/)**
+  - [x] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#staffplusplus]]**]
 - **[Statz](https://www.spigotmc.org/resources/25969/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#statz]]**]
+- **[Streaming Drops](https://www.spigotmc.org/resources/76996/)**
+  - [ ] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#streaming-drops]]**]
 - **[StrikePractice 2](https://www.spigotmc.org/resources/46906/)**
   - [x] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#strikepractice-2]]**]
@@ -825,9 +894,15 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
 - **[Thirst](https://www.spigotmc.org/resources/3316/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#thirst]]**]
+- **[TicketGUI](https://www.spigotmc.org/resources/68968/)**
+  - [ ] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#ticketgui]]**]
 - **[Timed Rewards](https://www.spigotmc.org/resources/34008/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#timed-rewards]]**]
+- **[TimeManager](https://www.spigotmc.org/resources/44344/)**
+  - [ ] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#timemanager]]**]
 - **[Time Tokens](https://www.spigotmc.org/resources/75441/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#time-tokens]]**]
@@ -843,12 +918,18 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
 - **[Tokens](https://www.spigotmc.org/resources/71941/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#tokens]]**]
+- **[TokensPlus](https://www.spigotmc.org/resources/90507/)**
+  - [ ] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#tokensplus]]**]
 - **[Towny](https://github.com/TownyAdvanced/Towny)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#towny]]**]
 - **[TownyChat](https://github.com/TownyAdvanced/TownyChat)**
   - [x] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#townychat]]**]
+- **[TpLogin](https://www.spigotmc.org/resources/21692/)**
+  - [x] Supports placeholders.
+  - [ ] Provides own placeholders. [Link]
 - **[TransmuteIt](https://www.spigotmc.org/resources/76287/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#transmuteIt]]**]
@@ -861,6 +942,9 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
 - **[TrickOrTreat](https://www.spigotmc.org/resources/61370/)**
   - [x] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#trickortreat]]**]
+- **[Two Factor Authentication](https://www.spigotmc.org/resources/85594/)**
+  - [x] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#twofactorauthentication]]**]
 
 ----
 ## U
@@ -873,6 +957,9 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
 - **[UltimateBossBar](https://www.spigotmc.org/resources/19303/)**
   - [x] Supports placeholders.
   - [ ] Provides own placeholders.
+- **[UltimateClaims](https://songoda.com/marketplace/product/65)**
+  - [ ] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#ultimateclaims]]**]
 - **[UltimateSigns](https://www.spigotmc.org/resources/72462/)**
   - [x] Supports placeholders.
   - [ ] Provides own placeholders.
@@ -912,6 +999,9 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
 - **[VentureChat](https://www.spigotmc.org/resources/771/)**
   - [x] Supports placeholders.
   - [ ] Provides own placeholders. [Link]
+- **[VenturahCalendar](https://www.spigotmc.org/resources/94096/)**
+  - [x] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#venturacalendar]]**]
 - **[ViaVersion](https://www.spigotmc.org/resources/19254/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#viaversion]]**]

wiki/README.md

@@ -1,82 +1,181 @@
-[Wiki]: https://github.com/PlaceholderAPI/PlaceholderAPI/wiki
-[Placeholders]: https://github.com/PlaceholderAPI/PlaceholderAPI/wiki/Placeholders
-[Plugins using PlaceholderAPI]: https://github.com/PlaceholderAPI/PlaceholderAPI/wiki/Placeholders
+[wiki]: https://github.com/PlaceholderAPI/PlaceholderAPI/wiki
+
+[placeholders]: https://github.com/PlaceholderAPI/PlaceholderAPI/wiki/Placeholders
+[using_papi]: https://github.com/PlaceholderAPI/PlaceholderAPI/wiki/Plugins-using-PlaceholderAPI
+
+[discord]: https://discord.gg/HelpChat
+[discussion]: https://github.com/PlaceholderAPI/PlaceholderAPI/discussions
+
+[andre]: https://github.com/Andre601
+[andrew]: https://github.com/Andrew-Chen-Wang
+[action]: https://github.com/Andrew-Chen-Wang/github-wiki-action
+
+<!-- Images -->
+[branch-selector]: https://user-images.githubusercontent.com/11576465/132779328-8571458a-d63d-4c25-b920-96aa16ae0058.png
+[upstream_up-to-date]: https://user-images.githubusercontent.com/11576465/132779917-96f19239-077d-44ed-98e7-6a76f305b33a.png
+[upstream_needs_update]: https://user-images.githubusercontent.com/11576465/132779798-1fe3dc72-a6c2-41eb-a8bc-95793671f384.png
+[create_branch]: https://user-images.githubusercontent.com/11576465/132780127-45599156-1400-40c9-b865-351574786873.png
 
 # Wiki
-This is the wiki folder. It contains all pages that you can find in our [Wiki].  
-It allows you to suggest changes through Pull request while keeping a simple way for us to maintain the wiki, without granting everyone push rights to it.
+Welcome to the Wiki folder!
 
-If you want to contribute towards the wiki would we highly recommend to follow the below contributing Guidelines, to keep the overal style of the wiki intact.
+This folder contains all the files of the [PlaceholderAPI Wiki][wiki].  
+It allows you to contribute towards the wiki and us to have more control about what changes are commited to it.
 
-## Adding your resource(s)
-If you have one or multiple resources that support PlaceholderAPI (being it by just supporting placeholders from other plugins, or providing your own) can you add them to the wiki in the following ways.
+## Contrbuting to the wiki
+If you want to contribute towards the wiki, will you need to follow the below instructions to not get your Pull request closed without a warning.
 
-### [Plugins using PlaceholderAPI]
-You should always add your resource to this page, no matter if it only supports placeholders or also provides its own.
+### Fork the Repository (Not wiki!)
+> Already having a fork? Skip to the [next Step](#select-target-branch)!
 
-The format of a plugin is always as follows:
-```md
-- **[:name](:url)**
-  - [?] Supports placeholders.
-  - [?] Provides own placeholders. [:link]
-```
+You need to make a fork of the PlaceholderAPI Repository to contribute towards the wiki.  
+To do this, click the "Fork" button on the top-right corner of the site and select the account you want your fork to be created on. This will also show you any already existing forks of this Repository that you may have.
 
-A quick summary over the different parts:
+The forking process should only take a few seconds and you should be redirected to your fork afterwards.
 
-- `:name` is the name of your resource. The resources are ordered by alphabet and if yours has the same name as another one listed, add it __below__ the other resource.
-- `:url` should be replaced with a URL to your resource page (Spigot, dev.bukkit, etc.). If you use Spigot, make sure to remove any text after the `/resources/` and only leave the ID. For example will https://www.spigotmc.org/resources/placeholderapi.6245/ become https://www.spigotmc.org/resources/6245/.  
-If you don't have your resource on any resource page can you either ommit the URL (Just provide the name) or provide a link to its source, if available.
-- `?` should be replaced with either an `x` or a space depending on wether your plugin supports the option or not. So the `[?]` becomes either `[x]` or `[ ]`
-- `:link` depends on wether your plugin provides own placeholders or not. If it doesn't, then you can just give `Link`. If it does provide placeholders, make sure to provide `[[Link|Placeholders#:name]]` where `:name` would be the name of your resource in the [Placeholders] page.
+### Select target branch
+All main changes to the wiki are made on the dedicated `docs/wiki` branch.  
+Before you try to make any changes should you make sure that you have the `docs/wiki` branch selected. To do that, check the button next to the `X branches` text. If it says anything other than `docs/wiki` will you need to click it and select the right branch.
 
-### [Placeholders]
-If your plugin provides its own placeholders through an extension is it recommendet to add this extension to the [Placeholders] page.  
-This page is split up into two sections: PAPI Placeholders and Plugin Placeholders.
+![branch-selector]
 
-PAPI Placeholders are extensions that don't require an external plugin or other dependency to function normally. Common examples are the Player or Server extensions.  
-The Plugin Placeholders are extensions that require a plugin or other dependency to function. They are often used to provide values from one pluging (e.g. Vault) to another plugin through the help of PlaceholderAPI.
+### Fetch Changes from Upstream
+This is only required when you already had a fork and didn't update it for some time.
 
-The overall structure of an entry is always the same:  
-````md
-- ### **[:name](:url)**
-> :command
+While you're on the `docs/wiki` branch, click the `Fetch upstream` text located right below the green `Code` button.  
+Depending on the status of your branch can the prompt show different outcomes:
 
-```
-:placeholders
-```
-----
+- `This branch is not behind the upstream PlaceholderAPI:docs/wiki`  
+  Your fork's `docs/wiki` branch is up-to-date with the latest changes from Upstream (This Repository). You don't have to update anything.  
+  ![upstream_up-to-date]
+- `Fetch and merge <number> upstream commits from PlaceholderAPI:docs/wiki`  
+  This is shown when your fork's branch is outdated and upstream (This Repository) has changes. Click the `Fetch and merge` button to fetch the latest commits and update your fork's `docs/wiki` branch.  
+  ![upstream_needs_update]
+
+### Commit changes
+To commit changes will you need to choose, if you want to directly commit to your fork's `docs/wiki` branch, or make a dedicated branch for it.
+
+#### Make separate branch (Optional)
+If you want to have a dedicated branch for it, will you need to click the button saying `docs/wiki`, type in the small text field the name of the branch you want to use and click the text saying `Create branch: <branch> from 'docs/wiki'`
+
+![create_branch]
+
+After that should you now have a separate branch that is based of the `docs/wiki` branch and you can finally commit changes to it.
+
+#### Formatting
+The wiki uses normal Markdown formatting with some special design-rules you need to keep in mind.  
+These rules are as follows:
+
+- Unordered lists need to start with a `-` and not `*`. This is to not get it confused with *italic text* which uses single `*` characters.
+- New lines in lists need to keep their indends. This means you need to add two spaces at the start to keep the text in the same line.  
+  Example:  
+  ```markdown
+  - Line 1  
+    Line 2
+  ```
+- Use the `[[Page]]` and `[[Text|Page]]` format to link to other wiki pages. While those aren't rendered in the wiki folder will they render in the final wiki pages.
+- External links should be set as Refernce Links, which means they are set as `[text]: link` at the top of the page and then used either through `[text]` or `[display text][text]` througout the page.
+
+#### Adding new Expansion
+When you add a new expansion to the wiki's [Placeholder page][placeholders] will you need to follow the following format:  
+````markdown
+- ### [:name](:link)
+  > :command
+  
+  :text
+  
+  ```
+  :placeholders
+  ```
 ````
 
-- `:name` is the name of your resource. The resources are ordered by alphabet and if yours has the same name as another one listed, add it __below__ the other resource.
-- `:url` should be replaced with a URL to your resource page (Spigot, dev.bukkit, etc.). If you use Spigot, make sure to remove any text after the `/resources/` and only leave the ID. For example will https://www.spigotmc.org/resources/placeholderapi.6245/ become https://www.spigotmc.org/resources/6245/.  
-If you don't have your resource on any resource page can you either ommit the URL (Just provide the name) or provide a link to its source, if available.
-- `:command` depends on if your extension is available on the eCloud or is build into your resource. If you have it on the eCloud should you provide `/papi ecloud download :name` where `:name` is the name your expansion has on the eCloud.  
-If your extension is build into your resource can you just set `NO DOWNLOAD COMMAND` instead.
-- `:placeholders` would be a list of all placeholders that your extension offers (Sorted by alphabet). If your placeholders support multiple variables like item names, should you use either `<text>` or `[text]` depending on if it is required or optional.
+There are a few extra rules you need to also keep in mind:
 
-Always keep an empty line in between the `----` and the next entry below it.  
-If your extension is at the very bottom of the page can you ommit the `----`.
+- `:name` would be the name of your Expansion, not the plugin (Unless it is integrated into your plugin).
+  - Only embed a link, if your Expansion requires a plugin to function.
+  - When linking to a Spigot page, make sure to sanitze the link.  
+    This means that f.e. https://www.spigotmc.org/resources/placeholderapi.6245/ becomes https://www.spigotmc.org/resources/6245/
+- `:command` should be replaced with either the PlaceholderAPI command to download your expansion from the eCloud (`/papi ecloud download :name`) or with `NO DOWNLOAD COMMAND` if no separate download is available.
+- `:text` is optional and should only be provided to link to additional documentation, your own placeholder list, or explain more complicated placeholders/features.
+- `:placeholders` will be the list of placeholders your expansion provides.  
+  Please avoid specific examples (i.e. `%placeholder_player_user123%`) and instead use `<>` and `[]` to mark required and optional options respecively (`%placeholder_player_<player>%`)
 
-You will also need to add your extension's name to the list at the very top in the format `- **[:name](#:name)**` where `:name` is the extension name.
+**Note:**  
+When your Expansion's entry is after and/or before other entries will you need to add `----` before or after it to separate it from other entries.
 
-## Other Wiki pages
-Please follow these general guidelines when editing any other pages.
+##### Example:  
+````markdown
+- ### SomeExpansion
+  > NO DOWNLOAD COMMAND
+  
+  ```
+  %someexpansion_placeholder%
+  ```
 
-### Linking
-Linking should always be done through either the reference option or through the Wiki link option.  
-When the link leads to a page on the wiki should you use either `[[:page]]` or `[[:name|:page]]` where `:page` would be the name of the Wiki page (Case sensitive) and `:name` the text that would be displayed instead.  
-When linking to a section within a Wiki page should you link to it using a hashtag (`#`). For example would linking to the player extension result in `[[Placeholders#player]]` (Always have the section lowercase.  
-However, when you link to a section in the same wiki page should you do it in the format `[:name](#:section)` where `:name` is the text to display and `:section` is the name of the section.
+----
 
+- ### YourExpansion
+  > NO DOWNLOAD COMMAND
+  
+  ```
+  %yourexpansion_placeholder%
+  ```
 
-When you link to an external page that isn't part of the wiki should you do it as a reference link (Exception is the above mentioned cases for resources and extensions).  
-You do this by adding `[:name]: :url` at the top of the page where `:name` is the reference name to use and `:url` is the url to link to.
+----
 
-You can then just use either `[:name]` or `[:display_text][:name]` to link to the url you set (`:display_text` could be any text (including spaces) to display).  
-Reference links are case-insensitive.
+- ### AnotherExpansion
+  > NO DOWNLOAD COMMAND
+  
+  ```
+  %anotherexpansion_placeholder%
+  ```
+````
 
-This system allows us to easly maintain the links without the need to update a URL on several places within the page.
+After you added your expansion to this page will you also need to add an entry to the list at the top of the page.  
+You do so by adding `- **[:text](#:name)**` to the list, where `:text` is the text to display (Usually the name you set) and `:name` is the name you just set. If your expansion shares the exact same name as another entry on the page will you need to make sure that your expansion is listed **after** the other one AND that the list-entry has a `-1` appended to `#:name` (So f.e. `#expansion` becomes `#expansion-1`).
 
-### Lists
-Lists should always be started with a hyphen (`-`) to better distinguish it from other formatting characters like the asterisk (`*`) used for bold or italic text.
+Finally can you now commit your changes and move forward to the [Plugins using PlaceholderAPI][using_papi] page in the wiki folder.
 
+#### Adding new plugin
+This step is only required if you either add a new plugin to the list, or you added an Expansion that is included in your own plugin.
+
+Similar to the [Placeholders page][placeholders] does this page follow a specific format which we will explain real quick.
+
+```markdown
+- [:name](:link)
+  - [?] Supports placeholders.
+  - [?] Provides own placeholders. [:page]
+```
+
+Here are the following rules:
+
+- `:name` needs to be replaced with the Name of your plugin.
+- `:link` needs to be the link of the plugin's resource page.
+  - If no resource page is available can a GitHub repository be linked (if available) or the link omited altogether)
+  - When linking to a Spigot page, make sure to sanitze the link.  
+    This means that f.e. https://www.spigotmc.org/resources/placeholderapi.6245/ becomes https://www.spigotmc.org/resources/6245/
+- `[?]` needs to be replaced with either `[ ]` or `[x]` depending on whether the mentioned option is supported or not.
+- `:page` needs to replace with the right value, depending on the conditions.
+  - If your plugin provides own Placeholders for other plugins to use can you set `**[[Link|Placeholders#:name]]**` where `:name` is the title you set in the placeholders page.
+  - If your plugin does not provide own placeholders will you need to set `Link`.
+
+### Make a Pull request
+After you made your changes is it time to make a Pull request.
+
+When you go to the upstream repository, should GitHub already show you a notification that you have commits to PR. Click the `Compare & pull request` button to proceed.
+
+![image](https://user-images.githubusercontent.com/11576465/132784030-c2ffd5e0-fb95-44de-bd77-97a965cc6dbd.png)
+
+By default will GitHub select the `master` branch as the target, which is not what we want. To fix this, click the button saying `base:master` and select the `docs/wiki` branch.
+
+![image](https://user-images.githubusercontent.com/11576465/132784142-8f752697-7dd7-4afb-bbdc-dc66c570dc3c.png)
+
+Finally, fill out the Pull request template and submit the Pull request.  
+Congratulations! You've successfully made a Pull request for the wiki.
+
+### Questions?
+If you have any questions, do not hesitate to ask in the [HelpChat Discord][discord] or [open a new discussion][discussion] in this repository. We will be happy to help you.
+
+### Credits
+- The Wiki is maintained by [Andre601][andre].
+- We use the [GitHub Wiki Action][action] by [Andrew-Chen-Wang][andrew] to update the PlaceholderAPI wiki through GitHub Actions.

wiki/_Footer.md

@@ -1,16 +1,23 @@
+[papi]: https://placeholderapi.com
+
 [discordImg]: https://img.shields.io/discord/164280494874165248.svg?logo=discord&label=Discord&colorB=7289DA
 [discord]: https://helpch.at/discord
+
 [jenkinsImg]: https://img.shields.io/badge/Download%20from-Jenkins-brightgreen.svg
 [jenkins]: http://ci.extendedclip.com/job/PlaceholderAPI/
+
 [licenseImg]: https://img.shields.io/github/license/PlaceholderAPI/PlaceholderAPI.svg
 [license]: https://github.com/PlaceholderAPI/PlaceholderAPI/blob/master/LICENSE
+
 [issuesImg]: https://img.shields.io/github/issues-raw/PlaceholderAPI/PlaceholderAPI.svg?logo=github&logoColor=white
 [issues]: https://github.com/PlaceholderAPI/PlaceholderAPI/issues
-[versionImg]: https://img.shields.io/nexus/r/http/repo.extendedclip.com/me.clip/placeholderapi.svg?label=API-Version
+
+[versionImg]: https://img.shields.io/nexus/placeholderapi/me.clip/placeholderapi?server=https%3A%2F%2Frepo.extendedclip.com&label=API%20Version
 [plugin-page]: https://spigotmc.org/resources/6245
 
+> © 2015 - 2021 [PlaceholderAPI Team][papi]  
 > Thanks for using PlaceholderAPI.
 >
 > **[Plugin-page]** | **[[Placeholders]]** | **[[Plugins using PlaceholderAPI]]** | **[[Hook into PlaceholderAPI]]**
- 
-![versionImg] [![jenkinsImg]][jenkins] [![licenseImg]][license] [![issuesImg]][issues] [![discordImg]][discord]
+> 
+> ![versionImg] [![jenkinsImg]][jenkins] [![licenseImg]][license] [![issuesImg]][issues] [![discordImg]][discord]

wiki/_Sidebar.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="https://i.imgur.com/Adp7xdh.png" alt="PlaceholderAPI">
+  <img src="https://raw.githubusercontent.com/PlaceholderAPI/PlaceholderAPI/docs/wiki/wiki/img/icon.png" alt="PlaceholderAPI">
 </p>
 
 **[[Main page|Home]]**
@@ -7,10 +7,12 @@
 ### Setup
 **[[Hook into PlaceholderAPI]]**
 - [[First steps|Hook-into-PlaceholderAPI#first-steps]]
-- [[Adding placeholders to PlaceholderAPI|Hook-into-PlaceholderAPI#adding-placeholders-to-placeholderapi]]
-  - [[PlaceholderExpansion]]
-    - [[Without an external plugin|PlaceholderExpansion#without-an-external-plugin]]
-    - [[With external plugin|PlaceholderExpansion#with-external-plugin]]
+- [[Adding placeholders to PlaceholderAPI|PlaceholderExpansion]]
+  - [[Common Parts|PlaceholderExpansion#common-parts]]
+  - [[Without an external plugin|PlaceholderExpansion#without-a-plugin]]
+  - [[With an external Plugin (Separate Jar)|PlaceholderExpansion#with-a-plugin-external-jar]]
+  - [[With an external Plugin (Internal class)|PlaceholderExpansion#with-a-plugin-internal-class]]
+  - [[Relational Placeholders|PlaceholderExpansion#relational-placeholders]]
 - [[Setting placeholders in your plugin|Hook-into-PlaceholderAPI#setting-placeholders-in-your-plugin]]
 
 ### Other
@@ -18,40 +20,8 @@
 **[[Expansion cloud]]**  
 **[[FAQ]]**  
 **[[Plugins using PlaceholderAPI]]**  
-**[[Placeholders]]**  
-- [[PAPI-placeholders|Placeholders#papi-placeholders-1]]
-  - [[Advancements|Placeholders#advancements]]
-  - [[Animations|Placeholders#animations]]
-  - [[Armor|Placeholders#armor]]
-  - [[ASCII|Placeholders#ASCII]]
-  - [[BungeeCord|Placeholders#bungeecord]]
-  - [[CheckItem|Placeholders#checkitem]]
-  - [[CooldownBar|Placeholders#cooldownbar]]
-  - [[Formatter|Placeholders#formatter]]
-  - [[Javascript|Placeholders#javascript]]
-  - [[ListPlayers|Placeholders#listplayer]]
-  - [[LocalTime|Placeholders#localtime]]
-  - [[Math|Placeholders#math]]
-  - [[MVdW placeholders|Placeholders#mvdw-placeholders]]
-  - [[OtherPlayer|Placeholders#otherplayer]]
-  - [[ParseNear|Placeholders#parsenear]]
-  - [[ParseOther|Placeholders#parseother]]
-  - [[Pinger|Placeholders#pinger]]
-  - [[Player|Placeholders#player]]
-  - [[PlayerList|Placeholders#playerlist]]
-  - [[Plugin|Placeholders#plugin]]
-  - [[Progress|Placeholders#progress]]
-  - [[RainbowColor|Placeholders#rainbowcolor]]
-  - [[RandomColor|Placeholders#randomcolor]]
-  - [[RedisBungee|Placeholders#redisbungee]]
-  - [[RelCon|Placeholders#relcon]]
-  - [[ScoreboardObjectives|Placeholders#scoreboardobjectives]]
-  - [[Server|Placeholders#server]]
-  - [[Sound|Placeholders#sound]]
-  - [[Spectators|Placeholders#spectators]]
-  - [[Statistic|Placeholders#statistic]]
-  
-- [[Plugin-placeholders|Placeholders#plugin-placeholders-1]]
+**[[Placeholders]]**
+- [[Standalone|Placeholders#standalone]]
   - [[A|Placeholders#a]]
   - [[B|Placeholders#b]]
   - [[C|Placeholders#c]]
@@ -75,4 +45,33 @@
   - [[U|Placeholders#u]]
   - [[V|Placeholders#v]]
   - [[W|Placeholders#w]]
+  - [[X|Placeholders#x]]
+  - [[Y|Placeholders#y]]
   - [[Z|Placeholders#z]]
+- [[Plugin-placeholders|Placeholders#plugin-placeholders-1]]
+  - [[A|Placeholders#a-1]]
+  - [[B|Placeholders#b-1]]
+  - [[C|Placeholders#c-1]]
+  - [[D|Placeholders#d-1]]
+  - [[E|Placeholders#e-1]]
+  - [[F|Placeholders#f-1]]
+  - [[G|Placeholders#g-1]]
+  - [[H|Placeholders#h-1]]
+  - [[I|Placeholders#i-1]]
+  - [[J|Placeholders#j-1]]
+  - [[K|Placeholders#k-1]]
+  - [[L|Placeholders#l-1]]
+  - [[M|Placeholders#m-1]]
+  - [[N|Placeholders#n-1]]
+  - [[O|Placeholders#o-1]]
+  - [[P|Placeholders#p-1]]
+  - [[Q|Placeholders#q-1]]
+  - [[R|Placeholders#r-1]]
+  - [[S|Placeholders#s-1]]
+  - [[T|Placeholders#t-1]]
+  - [[U|Placeholders#u-1]]
+  - [[V|Placeholders#v-1]]
+  - [[W|Placeholders#w-1]]
+  - [[X|Placeholders#x-1]]
+  - [[Y|Placeholders#y-1]]
+  - [[Z|Placeholders#z-1]]