.github/CODEOWNERS

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

.github/CONTRIBUTING.md

@@ -1,9 +1,8 @@
 [issue]: https://github.com/PlaceholderAPI/PlaceholderAPI/issues/new
 [discord]: https://helpch.at/discord
 [code of conduct]: https://github.com/PlaceholderAPI/PlaceholderAPI/blob/master/CODE_OF_CONDUCT.md
-[wiki]: https://github.com/PlaceholderAPI/PlaceholderAPI/blob/wiki
-[master]: https://github.com/PlaceholderAPI/PlaceholderAPI/tree/master
-[docs-wiki]: https://github.com/PlaceholderAPI/PlaceholderAPI/tree/docs/wiki
+[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 Guidelines
@@ -38,29 +37,15 @@ PlaceholderAPI provides a feature to have expansions (separate jar files) for pl
 In those cases should you report the issue to the issue tracker of the expansion or plugin.
 
 ## Pull requests
-As an open source project are we welcoming all contributions to improve PlaceholderAPI, being it changes to its code, or contributions to its documentation such as the [Wiki] or the Javadocs.
-
-> [!IMPORTANT]
-> When contributing, make sure to both base of and target the mentioned branch. Pull requests targeting the wrong branch may get closed without a warning.
+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
-> **Source and Target Branch:** [`master`][master]
+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.
 
-When contributing towards the code of PlaceholderAPI, be it new features or just bug fixes, your changes should follow the general code styling used in the project.  
-You can find the necessary files in the [`config/style`][style] directory of this repository.
-
-### Javadocs contributions
-> **Source and Target Branch:** [`master`][master]*
-
-Javadocs changes should usually be combined with [code contributions](#code-contributions) when possible, but if not, make sure the changes are significant enough to warrant a new build on our CI server.
-
-\*This branch may change in the future.
-
-### Wiki contributions
-> **Source and Target Branch:** [`wiki`][docs-wiki]
-
-The Wiki of PlaceholderAPI is located on its own dedicated branch, hosting all the assets and files that get used to create it through the usage of GitHub Actions and GitHub Pages.  
-We welcome contributions that update outdated information, add new expansions/plugins supporting PlaceholderAPI or even correct spelling mistakes and typos.
+### 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
 We have a [Code of Conduct] to maintain a welcoming atmosphere in this project.  

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -24,8 +24,6 @@ body:
         required: true
       - label: The issue isn't already fixed in a Spigot Release or Development Build.
         required: true
-      - label: The [Common Issues](https://github.com/PlaceholderAPI/PlaceholderAPI/wiki/Common-Issues) page doesn't mention this issue.
-        required: true
 - type: dropdown
   attributes:
     label: "Type"

.github/PULL_REQUEST_TEMPLATE.md

@@ -25,4 +25,4 @@ Closes N/A <!-- If your PR is based on an issue, change "N/A" the the issue ID (
 
 
 <!-- DO NOT ALTER ANYTHING BELOW THIS LINE! -->
-[Wiki]: https://wiki.placeholderapi.com
+[Wiki]: https://github.com/PlaceholderAPI/PlaceholderAPI/wiki

.github/label-commenter-config.yml

@@ -1,8 +1,7 @@
 comment:
   footer: "\
     ----\n\n
-    > [!NOTE]\n
-    > *This is an automated response created by a **GitHub Action***<br>
+    > *This is an automated response created by a **GitHub Action***\n
     > *Mentioning the bot won't have any effect!*
     "
 
@@ -36,12 +35,11 @@ labels:
           Your issue unfortunately lacks certain information that we require in order to help you with your issue.
           Please make sure you provide the following information:
           
-          - Currently used Versions of your server (`/version`) and PlaceholderAPI (`/version PlaceholderAPI`)
-          - Currently installed Expansions (`/papi list`)
-          - Currently installed Plugins (`/pl`)
-          - Any additional information requested by users in this issue.
+          - Currently used Versions of your server and PlaceholderAPI
+          - Currently installed Expansions
+          - Currently installed Plugins
           
-          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.
+          The easiest way to provide those information is through the `/papi dumb` command which posts the required information to https://paste.helpch.at and gives a URL to share.
     unlabeled:
       issue:
         body: |-
@@ -52,18 +50,18 @@ labels:
       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.
+          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?labels=Type%3A+Issue+%28Unconfirmed%29&template=bug_report.yml)
-          - [Feature Request](https://github.com/PlaceholderAPI/PlaceholderAPI/issues/new?labels=Type%3A+Enhancement&template=feature_request.yml)
+          - [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/wiki/README.md).
+          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 a faster response compared to the issue tracker here.
+          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:
@@ -73,20 +71,11 @@ labels:
           
           Here is a small summary of what you should know:
           
-          - Pull requests for PlaceholderAPI should target the `master` branch.
-          - Pull requests for the Wiki should target the `wiki` branch.
+          - 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 target the `wiki` branch.
-          More information can be found on the [Wiki README](https://github.com/PlaceholderAPI/PlaceholderAPI/blob/wiki/README.md).
-        action: close
   - name: 'Target: Wiki'
     labeled:
       issue:
@@ -94,11 +83,12 @@ labels:
           Hello @{{ issue.user.login }},
           
           Thank you for reaching out to us about the wiki.
-          We would like to inform you, that you are able to directly commit your changes to the wiki through a Pull request.
+          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 [`wiki`](https://github.com/PlaceholderAPI/PlaceholderAPI/tree/wiki) branch of the Repository.
-          - You followed the general Styling Guidelines mentioned in the wiki's [README](https://github.com/PlaceholderAPI/PlaceholderAPI/blob/wiki/README.md) file.
+          - The Pull request 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'
@@ -122,7 +112,7 @@ labels:
           The issue has been marked as **inactive** which means it didn't recieve any responses from the Author ({{ issue.user.login }}) for a long period of time.
           To keep the issue-tracker clean and up to date do we close issues that haven't received any responses for a long time.
           
-          If you're the Author of this issue and the reported problem is still present, make sure to respond with additional info to this issue, so that we can reopen it.
+          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:
@@ -136,7 +126,7 @@ labels:
           Hello @{{ issue.user.login }},
           
           Thank you for reaching out to us for getting Support with PlaceholderAPI.
-          We would like to inform you, that we have [Discussions](https://github.com/PlaceholderAPI/PlaceholderAPI/discussions) that you can use for asking questions.
+          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.

.github/release.yml

@@ -1,24 +0,0 @@
-#
-# 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/pr_build_jars.yml

@@ -10,13 +10,13 @@ on:
 
 jobs:
   testBuilds:
+    name: "Test-compile against Java 8, 11 and 16"
+    runs-on: ubuntu-latest
     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

.github/workflows/wiki.yml

@@ -0,0 +1,52 @@
+#
+# This is a GitHub Action that allows us to auto-update the wiki
+# when a Pull request changes specific files in a folder.
+#
+name: Update Wiki
+
+on:
+  push:
+    #
+    # Only trigger when the push changes any files in the wiki-folder.
+    #
+    paths:
+      - 'wiki/**'
+    branches:
+      - 'docs/wiki'
+    #
+    # Releases cause this action to also fire.
+    # Using this prevents this problem.
+    #
+    tags-ignore:
+      - '**'
+
+jobs:
+  update:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout Code'
+        uses: actions/Checkout@v2
+      - name: 'Update Wiki'
+        uses: docker://decathlon/wiki-page-creator-action:latest
+        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

README.md

@@ -7,8 +7,6 @@
 
 [discord]: https://helpch.at/discord
 [spigot]: https://www.spigotmc.org/resources/6245/
-[hangar]: https://hangar.papermc.io/HelpChat/PlaceholderAPI
-[bbb]: https://builtbybit.com/resources/placeholderapi.24306
 [Expansions cloud]: https://api.extendedclip.com/home
 [placeholder list]: https://helpch.at/placeholders
 [statistics]: https://bstats.org/plugin/bukkit/PlaceholderAPI
@@ -17,10 +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://wiki.placeholderapi.com/assets/img/papi-logo.png
+[logo]: https://i.imgur.com/Ea4PURv.png
 
 [contributing]: https://github.com/PlaceholderAPI/PlaceholderAPI/blob/master/.github/CONTRIBUTING.md
-[placeholderexpansion]: https://wiki.placeholderapi.com/developers/creating-a-placeholderexpansion/
+[placeholderexpansion]: https://github.com/PlaceholderAPI/PlaceholderAPI/wiki/PlaceholderExpansion
 <!-- The stuff above isn't visible in the readme -->
 
 [![logo]][spigot]
@@ -30,9 +28,9 @@
 # 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 240+ 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 150+ expansions that support a wide variety of plugins, such as Essentials, Factions, LuckPerms, and Vault. 
 
-PlaceholderAPI has been downloaded over 1,600,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.
+PlaceholderAPI has been downloaded over 500,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.
 
 ## 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.
@@ -49,6 +47,4 @@ If you would like to create your own Placeholder Expansion for PlaceholderAPI, t
 - [Expansions Cloud]
 - [Placeholder List]
 - [Spigot Page][spigot]
-- [Hangar Page][hangar]
-- [BuiltByBit Page][bbb]
 - [Plugin Statistics][statistics]

build.gradle

@@ -0,0 +1,132 @@
+import org.apache.tools.ant.filters.ReplaceTokens
+
+plugins {
+    id "java"
+    id "maven-publish"
+    id "org.cadixdev.licenser" version "0.6.0"
+    id "com.github.johnrengelman.shadow" version "7.0.0"
+}
+
+group "me.clip"
+version "2.10.10-DEV-${System.getProperty("BUILD_NUMBER")}"
+
+description "An awesome placeholder provider!"
+
+repositories {
+    maven({ url = "https://oss.sonatype.org/content/repositories/snapshots/" })
+
+    mavenCentral()
+    mavenLocal()
+
+    maven({ url = "https://repo.codemc.org/repository/maven-public" })
+    maven({ url = "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" })
+}
+
+dependencies {
+    implementation "org.bstats:bstats-bukkit:2.2.1"
+
+    implementation "net.kyori:adventure-platform-bukkit:4.0.0-SNAPSHOT"
+
+    compileOnly "org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT"
+    compileOnly "org.jetbrains:annotations:19.0.0"
+
+    testImplementation "org.openjdk.jmh:jmh-core:1.23"
+    testImplementation "org.openjdk.jmh:jmh-generator-annprocess:1.23"
+
+    testImplementation "org.junit.jupiter:junit-jupiter-engine:5.6.2"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.6.2"
+}
+
+processResources {
+    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"
+}
+
+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 "net.kyori", "me.clip.placeholderapi.libs.kyori"
+}
+
+license {
+    include '**/*.java'
+
+    matching('**/*.java') {
+        header = file('config/headers/main.txt')
+    }
+
+    ext {
+        year = 2021
+    }
+}
+
+test {
+    useJUnitPlatform()
+}
+
+configurations {
+    testImplementation {
+        extendsFrom(compileOnly)
+    }
+}
+
+publishing {
+    repositories {
+        maven {
+            if (version.contains("-DEV")) {
+                url = uri("https://repo.extendedclip.com/content/repositories/dev/")
+            } else {
+                url = uri("https://repo.extendedclip.com/content/repositories/placeholderapi/")
+            }
+
+            credentials {
+                username = System.getenv("JENKINS_USER")
+                password = System.getenv("JENKINS_PASS")
+            }
+        }
+    }
+
+    publications {
+        mavenJava(MavenPublication) {
+            artifactId = "placeholderapi"
+
+            from components.java
+
+            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"))
+
+                def dependenciesNode = asNode().appendNode("dependencies")
+                // jetbrains annotations
+                def jetbrainsAnnotations = dependenciesNode.appendNode("dependency")
+                jetbrainsAnnotations.appendNode("groupId", "org.jetbrains")
+                jetbrainsAnnotations.appendNode("artifactId", "annotations")
+                jetbrainsAnnotations.appendNode("version", "19.0.0")
+            }
+        }
+    }
+}
+
+publish.dependsOn clean, test, jar

build.gradle.kts

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

config/headers/jsonmessage.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2018-2024 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 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
-networkTimeout=10000
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright 2015 the original author or authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,101 +17,67 @@
 #
 
 ##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
+##
+##  Gradle start up script for UN*X
+##
 ##############################################################################
 
 # Attempt to set APP_HOME
-
 # Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
+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
 done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
-# This is normally unused
-# shellcheck disable=SC2034
-APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$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  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -121,9 +87,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
@@ -132,7 +98,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
@@ -140,105 +106,80 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
+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
 
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+# For 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" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
 
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
+    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
+    # 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" ;;
+    esac
 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.
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
 
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
-
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
-fi
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
+# 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"
 
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%"=="" @echo off
+@if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,8 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
+if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -41,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -76,15 +75,13 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
+if "%ERRORLEVEL%"=="0" goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

settings.gradle

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

settings.gradle.kts

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

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -22,7 +22,6 @@ 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;
@@ -82,7 +81,7 @@ public final class PlaceholderAPI {
    */
   @NotNull
   public static List<String> setPlaceholders(final OfflinePlayer player,
-      @NotNull final List<String> text) {
+      @NotNull final List<@NotNull String> text) {
     return text.stream().map(line -> setPlaceholders(player, line)).collect(Collectors.toList());
   }
 
@@ -136,7 +135,7 @@ public final class PlaceholderAPI {
    * @return String containing all translated placeholders
    */
   @NotNull
-  public static List<@NotNull String> setBracketPlaceholders(final OfflinePlayer player,
+  public static List<String> setBracketPlaceholders(final OfflinePlayer player,
       @NotNull final List<@NotNull String> text) {
     return text.stream().map(line -> setBracketPlaceholders(player, line))
         .collect(Collectors.toList());
@@ -150,8 +149,7 @@ public final class PlaceholderAPI {
    * @param text Text to set the placeholder values in
    * @return String containing all translated placeholders
    */
-  @NotNull
-  public static String setBracketPlaceholders(Player player, @NotNull String text) {
+  public static String setBracketPlaceholders(Player player, String text) {
     return setBracketPlaceholders((OfflinePlayer) player, text);
   }
   
@@ -163,8 +161,7 @@ public final class PlaceholderAPI {
    * @param text List of Strings to set the placeholder values in
    * @return String containing all translated placeholders
    */
-  @NotNull
-  public static List<String> setBracketPlaceholders(Player player, @NotNull List<String> text) {
+  public static List<String> setBracketPlaceholders(Player player, List<String> text) {
     return setBracketPlaceholders((OfflinePlayer) player, text);
   }
 
@@ -188,7 +185,7 @@ public final class PlaceholderAPI {
         continue;
       }
 
-      String identifier = format.substring(0, index).toLowerCase(Locale.ROOT);
+      String identifier = format.substring(0, index).toLowerCase();
       String params = format.substring(index + 1);
       final PlaceholderExpansion expansion = PlaceholderAPIPlugin.getInstance()
           .getLocalExpansionManager().getExpansion(identifier);
@@ -204,7 +201,7 @@ public final class PlaceholderAPI {
       }
     }
 
-    return text;
+    return Msg.color(text);
   }
 
   /**
@@ -295,14 +292,14 @@ public final class PlaceholderAPI {
   // === Deprecated API ===
 
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
   public static boolean registerExpansion(PlaceholderExpansion expansion)
   {
     return expansion.register();
   }
 
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
   public static boolean unregisterExpansion(PlaceholderExpansion expansion)
   {
     return expansion.unregister();
@@ -316,7 +313,7 @@ public final class PlaceholderAPI {
    * @return Map of registered placeholders
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
   public static Map<String, PlaceholderHook> getPlaceholders() {
     return PlaceholderAPIPlugin.getInstance().getLocalExpansionManager()
         .getExpansions().stream()
@@ -332,11 +329,12 @@ public final class PlaceholderAPI {
    * @return always false
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
   public static boolean registerPlaceholderHook(Plugin plugin, PlaceholderHook placeholderHook) {
-    Msg.warn("Nag author(s) %s of plugin %s about their usage of the deprecated PlaceholderHook" 
-        + " class! This class will be removed in v2.13.0!", plugin.getDescription().getAuthors(),
-        plugin.getName());
+    PlaceholderAPIPlugin.getInstance().getLogger().warning(plugin.getName()
+        + " is attempting to register placeholders via a PlaceholderHook class which is no longer supported!"
+        + " Please reach out to " + plugin.getDescription().getAuthors().toString()
+        + " and let them know that they need to update ASAP!");
     return false;
   }
 
@@ -349,11 +347,11 @@ public final class PlaceholderAPI {
    * @return always false
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
   public static boolean registerPlaceholderHook(String identifier,
       PlaceholderHook placeholderHook) {
-    Msg.warn("%s is attempting to register placeholders via deprecated PlaceholderHook class." 
-        + " This class is no longer supported and will be removed in v2.13.0!", identifier);
+    PlaceholderAPIPlugin.getInstance().getLogger().warning(identifier
+        + " is attempting to register placeholders via a PlaceholderHook class which is no longer supported!");
     return false;
   }
 
@@ -365,11 +363,12 @@ public final class PlaceholderAPI {
    * @return always false
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
   public static boolean unregisterPlaceholderHook(Plugin plugin) {
-    Msg.warn("Nag author(s) %s of plugin %s about their usage of the PlaceholderAPI class."
-            + " This way of unregistering placeholders is no longer supported and will be removed" 
-            + " in v2.13.0!", plugin.getDescription().getAuthors(), plugin.getName());
+    PlaceholderAPIPlugin.getInstance().getLogger().warning(plugin.getName()
+        + " is attempting to unregister placeholders via the PlaceholderAPI class which is no longer supported!"
+        + " Please reach out to " + plugin.getDescription().getAuthors().toString()
+        + " and let them know that they need to update ASAP!");
     return false;
   }
 
@@ -381,11 +380,10 @@ public final class PlaceholderAPI {
    * @return always false
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
   public static boolean unregisterPlaceholderHook(String identifier) {
-    Msg.warn("%s is attempting to unregister placeholders via PlaceholderAPI class."
-        + " This way of unregistering placeholders is no longer supported and will be removed"
-        + " in v2.13.0!", identifier);
+    PlaceholderAPIPlugin.getInstance().getLogger().warning(identifier
+        + " is attempting to unregister placeholders through the PlaceholderAPI class which is no longer supported!");
     return false;
   }
 
@@ -395,7 +393,7 @@ public final class PlaceholderAPI {
    * @return Set of registered identifiers
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
   public static Set<String> getRegisteredPlaceholderPlugins() {
     return getRegisteredIdentifiers();
   }
@@ -406,7 +404,7 @@ public final class PlaceholderAPI {
    * @return always null
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
   public static Set<String> getExternalPlaceholderPlugins() {
     return null;
   }
@@ -421,7 +419,7 @@ public final class PlaceholderAPI {
    * @return String with the parsed placeholders
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
   public static String setPlaceholders(OfflinePlayer player,
       String text, Pattern pattern, boolean colorize) {
     return setPlaceholders(player, text);
@@ -437,7 +435,7 @@ public final class PlaceholderAPI {
    * @return String with the parsed placeholders
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
   public static List<String> setPlaceholders(OfflinePlayer player,
       List<String> text, Pattern pattern, boolean colorize) {
     return setPlaceholders(player, text);
@@ -452,7 +450,7 @@ public final class PlaceholderAPI {
    * @return String with the parsed placeholders
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
   public static List<String> setPlaceholders(OfflinePlayer player, List<String> text,
       boolean colorize) {
     return setPlaceholders(player, text);
@@ -467,7 +465,7 @@ public final class PlaceholderAPI {
    * @return String with the parsed placeholders
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
   public static List<String> setPlaceholders(OfflinePlayer player, List<String> text,
       Pattern pattern) {
     return setPlaceholders(player, text);
@@ -481,7 +479,7 @@ public final class PlaceholderAPI {
    * @return String with the parsed placeholders
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
   public static String setPlaceholders(Player player, String text, boolean colorize) {
     return setPlaceholders(player, text);
   }
@@ -495,7 +493,7 @@ public final class PlaceholderAPI {
    * @return String with the parsed placeholders
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
   public static List<String> setPlaceholders(Player player, List<String> text, boolean colorize) {
     return setPlaceholders(player, text);
   }
@@ -509,7 +507,7 @@ public final class PlaceholderAPI {
    * @return String with the parsed placeholders
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
   public static String setPlaceholders(OfflinePlayer player, String text, boolean colorize) {
     return setPlaceholders(player, text);
   }
@@ -523,7 +521,7 @@ public final class PlaceholderAPI {
    * @return String with the parsed placeholders
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
   public static String setPlaceholders(OfflinePlayer player, String text, Pattern pattern) {
     return setPlaceholders(player, text);
   }
@@ -537,7 +535,7 @@ public final class PlaceholderAPI {
    * @return String with the parsed placeholders
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
   public static List<String> setBracketPlaceholders(OfflinePlayer player, List<String> text,
       boolean colorize) {
     return setBracketPlaceholders(player, text);
@@ -552,7 +550,7 @@ public final class PlaceholderAPI {
    * @return String with the parsed placeholders
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
   public static String setBracketPlaceholders(OfflinePlayer player, String text, boolean colorize) {
     return setBracketPlaceholders(player, text);
   }
@@ -566,7 +564,7 @@ public final class PlaceholderAPI {
    * @return String with the parsed placeholders
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
   public static String setBracketPlaceholders(Player player, String text, boolean colorize) {
     return setBracketPlaceholders(player, text);
   }
@@ -580,7 +578,7 @@ public final class PlaceholderAPI {
    * @return String with the parsed placeholders
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
   public static List<String> setBracketPlaceholders(Player player, List<String> text,
       boolean colorize) {
     return setBracketPlaceholders(player, text);
@@ -598,7 +596,7 @@ public final class PlaceholderAPI {
    * @deprecated Use {@link #setPlaceholders(OfflinePlayer, String)} instead.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
   public static String setRelationalPlaceholders(Player one, Player two, String text,
       boolean colorize) {
     return setRelationalPlaceholders(one, two, text);
@@ -616,7 +614,7 @@ public final class PlaceholderAPI {
    * @deprecated Use {@link #setRelationalPlaceholders(Player, Player, List)} instead.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.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,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -21,9 +21,9 @@
 package me.clip.placeholderapi;
 
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.logging.Level;
 import me.clip.placeholderapi.commands.PlaceholderCommandRouter;
 import me.clip.placeholderapi.configuration.PlaceholderAPIConfig;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
@@ -32,8 +32,8 @@ 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 me.clip.placeholderapi.util.Msg;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
+import net.kyori.adventure.text.serializer.craftbukkit.MinecraftComponentSerializer;
 import org.bstats.bukkit.Metrics;
 import org.bstats.charts.AdvancedPie;
 import org.bstats.charts.SimplePie;
@@ -56,17 +56,7 @@ public final class PlaceholderAPIPlugin extends JavaPlugin {
   private static PlaceholderAPIPlugin instance;
 
   static {
-    String version = Bukkit.getServer().getBukkitVersion().split("-")[0];
-    String suffix;
-    if (version.chars()
-            .filter(c -> c == '.')
-            .count() == 1) {
-      suffix = "R1";
-      version = 'v' + version.replace('.', '_') + '_' + suffix;
-    } else {
-      int minor = Integer.parseInt(version.split("\\.")[2].charAt(0) + "");
-      version = 'v' + version.replace('.', '_').replace("_" + minor, "") + '_' + "R" + (minor - 1);
-    }
+    final String version = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
 
     boolean isSpigot;
     try {
@@ -132,13 +122,11 @@ public final class PlaceholderAPIPlugin extends JavaPlugin {
     try {
       return new SimpleDateFormat(getInstance().getPlaceholderAPIConfig().dateFormat());
     } catch (final IllegalArgumentException ex) {
-      Msg.warn("Configured date format ('%s') is invalid! Defaulting to 'MM/dd/yy HH:mm:ss'",
-          ex, getInstance().getPlaceholderAPIConfig().dateFormat());
+      getInstance().getLogger().log(Level.WARNING, "configured date format is invalid", ex);
       return new SimpleDateFormat("MM/dd/yy HH:mm:ss");
     }
   }
 
-  @Deprecated
   public static Version getServerVersion() {
     return VERSION;
   }
@@ -261,7 +249,7 @@ public final class PlaceholderAPIPlugin extends JavaPlugin {
     try {
       Class.forName("org.bukkit.event.server.ServerLoadEvent");
       new ServerLoadEventListener(this);
-    } catch (final ClassNotFoundException ignored) {
+    } catch (final ExceptionInInitializerError | ClassNotFoundException ignored) {
       Bukkit.getScheduler()
           .runTaskLater(this, () -> getLocalExpansionManager().load(Bukkit.getConsoleSender()), 1);
     }

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -23,19 +23,17 @@ package me.clip.placeholderapi;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 public abstract class PlaceholderHook {
-  @Nullable
+
   public String onRequest(final OfflinePlayer player, @NotNull final String params) {
     if (player != null && player.isOnline()) {
-      return onPlaceholderRequest(player.getPlayer(), params);
+      return onPlaceholderRequest((Player) player, params);
     }
 
     return onPlaceholderRequest(null, params);
   }
 
-  @Nullable
   public String onPlaceholderRequest(final Player player, @NotNull final String params) {
     return null;
   }

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -23,7 +23,6 @@ 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;
@@ -62,7 +61,7 @@ public abstract class PlaceholderCommand {
     if (parameter == null) {
       possible.forEach(suggestions::add);
     } else {
-      possible.filter(suggestion -> suggestion.toLowerCase(Locale.ROOT).startsWith(parameter.toLowerCase(Locale.ROOT)))
+      possible.filter(suggestion -> suggestion.toLowerCase().startsWith(parameter.toLowerCase()))
           .forEach(suggestions::add);
     }
   }

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -27,7 +27,6 @@ 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;
@@ -96,7 +95,7 @@ public final class PlaceholderCommandRouter implements CommandExecutor, TabCompl
       return true;
     }
 
-    final String search = args[0].toLowerCase(Locale.ROOT);
+    final String search = args[0].toLowerCase();
     final PlaceholderCommand target = commands.get(search);
 
     if (target == null) {
@@ -122,10 +121,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(Locale.ROOT));
+      final PlaceholderCommand target = this.commands.get(args[0].toLowerCase());
 
       if (target != null) {
-        target.complete(plugin, sender, args[0].toLowerCase(Locale.ROOT),
+        target.complete(plugin, sender, args[0].toLowerCase(),
             Arrays.asList(Arrays.copyOfRange(args, 1, args.length)), suggestions);
       }
 

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -22,6 +22,10 @@ package me.clip.placeholderapi.commands.impl.cloud;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;
 import me.clip.placeholderapi.util.Msg;
@@ -29,17 +33,12 @@ import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Unmodifiable;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.stream.Stream;
-
 public final class CommandECloud extends PlaceholderCommand {
 
   @Unmodifiable
   private static final List<PlaceholderCommand> COMMANDS = ImmutableList
       .of(new CommandECloudClear(),
+          new CommandECloudToggle(),
           new CommandECloudStatus(),
           new CommandECloudUpdate(),
           new CommandECloudRefresh(),
@@ -79,6 +78,8 @@ public final class CommandECloud extends PlaceholderCommand {
       Msg.msg(sender,
           "&b&lPlaceholderAPI &8- &7eCloud Help Menu &8- ",
           " ",
+          "&b/papi &fenable/disable/toggle",
+          "  &7&oEnable or disable the eCloud",
           "&b/papi &fecloud status",
           "  &7&oView status of the eCloud",
           "&b/papi &fecloud list <all/{author}/installed> {page}",
@@ -99,7 +100,7 @@ public final class CommandECloud extends PlaceholderCommand {
       return;
     }
 
-    final String search = params.get(0).toLowerCase(Locale.ROOT);
+    final String search = params.get(0).toLowerCase();
     final PlaceholderCommand target = commands.get(search);
 
     if (target == null) {
@@ -113,8 +114,10 @@ public final class CommandECloud extends PlaceholderCommand {
       return;
     }
 
-    if (!plugin.getPlaceholderAPIConfig().isCloudEnabled()) {
-      Msg.msg(sender, "&cThe eCloud Manager is not enabled! To enable it, set 'cloud_enabled' to true and reload the plugin.");
+    if (!(target instanceof CommandECloudToggle) && !plugin.getPlaceholderAPIConfig()
+        .isCloudEnabled()) {
+      Msg.msg(sender,
+          "&cThe eCloud Manager is not enabled!");
       return;
     }
 
@@ -133,7 +136,7 @@ public final class CommandECloud extends PlaceholderCommand {
       return; // send sub commands
     }
 
-    final String search = params.get(0).toLowerCase(Locale.ROOT);
+    final String search = params.get(0).toLowerCase();
     final PlaceholderCommand target = commands.get(search);
 
     if (target == null) {

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -20,7 +20,6 @@
 
 package me.clip.placeholderapi.commands.impl.cloud;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Stream;
@@ -38,16 +37,6 @@ public final class CommandECloudDownload extends PlaceholderCommand {
     super("download");
   }
 
-  private boolean isBlockedExpansion(String name) {
-    String env = System.getenv("PAPI_BLOCKED_EXPANSIONS");
-    if (env == null) {
-      return false;
-    }
-
-    return Arrays.stream(env.split(","))
-            .anyMatch(s -> s.equalsIgnoreCase(name));
-  }
-
   @Override
   public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
       @NotNull final CommandSender sender, @NotNull final String alias,
@@ -58,12 +47,6 @@ public final class CommandECloudDownload extends PlaceholderCommand {
       return;
     }
 
-    if (isBlockedExpansion(params.get(0))) {
-      Msg.msg(sender,
-          "&cThis expansion can't be downloaded.");
-      return;
-    }
-
     final CloudExpansion expansion = plugin.getCloudExpansionManager()
         .findCloudExpansionByName(params.get(0)).orElse(null);
     if (expansion == null) {
@@ -72,11 +55,6 @@ public final class CommandECloudDownload extends PlaceholderCommand {
       return;
     }
 
-    if (!expansion.isVerified()) {
-      Msg.msg(sender, "&cThe expansion '&f" + params.get(0) + "&c' is not verified and can only be downloaded manually from &fhttps://placeholderapi.com/ecloud");
-      return;
-    }
-
     final CloudExpansion.Version version;
     if (params.size() < 2) {
       version = expansion.getVersion(expansion.getLatestVersion());
@@ -108,7 +86,9 @@ public final class CommandECloudDownload extends PlaceholderCommand {
                   .getVersion() + "] &ato file: &f" + file.getName(),
               "&aMake sure to type &f/papi reload &ato enable your new expansion!");
 
-          plugin.getCloudExpansionManager().load();
+          plugin.getCloudExpansionManager().clean();
+          plugin.getCloudExpansionManager()
+              .fetch(plugin.getPlaceholderAPIConfig().cloudAllowUnverifiedExpansions());
         });
   }
 

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -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(Locale.ROOT)) {
+    switch (target.toLowerCase()) {
       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(Locale.ROOT)) {
+    switch (target.toLowerCase()) {
       case "all":
         builder.append("&bAll Expansions");
         break;

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -38,7 +38,9 @@ public final class CommandECloudRefresh extends PlaceholderCommand {
   public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
       @NotNull final CommandSender sender, @NotNull final String alias,
       @NotNull @Unmodifiable final List<String> params) {
-    plugin.getCloudExpansionManager().load();
+    plugin.getCloudExpansionManager().clean();
+    plugin.getCloudExpansionManager()
+        .fetch(plugin.getPlaceholderAPIConfig().cloudAllowUnverifiedExpansions());
 
     Msg.msg(sender,
         "&aThe eCloud manager has been refreshed!");

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -54,7 +54,7 @@ public final class CommandECloudStatus extends PlaceholderCommand {
 
     if (updateCount > 0) {
       builder.append("&eYou have &f").append(updateCount)
-          .append(updateCount > 1 ? "&e expansions" : "&e expansion").append(" installed that ")
+          .append(updateCount > 1 ? "&e expansions" : "&e expansion").append("installed that ")
           .append(updateCount > 1 ? "have an" : "has an").append(" update available.");
     }
 

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

@@ -0,0 +1,72 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
+ *
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlaceholderAPI is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.clip.placeholderapi.commands.impl.cloud;
+
+import java.util.List;
+import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import me.clip.placeholderapi.commands.PlaceholderCommand;
+import me.clip.placeholderapi.util.Msg;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Unmodifiable;
+
+public final class CommandECloudToggle extends PlaceholderCommand {
+
+  public CommandECloudToggle() {
+    super("toggle", "enable", "disable");
+  }
+
+  @Override
+  public void evaluate(@NotNull final PlaceholderAPIPlugin plugin,
+      @NotNull final CommandSender sender, @NotNull final String alias,
+      @NotNull @Unmodifiable final List<String> params) {
+    final boolean desiredState;
+    final boolean currentState = plugin.getPlaceholderAPIConfig().isCloudEnabled();
+
+    switch (alias.toLowerCase()) {
+      case "enable":
+        desiredState = true;
+        break;
+      case "disable":
+        desiredState = false;
+        break;
+      default:
+        desiredState = !currentState;
+        break;
+    }
+
+    if (desiredState == currentState) {
+      Msg.msg(sender, "&7The eCloud Manager is already " + (desiredState ? "enabled" : "disabled"));
+      return;
+    }
+
+    plugin.getPlaceholderAPIConfig().setCloudEnabled(desiredState);
+
+    if (desiredState) {
+      plugin.getCloudExpansionManager().load();
+    } else {
+      plugin.getCloudExpansionManager().kill();
+    }
+
+    Msg.msg(sender, "&aThe eCloud Manager has been " + (desiredState ? "enabled" : "disabled"));
+  }
+
+}

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -23,7 +23,6 @@ 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;
@@ -129,7 +128,7 @@ public final class CommandECloudUpdate extends PlaceholderCommand {
     installed.removeIf(expansion -> !expansion.shouldUpdate());
 
     if (!installed.isEmpty() && (params.isEmpty() || "all"
-        .startsWith(params.get(0).toLowerCase(Locale.ROOT)))) {
+        .startsWith(params.get(0).toLowerCase()))) {
       suggestions.add("all");
     }
 

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -106,6 +106,7 @@ 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 gson.fromJson(json, JsonObject.class).get("key").getAsString();
         }
@@ -133,15 +134,18 @@ public final class CommandDump extends PlaceholderCommand {
     final List<PlaceholderExpansion> expansions = plugin.getLocalExpansionManager()
         .getExpansions()
         .stream()
-        .sorted(
-            Comparator.comparing(PlaceholderExpansion::getIdentifier)
-                      .thenComparing(PlaceholderExpansion::getAuthor)
-        )
+        .sorted(Comparator.comparing(PlaceholderExpansion::getIdentifier))
+        .sorted(Comparator.comparing(PlaceholderExpansion::getAuthor))
         .collect(Collectors.toList());
 
-    int size = expansions.stream().map(e -> e.getIdentifier().length())
-        .max(Integer::compareTo)
-        .orElse(0);
+    int size = 0;
+
+    for (final String name : expansions.stream().map(PlaceholderExpansion::getIdentifier)
+        .collect(Collectors.toList())) {
+      if (name.length() > size) {
+        size = name.length();
+      }
+    }
 
     for (final PlaceholderExpansion expansion : expansions) {
       builder.append("  ")
@@ -161,17 +165,12 @@ public final class CommandDump extends PlaceholderCommand {
 
     final String[] jars = plugin.getLocalExpansionManager()
         .getExpansionsFolder()
-        .list((dir, name) -> name.toLowerCase(Locale.ROOT).endsWith(".jar"));
+        .list((dir, name) -> name.toLowerCase().endsWith(".jar"));
 
-
-    if (jars == null) {
-      builder.append("  ¨[Warning]: Could not load jar files from expansions folder.");
-    } else {
-      for (final String jar : jars) {
-        builder.append("  ")
-            .append(jar)
-            .append('\n');
-      }
+    for (final String jar : jars) {
+      builder.append("  ")
+          .append(jar)
+          .append('\n');
     }
 
     builder.append('\n');
@@ -180,10 +179,6 @@ 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:")
@@ -192,17 +187,18 @@ public final class CommandDump extends PlaceholderCommand {
     List<Plugin> plugins = Arrays.stream(plugin.getServer().getPluginManager().getPlugins())
         .sorted(Comparator.comparing(Plugin::getName))
         .collect(Collectors.toList());
-    
-    size = plugins.stream().map(pl -> pl.getName().length())
-        .max(Integer::compareTo)
-        .orElse(0);
+
+    for (final String pluginName : plugins.stream().map(Plugin::getName)
+        .collect(Collectors.toList())) {
+      if (pluginName.length() > size) {
+        size = pluginName.length();
+      }
+    }
 
     for (final Plugin other : plugins) {
       builder.append("  ")
           .append(String.format("%-" + size + "s", other.getName()))
-          .append(" [Authors: [")
-          .append(String.join(", ", other.getDescription().getAuthors()))
-          .append("], Version: ")
+          .append(" [Version: ")
           .append(other.getDescription().getVersion())
           .append("]")
           .append("\n");

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -54,7 +54,7 @@ public final class CommandExpansionRegister extends PlaceholderCommand {
     final LocalExpansionManager manager = plugin.getLocalExpansionManager();
 
     final File file = new File(manager.getExpansionsFolder(), params.get(0));
-    if (!file.exists() || !file.getParentFile().equals(manager.getExpansionsFolder())) {
+    if (!file.exists()) {
       Msg.msg(sender,
           "&cThe file &f" + file.getName() + "&c doesn't exist!");
       return;

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -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|--null|player name> <message>",
+        "&b/papi &fbcparse &9<me/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|--null|player name> <message>",
+        "&b/papi &fparse &9<me/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,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -22,7 +22,6 @@ 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;
@@ -30,6 +29,7 @@ import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.PlaceholderCommand;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import me.clip.placeholderapi.util.Msg;
+import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
@@ -49,7 +49,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(Locale.ROOT)) {
+    switch (alias.toLowerCase()) {
       case "parserel":
         evaluateParseRelation(sender, params);
         break;
@@ -69,7 +69,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(Locale.ROOT)) {
+    switch (alias.toLowerCase()) {
       case "parserel":
         completeParseRelation(params, suggestions);
         break;
@@ -87,13 +87,12 @@ public final class CommandParse extends PlaceholderCommand {
       final boolean command) {
     if (params.size() < 2) {
       Msg.msg(sender,
-          "&cYou must provide a target and message: &b/papi "
-              + (command ? "cmdparse" : (broadcast ? "bcparse" : "parse")) 
+          "&cYou must supply a target, and a message: &b/papi " + (broadcast ? "bcparse" : "parse")
               + " &7{target} &a{message}");
       return;
     }
 
-    OfflinePlayer player;
+    @NotNull final OfflinePlayer player;
 
     if ("me".equalsIgnoreCase(params.get(0))) {
       if (!(sender instanceof Player)) {
@@ -102,8 +101,6 @@ 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) {
@@ -123,9 +120,13 @@ public final class CommandParse extends PlaceholderCommand {
     }
 
     if (broadcast) {
-      Bukkit.broadcastMessage(message);
+      Msg.broadcast(message);
     } else {
-      sender.sendMessage(message);
+      if (!(sender instanceof Player)) {
+        Msg.msg(sender, message);
+      } else {
+        ((Player) sender).spigot().sendMessage(TextComponent.fromLegacyText(message));
+      }
     }
   }
 
@@ -133,52 +134,26 @@ public final class CommandParse extends PlaceholderCommand {
       @NotNull @Unmodifiable final List<String> params) {
     if (params.size() < 3) {
       Msg.msg(sender,
-          "&cYou must supply two targets, and a message: &b/papi parserel &7{target one} " 
-              + "{target two} &a{message}");
+          "&cYou must supply two targets, and a message: &b/papi parserel &7{target one} {target two} &a{message}");
       return;
     }
-    
-    OfflinePlayer playerOne;
-    
-    if ("me".equalsIgnoreCase(params.get(0))) {
-      if (!(sender instanceof Player)) {
-        Msg.msg(sender, "&cYou must be a player to use &7me&c as a target!");
-        return;
-      }
-      
-      playerOne = ((Player) sender);
-    } else {
-      playerOne = resolvePlayer(params.get(0));
-    }
-    
-    if (playerOne == null || !playerOne.isOnline()) {
+
+    final OfflinePlayer targetOne = resolvePlayer(params.get(0));
+    if (targetOne == null || !targetOne.isOnline()) {
       Msg.msg(sender, "&cFailed to find player: &f" + params.get(0));
       return;
     }
-    
-    OfflinePlayer playerTwo;
-    
-    if ("me".equalsIgnoreCase(params.get(1))) {
-      if (!(sender instanceof Player)) {
-        Msg.msg(sender, "&cYou must be a player to use &7me&c as a target!");
-        return;
-      }
-      
-      playerTwo = ((Player) sender);
-    } else {
-      playerTwo = resolvePlayer(params.get(1));
-    }
-    
-    if (playerTwo == null || !playerTwo.isOnline()) {
+
+    final OfflinePlayer targetTwo = resolvePlayer(params.get(1));
+    if (targetTwo == null || !targetTwo.isOnline()) {
       Msg.msg(sender, "&cFailed to find player: &f" + params.get(1));
       return;
     }
 
     final String message = PlaceholderAPI
-        .setRelationalPlaceholders((Player) playerOne, (Player) playerTwo,
+        .setRelationalPlaceholders(((Player) targetOne), ((Player) targetTwo),
             String.join(" ", params.subList(2, params.size())));
-    
-    sender.sendMessage(message);
+    Msg.msg(sender, message);
   }
 
 
@@ -186,14 +161,10 @@ 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(Locale.ROOT)))) {
+          .startsWith(params.get(0).toLowerCase()))) {
         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));
 

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -38,6 +38,10 @@ public final class PlaceholderAPIConfig {
     return plugin.getConfig().getBoolean("check_updates");
   }
 
+  public boolean cloudAllowUnverifiedExpansions() {
+    return plugin.getConfig().getBoolean("cloud_allow_unverified_expansions");
+  }
+
 
   public boolean isCloudEnabled() {
     return plugin.getConfig().getBoolean("cloud_enabled");

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -27,11 +27,8 @@ 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.
+ * Indicates that a {@link PlaceholderExpansion} has been registered by
+ * PlaceholderAPI.
  */
 public final class ExpansionRegisterEvent extends Event implements Cancellable {
 
@@ -51,25 +48,15 @@ public final class ExpansionRegisterEvent extends Event implements Cancellable {
   }
   
   /**
-   * 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}!
+   * The {@link PlaceholderExpansion expansion} that was registered.
    * 
-   * @return Current instance of the registered {@link PlaceholderExpansion PlaceholderExpansion}
+   * @return The {@link PlaceholderExpansion} instance.
    */
   @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,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -26,19 +26,15 @@ 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.
+ * Indicates that a {@link PlaceholderExpansion} had been unregistered by
+ * PlaceholderAPI.
  */
 public final class ExpansionUnregisterEvent extends Event {
 
   @NotNull
   private static final HandlerList HANDLERS = new HandlerList();
-  
+
+
   @NotNull
   private final PlaceholderExpansion expansion;
 
@@ -52,9 +48,9 @@ public final class ExpansionUnregisterEvent extends Event {
   }
   
   /**
-   * The {@link PlaceholderExpansion PlaceholderExpansion} that was unregistered.
+   * The {@link PlaceholderExpansion expansion} that was unregistered.
    * 
-   * @return The {@link PlaceholderExpansion PlaceholderExpansion} instance.
+   * @return The {@link PlaceholderExpansion} instance.
    */
   @NotNull
   public PlaceholderExpansion getExpansion() {

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -21,42 +21,18 @@
 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.
+ * Indicates that <b>all</b> {@link me.clip.placeholderapi.expansion.PlaceholderExpansion PlayceholderExpansions}
+ * have been loaded.
+ * <br/>This event is fired on Server load and when reloading the
+ * confiuration.
  */
 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();
 

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -21,11 +21,9 @@
 package me.clip.placeholderapi.expansion;
 
 /**
- * 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.
+ * 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
  *
  * @author Ryan McCarthy
  */

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -23,11 +23,9 @@ package me.clip.placeholderapi.expansion;
 import org.bukkit.entity.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.
+ * 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
  *
  * @author Ryan McCarthy
  */

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -23,32 +23,18 @@ package me.clip.placeholderapi.expansion;
 import java.util.Map;
 
 /**
- * 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>
+ * Any {@link PlaceholderExpansion} class which implements configurable will have any options listed
+ * in the {@link #getDefaults()} map automatically added to the PlaceholderAPI config.yml file
  *
  * @author Ryan McCarthy
  */
 public interface Configurable {
 
   /**
-   * 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.
+   * 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)
    *
    * @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,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -42,16 +42,7 @@ public enum NMSVersion {
   SPIGOT_1_16_R1("v1_16_R1"),
   SPIGOT_1_16_R2("v1_16_R2"),
   SPIGOT_1_16_R3("v1_16_R3"),
-  SPIGOT_1_17_R1("v1_17_R1"),
-  SPIGOT_1_18_R1("v1_18_R1"),
-  SPIGOT_1_19_R1("v1_19_R1"),
-  SPIGOT_1_19_R2("v1_19_R2"),
-  SPIGOT_1_19_R3("v1_19_R3"),
-  SPIGOT_1_20_R1("v1_20_R1"),
-  SPIGOT_1_20_R2("v1_20_R2"),
-  SPIGOT_1_20_R3("v1_20_R3"),
-  SPIGOT_1_20_R4("v1_20_R4"),
-  SPIGOT_1_21_R1("v1_21_R1");
+  SPIGOT_1_17_R1("v1_17_R1");
 
   private final String version;
 

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -22,7 +22,6 @@ package me.clip.placeholderapi.expansion;
 
 import java.util.Collections;
 import java.util.List;
-import java.util.logging.Level;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.PlaceholderHook;
 import org.bukkit.Bukkit;
@@ -40,14 +39,6 @@ import org.jetbrains.annotations.Nullable;
  */
 public abstract class PlaceholderExpansion extends PlaceholderHook {
 
-  /**
-   * The type is {@link Type#INTERNAL} by default.
-   * For external expansions, the type is updated on {@link me.clip.placeholderapi.expansion.manager.LocalExpansionManager#register(Class) register}.
-   * @since 2.11.4
-   */
-  @ApiStatus.Internal
-  protected Type expansionType = Type.INTERNAL;
-
   /**
    * The placeholder identifier of this expansion. May not contain {@literal %},
    * {@literal {}} or _
@@ -167,27 +158,6 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
     return PlaceholderAPIPlugin.getInstance();
   }
 
-  /**
-   * Get the type of the expansion
-   *
-   * @return the type of the expansion
-   * @since 2.11.4
-   */
-  @ApiStatus.Internal
-  public Type getExpansionType() {
-    return expansionType;
-  }
-
-  /**
-   * Set the type of the expansion
-   * @param expansionType the new type
-   * @since 2.11.4
-   */
-  @ApiStatus.Internal
-  public void setExpansionType(Type expansionType) {
-    this.expansionType = expansionType;
-  }
-
   // === Configuration ===
   
   /**
@@ -195,7 +165,7 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
    * null when not specified.
    * <br>You may use the {@link Configurable} interface to define default values set
    * 
-   * @return ConfigurationSection that this expansion has.
+   * @return ConfigurationSection that this epxpansion has.
    */
   @Nullable
   public final ConfigurationSection getConfigSection() {
@@ -305,6 +275,7 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
    * @param def The default boolean to return when the ConfigurationSection is null
    * @return boolean from the provided path or the default one provided
    */
+  @NotNull
   public final boolean getBoolean(@NotNull final String path, final boolean def) {
     final ConfigurationSection section = getConfigSection();
     return section == null ? def : section.getBoolean(path, def);
@@ -322,71 +293,6 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
     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.
@@ -423,8 +329,8 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
    */
   @Override
   public final String toString() {
-    return String.format("PlaceholderExpansion[name: '%s', author: '%s', version: '%s', type: '%s']", getName(),
-        getAuthor(), getVersion(), getExpansionType());
+    return String.format("PlaceholderExpansion[name: '%s', author: '%s', version: '%s']", getName(),
+        getAuthor(), getVersion());
   }
 
   // === Deprecated API ===
@@ -435,7 +341,7 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
    * @return The plugin name.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
   public String getPlugin() {
     return null;
   }
@@ -446,7 +352,7 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
    * @return The description of the expansion.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
   public String getDescription() {
     return null;
   }
@@ -457,23 +363,8 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
    * @return The link for the expansion.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
   public String getLink() {
     return null;
   }
-
-  public enum Type {
-
-    /**
-     * An expansion provided by a plugin is considered internal
-     */
-    INTERNAL,
-
-    /**
-     * An expansion loaded from the expansions folder is considered external
-     */
-    EXTERNAL
-
-  }
-
 }

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -22,22 +22,7 @@ package me.clip.placeholderapi.expansion;
 
 import org.bukkit.entity.Player;
 
-/**
- * Implementing this interface allows your {@link me.clip.placeholderapi.expansion.PlaceholderExpansion PlaceholderExpansion}
- * to be used as a relational placeholder expansion.
- * 
- * <p>Relational placeholders take two Players as input and are always prefixed with {@code rel_},
- * so {@code %foo_bar%} becomes {@code %rel_foo_bar%}
- */
 public interface Relational {
 
-  /**
-   * This method is called whenever a placeholder starting with {@code rel_} is called.
-   * 
-   * @param one The first player used for the placeholder.
-   * @param two The second player used for the placeholder.
-   * @param identifier The text right after the expansion's name (%expansion_<b>identifier</b>%)
-   * @return Parsed String from the expansion.
-   */
   String onPlaceholderRequest(Player one, Player two, String identifier);
 }

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -20,24 +20,18 @@
 
 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.
-   * <br>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
+   * 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.
-   * <br>Tasks that need to be performed when this expansion has unregistered should go here
+   * Called when the implementing class has been unregistered from PlaceholderAPI 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,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -20,7 +20,6 @@
 
 package me.clip.placeholderapi.expansion;
 
-@Deprecated
 public final class Version {
 
   private final boolean isSpigot;

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -27,10 +27,7 @@ package me.clip.placeholderapi.expansion;
  * with that version.
  *
  * @author Ryan McCarthy
- *
- * @deprecated Will be removed in a future release.
  */
-@Deprecated
 public interface VersionSpecific {
 
   /**

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -171,7 +171,7 @@ public class CloudExpansion {
     this.versions = versions;
   }
 
-  public static class Version {
+  public class Version {
 
     private String url, version, release_notes;
 

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -37,7 +37,6 @@ 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;
@@ -53,7 +52,6 @@ import java.util.stream.Collectors;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import me.clip.placeholderapi.expansion.cloud.CloudExpansion;
-import me.clip.placeholderapi.util.Msg;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Unmodifiable;
 
@@ -90,7 +88,7 @@ public final class CloudExpansionManager {
 
   @NotNull
   private static String toIndexName(@NotNull final String name) {
-    return name.toLowerCase(Locale.ROOT).replace(' ', '_');
+    return name.toLowerCase().replace(' ', '_');
   }
 
   @NotNull
@@ -100,7 +98,7 @@ public final class CloudExpansionManager {
 
   public void load() {
     clean();
-    fetch();
+    fetch(plugin.getPlaceholderAPIConfig().cloudAllowUnverifiedExpansions());
   }
 
   public void kill() {
@@ -170,7 +168,7 @@ public final class CloudExpansionManager {
     await.clear();
   }
 
-  public void fetch() {
+  public void fetch(final boolean allowUnverified) {
     plugin.getLogger().info("Fetching available expansion information...");
 
     ASYNC_EXECUTOR.submit(
@@ -190,6 +188,9 @@ public final class CloudExpansionManager {
                   || expansion.getVersion(expansion.getLatestVersion()) == null) {
                 toRemove.add(entry.getKey());
               }
+              if (!allowUnverified && !expansion.isVerified()) {
+                toRemove.add(entry.getKey());
+              }
             }
 
             for (String name : toRemove) {
@@ -200,7 +201,7 @@ public final class CloudExpansionManager {
             plugin.getLogger().log(Level.WARNING, "Failed to download expansion information", e);
           }
 
-          // loop through what's left on the main thread
+          // loop thru what's left on the main thread
           plugin
               .getServer()
               .getScheduler()
@@ -266,7 +267,8 @@ public final class CloudExpansionManager {
       await.remove(toIndexName(expansion));
 
       if (exception != null) {
-        Msg.severe("Failed to download %s:%s", exception, expansion.getName(), expansion.getVersion());
+        plugin.getLogger().log(Level.SEVERE,
+            "failed to download " + expansion.getName() + ":" + version.getVersion(), exception);
       }
     }, ASYNC_EXECUTOR);
 

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -22,32 +22,11 @@ package me.clip.placeholderapi.expansion.manager;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
-import java.io.File;
-import java.lang.reflect.Modifier;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.locks.ReentrantLock;
-import java.util.stream.Collectors;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.events.ExpansionRegisterEvent;
 import me.clip.placeholderapi.events.ExpansionUnregisterEvent;
 import me.clip.placeholderapi.events.ExpansionsLoadedEvent;
-import me.clip.placeholderapi.expansion.Cacheable;
-import me.clip.placeholderapi.expansion.Cleanable;
-import me.clip.placeholderapi.expansion.Configurable;
-import me.clip.placeholderapi.expansion.PlaceholderExpansion;
-import me.clip.placeholderapi.expansion.Taskable;
-import me.clip.placeholderapi.expansion.VersionSpecific;
+import me.clip.placeholderapi.expansion.*;
 import me.clip.placeholderapi.expansion.cloud.CloudExpansion;
 import me.clip.placeholderapi.util.FileUtil;
 import me.clip.placeholderapi.util.Futures;
@@ -66,6 +45,16 @@ 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
@@ -92,7 +81,7 @@ public final class LocalExpansionManager implements Listener {
     this.folder = new File(plugin.getDataFolder(), EXPANSIONS_FOLDER_NAME);
 
     if (!this.folder.exists() && !folder.mkdirs()) {
-      Msg.warn("Failed to create expansions folder!");
+      plugin.getLogger().log(Level.WARNING, "failed to create expansions folder!");
     }
   }
 
@@ -136,7 +125,7 @@ public final class LocalExpansionManager implements Listener {
   public PlaceholderExpansion getExpansion(@NotNull final String identifier) {
     expansionsLock.lock();
     try {
-      return expansions.get(identifier.toLowerCase(Locale.ROOT));
+      return expansions.get(identifier.toLowerCase());
     } finally {
       expansionsLock.unlock();
     }
@@ -171,27 +160,12 @@ public final class LocalExpansionManager implements Listener {
       @NotNull final Class<? extends PlaceholderExpansion> clazz) {
     try {
       final PlaceholderExpansion expansion = createExpansionInstance(clazz);
-      
-      if(expansion == null){
-        return Optional.empty();
-      }
-      
+
       Objects.requireNonNull(expansion.getAuthor(), "The expansion author is null!");
       Objects.requireNonNull(expansion.getIdentifier(), "The expansion identifier is null!");
       Objects.requireNonNull(expansion.getVersion(), "The expansion version is null!");
-      
-      if (expansion.getRequiredPlugin() != null && !expansion.getRequiredPlugin().isEmpty()) {
-        if (!Bukkit.getPluginManager().isPluginEnabled(expansion.getRequiredPlugin())) {
-          Msg.warn("Cannot load expansion %s due to a missing plugin: %s", expansion.getIdentifier(),
-              expansion.getRequiredPlugin());
-          return Optional.empty();
-        }
-      }
 
-      expansion.setExpansionType(PlaceholderExpansion.Type.EXTERNAL);
-      
       if (!expansion.register()) {
-        Msg.warn("Cannot load expansion %s due to an unknown issue.", expansion.getIdentifier());
         return Optional.empty();
       }
 
@@ -204,32 +178,23 @@ public final class LocalExpansionManager implements Listener {
       } else {
         reason = " - One of its properties is null which is not allowed!";
       }
-      
-      Msg.severe("Failed to load expansion class %s%s", ex, clazz.getSimpleName(), reason);
+
+      plugin.getLogger().severe("Failed to load expansion class " + clazz.getSimpleName() +
+              reason);
+      plugin.getLogger().log(Level.SEVERE, "", ex);
     }
 
     return Optional.empty();
   }
 
-  /**
-   * Attempt to register a {@link PlaceholderExpansion}
-   * @param expansion the expansion to register
-   * @return if the expansion was registered
-   */
   @ApiStatus.Internal
   public boolean register(@NotNull final PlaceholderExpansion expansion) {
-    final String identifier = expansion.getIdentifier().toLowerCase(Locale.ROOT);
+    final String identifier = expansion.getIdentifier().toLowerCase();
 
     if (!expansion.canRegister()) {
       return false;
     }
 
-    // Avoid loading two external expansions with the same identifier
-    if (expansion.getExpansionType() == PlaceholderExpansion.Type.EXTERNAL && expansions.containsKey(identifier)) {
-      Msg.warn("Failed to load external expansion %s. Identifier is already in use.", expansion.getIdentifier());
-      return false;
-    }
-
     if (expansion instanceof Configurable) {
       Map<String, Object> defaults = ((Configurable) expansion).getDefaults();
       String pre = "expansions." + identifier + ".";
@@ -265,8 +230,8 @@ public final class LocalExpansionManager implements Listener {
     if (expansion instanceof VersionSpecific) {
       VersionSpecific nms = (VersionSpecific) expansion;
       if (!nms.isCompatibleWith(PlaceholderAPIPlugin.getServerVersion())) {
-        Msg.warn("Your server version is incompatible with expansion %s %s",
-            expansion.getIdentifier(), expansion.getVersion());
+        plugin.getLogger().warning("Your server version is not compatible with expansion " +
+            expansion.getIdentifier() + " " + expansion.getVersion());
         return false;
       }
     }
@@ -293,25 +258,21 @@ public final class LocalExpansionManager implements Listener {
     if (expansion instanceof Listener) {
       Bukkit.getPluginManager().registerEvents(((Listener) expansion), plugin);
     }
-    
-    Msg.info(
-            "Successfully registered %s expansion: %s [%s]",
-            expansion.getExpansionType().name().toLowerCase(),
-            expansion.getIdentifier(),
-            expansion.getVersion()
-    );
+
+    plugin.getLogger().info("Successfully registered expansion: " + expansion.getIdentifier());
 
     if (expansion instanceof Taskable) {
       ((Taskable) expansion).start();
     }
 
-    // Check eCloud for updates only if the expansion is external
-    if (plugin.getPlaceholderAPIConfig().isCloudEnabled() && expansion.getExpansionType() == PlaceholderExpansion.Type.EXTERNAL) {
-      final Optional<CloudExpansion> cloudExpansionOptional = plugin.getCloudExpansionManager().findCloudExpansionByName(identifier);
+    if (plugin.getPlaceholderAPIConfig().isCloudEnabled()) {
+      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()));
+        cloudExpansion.setShouldUpdate(
+            !cloudExpansion.getLatestVersion().equals(expansion.getVersion()));
       }
     }
 
@@ -320,7 +281,7 @@ public final class LocalExpansionManager implements Listener {
 
   @ApiStatus.Internal
   public boolean unregister(@NotNull final PlaceholderExpansion expansion) {
-    if (expansions.remove(expansion.getIdentifier().toLowerCase(Locale.ROOT)) == null) {
+    if (expansions.remove(expansion.getIdentifier()) == null) {
       return false;
     }
 
@@ -349,45 +310,27 @@ public final class LocalExpansionManager implements Listener {
     return true;
   }
 
+
   private void registerAll(@NotNull final CommandSender sender) {
-    Msg.info("Placeholder expansion registration initializing...");
+    plugin.getLogger().info("Placeholder expansion registration initializing...");
 
     Futures.onMainThread(plugin, findExpansionsOnDisk(), (classes, exception) -> {
       if (exception != null) {
-        Msg.severe("Failed to load class files of expansion.", exception);
+        plugin.getLogger().log(Level.SEVERE, "failed to load class files of expansions", exception);
         return;
       }
-      
-      final List<PlaceholderExpansion> registered = classes.stream()
+
+      final long registered = classes.stream()
           .filter(Objects::nonNull)
           .map(this::register)
           .filter(Optional::isPresent)
-          .map(Optional::get)
-          .collect(Collectors.toList());
-
-      final long needsUpdate = registered.stream()
-          .map(expansion -> plugin.getCloudExpansionManager().findCloudExpansionByName(expansion.getName()).orElse(null))
-          .filter(Objects::nonNull)
-          .filter(CloudExpansion::shouldUpdate)
           .count();
 
-      StringBuilder message = new StringBuilder(registered.size() == 0 ? "&6" : "&a")
-          .append(registered.size())
-          .append(' ')
-          .append("placeholder hook(s) registered!");
-      
-      if (needsUpdate > 0) {
-        message.append(' ')
-            .append("&6")
-            .append(needsUpdate)
-            .append(' ')
-            .append("placeholder hook(s) have an update available.");
-      }
-      
-      
-      Msg.msg(sender, message.toString());
+      Msg.msg(sender,
+          registered == 0 ? "&6No expansions were registered!"
+              : registered + "&a placeholder hooks successfully registered!");
 
-      Bukkit.getPluginManager().callEvent(new ExpansionsLoadedEvent(registered));
+      Bukkit.getPluginManager().callEvent(new ExpansionsLoadedEvent());
     });
   }
 
@@ -403,12 +346,7 @@ public final class LocalExpansionManager implements Listener {
 
   @NotNull
   public CompletableFuture<@NotNull List<@Nullable Class<? extends PlaceholderExpansion>>> findExpansionsOnDisk() {
-    File[] files = folder.listFiles((dir, name) -> name.endsWith(".jar"));
-    if (files == null) {
-      return CompletableFuture.completedFuture(Collections.emptyList());
-    }
-    
-    return Arrays.stream(files)
+    return Arrays.stream(folder.listFiles((dir, name) -> name.endsWith(".jar")))
         .map(this::findExpansionInFile)
         .collect(Futures.collector());
   }
@@ -421,8 +359,8 @@ public final class LocalExpansionManager implements Listener {
         final Class<? extends PlaceholderExpansion> expansionClass = FileUtil.findClass(file, PlaceholderExpansion.class);
 
         if (expansionClass == null) {
-          Msg.severe("Failed to load expansion %s, as it does not have a class which"
-              + " extends PlaceholderExpansion", file.getName());
+          plugin.getLogger().severe("Failed to load Expansion: " + file.getName() + ", as it does not have" +
+                  " a class which extends PlaceholderExpansion.");
           return null;
         }
 
@@ -430,17 +368,19 @@ public final class LocalExpansionManager implements Listener {
                 .map(method -> new MethodSignature(method.getName(), method.getParameterTypes()))
                 .collect(Collectors.toSet());
         if (!expansionMethods.containsAll(ABSTRACT_EXPANSION_METHODS)) {
-          Msg.severe("Failed to load expansion %s, as it does not have the required"
-              + " methods declared for a PlaceholderExpansion.", file.getName());
+          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 (VerifyError | NoClassDefFoundError e) {
-        Msg.severe("Failed to load expansion %s (is a dependency missing?)", e, file.getName());
+      } catch (final VerifyError ex) {
+        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 (Exception e) {
-        throw new CompletionException(e.getMessage() + " (expansion file: " + file.getAbsolutePath() + ")", e);
+      } catch (final Exception ex) {
+        throw new CompletionException(ex);
       }
     });
   }
@@ -455,8 +395,9 @@ public final class LocalExpansionManager implements Listener {
       if (ex.getCause() instanceof LinkageError) {
         throw ((LinkageError) ex.getCause());
       }
+
+      plugin.getLogger().warning("There was an issue with loading an expansion.");
       
-      Msg.warn("There was an issue with loading an expansion.");
       return null;
     }
   }
@@ -486,8 +427,7 @@ public final class LocalExpansionManager implements Listener {
       }
 
       expansion.unregister();
-      Msg.info("Unregistered placeholder expansion %s", expansion.getIdentifier());
-      Msg.info("Reason: required plugin %s was disabled.", name);
+      plugin.getLogger().info("Unregistered placeholder expansion: " + expansion.getName());
     }
   }
 

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

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

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

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

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

@@ -0,0 +1,72 @@
+/*
+ * This file is part of PlaceholderAPI
+ *
+ * PlaceholderAPI
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
+ *
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 java.util.regex.Matcher;
+import java.util.regex.Pattern;
+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 RegexReplacer implements Replacer {
+
+  @NotNull
+  private final Pattern pattern;
+
+  public RegexReplacer(@NotNull final Closure closure) {
+    this.pattern = Pattern.compile(String
+        .format("\\%s((?<identifier>[a-zA-Z0-9]+)_)(?<parameters>[^%s%s]+)\\%s", closure.head,
+            closure.head, closure.tail, closure.tail));
+  }
+
+
+  @NotNull
+  @Override
+  public String apply(@NotNull final String text, @Nullable final OfflinePlayer player,
+      @NotNull final Function<String, @Nullable PlaceholderExpansion> lookup) {
+    final Matcher matcher = pattern.matcher(text);
+    if (!matcher.find()) {
+      return text;
+    }
+
+    final StringBuffer builder = new StringBuffer();
+
+    do {
+      final String identifier = matcher.group("identifier");
+      final String parameters = matcher.group("parameters");
+
+      final PlaceholderExpansion expansion = lookup.apply(identifier);
+      if (expansion == null) {
+        continue;
+      }
+
+      final String requested = expansion.onRequest(player, parameters);
+      matcher.appendReplacement(builder, requested != null ? requested : matcher.group(0));
+    }
+    while (matcher.find());
+
+    return ChatColor.translateAlternateColorCodes('&', matcher.appendTail(builder).toString());
+  }
+
+}

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -50,7 +50,7 @@ public final class Format {
   }
 
   @NotNull
-  private static String buildFormat(@NotNull final Align align, final int[] spacing) {
+  private static String buildFormat(@NotNull final Align align, @NotNull 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,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -21,40 +21,14 @@
 package me.clip.placeholderapi.util;
 
 import java.util.Arrays;
-import java.util.logging.Level;
 import java.util.stream.Collectors;
-import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 
 public final class Msg {
-  
-  public static void log(Level level, String msg, Object... args) {
-    PlaceholderAPIPlugin.getInstance().getLogger().log(level, String.format(msg, args));
-  }
-  
-  public static void info(String msg, Object... args) {
-    log(Level.INFO, msg, args);
-  }
-  
-  public static void warn(String msg, Object... args) {
-    log(Level.WARNING, msg, args);
-  }
-  
-  public static void warn(String msg, Throwable throwable, Object... args){
-    PlaceholderAPIPlugin.getInstance().getLogger().log(Level.WARNING, String.format(msg, args), throwable);
-  }
-  
-  public static void severe(String msg, Object... args) {
-    log(Level.SEVERE, msg, args);
-  }
-  
-  public static void severe(String msg, Throwable throwable, Object... args) {
-    PlaceholderAPIPlugin.getInstance().getLogger().log(Level.SEVERE, String.format(msg, args), throwable);
-  }
-  
+
   public static void msg(@NotNull final CommandSender sender, @NotNull final String... messages) {
     if (messages.length == 0) {
       return;

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.

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

@@ -2,9 +2,9 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
+ * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI free software: you can redistribute it and/or modify
+ * PlaceholderAPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.

src/main/resources/config.yml

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

src/main/resources/plugin.yml

@@ -1,11 +1,11 @@
-name: PlaceholderAPI
+name: "@name@"
 main: "me.clip.placeholderapi.PlaceholderAPIPlugin"
 
-version: ${version}
+version: "@version@"
 author: HelpChat
 
 api-version: "1.13"
-description: "An awesome placeholder provider!"
+description: "@description@"
 
 commands:
   placeholderapi:
@@ -37,6 +37,7 @@ permissions:
       placeholderapi.ecloud.info: true
       placeholderapi.ecloud.list: true
       placeholderapi.ecloud.clear: true
+      placeholderapi.ecloud.toggle: true
       placeholderapi.ecloud.status: true
       placeholderapi.ecloud.update: true
       placeholderapi.ecloud.refresh: true
@@ -81,6 +82,9 @@ permissions:
   placeholderapi.ecloud.clear:
     default: "op"
     description: "Allows you to clear the local eCloud expansion cache"
+  placeholderapi.ecloud.toggle:
+    default: "op"
+    description: "Allows you to toggle/enable/disable the eCloud manager"
   placeholderapi.ecloud.status:
     default: "op"
     description: "Allows you to view the status of eCloud expansions"
@@ -95,4 +99,4 @@ permissions:
     description: "Allows you to download an expansion from the eCloud"
   placeholderapi.ecloud.placeholders:
     default: "op"
-    description: "Allows you to view the placeholders of a eCloud expansion"
+    description: "Allows you to view the placeholders of a eCloud expansion"

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 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;
 import com.google.common.collect.ImmutableMap;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import me.clip.placeholderapi.replacer.CharsReplacer;
+import me.clip.placeholderapi.replacer.RegexReplacer;
 import me.clip.placeholderapi.replacer.Replacer;
 import org.bukkit.OfflinePlayer;
 import org.jetbrains.annotations.NotNull;
@@ -39,6 +40,7 @@ public interface Values {
 
 
   Replacer CHARS_REPLACER = new CharsReplacer(Replacer.Closure.PERCENT);
+  Replacer REGEX_REPLACER = new RegexReplacer(Replacer.Closure.PERCENT);
 
 
   final class MockPlayerPlaceholderExpansion extends PlaceholderExpansion {

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 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
@@ -30,9 +30,19 @@ public class ReplacerBenchmarks {
     Values.CHARS_REPLACER.apply(Values.SMALL_TEXT, null, Values.PLACEHOLDERS::get);
   }
 
+  @Benchmark
+  public void measureRegexReplacerSmallText() {
+    Values.REGEX_REPLACER.apply(Values.SMALL_TEXT, null, Values.PLACEHOLDERS::get);
+  }
+
   @Benchmark
   public void measureCharsReplacerLargeText() {
     Values.CHARS_REPLACER.apply(Values.LARGE_TEXT, null, Values.PLACEHOLDERS::get);
   }
 
+  @Benchmark
+  public void measureRegexReplacerLargeText() {
+    Values.REGEX_REPLACER.apply(Values.LARGE_TEXT, null, Values.PLACEHOLDERS::get);
+  }
+
 }

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

@@ -2,7 +2,7 @@
  * This file is part of PlaceholderAPI
  *
  * PlaceholderAPI
- * Copyright (c) 2015 - 2024 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
@@ -37,6 +37,12 @@ public final class ReplacerUnitTester {
         Values.CHARS_REPLACER.apply("%player_name%", null, Values.PLACEHOLDERS::get));
   }
 
+  @Test
+  void testRegexReplacerProducesExpectedSingleValue() {
+    assertEquals(PLAYER_NAME,
+        Values.REGEX_REPLACER.apply("%player_name%", null, Values.PLACEHOLDERS::get));
+  }
+
   @Test
   void testCharsReplacerProducesExpectedSentence() {
     assertEquals(String.format(
@@ -45,14 +51,36 @@ public final class ReplacerUnitTester {
         Values.CHARS_REPLACER.apply(Values.LARGE_TEXT, null, Values.PLACEHOLDERS::get));
   }
 
+  @Test
+  void testRegexReplacerProducesExpectedSentence() {
+    assertEquals(String.format(
+        "My name is %s and my location is (%s, %s, %s), this placeholder is invalid %%server_name%%",
+        PLAYER_NAME, PLAYER_X, PLAYER_Y, PLAYER_Z),
+        Values.REGEX_REPLACER.apply(Values.LARGE_TEXT, null, Values.PLACEHOLDERS::get));
+  }
+
   @Test
   void testResultsAreTheSameAsReplacement() {
     final String resultChars = Values.CHARS_REPLACER
         .apply("%player_name%", null, Values.PLACEHOLDERS::get);
+    final String resultRegex = Values.REGEX_REPLACER
+        .apply("%player_name%", null, Values.PLACEHOLDERS::get);
+
+    assertEquals(resultChars, resultRegex);
 
     assertEquals(PLAYER_NAME, resultChars);
   }
 
+  @Test
+  void testResultsAreTheSameNoReplacement() {
+    final String resultChars = Values.CHARS_REPLACER
+        .apply("%player_location%", null, Values.PLACEHOLDERS::get);
+    final String resultRegex = Values.REGEX_REPLACER
+        .apply("%player_location%", null, Values.PLACEHOLDERS::get);
+
+    assertEquals(resultChars, resultRegex);
+  }
+
   @Test
   void testCharsReplacerIgnoresMalformed() {
     final String text = "10% and %hello world 15%";
@@ -60,4 +88,12 @@ 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

@@ -0,0 +1,239 @@
+This page shows all commands, including with a detailed description of what every command does.
+
+## Overview
+
+- **[Parse Commands](#parse-commands)**
+  - [`/papi bcparse <player|me> <string>`](#papi-bcparse)
+  - [`/papi cmdparse <player|me> <string>`](#papi-cmdparse)
+  - [`/papi parse <player|me> <string>`](#papi-parse)
+  - [`/papi parserel <player> <player> <string>`](#papi-parserel)
+
+- **[eCloud Commands](#ecloud-commands)**
+  - [`/papi ecloud clear`](#papi-ecloud-clear)
+  - [`/papi ecloud disable`](#papi-ecloud-disable)
+  - [`/papi ecloud download <expansion> [version]`](#papi-ecloud-download)
+  - [`/papi ecloud enable`](#papi-ecloud-enable)
+  - [`/papi ecloud info <expansion> [version]`](#papi-ecloud-info)
+  - [`/papi ecloud list <all|<author>|installed>`](#papi-ecloud-list)
+  - [`/papi ecloud placeholders <expansion>`](#papi-ecloud-placeholders)
+  - [`/papi ecloud refresh`](#papi-ecloud-refresh)
+  - [`/papi ecloud status`](#papi-ecloud-status)
+
+- **[Expansion Commands](#expansion-commands)**
+  - [`/papi info <expansion>`](#papi-info)
+  - [`/papi list`](#papi-list)
+  - [`/papi register <jar file>`](#papi-register)
+  - [`/papi unregister <jar file>`](#papi-unregister)
+
+- **[Other Commands](#other-commands)**
+  - [`/papi dump`](#papi-dump)
+  - [`/papi reload`](#papi-reload)
+
+----
+### 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.
+
+**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%!
+```
+
+----
+#### `/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 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.
+
+**Argument(s)**:  
+- `<expansion>` - The Expansion to get info from (Needs to be registered and active).
+
+**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
+```
+
+----
+### 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 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.

wiki/Expansion-cloud.md

@@ -0,0 +1,67 @@
+## About
+PlaceholderAPI uses an expansion-cloud (A website that has all kinds of expansions stored), to download jar-files, that contain the placeholders for it to use.
+
+The expansion-cloud can be seen under https://api.extendedclip.com/home
+
+## How it works
+PlaceholderAPI connects to the ecloud on startup of your server, to check if the cloud is available and how many expansions are available on it.  
+If you run `/papi ecloud download <expansion>` PlaceholderAPI will connect to the site to first check if the specified expansion exists and then downloads it if it does.  
+Note that not all listed expansions are on the ecloud. Some are in the corresponding plugin itself and are registered on the startup of the server.
+
+You can disable the connection to the cloud by setting `cloud_enabled` in the config.yml to false.
+
+## Adding your own expansion
+You can add your own expansion to the expansion-cloud for others to use.  
+In order to do that, you have to follow those steps:
+1. Make sure you have created a seperate jar-file like explained on the page [[PlaceholderExpansion]].
+2. Create an account on the site, or log in, if you already have one.
+3. Click on `Expansions` and then on [`Upload New`](https://api.extendedclip.com/manage/add/).
+4. Fill out the required information. `Source URL` and `Dependency URL` are optional.
+5. Click on the button that says `Choose an file...` and select the jar of your expansion.
+    * **Important**! Make sure, that the name of the jar-file contains the same version like you set in the version-field!
+6. Click on `Submit Expansion`
+
+Your expansion is now uploaded and will be reviewed by a moderator.  
+If everything is ok will your expansion be approved and will be available on the ecloud for PlaceholderAPI*.
+
+> *You can only download verified Expansions through PlaceholderAPIs command, unless you enable the option `cloud_allow_unverified_expansions` in the config.yml  
+> Unverified expansions can be downloaded manually by going to the site and download it yourself.
+
+## Updating your expansion
+Before you update, please note the following:  
+If you aren't a verified dev and you upload an update, your expansion will become **unverified** until a moderator reviews the update and approves it!  
+It is recommended to only update the expansion, if it contains huge changes or bug fixes.
+
+To update your expansion, you first have to go to the list of [your expansions](https://api.extendedclip.com/manage/).  
+For that click on `Expansions` and select `Your Expansions`.  
+After that, follow those steps:
+1. Click the name of the expansion, that you want to update.
+2. Click on the button that says `Version`
+3. Click on `Add Version`
+4. Fill out the fields and upload the new jar.
+    * **Important**! Make sure, that the name of the jar-file contains the same version like you set in the version-field!
+5. Click on `Save Changes`
+
+If you're a verified dev, your version will be approved and is available directly.  
+If you aren't a verified dev, you have to wait until a moderator approves the update.
+
+## Downloading a specific expansion version
+In some cases, you may want to use a specific, older version of expansion. Such a case could be for example, when you run an old server version and the newest version of an expansion uses methods that aren't available on that particular server version.  
+For that case is there a way, to download a specific version of expansion. You can download the expansion either manually, or through PlaceholderAPI itself.  
+Here is how you can do it for each.
+
+### Download with PlaceholderAPI
+This is the easiest of both methods since it requires the least amount of effort.  
+Run the following command in-game or in your console to download a specific version:  
+`/papi ecloud download <expansion> [version]`
+
+To find out, what versions are available for the expansion, run `/papi ecloud info <expansion>`  
+You can then run `/papi ecloud versioninfo <expansion> <version>` to receive more infor about a specific version.
+
+After you downloaded the specific version, run `/papi reload` to refresh the installed expansions.
+
+### Download manually
+To download an expansion manually, you first have to connect to the website and go to the expansion of your choice.  
+There, you click on the button that says `Version` and click on the download-icon of the version you want to download.
+
+Finally, stop your server, upload the jar to the folder in `/plugins/PlaceholderAPI/expansions` (Make sure to delete the old jar, if there's already one) and start the server again.

wiki/FAQ.md

@@ -0,0 +1,55 @@
+[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
+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.  
+Next step would be to check if the expansion actually exists on the cloud. Not all plugins provide their placeholders through a separate jar on the cloud. Some have them build in and register them on startup.
+
+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]]!
+
+## 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

@@ -0,0 +1,78 @@
+<p align="center">
+  <img src="https://raw.githubusercontent.com/PlaceholderAPI/PlaceholderAPI/docs/wiki/wiki/img/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).
+
+### 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]]
+- [[Setting placeholders in your plugin|Hook-into-PlaceholderAPI#setting-placeholders-in-your-plugin]]
+
+### Other
+**[[Commands]]**  
+**[[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]]
+  - [[A|Placeholders#a]]
+  - [[B|Placeholders#b]]
+  - [[C|Placeholders#c]]
+  - [[D|Placeholders#d]]
+  - [[E|Placeholders#e]]
+  - [[F|Placeholders#f]]
+  - [[G|Placeholders#g]]
+  - [[H|Placeholders#h]]
+  - [[I|Placeholders#i]]
+  - [[J|Placeholders#j]]
+  - [[K|Placeholders#k]]
+  - [[L|Placeholders#l]]
+  - [[M|Placeholders#m]]
+  - [[N|Placeholders#n]]
+  - [[O|Placeholders#o]]
+  - [[P|Placeholders#p]]
+  - [[Q|Placeholders#q]]
+  - [[R|Placeholders#r]]
+  - [[S|Placeholders#s]]
+  - [[T|Placeholders#t]]
+  - [[U|Placeholders#u]]
+  - [[V|Placeholders#v]]
+  - [[W|Placeholders#w]]
+  - [[Z|Placeholders#z]]

wiki/Hook-into-PlaceholderAPI.md

@@ -0,0 +1,142 @@
+[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
+
+[GitHubBadge]: https://img.shields.io/github/v/release/PlaceholderAPI/PlaceholderAPI?label=GitHub%20Release
+[GitHub]: /PlaceholderAPI/PlaceholderAPI/releases/latest
+
+> [![SpigotBadge]][Spigot] [![GitHubBadge]][GitHub]
+>
+> ![APIBadge]  
+>
+> *The GitHub release may be different from the spigot release*
+
+This page is about using PlaceholderAPI in your own plugin, to either let other plugins use your plugin, or just use placeholders from other plugins in your own.
+
+Please note, that the examples in this page are only available for **PlaceholderAPI 2.10.0 or higher**!
+
+## First steps
+Before you can actually make use of PlaceholderAPI, you first have to import it into your project.
+
+### Import with Maven
+To import PlaceholderAPI, simply add the following code to your **pom.xml**  
+Replace `{VERSION}` with the version listed at the top of this page.  
+```xml
+    <repositories>
+        <repository>
+            <id>placeholderapi</id>
+            <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
+        </repository>
+    </repositories>
+    <dependencies>
+        <dependency>
+         <groupId>me.clip</groupId>
+          <artifactId>placeholderapi</artifactId>
+          <version>{VERSION}</version>
+         <scope>provided</scope>
+        </dependency>
+    </dependencies>
+```
+
+### Import with Gradle
+Here is how you can import PlaceholderAPI through gradle.  
+Put this into your **Gradle.build**.  
+Replace `{VERSION}` with the version listed at the top of this page.  
+```gradle
+repositories {
+    maven {
+        url = 'https://repo.extendedclip.com/content/repositories/placeholderapi/'
+    }
+}
+
+dependencies {
+    compileOnly 'me.clip:placeholderapi:{VERSION}'
+}
+```
+
+### Set PlaceholderAPI as (soft)depend
+Next step is to go to your plugin.yml and add PlaceholderAPI as a depend or softdepend, depending (no pun intended) on if it is optional or not.
+
+**Example Softdepend**:
+```yaml
+name: ExamplePlugin
+version: 1.0
+author: author
+main: your.main.path.here
+
+softdepend: [PlaceholderAPI] # This is used, if your plugin works without PlaceholderAPI.
+```
+
+**Example Depend**:
+```yaml
+name: ExamplePlugin
+version: 1.0
+author: author
+main: your.main.path.here
+
+depend: [PlaceholderAPI] # If your plugin requires PlaceholderAPI, to work, use this.
+```
+
+## Adding placeholders to PlaceholderAPI
+
+A full guide on how to create expansions can be found on the [[PlaceholderExpansion]] page of this wiki.
+
+## Setting placeholders in your plugin
+PlaceholderAPI offers the ability, to automatically parse placeholders from other plugins within your own plugin, giving the ability for your plugin to support thousands of other placeholders without depending on each plugin individually.  
+To use placeholders from other plugins in our own plugin, we simply have to [(soft)depend on PlaceholderAPI](#set-placeholderapi-as-softdepend) and use the `setPlaceholders` method.
+
+It is also important to point out, that any required plugin/dependency for an expansion has to be on the server and enabled, or the `setPlaceholders` method will just return the placeholder itself (do nothing).
+
+**Example**:  
+Let's assume we want to send an own join message that shows the group a player has.  
+To achieve that, we can do the following:  
+```java
+package at.helpch.placeholderapi;
+
+import me.clip.placeholderapi.PlaceholderAPI;
+
+import org.bukkit.Bukkit;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.plugin.java.JavaPlugin;
+import me.clip.placeholderapi.PlaceholderAPI;
+
+public class JoinExample extends JavaPlugin implements Listener {
+
+    @Override
+    public void onEnable() {
+ 
+        if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) {
+            /*
+             * We register the EventListener here, when PlaceholderAPI is installed.
+             * Since all events are in the main class (this class), we simply use "this"
+             */
+            Bukkit.getPluginManager().registerEvents(this, this);
+        } else {
+            /*
+             * We inform about the fact that PlaceholderAPI isn't installed and then
+             * disable this plugin to prevent issues.
+             */
+            getLogger().warn("Could not find PlaceholderAPI! This plugin is required.");
+            Bukkit.getPluginManager().disablePlugin(this);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST)
+    public void onJoin(PlayerJoinEvent event) {
+        String joinText = "%player_name% &ajoined the server! They are rank &f%vault_rank%";
+
+        /*
+         * We parse the placeholders using "setPlaceholders"
+         * This would turn %vault_rank% into the name of the Group, that the
+         * joining player has.
+         */
+        joinText = PlaceholderAPI.setPlaceholders(event.getPlayer(), joinText);
+
+        event.setJoinMessage(joinText);
+    }
+}
+```

wiki/PlaceholderExpansion.md

@@ -0,0 +1,411 @@
+## Overview
+This page covers how you can use the `PlaceholderExpansion` to add own placeholders to PlaceholderAPI, which then can be used by other plugins.
+
+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.
+
+## 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.
+
+## 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.
+
+* [Without external plugin](#without-external-plugin)
+* [With external plugin](#with-external-plugin)
+  * [Separate jar](#separate-jar)
+  * [Internal class](#internal-class)
+
+### 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)
+
+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:  
+```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(){
+        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>The identifier has to be lowercase and can't contain _ or %
+     *
+     * @return The identifier in {@code %<identifier>_<value>%} as String.
+     */
+    @Override
+    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(){
+        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;
+    }
+}
+```
+----
+
+### 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.
+
+In our examples do we have the plugin `SomePlugin` and want to show certain placeholders with it.
+
+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.
+
+#### 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.
+
+```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 onEnable()} 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(){
+        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>The identifier has to be lowercase and can't 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";
+    }
+
+    /**
+     * 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(){
+        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 "";
+        }
+
+        // %someplugin_placeholder1%
+        if(identifier.equals("placeholder1")){
+            return plugin.getConfig().getString("placeholder1", "value doesnt exist");
+        }
+
+        // %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;
+    }
+}
+```
+
+----
+#### 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.
+
+
+```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 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){
+        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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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();
+    }
+
+    /**
+     * 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>The identifier has to be lowercase and can't 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 "";
+        }
+
+        // %someplugin_placeholder1%
+        if(identifier.equals("placeholder1")){
+            return plugin.getConfig().getString("placeholder1", "value doesnt exist");
+        }
+
+        // %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;
+    }
+}
+```
+
+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.
+
+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{
+    
+    @Override
+    public void onEnable(){
+        // Small check to make sure that PlaceholderAPI is installed
+        if(Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null){
+              new SomeExpansion(this).register();
+        }
+    }
+}
+```

wiki/README.md

@@ -0,0 +1,104 @@
+[Wiki]: https://github.com/PlaceholderAPI/PlaceholderAPI/wiki
+[Placeholders]: https://github.com/PlaceholderAPI/PlaceholderAPI/wiki/Placeholders
+[Plugins using PlaceholderAPI]: https://github.com/PlaceholderAPI/PlaceholderAPI/wiki/Plugins-using-PlaceholderAPI
+
+# 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.
+
+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.
+
+## Target branch
+The wiki is handled on a separate branch called `docs/wiki`.  
+When making a Pull request, make sure to target this specific branch. Any PR not targeting this branch may either be closed or the target changed.
+
+## Adding your resource(s)
+When you either have a plugin, which adds and/or uses placeholders or an expansion and you want to add it to the wiki should you follow the below steps.
+
+- [Plugins using PlaceholderAPI](#plugins-using-placeholderapi)
+- [Placeholders](#placeholders)
+
+### [Plugins using PlaceholderAPI]
+This is only required for plugins.  
+If your plugin supports placeholders of other plugins and/or provides own placeholders through PlaceholderAPI should you always add it the the `Plugins using PlaceholderAPI` page.
+
+Each entry on this page follows a specific format that you need to follow:  
+```markdown
+- **[:name](:url)**
+  - [?] Supports placeholders.
+  - [?] Provides own placeholders. [:link]
+```
+
+| Key     | Description                                                                                                                                                                              |
+| ------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `:name` | The name of the Plugin. Plugins are ordered by alphabet and if your plugin shares the same name as another one will you need to add it **below** the other resource.                     |
+| `:url`  | The URL to your plugin. Spigot URLs should only contain the ID. E.g. https://www.spigotmc.org/resources/placeholderapi.6245/ becomes https://www.spigotmc.org/resources/6245/            |
+| `?`     | Should be replaced with either an `x` or a space, depending on if the option is supported. So the result is either `[x]` or `[ ]`                                                        |
+| `:link` | If your plugin also provides own placeholders should you add it to the [Placeholders] page. In such a case should you use `[**[[Link\|Placeholders#:name]]**]` otherwhise just `[Link]` |
+
+### [Placeholders]
+This step is required if you either have a plugin or an expansion that provides their own placeholders. You should add your resource to the Placeholders page of the wiki.  
+This page is split up into two sections: PAPI Placeholders and Plugin Placeholders.
+
+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.
+
+The syntax used for each entry is the same:
+````markdown
+- ### **[:name](:url)**
+> :command
+
+```
+:placeholders
+```
+----
+````
+
+| Key             | Description                                                                                                                                                                                        |
+| --------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `:name`         | The name of the resource. Resources are ordered by alphabet and if your plugin shares the same name as another one will you need to add it **below** the other resource.                           |
+| `:url`          | The URL to your plugin. Spigot URLs should only contain the ID. E.g. https://www.spigotmc.org/resources/placeholderapi.6245/ becomes https://www.spigotmc.org/resources/6245/                      |
+| `:command`      | The download command. When your resource is an expansion on the ecloud would you need to add `/papi ecloud download :name`. If it isn't an expansion should you put `NO DOWNLOAD COMMAND` instead. |
+| `:placeholders` | List of placeholders your plugin/expansion offers. The list should stay in alphabetical order. You can use `<>` and `[]` to indicate required and optional variables.                              |
+
+#### Extra notes
+
+- If your entry has another one below it will you need to add an empty line, followed by for hypthons (`----`) at the bottom of your entry to separate it.
+- You are allowed to add a description between the `> :command` and the placeholder list. Keep in mind to keep an empty line after the command line to prevent wrong formatting. A description is only useful/required if your expansion/plugin offers specific placeholder values and/or features.
+- Always add your entry's name to the list at the top of the page in the format `- [:name](#:name)`. Note that if your entry shares the same name as another one on the page and you added it below it, that you will need to append a `-1`, `-2`, ... to the name in the brackets, depending on how many entries with the same name there are.
+
+----
+## Other Wiki pages
+Please follow these general guidelines when editing any other pages.
+
+### Links
+The wiki uses 3 types of links:
+
+- [Reference Links](#reference-links)
+- [Wiki Links](#wiki-links)
+- [Header Links](#header-links)
+
+#### Reference Links
+Reference Links are in the format `[:text]: :url` where `:text` is the name to use as reference and `:url` is the url.  
+These types of links are usually put at the top of the page and allow us easier updating of these links, by just altering the URL without the need to replace them in the entire file.
+
+To use a reference link, either use `[:text]` or `[:displayed_text][:text]` to link with a differently shown text.
+
+For example: With `[wiki]: https://github.com/PlaceholderAPI/PlaceholderAPI/wiki` will `[wiki]` become [wiki] and `[to the wiki][wiki]` becomes [to the wiki][wiki].
+
+Always use reference links for URLs that point outside of the Wiki. Only exceptions are Links in the [Placeholders] and [Plugins using PlaceholderAPI] page (See above for details).
+
+#### Wiki Links
+Wiki links are used to link to other pages on the wiki.  
+These types of links are in the format `[[:pagename]]` or `[[:text|:pagename]]` to display a different text. `:pagename` is case-sensitive.
+
+If you want to link to a header in another wiki page can you use `[[:text|:pagename#:header]]`.
+
+#### Header Links
+Header links are used to link to a section within the same wiki page.  
+The format is `[:text](#:header)`. The header name is case-insensitive but it's recommended to keep it lowercase.
+
+----
+### 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.
+

wiki/_Footer.md

@@ -0,0 +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/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]

wiki/_Sidebar.md

@@ -0,0 +1,81 @@
+<p align="center">
+  <img src="https://raw.githubusercontent.com/PlaceholderAPI/PlaceholderAPI/docs/wiki/wiki/img/icon.png" alt="PlaceholderAPI">
+</p>
+
+**[[Main page|Home]]**
+
+### 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]]
+- [[Setting placeholders in your plugin|Hook-into-PlaceholderAPI#setting-placeholders-in-your-plugin]]
+
+### Other
+**[[Commands]]**  
+**[[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]]
+  - [[SpeedPerSec|Placeholders#speedpersec]]
+  - [[Statistic|Placeholders#statistic]]
+  - [[Team|Placeholders#team]]
+  - [[World|Placeholders#world]]
+  
+- [[Plugin-placeholders|Placeholders#plugin-placeholders-1]]
+  - [[A|Placeholders#a]]
+  - [[B|Placeholders#b]]
+  - [[C|Placeholders#c]]
+  - [[D|Placeholders#d]]
+  - [[E|Placeholders#e]]
+  - [[F|Placeholders#f]]
+  - [[G|Placeholders#g]]
+  - [[H|Placeholders#h]]
+  - [[I|Placeholders#i]]
+  - [[J|Placeholders#j]]
+  - [[K|Placeholders#k]]
+  - [[L|Placeholders#l]]
+  - [[M|Placeholders#m]]
+  - [[N|Placeholders#n]]
+  - [[O|Placeholders#o]]
+  - [[P|Placeholders#p]]
+  - [[Q|Placeholders#q]]
+  - [[R|Placeholders#r]]
+  - [[S|Placeholders#s]]
+  - [[T|Placeholders#t]]
+  - [[U|Placeholders#u]]
+  - [[V|Placeholders#v]]
+  - [[W|Placeholders#w]]
+  - [[Z|Placeholders#z]]